From 360f37e23adc646dcdb3f6507cd3e311a426fb4b Mon Sep 17 00:00:00 2001 From: Joshua Chen Date: Tue, 12 Jul 2022 15:14:38 +0800 Subject: [PATCH 1/3] fix(migrate): import siteConfig with file extension --- packages/docusaurus-migrate/package.json | 1 - packages/docusaurus-migrate/src/index.ts | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/docusaurus-migrate/package.json b/packages/docusaurus-migrate/package.json index 4c547c505558..c546c151146f 100644 --- a/packages/docusaurus-migrate/package.json +++ b/packages/docusaurus-migrate/package.json @@ -32,7 +32,6 @@ "fs-extra": "^10.1.0", "hast-util-to-string": "^1.0.4", "html-tags": "^3.2.0", - "import-fresh": "^3.3.0", "jscodeshift": "^0.13.1", "rehype-parse": "^7.0.1", "remark-parse": "^8.0.2", diff --git a/packages/docusaurus-migrate/src/index.ts b/packages/docusaurus-migrate/src/index.ts index bab7fd688222..ec0615a5801b 100644 --- a/packages/docusaurus-migrate/src/index.ts +++ b/packages/docusaurus-migrate/src/index.ts @@ -9,7 +9,6 @@ import path from 'path'; import fs from 'fs-extra'; import logger from '@docusaurus/logger'; import {Globby, DOCUSAURUS_VERSION} from '@docusaurus/utils'; -import importFresh from 'import-fresh'; import Color from 'color'; import extractMetadata, {shouldQuotifyFrontMatter} from './frontMatter'; @@ -79,7 +78,7 @@ export async function migrateDocusaurusProject( shouldMigratePages: boolean = false, ): Promise { async function createMigrationContext(): Promise { - const v1Config = (await import(`${siteDir}/siteConfig`)) + const v1Config = (await import(`${siteDir}/siteConfig.js`)) .default as VersionOneConfig; logger.info('Starting migration from v1 to v2...'); const deps = { @@ -709,12 +708,13 @@ async function migrateLatestDocs(context: MigrationContext) { async function migratePackageFile(context: MigrationContext): Promise { const {deps, siteDir, newDir} = context; - const packageFile = importFresh<{ + // eslint-disable-next-line global-require, import/no-dynamic-require + const packageFile = (await require(`${siteDir}/package.json`)) as { scripts?: {[key: string]: string}; dependencies?: {[key: string]: string}; devDependencies?: {[key: string]: string}; [otherKey: string]: unknown; - }>(`${siteDir}/package.json`); + }; packageFile.scripts = { ...packageFile.scripts, start: 'docusaurus start', From f5d00ab0e61f156aa6a4f2574bb42d9070a4037e Mon Sep 17 00:00:00 2001 From: Joshua Chen Date: Tue, 12 Jul 2022 15:23:32 +0800 Subject: [PATCH 2/3] fix test --- jest.config.mjs | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jest.config.mjs b/jest.config.mjs index d9fc678189a3..213f08789fef 100644 --- a/jest.config.mjs +++ b/jest.config.mjs @@ -52,6 +52,9 @@ export default { }, target: 'es2020', }, + module: { + ignoreDynamic: true, + }, }, ], }, diff --git a/package.json b/package.json index eb2169441106..b1d3fb746e36 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "lint:spelling": "cspell \"**\" --no-progress", "lint:style": "stylelint \"**/*.css\"", "lerna": "lerna", - "test": "jest", + "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest", "test:build:website": "./admin/scripts/test-release.sh", "watch": "yarn lerna run --parallel watch", "clear": "(yarn workspace website clear || echo 'Failure while running docusaurus clear') && yarn lerna exec --ignore docusaurus yarn rimraf lib", From 5c5bb55a1e939882821aeb063d3b487fb4b2aea1 Mon Sep 17 00:00:00 2001 From: Joshua Chen Date: Tue, 12 Jul 2022 15:36:47 +0800 Subject: [PATCH 3/3] Revert "fix test" This reverts commit f5d00ab0e61f156aa6a4f2574bb42d9070a4037e. --- jest.config.mjs | 3 --- package.json | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/jest.config.mjs b/jest.config.mjs index 213f08789fef..d9fc678189a3 100644 --- a/jest.config.mjs +++ b/jest.config.mjs @@ -52,9 +52,6 @@ export default { }, target: 'es2020', }, - module: { - ignoreDynamic: true, - }, }, ], }, diff --git a/package.json b/package.json index b1d3fb746e36..eb2169441106 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "lint:spelling": "cspell \"**\" --no-progress", "lint:style": "stylelint \"**/*.css\"", "lerna": "lerna", - "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest", + "test": "jest", "test:build:website": "./admin/scripts/test-release.sh", "watch": "yarn lerna run --parallel watch", "clear": "(yarn workspace website clear || echo 'Failure while running docusaurus clear') && yarn lerna exec --ignore docusaurus yarn rimraf lib",