Skip to content

fix(migrate): import siteConfig with file extension #7766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Josh-Cena merged 3 commits into from
Jul 12, 2022
Merged

fix(migrate): import siteConfig with file extension #7766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
360f37e
fix(migrate): import siteConfig with file extension
Josh-Cena Jul 12, 2022
f5d00ab
fix test
Josh-Cena Jul 12, 2022
5c5bb55
Revert "fix test"
Josh-Cena Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/docusaurus-migrate/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/docusaurus-migrate/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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',
Expand Down