Skip to content

Commit

Permalink
fix(migrate): import siteConfig with file extension (#7766)
Browse files Browse the repository at this point in the history
* fix(migrate): import siteConfig with file extension

* fix test

* Revert "fix test"

This reverts commit f5d00ab.
Josh-Cena authored Jul 12, 2022

Partially verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
1 parent 337463a commit a4b4a7f
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion packages/docusaurus-migrate/package.json
Original file line number Diff line number Diff line change
@@ -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",
8 changes: 4 additions & 4 deletions packages/docusaurus-migrate/src/index.ts
Original file line number Diff line number Diff line change
@@ -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<void> {
async function createMigrationContext(): Promise<MigrationContext> {
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<void> {
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',

0 comments on commit a4b4a7f

Please sign in to comment.