move docusaurus version to utils

facebook · Apr 21, 2022 · ec720ab · ec720ab
1 parent 7cc5aa4
commit ec720ab
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/jest.config.mjs b/jest.config.mjs
@@ -6,12 +6,8 @@
  */
 
 import {fileURLToPath} from 'url';
-import {createRequire} from 'module';
 
 process.env.TZ = 'UTC';
-process.env.DOCUSAURUS_VERSION = createRequire(import.meta.url)(
-  '@docusaurus/core/package.json',
-).version;
 
 const ignorePatterns = [
   '/node_modules/',

diff --git a/packages/docusaurus-utils/src/constants.ts b/packages/docusaurus-utils/src/constants.ts
@@ -16,6 +16,10 @@ export const NODE_MINOR_VERSION = parseInt(
   10,
 );
 
+/** Docusaurus core version. */
+// eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
+export const DOCUSAURUS_VERSION = require('../package.json').version;
+
 /**
  * Can be overridden with cli option `--out-dir`. Code should generally use
  * `context.outDir` instead (which is always absolute and localized).

diff --git a/packages/docusaurus-utils/src/index.ts b/packages/docusaurus-utils/src/index.ts
@@ -8,6 +8,7 @@
 export {
   NODE_MAJOR_VERSION,
   NODE_MINOR_VERSION,
+  DOCUSAURUS_VERSION,
   DEFAULT_BUILD_DIR_NAME,
   DEFAULT_CONFIG_FILE_NAME,
   BABEL_CONFIG_FILE_NAME,

diff --git a/packages/docusaurus/bin/beforeCli.mjs b/packages/docusaurus/bin/beforeCli.mjs
@@ -14,6 +14,7 @@ import path from 'path';
 import updateNotifier from 'update-notifier';
 import boxen from 'boxen';
 import {createRequire} from 'module';
+import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 
 const packageJson = createRequire(import.meta.url)('../package.json');
 /** @type {Record<string, any>} */
@@ -28,12 +29,9 @@ try {
 
 const {
   name,
-  version,
   engines: {node: requiredVersion},
 } = packageJson;
 
-process.env.DOCUSAURUS_VERSION = version;
-
 /**
  * Notify user if `@docusaurus` packages are outdated
  *
@@ -48,7 +46,7 @@ export default async function beforeCli() {
   const notifier = updateNotifier({
     pkg: {
       name,
-      version,
+      version: DOCUSAURUS_VERSION,
     },
     // Check is in background so it's fine to use a small value like 1h
     // Use 0 for debugging

diff --git a/packages/docusaurus/bin/docusaurus.mjs b/packages/docusaurus/bin/docusaurus.mjs
@@ -11,6 +11,7 @@
 import logger from '@docusaurus/logger';
 import fs from 'fs-extra';
 import cli from 'commander';
+import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 import {
   build,
   swizzle,
@@ -28,7 +29,7 @@ await beforeCli();
 
 const resolveDir = (dir = '.') => fs.realpath(dir);
 
-cli.version(process.env.DOCUSAURUS_VERSION).usage('<command> [options]');
+cli.version(DOCUSAURUS_VERSION).usage('<command> [options]');
 
 cli
   .command('build [siteDir]')

diff --git a/packages/docusaurus/src/client/serverEntry.tsx b/packages/docusaurus/src/client/serverEntry.tsx
@@ -26,6 +26,7 @@ import logger from '@docusaurus/logger';
 // eslint-disable-next-line no-restricted-imports
 import _ from 'lodash';
 import type {Locals} from '@slorber/static-site-generator-webpack-plugin';
+import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 
 const getCompiledSSRTemplate = _.memoize((template: string) =>
   eta.compile(template.trim(), {
@@ -129,7 +130,7 @@ async function doRender(locals: Locals & {path: string}) {
     scripts,
     stylesheets,
     noIndex,
-    version: process.env.DOCUSAURUS_VERSION,
+    version: DOCUSAURUS_VERSION,
   });
 
   try {

diff --git a/packages/docusaurus/src/server/siteMetadata.ts b/packages/docusaurus/src/server/siteMetadata.ts
@@ -10,6 +10,7 @@ import type {
   PluginVersionInformation,
   SiteMetadata,
 } from '@docusaurus/types';
+import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 import fs from 'fs-extra';
 import path from 'path';
 import logger from '@docusaurus/logger';
@@ -98,7 +99,7 @@ export async function loadSiteMetadata({
   siteDir: string;
 }): Promise<SiteMetadata> {
   const siteMetadata: SiteMetadata = {
-    docusaurusVersion: process.env.DOCUSAURUS_VERSION!,
+    docusaurusVersion: DOCUSAURUS_VERSION,
     siteVersion: await getPackageJsonVersion(
       path.join(siteDir, 'package.json'),
     ),