@modern-js/app-tools 2.8.0 → 2.8.1-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/analyze/templates.js +5 -3
- package/dist/cjs/analyze/utils.js +9 -1
- package/dist/cjs/builder/index.js +2 -0
- package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js +3 -0
- package/dist/esm/analyze/templates.js +3 -3
- package/dist/esm/analyze/utils.js +5 -1
- package/dist/esm/builder/index.js +2 -0
- package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js +3 -0
- package/dist/esm-node/analyze/templates.js +5 -3
- package/dist/esm-node/analyze/utils.js +9 -1
- package/dist/esm-node/builder/index.js +2 -0
- package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js +3 -0
- package/dist/js/modern/analyze/constants.js +56 -0
- package/dist/js/modern/analyze/generateCode.js +247 -0
- package/dist/js/modern/analyze/getBundleEntry.js +71 -0
- package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +220 -0
- package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +216 -0
- package/dist/js/modern/analyze/getClientRoutes/index.js +6 -0
- package/dist/js/modern/analyze/getClientRoutes/utils.js +31 -0
- package/dist/js/modern/analyze/getFileSystemEntry.js +109 -0
- package/dist/js/modern/analyze/getHtmlTemplate.js +115 -0
- package/dist/js/modern/analyze/getServerRoutes.js +178 -0
- package/dist/js/modern/analyze/index.js +333 -0
- package/dist/js/modern/analyze/isDefaultExportFunction.js +42 -0
- package/dist/js/modern/analyze/makeLegalIdentifier.js +13 -0
- package/dist/js/modern/analyze/nestedRoutes.js +186 -0
- package/dist/js/modern/analyze/templates.js +328 -0
- package/dist/js/modern/analyze/utils.js +141 -0
- package/dist/js/modern/builder/builder-rspack/index.js +8 -0
- package/dist/js/modern/builder/builder-webpack/builderPlugins/compatModern.js +41 -0
- package/dist/js/modern/builder/builder-webpack/index.js +93 -0
- package/dist/js/modern/builder/builder-webpack/webpackPlugins/RouterPlugin.js +116 -0
- package/dist/js/modern/builder/builder-webpack/webpackPlugins/index.js +1 -0
- package/dist/js/modern/builder/generator/createBuilderOptions.js +24 -0
- package/dist/js/modern/builder/generator/createBuilderProviderConfig.js +39 -0
- package/dist/js/modern/builder/generator/getBuilderTargets.js +21 -0
- package/dist/js/modern/builder/generator/index.js +53 -0
- package/dist/js/modern/builder/index.js +39 -0
- package/dist/js/modern/builder/shared/builderPlugins/adapterModern.js +219 -0
- package/dist/js/modern/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +27 -0
- package/dist/js/modern/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +34 -0
- package/dist/js/modern/builder/shared/createCopyPattern.js +46 -0
- package/dist/js/modern/builder/shared/index.js +3 -0
- package/dist/js/modern/builder/shared/loaders/serverModuleLoader.js +7 -0
- package/dist/js/modern/builder/shared/types.js +0 -0
- package/dist/js/modern/commands/build.js +91 -0
- package/dist/js/modern/commands/deploy.js +28 -0
- package/dist/js/modern/commands/dev.js +109 -0
- package/dist/js/modern/commands/index.js +3 -0
- package/dist/js/modern/commands/inspect.js +38 -0
- package/dist/js/modern/commands/serve.js +54 -0
- package/dist/js/modern/config/default.js +175 -0
- package/dist/js/modern/config/index.js +3 -0
- package/dist/js/modern/config/initialize/index.js +12 -0
- package/dist/js/modern/config/initialize/inits.js +154 -0
- package/dist/js/modern/config/legacy/createHtmlConfig.js +35 -0
- package/dist/js/modern/config/legacy/createOutputConfig.js +68 -0
- package/dist/js/modern/config/legacy/createSourceConfig.js +39 -0
- package/dist/js/modern/config/legacy/createToolsConfig.js +42 -0
- package/dist/js/modern/config/legacy/index.js +51 -0
- package/dist/js/modern/defineConfig.js +27 -0
- package/dist/js/modern/exports/server.js +4 -0
- package/dist/js/modern/hooks.js +35 -0
- package/dist/js/modern/index.js +221 -0
- package/dist/js/modern/initialize/index.js +132 -0
- package/dist/js/modern/locale/en.js +36 -0
- package/dist/js/modern/locale/index.js +9 -0
- package/dist/js/modern/locale/zh.js +36 -0
- package/dist/js/modern/schema/Schema.js +40 -0
- package/dist/js/modern/schema/index.js +88 -0
- package/dist/js/modern/schema/legacy.js +148 -0
- package/dist/js/modern/types/config/deploy.js +0 -0
- package/dist/js/modern/types/config/dev.js +0 -0
- package/dist/js/modern/types/config/experiments.js +0 -0
- package/dist/js/modern/types/config/html.js +0 -0
- package/dist/js/modern/types/config/index.js +1 -0
- package/dist/js/modern/types/config/output.js +0 -0
- package/dist/js/modern/types/config/performance.js +0 -0
- package/dist/js/modern/types/config/security.js +0 -0
- package/dist/js/modern/types/config/source.js +0 -0
- package/dist/js/modern/types/config/tools.js +0 -0
- package/dist/js/modern/types/hooks.js +0 -0
- package/dist/js/modern/types/index.js +3 -0
- package/dist/js/modern/types/legacyConfig/deploy.js +0 -0
- package/dist/js/modern/types/legacyConfig/dev.js +0 -0
- package/dist/js/modern/types/legacyConfig/index.js +0 -0
- package/dist/js/modern/types/legacyConfig/output.js +0 -0
- package/dist/js/modern/types/legacyConfig/source.js +0 -0
- package/dist/js/modern/types/legacyConfig/tools.js +0 -0
- package/dist/js/modern/types/utils.js +0 -0
- package/dist/js/modern/utils/config.js +128 -0
- package/dist/js/modern/utils/createServer.js +75 -0
- package/dist/js/modern/utils/env.js +15 -0
- package/dist/js/modern/utils/generateWatchFiles.js +55 -0
- package/dist/js/modern/utils/getSelectedEntries.js +58 -0
- package/dist/js/modern/utils/getServerInternalPlugins.js +58 -0
- package/dist/js/modern/utils/language.js +8 -0
- package/dist/js/modern/utils/printInstructions.js +31 -0
- package/dist/js/modern/utils/restart.js +44 -0
- package/dist/js/modern/utils/routes.js +30 -0
- package/dist/js/modern/utils/types.js +0 -0
- package/dist/js/node/analyze/constants.js +100 -0
- package/dist/js/node/analyze/generateCode.js +271 -0
- package/dist/js/node/analyze/getBundleEntry.js +95 -0
- package/dist/js/node/analyze/getClientRoutes/getRoutes.js +242 -0
- package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +238 -0
- package/dist/js/node/analyze/getClientRoutes/index.js +30 -0
- package/dist/js/node/analyze/getClientRoutes/utils.js +58 -0
- package/dist/js/node/analyze/getFileSystemEntry.js +131 -0
- package/dist/js/node/analyze/getHtmlTemplate.js +144 -0
- package/dist/js/node/analyze/getServerRoutes.js +196 -0
- package/dist/js/node/analyze/index.js +340 -0
- package/dist/js/node/analyze/isDefaultExportFunction.js +71 -0
- package/dist/js/node/analyze/makeLegalIdentifier.js +36 -0
- package/dist/js/node/analyze/nestedRoutes.js +213 -0
- package/dist/js/node/analyze/templates.js +359 -0
- package/dist/js/node/analyze/utils.js +172 -0
- package/dist/js/node/builder/builder-rspack/index.js +31 -0
- package/dist/js/node/builder/builder-webpack/builderPlugins/compatModern.js +64 -0
- package/dist/js/node/builder/builder-webpack/index.js +118 -0
- package/dist/js/node/builder/builder-webpack/webpackPlugins/RouterPlugin.js +140 -0
- package/dist/js/node/builder/builder-webpack/webpackPlugins/index.js +17 -0
- package/dist/js/node/builder/generator/createBuilderOptions.js +47 -0
- package/dist/js/node/builder/generator/createBuilderProviderConfig.js +60 -0
- package/dist/js/node/builder/generator/getBuilderTargets.js +39 -0
- package/dist/js/node/builder/generator/index.js +82 -0
- package/dist/js/node/builder/index.js +68 -0
- package/dist/js/node/builder/shared/builderPlugins/adapterModern.js +245 -0
- package/dist/js/node/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +50 -0
- package/dist/js/node/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +57 -0
- package/dist/js/node/builder/shared/createCopyPattern.js +75 -0
- package/dist/js/node/builder/shared/index.js +19 -0
- package/dist/js/node/builder/shared/loaders/serverModuleLoader.js +28 -0
- package/dist/js/node/builder/shared/types.js +15 -0
- package/dist/js/node/commands/build.js +112 -0
- package/dist/js/node/commands/deploy.js +51 -0
- package/dist/js/node/commands/dev.js +126 -0
- package/dist/js/node/commands/index.js +19 -0
- package/dist/js/node/commands/inspect.js +61 -0
- package/dist/js/node/commands/serve.js +83 -0
- package/dist/js/node/config/default.js +197 -0
- package/dist/js/node/config/index.js +19 -0
- package/dist/js/node/config/initialize/index.js +35 -0
- package/dist/js/node/config/initialize/inits.js +177 -0
- package/dist/js/node/config/legacy/createHtmlConfig.js +58 -0
- package/dist/js/node/config/legacy/createOutputConfig.js +91 -0
- package/dist/js/node/config/legacy/createSourceConfig.js +62 -0
- package/dist/js/node/config/legacy/createToolsConfig.js +65 -0
- package/dist/js/node/config/legacy/index.js +75 -0
- package/dist/js/node/defineConfig.js +49 -0
- package/dist/js/node/exports/server.js +27 -0
- package/dist/js/node/hooks.js +54 -0
- package/dist/js/node/index.js +245 -0
- package/dist/js/node/initialize/index.js +141 -0
- package/dist/js/node/locale/en.js +59 -0
- package/dist/js/node/locale/index.js +33 -0
- package/dist/js/node/locale/zh.js +59 -0
- package/dist/js/node/schema/Schema.js +63 -0
- package/dist/js/node/schema/index.js +118 -0
- package/dist/js/node/schema/legacy.js +169 -0
- package/dist/js/node/types/config/deploy.js +15 -0
- package/dist/js/node/types/config/dev.js +15 -0
- package/dist/js/node/types/config/experiments.js +15 -0
- package/dist/js/node/types/config/html.js +15 -0
- package/dist/js/node/types/config/index.js +17 -0
- package/dist/js/node/types/config/output.js +15 -0
- package/dist/js/node/types/config/performance.js +15 -0
- package/dist/js/node/types/config/security.js +15 -0
- package/dist/js/node/types/config/source.js +15 -0
- package/dist/js/node/types/config/tools.js +15 -0
- package/dist/js/node/types/hooks.js +15 -0
- package/dist/js/node/types/index.js +19 -0
- package/dist/js/node/types/legacyConfig/deploy.js +15 -0
- package/dist/js/node/types/legacyConfig/dev.js +15 -0
- package/dist/js/node/types/legacyConfig/index.js +15 -0
- package/dist/js/node/types/legacyConfig/output.js +15 -0
- package/dist/js/node/types/legacyConfig/source.js +15 -0
- package/dist/js/node/types/legacyConfig/tools.js +15 -0
- package/dist/js/node/types/utils.js +15 -0
- package/dist/js/node/utils/config.js +153 -0
- package/dist/js/node/utils/createServer.js +106 -0
- package/dist/js/node/utils/env.js +38 -0
- package/dist/js/node/utils/generateWatchFiles.js +85 -0
- package/dist/js/node/utils/getSelectedEntries.js +81 -0
- package/dist/js/node/utils/getServerInternalPlugins.js +79 -0
- package/dist/js/node/utils/language.js +31 -0
- package/dist/js/node/utils/printInstructions.js +54 -0
- package/dist/js/node/utils/restart.js +67 -0
- package/dist/js/node/utils/routes.js +59 -0
- package/dist/js/node/utils/types.js +15 -0
- package/dist/js/treeshaking/analyze/constants.js +42 -0
- package/dist/js/treeshaking/analyze/generateCode.js +485 -0
- package/dist/js/treeshaking/analyze/getBundleEntry.js +62 -0
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +233 -0
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +231 -0
- package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -0
- package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +23 -0
- package/dist/js/treeshaking/analyze/getFileSystemEntry.js +107 -0
- package/dist/js/treeshaking/analyze/getHtmlTemplate.js +302 -0
- package/dist/js/treeshaking/analyze/getServerRoutes.js +224 -0
- package/dist/js/treeshaking/analyze/index.js +702 -0
- package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +47 -0
- package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -0
- package/dist/js/treeshaking/analyze/nestedRoutes.js +409 -0
- package/dist/js/treeshaking/analyze/templates.js +465 -0
- package/dist/js/treeshaking/analyze/utils.js +374 -0
- package/dist/js/treeshaking/builder/builder-rspack/index.js +6 -0
- package/dist/js/treeshaking/builder/builder-webpack/builderPlugins/compatModern.js +64 -0
- package/dist/js/treeshaking/builder/builder-webpack/index.js +301 -0
- package/dist/js/treeshaking/builder/builder-webpack/webpackPlugins/RouterPlugin.js +346 -0
- package/dist/js/treeshaking/builder/builder-webpack/webpackPlugins/index.js +1 -0
- package/dist/js/treeshaking/builder/generator/createBuilderOptions.js +41 -0
- package/dist/js/treeshaking/builder/generator/createBuilderProviderConfig.js +70 -0
- package/dist/js/treeshaking/builder/generator/getBuilderTargets.js +16 -0
- package/dist/js/treeshaking/builder/generator/index.js +199 -0
- package/dist/js/treeshaking/builder/index.js +175 -0
- package/dist/js/treeshaking/builder/shared/builderPlugins/adapterModern.js +300 -0
- package/dist/js/treeshaking/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +110 -0
- package/dist/js/treeshaking/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +72 -0
- package/dist/js/treeshaking/builder/shared/createCopyPattern.js +40 -0
- package/dist/js/treeshaking/builder/shared/index.js +3 -0
- package/dist/js/treeshaking/builder/shared/loaders/serverModuleLoader.js +5 -0
- package/dist/js/treeshaking/builder/shared/types.js +1 -0
- package/dist/js/treeshaking/commands/build.js +291 -0
- package/dist/js/treeshaking/commands/deploy.js +154 -0
- package/dist/js/treeshaking/commands/dev.js +301 -0
- package/dist/js/treeshaking/commands/index.js +3 -0
- package/dist/js/treeshaking/commands/inspect.js +149 -0
- package/dist/js/treeshaking/commands/serve.js +199 -0
- package/dist/js/treeshaking/config/default.js +210 -0
- package/dist/js/treeshaking/config/index.js +3 -0
- package/dist/js/treeshaking/config/initialize/index.js +10 -0
- package/dist/js/treeshaking/config/initialize/inits.js +211 -0
- package/dist/js/treeshaking/config/legacy/createHtmlConfig.js +19 -0
- package/dist/js/treeshaking/config/legacy/createOutputConfig.js +41 -0
- package/dist/js/treeshaking/config/legacy/createSourceConfig.js +42 -0
- package/dist/js/treeshaking/config/legacy/createToolsConfig.js +23 -0
- package/dist/js/treeshaking/config/legacy/index.js +38 -0
- package/dist/js/treeshaking/defineConfig.js +61 -0
- package/dist/js/treeshaking/exports/server.js +2 -0
- package/dist/js/treeshaking/hooks.js +29 -0
- package/dist/js/treeshaking/index.js +713 -0
- package/dist/js/treeshaking/initialize/index.js +284 -0
- package/dist/js/treeshaking/locale/en.js +38 -0
- package/dist/js/treeshaking/locale/index.js +9 -0
- package/dist/js/treeshaking/locale/zh.js +38 -0
- package/dist/js/treeshaking/schema/Schema.js +273 -0
- package/dist/js/treeshaking/schema/index.js +181 -0
- package/dist/js/treeshaking/schema/legacy.js +337 -0
- package/dist/js/treeshaking/types/config/deploy.js +1 -0
- package/dist/js/treeshaking/types/config/dev.js +1 -0
- package/dist/js/treeshaking/types/config/experiments.js +1 -0
- package/dist/js/treeshaking/types/config/html.js +1 -0
- package/dist/js/treeshaking/types/config/index.js +1 -0
- package/dist/js/treeshaking/types/config/output.js +1 -0
- package/dist/js/treeshaking/types/config/performance.js +1 -0
- package/dist/js/treeshaking/types/config/security.js +1 -0
- package/dist/js/treeshaking/types/config/source.js +1 -0
- package/dist/js/treeshaking/types/config/tools.js +1 -0
- package/dist/js/treeshaking/types/hooks.js +1 -0
- package/dist/js/treeshaking/types/index.js +3 -0
- package/dist/js/treeshaking/types/legacyConfig/deploy.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/dev.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/index.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/output.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/source.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/tools.js +1 -0
- package/dist/js/treeshaking/types/utils.js +1 -0
- package/dist/js/treeshaking/utils/config.js +302 -0
- package/dist/js/treeshaking/utils/createServer.js +258 -0
- package/dist/js/treeshaking/utils/env.js +13 -0
- package/dist/js/treeshaking/utils/generateWatchFiles.js +214 -0
- package/dist/js/treeshaking/utils/getSelectedEntries.js +186 -0
- package/dist/js/treeshaking/utils/getServerInternalPlugins.js +210 -0
- package/dist/js/treeshaking/utils/language.js +6 -0
- package/dist/js/treeshaking/utils/printInstructions.js +152 -0
- package/dist/js/treeshaking/utils/restart.js +187 -0
- package/dist/js/treeshaking/utils/routes.js +153 -0
- package/dist/js/treeshaking/utils/types.js +1 -0
- package/package.json +9 -9
|
@@ -110,10 +110,10 @@ const html = (partials) => `
|
|
|
110
110
|
</script>
|
|
111
111
|
${partials.head.join("\n")}
|
|
112
112
|
|
|
113
|
-
<!--<?- chunksMap.css ?>-->
|
|
114
113
|
</head>
|
|
115
114
|
|
|
116
115
|
<body>
|
|
116
|
+
<!--<?- chunksMap.css ?>-->
|
|
117
117
|
<noscript>
|
|
118
118
|
We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.
|
|
119
119
|
</noscript>
|
|
@@ -276,7 +276,7 @@ const fileSystemRoutes = async ({
|
|
|
276
276
|
for (const route of routes) {
|
|
277
277
|
if ("type" in route) {
|
|
278
278
|
const newRoute = traverseRouteTree(route);
|
|
279
|
-
routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
|
|
279
|
+
routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"]+)"/g, "$1").replace(/"(loader_[^"]+)"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"]+)"/g, "$1").replace(/\\"/g, '"')},`;
|
|
280
280
|
} else {
|
|
281
281
|
const component = `loadable(() => import('${route._component}'))`;
|
|
282
282
|
const finalRoute = {
|
|
@@ -337,7 +337,9 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
|
|
|
337
337
|
internalDirectory,
|
|
338
338
|
entryName
|
|
339
339
|
);
|
|
340
|
-
const combinedModule = `export * from "${
|
|
340
|
+
const combinedModule = `export * from "${(0, import_utils.slash)(
|
|
341
|
+
serverLoaderRuntime
|
|
342
|
+
)}"; export * from "${(0, import_utils.slash)(serverLoadersFile)}"`;
|
|
341
343
|
return combinedModule;
|
|
342
344
|
}
|
|
343
345
|
return null;
|
|
@@ -119,7 +119,15 @@ const isPageComponentFile = (filePath) => {
|
|
|
119
119
|
}
|
|
120
120
|
return false;
|
|
121
121
|
};
|
|
122
|
-
const replaceWithAlias = (base, filePath, alias) =>
|
|
122
|
+
const replaceWithAlias = (base, filePath, alias) => {
|
|
123
|
+
if (filePath.includes(base)) {
|
|
124
|
+
return (0, import_utils.normalizeToPosixPath)(
|
|
125
|
+
import_path.default.join(alias, import_path.default.relative(base, filePath))
|
|
126
|
+
);
|
|
127
|
+
} else {
|
|
128
|
+
return filePath;
|
|
129
|
+
}
|
|
130
|
+
};
|
|
123
131
|
const parseModule = async ({
|
|
124
132
|
source,
|
|
125
133
|
filename
|
|
@@ -30,10 +30,12 @@ __export(builder_exports, {
|
|
|
30
30
|
createBuilderGenerator: () => createBuilderGenerator
|
|
31
31
|
});
|
|
32
32
|
module.exports = __toCommonJS(builder_exports);
|
|
33
|
+
var import_utils = require("@modern-js/utils");
|
|
33
34
|
async function createBuilderGenerator(bundler) {
|
|
34
35
|
if (bundler === "rspack") {
|
|
35
36
|
try {
|
|
36
37
|
const { createRspackBuilderForModern } = await Promise.resolve().then(() => __toESM(require("./builder-rspack")));
|
|
38
|
+
import_utils.logger.info("Using Rspack ✨");
|
|
37
39
|
return createRspackBuilderForModern;
|
|
38
40
|
} catch (_) {
|
|
39
41
|
throw new Error(
|
|
@@ -107,6 +107,9 @@ class RouterPlugin {
|
|
|
107
107
|
);
|
|
108
108
|
for (const file of entryChunkFiles) {
|
|
109
109
|
const asset = compilation.assets[file];
|
|
110
|
+
if (!asset) {
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
110
113
|
const newContent = `${injectedContent}${asset.source().toString()}`;
|
|
111
114
|
newAssetsMap.set(import_path.default.join(outputPath, file), newContent);
|
|
112
115
|
compilation.updateAsset(
|
|
@@ -237,7 +237,7 @@ var renderFunction = function(param) {
|
|
|
237
237
|
}).join("\n"), "\n ]\n })(").concat(fileSystemRoutes2 ? "" : "App", ")\n\n\n if(!AppWrapper.init && typeof appInit !== 'undefined') {\n AppWrapper.init = appInit;\n }\n\n\n if (IS_BROWSER) {\n ").concat(customBootstrap ? "customBootstrap(AppWrapper, () => ".concat(bootstrap, ");") : "".concat(bootstrap, ";"), "\n }\n\n return AppWrapper\n");
|
|
238
238
|
};
|
|
239
239
|
var html = function(partials) {
|
|
240
|
-
return "\n<!DOCTYPE html>\n<html>\n<head>\n <%= meta %>\n <title><%= title %></title>\n\n ".concat(partials.top.join("\n"), "\n\n <script>\n window.__assetPrefix__ = '<%= assetPrefix %>';\n </script>\n ").concat(partials.head.join("\n"), "\n\n
|
|
240
|
+
return "\n<!DOCTYPE html>\n<html>\n<head>\n <%= meta %>\n <title><%= title %></title>\n\n ".concat(partials.top.join("\n"), "\n\n <script>\n window.__assetPrefix__ = '<%= assetPrefix %>';\n </script>\n ").concat(partials.head.join("\n"), "\n\n</head>\n\n<body>\n <!--<?- chunksMap.css ?>-->\n <noscript>\n We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.\n </noscript>\n <div id=\"<%= mountId %>\"><!--<?- html ?>--></div>\n ").concat(partials.body.join("\n"), "\n <!--<?- chunksMap.js ?>-->\n <!--<?- SSRDataScript ?>-->\n <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
|
|
241
241
|
};
|
|
242
242
|
var routesForServer = function(param) {
|
|
243
243
|
var routes = param.routes;
|
|
@@ -385,7 +385,7 @@ var fileSystemRoutes = function() {
|
|
|
385
385
|
route = _step.value;
|
|
386
386
|
if ("type" in route) {
|
|
387
387
|
newRoute = traverseRouteTree(route);
|
|
388
|
-
routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"'), ",");
|
|
388
|
+
routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"]+)"/g, "$1").replace(/"(loader_[^"]+)"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"]+)"/g, "$1").replace(/\\"/g, '"'), ",");
|
|
389
389
|
} else {
|
|
390
390
|
component = "loadable(() => import('".concat(route._component, "'))");
|
|
391
391
|
finalRoute = _objectSpreadProps(_objectSpread({}, route), {
|
|
@@ -471,7 +471,7 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
|
|
|
471
471
|
if (entrypoint.nestedRoutesEntry && (ssr || ssg)) {
|
|
472
472
|
var serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
|
|
473
473
|
var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
|
|
474
|
-
var combinedModule = 'export * from "'.concat(serverLoaderRuntime, '"; export * from "').concat(serverLoadersFile, '"');
|
|
474
|
+
var combinedModule = 'export * from "'.concat(slash(serverLoaderRuntime), '"; export * from "').concat(slash(serverLoadersFile), '"');
|
|
475
475
|
return combinedModule;
|
|
476
476
|
}
|
|
477
477
|
return null;
|
|
@@ -287,7 +287,11 @@ var isPageComponentFile = function(filePath) {
|
|
|
287
287
|
return false;
|
|
288
288
|
};
|
|
289
289
|
var replaceWithAlias = function(base, filePath, alias) {
|
|
290
|
-
|
|
290
|
+
if (filePath.includes(base)) {
|
|
291
|
+
return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
|
|
292
|
+
} else {
|
|
293
|
+
return filePath;
|
|
294
|
+
}
|
|
291
295
|
};
|
|
292
296
|
var parseModule = function() {
|
|
293
297
|
var _ref = _asyncToGenerator(function(param) {
|
|
@@ -122,6 +122,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
|
|
|
122
122
|
};
|
|
123
123
|
}
|
|
124
124
|
};
|
|
125
|
+
import { logger } from "@modern-js/utils";
|
|
125
126
|
function createBuilderGenerator(bundler) {
|
|
126
127
|
return _createBuilderGenerator.apply(this, arguments);
|
|
127
128
|
}
|
|
@@ -149,6 +150,7 @@ function _createBuilderGenerator() {
|
|
|
149
150
|
];
|
|
150
151
|
case 2:
|
|
151
152
|
createRspackBuilderForModern = _state.sent().createRspackBuilderForModern;
|
|
153
|
+
logger.info("Using Rspack ✨");
|
|
152
154
|
return [
|
|
153
155
|
2,
|
|
154
156
|
createRspackBuilderForModern
|
|
@@ -303,6 +303,9 @@ var RouterPlugin = /*#__PURE__*/ function() {
|
|
|
303
303
|
for(_iterator1 = entryChunkFiles[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
|
|
304
304
|
file = _step1.value;
|
|
305
305
|
asset = compilation.assets[file];
|
|
306
|
+
if (!asset) {
|
|
307
|
+
continue;
|
|
308
|
+
}
|
|
306
309
|
newContent = "".concat(injectedContent).concat(asset.source().toString());
|
|
307
310
|
newAssetsMap.set(path.join(outputPath, file), newContent);
|
|
308
311
|
compilation.updateAsset(file, new RawSource(newContent), // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
|
|
@@ -73,10 +73,10 @@ const html = (partials) => `
|
|
|
73
73
|
</script>
|
|
74
74
|
${partials.head.join("\n")}
|
|
75
75
|
|
|
76
|
-
<!--<?- chunksMap.css ?>-->
|
|
77
76
|
</head>
|
|
78
77
|
|
|
79
78
|
<body>
|
|
79
|
+
<!--<?- chunksMap.css ?>-->
|
|
80
80
|
<noscript>
|
|
81
81
|
We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.
|
|
82
82
|
</noscript>
|
|
@@ -239,7 +239,7 @@ const fileSystemRoutes = async ({
|
|
|
239
239
|
for (const route of routes) {
|
|
240
240
|
if ("type" in route) {
|
|
241
241
|
const newRoute = traverseRouteTree(route);
|
|
242
|
-
routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
|
|
242
|
+
routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"]+)"/g, "$1").replace(/"(loader_[^"]+)"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"]+)"/g, "$1").replace(/\\"/g, '"')},`;
|
|
243
243
|
} else {
|
|
244
244
|
const component = `loadable(() => import('${route._component}'))`;
|
|
245
245
|
const finalRoute = {
|
|
@@ -300,7 +300,9 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
|
|
|
300
300
|
internalDirectory,
|
|
301
301
|
entryName
|
|
302
302
|
);
|
|
303
|
-
const combinedModule = `export * from "${
|
|
303
|
+
const combinedModule = `export * from "${slash(
|
|
304
|
+
serverLoaderRuntime
|
|
305
|
+
)}"; export * from "${slash(serverLoadersFile)}"`;
|
|
304
306
|
return combinedModule;
|
|
305
307
|
}
|
|
306
308
|
return null;
|
|
@@ -84,7 +84,15 @@ const isPageComponentFile = (filePath) => {
|
|
|
84
84
|
}
|
|
85
85
|
return false;
|
|
86
86
|
};
|
|
87
|
-
const replaceWithAlias = (base, filePath, alias) =>
|
|
87
|
+
const replaceWithAlias = (base, filePath, alias) => {
|
|
88
|
+
if (filePath.includes(base)) {
|
|
89
|
+
return normalizeToPosixPath(
|
|
90
|
+
path.join(alias, path.relative(base, filePath))
|
|
91
|
+
);
|
|
92
|
+
} else {
|
|
93
|
+
return filePath;
|
|
94
|
+
}
|
|
95
|
+
};
|
|
88
96
|
const parseModule = async ({
|
|
89
97
|
source,
|
|
90
98
|
filename
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { logger } from "@modern-js/utils";
|
|
1
2
|
async function createBuilderGenerator(bundler) {
|
|
2
3
|
if (bundler === "rspack") {
|
|
3
4
|
try {
|
|
4
5
|
const { createRspackBuilderForModern } = await import("./builder-rspack");
|
|
6
|
+
logger.info("Using Rspack ✨");
|
|
5
7
|
return createRspackBuilderForModern;
|
|
6
8
|
} catch (_) {
|
|
7
9
|
throw new Error(
|
|
@@ -80,6 +80,9 @@ class RouterPlugin {
|
|
|
80
80
|
);
|
|
81
81
|
for (const file of entryChunkFiles) {
|
|
82
82
|
const asset = compilation.assets[file];
|
|
83
|
+
if (!asset) {
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
83
86
|
const newContent = `${injectedContent}${asset.source().toString()}`;
|
|
84
87
|
newAssetsMap.set(path.join(outputPath, file), newContent);
|
|
85
88
|
compilation.updateAsset(
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
const JS_EXTENSIONS = [".js", ".ts", ".jsx", ".tsx"];
|
|
2
|
+
const INDEX_FILE_NAME = "index";
|
|
3
|
+
const APP_FILE_NAME = "App";
|
|
4
|
+
const PAGES_DIR_NAME = "pages";
|
|
5
|
+
const NESTED_ROUTES_DIR = "routes";
|
|
6
|
+
const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
|
|
7
|
+
const LOADER_EXPORT_NAME = "loader";
|
|
8
|
+
const TEMP_LOADERS_DIR = "__loaders__";
|
|
9
|
+
const ENTRY_POINT_FILE_NAME = "index.js";
|
|
10
|
+
const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
|
|
11
|
+
const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
|
|
12
|
+
const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
|
|
13
|
+
const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
|
|
14
|
+
const FILE_SYSTEM_ROUTES_INDEX = "index";
|
|
15
|
+
const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
|
|
16
|
+
const HTML_PARTIALS_FOLDER = "html";
|
|
17
|
+
const HTML_PARTIALS_EXTENSIONS = [".htm", ".html", ".ejs"];
|
|
18
|
+
const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
|
|
19
|
+
const NESTED_ROUTE = {
|
|
20
|
+
LAYOUT_FILE: "layout",
|
|
21
|
+
LAYOUT_LOADER_FILE: "layout.loader",
|
|
22
|
+
PAGE_FILE: "page",
|
|
23
|
+
PAGE_LOADER_FILE: "page.loader",
|
|
24
|
+
LOADING_FILE: "loading",
|
|
25
|
+
ERROR_FILE: "error",
|
|
26
|
+
LOADER_FILE: "loader",
|
|
27
|
+
SPLATE_FILE: "$",
|
|
28
|
+
SPLATE_LOADER_FILE: "$.loader"
|
|
29
|
+
};
|
|
30
|
+
const APP_CONFIG_NAME = "config";
|
|
31
|
+
const APP_INIT_EXPORTED = "init";
|
|
32
|
+
const APP_INIT_IMPORTED = "appInit";
|
|
33
|
+
export {
|
|
34
|
+
APP_CONFIG_NAME,
|
|
35
|
+
APP_FILE_NAME,
|
|
36
|
+
APP_INIT_EXPORTED,
|
|
37
|
+
APP_INIT_IMPORTED,
|
|
38
|
+
ENTRY_BOOTSTRAP_FILE_NAME,
|
|
39
|
+
ENTRY_POINT_FILE_NAME,
|
|
40
|
+
FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
|
|
41
|
+
FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
|
|
42
|
+
FILE_SYSTEM_ROUTES_FILE_NAME,
|
|
43
|
+
FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
|
|
44
|
+
FILE_SYSTEM_ROUTES_IGNORED_REGEX,
|
|
45
|
+
FILE_SYSTEM_ROUTES_INDEX,
|
|
46
|
+
FILE_SYSTEM_ROUTES_LAYOUT,
|
|
47
|
+
HTML_PARTIALS_EXTENSIONS,
|
|
48
|
+
HTML_PARTIALS_FOLDER,
|
|
49
|
+
INDEX_FILE_NAME,
|
|
50
|
+
JS_EXTENSIONS,
|
|
51
|
+
LOADER_EXPORT_NAME,
|
|
52
|
+
NESTED_ROUTE,
|
|
53
|
+
NESTED_ROUTES_DIR,
|
|
54
|
+
PAGES_DIR_NAME,
|
|
55
|
+
TEMP_LOADERS_DIR
|
|
56
|
+
};
|
|
@@ -0,0 +1,247 @@
|
|
|
1
|
+
var __async = (__this, __arguments, generator) => {
|
|
2
|
+
return new Promise((resolve, reject) => {
|
|
3
|
+
var fulfilled = (value) => {
|
|
4
|
+
try {
|
|
5
|
+
step(generator.next(value));
|
|
6
|
+
} catch (e) {
|
|
7
|
+
reject(e);
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
var rejected = (value) => {
|
|
11
|
+
try {
|
|
12
|
+
step(generator.throw(value));
|
|
13
|
+
} catch (e) {
|
|
14
|
+
reject(e);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
18
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
import path from "path";
|
|
22
|
+
import { fs, getEntryOptions, logger } from "@modern-js/utils";
|
|
23
|
+
import {
|
|
24
|
+
useResolvedConfigContext
|
|
25
|
+
} from "@modern-js/core";
|
|
26
|
+
import * as templates from "./templates";
|
|
27
|
+
import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
|
|
28
|
+
import {
|
|
29
|
+
FILE_SYSTEM_ROUTES_FILE_NAME,
|
|
30
|
+
ENTRY_POINT_FILE_NAME,
|
|
31
|
+
ENTRY_BOOTSTRAP_FILE_NAME
|
|
32
|
+
} from "./constants";
|
|
33
|
+
import { getDefaultImports, getServerLoadersFile } from "./utils";
|
|
34
|
+
import { walk } from "./nestedRoutes";
|
|
35
|
+
const createImportSpecifier = (specifiers) => {
|
|
36
|
+
let defaults = "";
|
|
37
|
+
const named = [];
|
|
38
|
+
for (const { local, imported } of specifiers) {
|
|
39
|
+
if (local && imported) {
|
|
40
|
+
named.push(`${imported} as ${local}`);
|
|
41
|
+
} else if (local) {
|
|
42
|
+
defaults = local;
|
|
43
|
+
} else {
|
|
44
|
+
named.push(imported);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
if (defaults && named.length) {
|
|
48
|
+
return `${defaults}, { ${named.join(", ")} }`;
|
|
49
|
+
} else if (defaults) {
|
|
50
|
+
return defaults;
|
|
51
|
+
} else {
|
|
52
|
+
return `{ ${named.join(", ")} }`;
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
const createImportStatements = (statements) => {
|
|
56
|
+
var _a, _b;
|
|
57
|
+
const deDuplicated = [];
|
|
58
|
+
const seen = /* @__PURE__ */ new Map();
|
|
59
|
+
for (const { value, specifiers, initialize } of statements) {
|
|
60
|
+
if (!seen.has(value)) {
|
|
61
|
+
deDuplicated.push({
|
|
62
|
+
value,
|
|
63
|
+
specifiers,
|
|
64
|
+
initialize
|
|
65
|
+
});
|
|
66
|
+
seen.set(value, specifiers);
|
|
67
|
+
} else {
|
|
68
|
+
seen.get(value).push(...specifiers);
|
|
69
|
+
const modifyIndex = deDuplicated.findIndex((v) => v.value === value);
|
|
70
|
+
const originInitialize = (_b = (_a = deDuplicated[modifyIndex]) == null ? void 0 : _a.initialize) != null ? _b : "";
|
|
71
|
+
deDuplicated[modifyIndex].initialize = originInitialize.concat(
|
|
72
|
+
`
|
|
73
|
+
${initialize || ""}`
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return deDuplicated.map(
|
|
78
|
+
({ value, specifiers, initialize }) => `import ${createImportSpecifier(specifiers)} from '${value}';
|
|
79
|
+
${initialize || ""}`
|
|
80
|
+
).join("\n");
|
|
81
|
+
};
|
|
82
|
+
const generateCode = (appContext, config, entrypoints, api) => __async(void 0, null, function* () {
|
|
83
|
+
var _a, _b, _c;
|
|
84
|
+
const {
|
|
85
|
+
internalDirectory,
|
|
86
|
+
srcDirectory,
|
|
87
|
+
internalDirAlias,
|
|
88
|
+
internalSrcAlias,
|
|
89
|
+
packageName
|
|
90
|
+
} = appContext;
|
|
91
|
+
const hookRunners = api.useHookRunners();
|
|
92
|
+
const isV5 = typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
|
|
93
|
+
const { mountId } = config.html;
|
|
94
|
+
const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
|
|
95
|
+
yield Promise.all(entrypoints.map(generateEntryCode));
|
|
96
|
+
function generateEntryCode(entrypoint) {
|
|
97
|
+
return __async(this, null, function* () {
|
|
98
|
+
const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
|
|
99
|
+
if (isAutoMount) {
|
|
100
|
+
if (fileSystemRoutes) {
|
|
101
|
+
let initialRoutes = [];
|
|
102
|
+
let nestedRoute = null;
|
|
103
|
+
if (entrypoint.entry) {
|
|
104
|
+
initialRoutes = getRoutes({
|
|
105
|
+
entrypoint,
|
|
106
|
+
srcDirectory,
|
|
107
|
+
srcAlias: internalSrcAlias,
|
|
108
|
+
internalDirectory,
|
|
109
|
+
internalDirAlias
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
if (entrypoint.nestedRoutesEntry) {
|
|
113
|
+
if (!isV5) {
|
|
114
|
+
nestedRoute = yield walk(
|
|
115
|
+
entrypoint.nestedRoutesEntry,
|
|
116
|
+
entrypoint.nestedRoutesEntry,
|
|
117
|
+
{
|
|
118
|
+
name: internalSrcAlias,
|
|
119
|
+
basename: srcDirectory
|
|
120
|
+
},
|
|
121
|
+
entrypoint.entryName
|
|
122
|
+
);
|
|
123
|
+
if (nestedRoute) {
|
|
124
|
+
initialRoutes.unshift(nestedRoute);
|
|
125
|
+
}
|
|
126
|
+
} else {
|
|
127
|
+
logger.error("Nested routes is not supported in legacy mode.");
|
|
128
|
+
process.exit(1);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
const { routes } = yield hookRunners.modifyFileSystemRoutes({
|
|
132
|
+
entrypoint,
|
|
133
|
+
routes: initialRoutes
|
|
134
|
+
});
|
|
135
|
+
const config2 = useResolvedConfigContext();
|
|
136
|
+
const ssr = getEntryOptions(
|
|
137
|
+
entryName,
|
|
138
|
+
config2.server.ssr,
|
|
139
|
+
config2.server.ssrByEntries,
|
|
140
|
+
packageName
|
|
141
|
+
);
|
|
142
|
+
let mode;
|
|
143
|
+
if (ssr) {
|
|
144
|
+
mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
|
|
145
|
+
} else {
|
|
146
|
+
mode = false;
|
|
147
|
+
}
|
|
148
|
+
if (mode === "stream") {
|
|
149
|
+
const hasPageRoute = routes.some(
|
|
150
|
+
(route) => "type" in route && route.type === "page"
|
|
151
|
+
);
|
|
152
|
+
if (hasPageRoute) {
|
|
153
|
+
logger.error(
|
|
154
|
+
"Streaming ssr is not supported when pages dir exists"
|
|
155
|
+
);
|
|
156
|
+
process.exit(1);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
const { code: code2 } = yield hookRunners.beforeGenerateRoutes({
|
|
160
|
+
entrypoint,
|
|
161
|
+
code: yield templates.fileSystemRoutes({
|
|
162
|
+
routes,
|
|
163
|
+
ssrMode: mode,
|
|
164
|
+
nestedRoutesEntry: entrypoint.nestedRoutesEntry,
|
|
165
|
+
entryName: entrypoint.entryName,
|
|
166
|
+
internalDirectory
|
|
167
|
+
})
|
|
168
|
+
});
|
|
169
|
+
if (entrypoint.nestedRoutesEntry && mode) {
|
|
170
|
+
const routesServerFile = getServerLoadersFile(
|
|
171
|
+
internalDirectory,
|
|
172
|
+
entryName
|
|
173
|
+
);
|
|
174
|
+
const code3 = templates.routesForServer({
|
|
175
|
+
routes
|
|
176
|
+
});
|
|
177
|
+
yield fs.ensureFile(routesServerFile);
|
|
178
|
+
yield fs.writeFile(routesServerFile, code3);
|
|
179
|
+
}
|
|
180
|
+
fs.outputFileSync(
|
|
181
|
+
path.resolve(
|
|
182
|
+
internalDirectory,
|
|
183
|
+
`./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`
|
|
184
|
+
),
|
|
185
|
+
code2,
|
|
186
|
+
"utf8"
|
|
187
|
+
);
|
|
188
|
+
}
|
|
189
|
+
const { imports: importStatements } = yield hookRunners.modifyEntryImports({
|
|
190
|
+
entrypoint,
|
|
191
|
+
imports: getDefaultImports({
|
|
192
|
+
entrypoint,
|
|
193
|
+
srcDirectory,
|
|
194
|
+
internalSrcAlias,
|
|
195
|
+
internalDirAlias,
|
|
196
|
+
internalDirectory
|
|
197
|
+
})
|
|
198
|
+
});
|
|
199
|
+
const { plugins } = yield hookRunners.modifyEntryRuntimePlugins({
|
|
200
|
+
entrypoint,
|
|
201
|
+
plugins: []
|
|
202
|
+
});
|
|
203
|
+
const { code: renderFunction } = yield hookRunners.modifyEntryRenderFunction({
|
|
204
|
+
entrypoint,
|
|
205
|
+
code: templates.renderFunction({
|
|
206
|
+
plugins,
|
|
207
|
+
customBootstrap,
|
|
208
|
+
fileSystemRoutes
|
|
209
|
+
})
|
|
210
|
+
});
|
|
211
|
+
const { exportStatement } = yield hookRunners.modifyEntryExport({
|
|
212
|
+
entrypoint,
|
|
213
|
+
exportStatement: "export default AppWrapper;"
|
|
214
|
+
});
|
|
215
|
+
const code = templates.index({
|
|
216
|
+
mountId,
|
|
217
|
+
imports: createImportStatements(importStatements),
|
|
218
|
+
renderFunction,
|
|
219
|
+
exportStatement
|
|
220
|
+
});
|
|
221
|
+
const entryFile = path.resolve(
|
|
222
|
+
internalDirectory,
|
|
223
|
+
`./${entryName}/${ENTRY_POINT_FILE_NAME}`
|
|
224
|
+
);
|
|
225
|
+
entrypoint.entry = entryFile;
|
|
226
|
+
if (config.source.enableAsyncEntry) {
|
|
227
|
+
const { code: asyncEntryCode } = yield hookRunners.modifyAsyncEntry({
|
|
228
|
+
entrypoint,
|
|
229
|
+
code: `import('./${ENTRY_BOOTSTRAP_FILE_NAME}');`
|
|
230
|
+
});
|
|
231
|
+
fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
|
|
232
|
+
const bootstrapFile = path.resolve(
|
|
233
|
+
internalDirectory,
|
|
234
|
+
`./${entryName}/${ENTRY_BOOTSTRAP_FILE_NAME}`
|
|
235
|
+
);
|
|
236
|
+
fs.outputFileSync(bootstrapFile, code, "utf8");
|
|
237
|
+
} else {
|
|
238
|
+
fs.outputFileSync(entryFile, code, "utf8");
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
});
|
|
242
|
+
}
|
|
243
|
+
});
|
|
244
|
+
export {
|
|
245
|
+
createImportStatements,
|
|
246
|
+
generateCode
|
|
247
|
+
};
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import path from "path";
|
|
2
|
+
import {
|
|
3
|
+
ensureAbsolutePath,
|
|
4
|
+
fs,
|
|
5
|
+
findExists,
|
|
6
|
+
MAIN_ENTRY_NAME
|
|
7
|
+
} from "@modern-js/utils";
|
|
8
|
+
import { getFileSystemEntry } from "./getFileSystemEntry";
|
|
9
|
+
import { JS_EXTENSIONS } from "./constants";
|
|
10
|
+
const ensureExtensions = (file) => {
|
|
11
|
+
if (!path.extname(file)) {
|
|
12
|
+
return findExists(JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
|
|
13
|
+
}
|
|
14
|
+
return file;
|
|
15
|
+
};
|
|
16
|
+
const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
|
|
17
|
+
if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
|
|
18
|
+
checked.entryName = entrypoint.entryName;
|
|
19
|
+
return true;
|
|
20
|
+
}
|
|
21
|
+
if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
|
|
22
|
+
throw new Error(
|
|
23
|
+
`Entry configuration conflicts
|
|
24
|
+
Your configuration: ${checked.entry}.
|
|
25
|
+
Default entrypoint: ${entrypoint.entry}
|
|
26
|
+
Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`
|
|
27
|
+
);
|
|
28
|
+
}
|
|
29
|
+
return false;
|
|
30
|
+
});
|
|
31
|
+
const getBundleEntry = (appContext, config) => {
|
|
32
|
+
const { appDirectory, packageName } = appContext;
|
|
33
|
+
const {
|
|
34
|
+
source: { disableDefaultEntries, entries, entriesDir }
|
|
35
|
+
} = config;
|
|
36
|
+
const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
|
|
37
|
+
if (entries) {
|
|
38
|
+
Object.keys(entries).forEach((name) => {
|
|
39
|
+
const value = entries[name];
|
|
40
|
+
const entrypoint = typeof value === "string" ? {
|
|
41
|
+
entryName: name,
|
|
42
|
+
entry: ensureAbsolutePath(appDirectory, value),
|
|
43
|
+
isAutoMount: true,
|
|
44
|
+
fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
|
|
45
|
+
} : {
|
|
46
|
+
entryName: name,
|
|
47
|
+
entry: ensureAbsolutePath(appDirectory, value.entry),
|
|
48
|
+
isAutoMount: !value.disableMount,
|
|
49
|
+
customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
|
|
50
|
+
fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
|
|
51
|
+
};
|
|
52
|
+
if (entrypoint.fileSystemRoutes) {
|
|
53
|
+
entrypoint.nestedRoutesEntry = entrypoint.entry;
|
|
54
|
+
}
|
|
55
|
+
if (!ifAlreadyExists(defaults, entrypoint)) {
|
|
56
|
+
defaults.push(entrypoint);
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
if (!disableDefaultEntries) {
|
|
61
|
+
const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
|
|
62
|
+
const found = defaults.find(
|
|
63
|
+
({ entryName, entry, nestedRoutesEntry = "" }) => entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs
|
|
64
|
+
);
|
|
65
|
+
found && (found.entryName = MAIN_ENTRY_NAME);
|
|
66
|
+
}
|
|
67
|
+
return defaults;
|
|
68
|
+
};
|
|
69
|
+
export {
|
|
70
|
+
getBundleEntry
|
|
71
|
+
};
|