Skip to content
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

fix(core): make generated files have unambiguous module types #7379

Closed
wants to merge 2 commits into from
+22 −15
Closed

fix(core): make generated files have unambiguous module types #7379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d79e8f9
fix(core): make generated files have unambiguous module types
Josh-Cena May 9, 2022
81ab334
fix?
Josh-Cena May 14, 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
9 changes: 3 additions & 6 deletions packages/docusaurus/src/server/__tests__/__snapshots__/routes.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ exports[`loadRoutes loads flat route config 1`] = `
],
},
},
"routesConfig": "import React from 'react';
import ComponentCreator from '@docusaurus/ComponentCreator';
"routesConfig": "import ComponentCreator from '@docusaurus/ComponentCreator';

export default [
{
Expand Down Expand Up @@ -90,8 +89,7 @@ exports[`loadRoutes loads nested route config 1`] = `
"metadata": "metadata---docs-foo-baz-2-cf-fa7",
},
},
"routesConfig": "import React from 'react';
import ComponentCreator from '@docusaurus/ComponentCreator';
"routesConfig": "import ComponentCreator from '@docusaurus/ComponentCreator';

export default [
{
Expand Down Expand Up @@ -140,8 +138,7 @@ exports[`loadRoutes loads route config with empty (but valid) path string 1`] =
"__comp": "__comp---hello-world-jse-0-f-b6c",
},
},
"routesConfig": "import React from 'react';
import ComponentCreator from '@docusaurus/ComponentCreator';
"routesConfig": "import ComponentCreator from '@docusaurus/ComponentCreator';

export default [
{
Expand Down
10 changes: 5 additions & 5 deletions packages/docusaurus/src/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ export default ${JSON.stringify(siteConfig, null, 2)};

const genClientModules = generate(
generatedFilesDir,
'client-modules.js',
`export default [
'client-modules.cjs',
`module.exports = [
${clientModules
// Use `require()` because `import()` is async but client modules can have CSS
// and the order matters for loading CSS.
Expand All @@ -181,8 +181,8 @@ ${clientModules

const genRegistry = generate(
generatedFilesDir,
'registry.js',
`export default {
'registry.cjs',
`module.exports = {
${Object.entries(registry)
.sort((a, b) => a[0].localeCompare(b[0]))
.map(
Expand All @@ -199,7 +199,7 @@ ${Object.entries(registry)
JSON.stringify(routesChunkNames, null, 2),
);

const genRoutes = generate(generatedFilesDir, 'routes.js', routesConfig);
const genRoutes = generate(generatedFilesDir, 'routes.mjs', routesConfig);

const genGlobalData = generate(
generatedFilesDir,
Expand Down
3 changes: 1 addition & 2 deletions packages/docusaurus/src/server/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,7 @@ export function loadRoutes(
.map((r) => genRouteCode(r, res))
.join(',\n');

res.routesConfig = `import React from 'react';
import ComponentCreator from '@docusaurus/ComponentCreator';
res.routesConfig = `import ComponentCreator from '@docusaurus/ComponentCreator';

export default [
${indent(routeConfigSerialized)},
Expand Down
15 changes: 13 additions & 2 deletions packages/docusaurus/src/webpack/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,18 @@ export async function createBaseConfig(
devtool: isProd ? undefined : 'eval-cheap-module-source-map',
resolve: {
unsafeCache: false, // Not enabled, does not seem to improve perf much
extensions: ['.wasm', '.mjs', '.js', '.jsx', '.ts', '.tsx', '.json'],
extensions: [
'.wasm',
'.mjs',
'.cjs',
'.js',
'.jsx',
'.ts',
'.tsx',
'.json',
],
// Allow omitting extension even when the current file is ESM
fullySpecified: false,
symlinks: true, // See https://github.com/facebook/docusaurus/issues/3272
roots: [
// Allow resolution of url("/fonts/xyz.ttf") by webpack
Expand Down Expand Up @@ -196,7 +207,7 @@ export async function createBaseConfig(
fileLoaderUtils.rules.svg(),
fileLoaderUtils.rules.otherAssets(),
{
test: /\.[jt]sx?$/i,
test: /\.[mc]?[jt]sx?$/i,
exclude: excludeJS,
use: [
getCustomizableJSLoader(siteConfig.webpack?.jsLoader)({
Expand Down