@modern-js/app-tools 1.22.2 → 2.0.0-alpha.0
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/CHANGELOG.md +1383 -104
- package/bin/modern.js +13 -1
- package/dist/js/modern/analyze/Builder.js +39 -0
- package/dist/js/modern/analyze/constants.js +48 -15
- package/dist/js/modern/analyze/generateCode.js +286 -133
- package/dist/js/modern/analyze/getBundleEntry.js +39 -41
- 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 +74 -39
- package/dist/js/modern/analyze/getHtmlTemplate.js +90 -57
- package/dist/js/modern/analyze/getServerRoutes.js +123 -140
- package/dist/js/modern/analyze/index.js +220 -133
- package/dist/js/modern/analyze/isDefaultExportFunction.js +30 -20
- package/dist/js/modern/analyze/makeLegalIdentifier.js +10 -13
- package/dist/js/modern/analyze/nestedRoutes.js +166 -0
- package/dist/js/modern/analyze/templates.js +289 -29
- package/dist/js/modern/analyze/utils.js +128 -58
- package/dist/js/modern/builder/builderPlugins/compatModern.js +233 -0
- package/dist/js/modern/builder/index.js +154 -0
- package/dist/js/modern/builder/loaders/routerLoader.js +17 -0
- package/dist/js/modern/builder/loaders/serverModuleLoader.js +7 -0
- package/dist/js/modern/builder/share.js +46 -0
- package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +30 -0
- package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +37 -0
- package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +113 -0
- package/dist/js/modern/commands/build.js +75 -138
- package/dist/js/modern/commands/deploy.js +27 -4
- package/dist/js/modern/commands/dev.js +102 -66
- package/dist/js/modern/commands/index.js +1 -1
- package/dist/js/modern/commands/inspect.js +33 -64
- package/dist/js/modern/commands/serve.js +54 -0
- package/dist/js/modern/config/default.js +173 -0
- package/dist/js/modern/config/index.js +8 -0
- package/dist/js/modern/config/initial/createHtmlConfig.js +35 -0
- package/dist/js/modern/config/initial/createOutputConfig.js +68 -0
- package/dist/js/modern/config/initial/createSourceConfig.js +39 -0
- package/dist/js/modern/config/initial/createToolsConfig.js +42 -0
- package/dist/js/modern/config/initial/index.js +16 -0
- package/dist/js/modern/config/initial/inits.js +153 -0
- package/dist/js/modern/config/initial/transformNormalizedConfig.js +47 -0
- package/dist/js/modern/defineConfig.js +27 -0
- package/dist/js/modern/exports/server.js +4 -1
- package/dist/js/modern/hooks.js +37 -21
- package/dist/js/modern/index.js +185 -94
- package/dist/js/modern/initialize/index.js +120 -0
- package/dist/js/modern/locale/en.js +20 -22
- package/dist/js/modern/locale/index.js +6 -6
- package/dist/js/modern/locale/zh.js +21 -23
- 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/utils/commands.js +13 -0
- package/dist/js/modern/utils/config.js +102 -52
- package/dist/js/modern/utils/createFileWatcher.js +115 -0
- package/dist/js/modern/utils/createServer.js +67 -10
- package/dist/js/modern/utils/getServerInternalPlugins.js +58 -0
- package/dist/js/modern/utils/getSpecifiedEntries.js +46 -25
- package/dist/js/modern/utils/language.js +6 -3
- package/dist/js/modern/utils/printInstructions.js +29 -9
- package/dist/js/modern/utils/restart.js +44 -0
- package/dist/js/modern/utils/routes.js +29 -14
- package/dist/js/node/analyze/Builder.js +64 -0
- package/dist/js/node/analyze/constants.js +86 -33
- package/dist/js/node/analyze/generateCode.js +305 -163
- package/dist/js/node/analyze/getBundleEntry.js +66 -58
- 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 +99 -58
- package/dist/js/node/analyze/getHtmlTemplate.js +121 -83
- package/dist/js/node/analyze/getServerRoutes.js +146 -160
- package/dist/js/node/analyze/index.js +243 -161
- package/dist/js/node/analyze/isDefaultExportFunction.js +59 -38
- package/dist/js/node/analyze/makeLegalIdentifier.js +31 -19
- package/dist/js/node/analyze/nestedRoutes.js +193 -0
- package/dist/js/node/analyze/templates.js +316 -43
- package/dist/js/node/analyze/utils.js +158 -78
- package/dist/js/node/builder/builderPlugins/compatModern.js +258 -0
- package/dist/js/node/builder/index.js +177 -0
- package/dist/js/node/builder/loaders/routerLoader.js +38 -0
- package/dist/js/node/builder/loaders/serverModuleLoader.js +28 -0
- package/dist/js/node/builder/share.js +75 -0
- package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +53 -0
- package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +60 -0
- package/dist/js/node/builder/webpackPlugins/routerPlugin.js +135 -0
- package/dist/js/node/commands/build.js +97 -159
- package/dist/js/node/commands/deploy.js +49 -12
- package/dist/js/node/commands/dev.js +121 -93
- package/dist/js/node/commands/index.js +19 -44
- package/dist/js/node/commands/inspect.js +56 -93
- package/dist/js/node/commands/serve.js +83 -0
- package/dist/js/node/config/default.js +195 -0
- package/dist/js/node/config/index.js +34 -0
- package/dist/js/node/config/initial/createHtmlConfig.js +58 -0
- package/dist/js/node/config/initial/createOutputConfig.js +91 -0
- package/dist/js/node/config/initial/createSourceConfig.js +62 -0
- package/dist/js/node/config/initial/createToolsConfig.js +65 -0
- package/dist/js/node/config/initial/index.js +41 -0
- package/dist/js/node/config/initial/inits.js +176 -0
- package/dist/js/node/config/initial/transformNormalizedConfig.js +70 -0
- package/dist/js/node/defineConfig.js +49 -0
- package/dist/js/node/exports/server.js +25 -11
- package/dist/js/node/hooks.js +53 -36
- package/dist/js/node/index.js +216 -128
- package/dist/js/node/initialize/index.js +135 -0
- package/dist/js/node/locale/en.js +40 -26
- package/dist/js/node/locale/index.js +31 -18
- package/dist/js/node/locale/zh.js +41 -27
- 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/utils/commands.js +37 -0
- package/dist/js/node/utils/config.js +125 -75
- package/dist/js/node/utils/createFileWatcher.js +139 -0
- package/dist/js/node/utils/createServer.js +96 -25
- package/dist/js/node/utils/getServerInternalPlugins.js +79 -0
- package/dist/js/node/utils/getSpecifiedEntries.js +68 -34
- package/dist/js/node/utils/language.js +28 -10
- package/dist/js/node/utils/printInstructions.js +51 -19
- package/dist/js/node/utils/restart.js +67 -0
- package/dist/js/node/utils/routes.js +58 -24
- package/dist/js/node/utils/types.js +15 -0
- package/dist/js/treeshaking/analyze/Builder.js +199 -0
- package/dist/js/treeshaking/analyze/constants.js +37 -0
- package/dist/js/treeshaking/analyze/generateCode.js +615 -0
- package/dist/js/treeshaking/analyze/getBundleEntry.js +64 -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 +222 -0
- package/dist/js/treeshaking/analyze/index.js +589 -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 +426 -0
- package/dist/js/treeshaking/analyze/templates.js +446 -0
- package/dist/js/treeshaking/analyze/utils.js +390 -0
- package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +304 -0
- package/dist/js/treeshaking/builder/index.js +374 -0
- package/dist/js/treeshaking/builder/loaders/routerLoader.js +13 -0
- package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +5 -0
- package/dist/js/treeshaking/builder/share.js +40 -0
- package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +110 -0
- package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +72 -0
- package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +343 -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 +319 -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 +208 -0
- package/dist/js/treeshaking/config/index.js +3 -0
- package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -0
- package/dist/js/treeshaking/config/initial/createOutputConfig.js +41 -0
- package/dist/js/treeshaking/config/initial/createSourceConfig.js +42 -0
- package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -0
- package/dist/js/treeshaking/config/initial/index.js +12 -0
- package/dist/js/treeshaking/config/initial/inits.js +213 -0
- package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +35 -0
- package/dist/js/treeshaking/defineConfig.js +61 -0
- package/dist/js/treeshaking/exports/server.js +2 -0
- package/dist/js/treeshaking/hooks.js +31 -0
- package/dist/js/treeshaking/index.js +694 -0
- package/dist/js/treeshaking/initialize/index.js +300 -0
- package/dist/js/treeshaking/locale/en.js +35 -0
- package/dist/js/treeshaking/locale/index.js +9 -0
- package/dist/js/treeshaking/locale/zh.js +35 -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/utils/commands.js +10 -0
- package/dist/js/treeshaking/utils/config.js +302 -0
- package/dist/js/treeshaking/utils/createFileWatcher.js +283 -0
- package/dist/js/treeshaking/utils/createServer.js +258 -0
- package/dist/js/treeshaking/utils/getServerInternalPlugins.js +210 -0
- package/dist/js/treeshaking/utils/getSpecifiedEntries.js +185 -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/dist/types/analyze/Builder.d.ts +8 -0
- package/dist/types/analyze/constants.d.ts +13 -1
- package/dist/types/analyze/generateCode.d.ts +3 -2
- package/dist/types/analyze/getBundleEntry.d.ts +2 -2
- package/dist/types/analyze/{getClientRoutes.d.ts → getClientRoutes/getRoutes.d.ts} +2 -7
- package/dist/types/analyze/getClientRoutes/getRoutesLegacy.d.ts +15 -0
- package/dist/types/analyze/getClientRoutes/index.d.ts +2 -0
- package/dist/types/analyze/getClientRoutes/utils.d.ts +5 -0
- package/dist/types/analyze/getFileSystemEntry.d.ts +2 -2
- package/dist/types/analyze/getHtmlTemplate.d.ts +3 -3
- package/dist/types/analyze/getServerRoutes.d.ts +3 -2
- package/dist/types/analyze/index.d.ts +3 -40
- package/dist/types/analyze/nestedRoutes.d.ts +5 -0
- package/dist/types/analyze/templates.d.ts +24 -5
- package/dist/types/analyze/utils.d.ts +12 -2
- package/dist/types/builder/builderPlugins/compatModern.d.ts +14 -0
- package/dist/types/builder/index.d.ts +18 -0
- package/dist/types/builder/loaders/routerLoader.d.ts +3 -0
- package/dist/types/builder/loaders/serverModuleLoader.d.ts +3 -0
- package/dist/types/builder/share.d.ts +26 -0
- package/dist/types/builder/webpackPlugins/htmlAsyncChunkPlugin.d.ts +8 -0
- package/dist/types/builder/webpackPlugins/htmlBottomTemplate.d.ts +10 -0
- package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +4 -0
- package/dist/types/commands/build.d.ts +2 -1
- package/dist/types/commands/deploy.d.ts +2 -1
- package/dist/types/commands/dev.d.ts +2 -1
- package/dist/types/commands/index.d.ts +1 -1
- package/dist/types/commands/inspect.d.ts +10 -6
- package/dist/types/commands/serve.d.ts +3 -0
- package/dist/types/config/default.d.ts +3 -0
- package/dist/types/config/index.d.ts +2 -0
- package/dist/types/config/initial/createHtmlConfig.d.ts +2 -0
- package/dist/types/config/initial/createOutputConfig.d.ts +2 -0
- package/dist/types/config/initial/createSourceConfig.d.ts +2 -0
- package/dist/types/config/initial/createToolsConfig.d.ts +2 -0
- package/dist/types/config/initial/index.d.ts +4 -0
- package/dist/types/config/initial/inits.d.ts +4 -0
- package/dist/types/config/initial/transformNormalizedConfig.d.ts +2 -0
- package/dist/types/defineConfig.d.ts +8 -0
- package/dist/types/hooks.d.ts +2 -37
- package/dist/types/index.d.ts +9 -3
- package/dist/types/initialize/index.d.ts +5 -0
- package/dist/types/locale/en.d.ts +1 -2
- package/dist/types/locale/index.d.ts +2 -4
- package/dist/types/locale/zh.d.ts +1 -2
- package/dist/types/schema/Schema.d.ts +14 -0
- package/dist/types/schema/index.d.ts +4 -0
- package/dist/types/schema/legacy.d.ts +3 -0
- package/dist/types/types/config/deploy.d.ts +9 -0
- package/dist/types/types/config/dev.d.ts +13 -0
- package/dist/types/types/config/experiments.d.ts +4 -0
- package/dist/types/types/config/html.d.ts +4 -0
- package/dist/types/types/config/index.d.ts +66 -0
- package/dist/types/types/config/output.d.ts +22 -0
- package/dist/types/types/config/performance.d.ts +4 -0
- package/dist/types/types/config/security.d.ts +4 -0
- package/dist/types/types/config/source.d.ts +24 -0
- package/dist/types/types/config/tools.d.ts +24 -0
- package/dist/types/types/hooks.d.ts +89 -0
- package/dist/types/types/index.d.ts +23 -0
- package/dist/types/types/legacyConfig/deploy.d.ts +8 -0
- package/dist/types/types/legacyConfig/dev.d.ts +13 -0
- package/dist/types/types/legacyConfig/index.d.ts +33 -0
- package/dist/types/types/legacyConfig/output.d.ts +51 -0
- package/dist/types/types/legacyConfig/source.d.ts +25 -0
- package/dist/types/types/legacyConfig/tools.d.ts +17 -0
- package/dist/types/utils/commands.d.ts +2 -0
- package/dist/types/utils/config.d.ts +2 -2
- package/dist/types/utils/createFileWatcher.d.ts +4 -0
- package/dist/types/utils/createServer.d.ts +9 -1
- package/dist/types/utils/getServerInternalPlugins.d.ts +2 -0
- package/dist/types/utils/printInstructions.d.ts +3 -2
- package/dist/types/utils/restart.d.ts +3 -0
- package/dist/types/utils/types.d.ts +2 -3
- package/lib/types.d.ts +1 -1
- package/package.json +37 -46
- package/dist/js/modern/analyze/getClientRoutes.js +0 -219
- package/dist/js/modern/commands/start.js +0 -31
- package/dist/js/modern/utils/createCompiler.js +0 -61
- package/dist/js/node/analyze/getClientRoutes.js +0 -241
- package/dist/js/node/commands/start.js +0 -47
- package/dist/js/node/utils/createCompiler.js +0 -81
- package/dist/types/commands/start.d.ts +0 -2
- package/dist/types/utils/createCompiler.d.ts +0 -13
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import path from "path";
|
|
2
|
+
import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME } from "@modern-js/utils";
|
|
3
|
+
import { getFileSystemEntry } from "./getFileSystemEntry";
|
|
4
|
+
import { JS_EXTENSIONS } from "./constants";
|
|
5
|
+
var ensureExtensions = function(file) {
|
|
6
|
+
if (!path.extname(file)) {
|
|
7
|
+
return findExists(JS_EXTENSIONS.map(function(ext) {
|
|
8
|
+
return "".concat(file).concat(ext);
|
|
9
|
+
})) || file;
|
|
10
|
+
}
|
|
11
|
+
return file;
|
|
12
|
+
};
|
|
13
|
+
var ifAlreadyExists = function(entrypoints, checked) {
|
|
14
|
+
return entrypoints.some(function(entrypoint) {
|
|
15
|
+
if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
|
|
16
|
+
checked.entryName = entrypoint.entryName;
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
|
|
20
|
+
throw new Error("Entry configuration conflicts\n Your configuration: ".concat(checked.entry, ".\n Default entrypoint: ").concat(entrypoint.entry, "\n Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules."));
|
|
21
|
+
}
|
|
22
|
+
return false;
|
|
23
|
+
});
|
|
24
|
+
};
|
|
25
|
+
var getBundleEntry = function(appContext, config) {
|
|
26
|
+
var appDirectory = appContext.appDirectory, packageName = appContext.packageName;
|
|
27
|
+
var _source = config.source, disableDefaultEntries = _source.disableDefaultEntries, entries = _source.entries, entriesDir = _source.entriesDir;
|
|
28
|
+
var defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
|
|
29
|
+
console.log("defaults", defaults, entries);
|
|
30
|
+
if (entries) {
|
|
31
|
+
Object.keys(entries).forEach(function(name) {
|
|
32
|
+
var value = entries[name];
|
|
33
|
+
var entrypoint = typeof value === "string" ? {
|
|
34
|
+
entryName: name,
|
|
35
|
+
entry: ensureAbsolutePath(appDirectory, value),
|
|
36
|
+
isAutoMount: true,
|
|
37
|
+
fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
|
|
38
|
+
} : {
|
|
39
|
+
entryName: name,
|
|
40
|
+
entry: ensureAbsolutePath(appDirectory, value.entry),
|
|
41
|
+
isAutoMount: !value.disableMount,
|
|
42
|
+
customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
|
|
43
|
+
fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
|
|
44
|
+
};
|
|
45
|
+
if (entrypoint.fileSystemRoutes) {
|
|
46
|
+
entrypoint.nestedRoutesEntry = entrypoint.entry;
|
|
47
|
+
}
|
|
48
|
+
if (!ifAlreadyExists(defaults, entrypoint)) {
|
|
49
|
+
defaults.push(entrypoint);
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
if (!disableDefaultEntries) {
|
|
54
|
+
var entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
|
|
55
|
+
var found = defaults.find(function(param) {
|
|
56
|
+
var entryName = param.entryName, entry = param.entry, _nestedRoutesEntry = param.nestedRoutesEntry, nestedRoutesEntry = _nestedRoutesEntry === void 0 ? "" : _nestedRoutesEntry;
|
|
57
|
+
return entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs;
|
|
58
|
+
});
|
|
59
|
+
found && (found.entryName = MAIN_ENTRY_NAME);
|
|
60
|
+
}
|
|
61
|
+
console.log("22222222222222", defaults);
|
|
62
|
+
return defaults;
|
|
63
|
+
};
|
|
64
|
+
export { getBundleEntry };
|
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
function _defineProperty(obj, key, value) {
|
|
2
|
+
if (key in obj) {
|
|
3
|
+
Object.defineProperty(obj, key, {
|
|
4
|
+
value: value,
|
|
5
|
+
enumerable: true,
|
|
6
|
+
configurable: true,
|
|
7
|
+
writable: true
|
|
8
|
+
});
|
|
9
|
+
} else {
|
|
10
|
+
obj[key] = value;
|
|
11
|
+
}
|
|
12
|
+
return obj;
|
|
13
|
+
}
|
|
14
|
+
function _objectSpread(target) {
|
|
15
|
+
for(var i = 1; i < arguments.length; i++){
|
|
16
|
+
var source = arguments[i] != null ? arguments[i] : {};
|
|
17
|
+
var ownKeys = Object.keys(source);
|
|
18
|
+
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
19
|
+
ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
20
|
+
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
21
|
+
}));
|
|
22
|
+
}
|
|
23
|
+
ownKeys.forEach(function(key) {
|
|
24
|
+
_defineProperty(target, key, source[key]);
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
return target;
|
|
28
|
+
}
|
|
29
|
+
function ownKeys(object, enumerableOnly) {
|
|
30
|
+
var keys = Object.keys(object);
|
|
31
|
+
if (Object.getOwnPropertySymbols) {
|
|
32
|
+
var symbols = Object.getOwnPropertySymbols(object);
|
|
33
|
+
if (enumerableOnly) {
|
|
34
|
+
symbols = symbols.filter(function(sym) {
|
|
35
|
+
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
keys.push.apply(keys, symbols);
|
|
39
|
+
}
|
|
40
|
+
return keys;
|
|
41
|
+
}
|
|
42
|
+
function _objectSpreadProps(target, source) {
|
|
43
|
+
source = source != null ? source : {};
|
|
44
|
+
if (Object.getOwnPropertyDescriptors) {
|
|
45
|
+
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
46
|
+
} else {
|
|
47
|
+
ownKeys(Object(source)).forEach(function(key) {
|
|
48
|
+
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
return target;
|
|
52
|
+
}
|
|
53
|
+
import path from "path";
|
|
54
|
+
import { fs } from "@modern-js/utils";
|
|
55
|
+
import { makeLegalIdentifier } from "../makeLegalIdentifier";
|
|
56
|
+
import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../constants";
|
|
57
|
+
import { replaceWithAlias } from "../utils";
|
|
58
|
+
import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
|
|
59
|
+
var compName = function(srcDirectory, filePath) {
|
|
60
|
+
var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
|
|
61
|
+
return "Comp_".concat(legalCompName);
|
|
62
|
+
};
|
|
63
|
+
var layoutNameAbbr = function(filePath) {
|
|
64
|
+
var prefix = "L_";
|
|
65
|
+
var dirName = path.dirname(filePath).split("/").pop() || "";
|
|
66
|
+
return "".concat(prefix).concat(makeLegalIdentifier(dirName));
|
|
67
|
+
};
|
|
68
|
+
var parents = [];
|
|
69
|
+
var recursiveReadDir = function(param) {
|
|
70
|
+
var dir = param.dir, routes = param.routes, _basePath = param.basePath, basePath = _basePath === void 0 ? "/" : _basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
|
|
71
|
+
var hasDynamicRoute = false;
|
|
72
|
+
var resetParent = false;
|
|
73
|
+
var parent = parents[parents.length - 1];
|
|
74
|
+
var layout = findLayout(dir);
|
|
75
|
+
if (layout) {
|
|
76
|
+
if (basePath === "/") {
|
|
77
|
+
throw new Error("should use _app instead of _layout in ".concat(dir));
|
|
78
|
+
} else {
|
|
79
|
+
var alias = replaceWithAlias(srcDirectory, layout, srcAlias);
|
|
80
|
+
var componentName = compName(srcDirectory, layout);
|
|
81
|
+
var route = {
|
|
82
|
+
path: "".concat(basePath.substring(0, basePath.length - 1)),
|
|
83
|
+
children: [],
|
|
84
|
+
_component: alias,
|
|
85
|
+
component: componentName,
|
|
86
|
+
parent: parent,
|
|
87
|
+
type: "page"
|
|
88
|
+
};
|
|
89
|
+
parent = route;
|
|
90
|
+
resetParent = true;
|
|
91
|
+
routes.push(route);
|
|
92
|
+
parents.push(route);
|
|
93
|
+
routes = route.children;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
|
|
97
|
+
try {
|
|
98
|
+
for(var _iterator = fs.readdirSync(dir)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
|
|
99
|
+
var relative = _step.value;
|
|
100
|
+
var filePath = path.join(dir, relative);
|
|
101
|
+
if (!shouldSkip(filePath)) {
|
|
102
|
+
var filename = path.basename(filePath, path.extname(filePath));
|
|
103
|
+
var alias1 = replaceWithAlias(srcDirectory, filePath, srcAlias);
|
|
104
|
+
var componentName1 = compName(srcDirectory, filePath);
|
|
105
|
+
var dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
|
|
106
|
+
if (dynamicRouteMatched) {
|
|
107
|
+
if (hasDynamicRoute) {
|
|
108
|
+
throw new Error("Can't set two dynamic route in one directory: ".concat(dir));
|
|
109
|
+
} else {
|
|
110
|
+
hasDynamicRoute = true;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
var route1 = {
|
|
114
|
+
path: "".concat(basePath).concat(dynamicRouteMatched ? ":".concat(dynamicRouteMatched[1]).concat(dynamicRouteMatched[2]) : filename),
|
|
115
|
+
_component: alias1,
|
|
116
|
+
component: componentName1,
|
|
117
|
+
parent: parent,
|
|
118
|
+
type: "page"
|
|
119
|
+
};
|
|
120
|
+
if (fs.statSync(filePath).isDirectory()) {
|
|
121
|
+
recursiveReadDir({
|
|
122
|
+
dir: filePath,
|
|
123
|
+
routes: routes,
|
|
124
|
+
basePath: "".concat(route1.path, "/"),
|
|
125
|
+
srcDirectory: srcDirectory,
|
|
126
|
+
srcAlias: srcAlias
|
|
127
|
+
});
|
|
128
|
+
continue;
|
|
129
|
+
}
|
|
130
|
+
if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
|
|
131
|
+
continue;
|
|
132
|
+
}
|
|
133
|
+
if (filename === FILE_SYSTEM_ROUTES_INDEX) {
|
|
134
|
+
route1.path = basePath === "/" ? basePath : "".concat(basePath.substring(0, basePath.length - 1));
|
|
135
|
+
}
|
|
136
|
+
if (filename === "404" && basePath === "/") {
|
|
137
|
+
route1.path = "*";
|
|
138
|
+
}
|
|
139
|
+
routes.push(route1);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
} catch (err) {
|
|
143
|
+
_didIteratorError = true;
|
|
144
|
+
_iteratorError = err;
|
|
145
|
+
} finally{
|
|
146
|
+
try {
|
|
147
|
+
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
148
|
+
_iterator.return();
|
|
149
|
+
}
|
|
150
|
+
} finally{
|
|
151
|
+
if (_didIteratorError) {
|
|
152
|
+
throw _iteratorError;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
if (resetParent) {
|
|
157
|
+
parents.pop();
|
|
158
|
+
}
|
|
159
|
+
};
|
|
160
|
+
var normalizeNestedRoutes = function(nested, internalComponentsDir, internalDirectory, internalDirAlias) {
|
|
161
|
+
var flat = function(routes) {
|
|
162
|
+
return routes.reduce(function(memo, route) {
|
|
163
|
+
return memo.concat(Array.isArray(route.children) ? flat(route.children) : [
|
|
164
|
+
route
|
|
165
|
+
]);
|
|
166
|
+
}, []);
|
|
167
|
+
};
|
|
168
|
+
var generate = function(route) {
|
|
169
|
+
var codes = [];
|
|
170
|
+
var lastComponent = route.component;
|
|
171
|
+
var imports = [
|
|
172
|
+
"import React from 'react';",
|
|
173
|
+
"import ".concat(lastComponent, " from '").concat(route._component, "'")
|
|
174
|
+
];
|
|
175
|
+
while(route = route.parent){
|
|
176
|
+
var layoutComponent = route.component;
|
|
177
|
+
var layoutComponentAbbr = layoutNameAbbr(route._component);
|
|
178
|
+
imports.push("import ".concat(layoutComponent, " from '").concat(route._component, "';"));
|
|
179
|
+
var currentComponent = "".concat(layoutComponentAbbr, "_").concat(lastComponent);
|
|
180
|
+
codes.push("const ".concat(currentComponent, " = props => <").concat(layoutComponent, " Component={").concat(lastComponent, "} {...props} />;"));
|
|
181
|
+
lastComponent = currentComponent;
|
|
182
|
+
}
|
|
183
|
+
var file = path.resolve(internalComponentsDir, "".concat(lastComponent, ".jsx"));
|
|
184
|
+
fs.outputFileSync(file, "".concat(imports.join("\n"), "\n").concat(codes.join("\n"), "\nexport default ").concat(lastComponent));
|
|
185
|
+
return {
|
|
186
|
+
component: lastComponent,
|
|
187
|
+
_component: replaceWithAlias(internalDirectory, file, internalDirAlias)
|
|
188
|
+
};
|
|
189
|
+
};
|
|
190
|
+
var normalized = flat(nested).map(function(route) {
|
|
191
|
+
return route.parent ? _objectSpreadProps(_objectSpread({}, route, generate(route)), {
|
|
192
|
+
parent: void 0
|
|
193
|
+
}) : _objectSpreadProps(_objectSpread({}, route), {
|
|
194
|
+
parent: void 0
|
|
195
|
+
});
|
|
196
|
+
});
|
|
197
|
+
return normalized;
|
|
198
|
+
};
|
|
199
|
+
var getClientRoutes = function(param) {
|
|
200
|
+
var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias, internalDirectory = param.internalDirectory, internalDirAlias = param.internalDirAlias;
|
|
201
|
+
var entryName = entrypoint.entryName, pageRoutesEntry = entrypoint.pageRoutesEntry;
|
|
202
|
+
if (!pageRoutesEntry) {
|
|
203
|
+
return [];
|
|
204
|
+
}
|
|
205
|
+
if (!fs.existsSync(pageRoutesEntry)) {
|
|
206
|
+
throw new Error("generate file system routes error, ".concat(pageRoutesEntry, " directory not found."));
|
|
207
|
+
}
|
|
208
|
+
if (!(fs.existsSync(pageRoutesEntry) && fs.statSync(pageRoutesEntry).isDirectory())) {
|
|
209
|
+
throw new Error("generate file system routes error, ".concat(pageRoutesEntry, " should be directory."));
|
|
210
|
+
}
|
|
211
|
+
var routes = [];
|
|
212
|
+
recursiveReadDir({
|
|
213
|
+
dir: pageRoutesEntry,
|
|
214
|
+
routes: routes,
|
|
215
|
+
basePath: "/",
|
|
216
|
+
srcDirectory: srcDirectory,
|
|
217
|
+
srcAlias: srcAlias
|
|
218
|
+
});
|
|
219
|
+
var internalComponentsDir = path.resolve(internalDirectory, "".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_COMPONENTS_DIR));
|
|
220
|
+
fs.emptyDirSync(internalComponentsDir);
|
|
221
|
+
routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
|
|
222
|
+
parents.length = 0;
|
|
223
|
+
routes.sort(function(a, b) {
|
|
224
|
+
var delta = getRouteWeight(a.path) - getRouteWeight(b.path);
|
|
225
|
+
if (delta === 0) {
|
|
226
|
+
return a.path.length - b.path.length;
|
|
227
|
+
}
|
|
228
|
+
return delta;
|
|
229
|
+
});
|
|
230
|
+
debug("fileSystem routes: %o", routes);
|
|
231
|
+
return routes;
|
|
232
|
+
};
|
|
233
|
+
export { getClientRoutes };
|
|
@@ -0,0 +1,231 @@
|
|
|
1
|
+
function _defineProperty(obj, key, value) {
|
|
2
|
+
if (key in obj) {
|
|
3
|
+
Object.defineProperty(obj, key, {
|
|
4
|
+
value: value,
|
|
5
|
+
enumerable: true,
|
|
6
|
+
configurable: true,
|
|
7
|
+
writable: true
|
|
8
|
+
});
|
|
9
|
+
} else {
|
|
10
|
+
obj[key] = value;
|
|
11
|
+
}
|
|
12
|
+
return obj;
|
|
13
|
+
}
|
|
14
|
+
function _objectSpread(target) {
|
|
15
|
+
for(var i = 1; i < arguments.length; i++){
|
|
16
|
+
var source = arguments[i] != null ? arguments[i] : {};
|
|
17
|
+
var ownKeys = Object.keys(source);
|
|
18
|
+
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
19
|
+
ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
20
|
+
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
21
|
+
}));
|
|
22
|
+
}
|
|
23
|
+
ownKeys.forEach(function(key) {
|
|
24
|
+
_defineProperty(target, key, source[key]);
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
return target;
|
|
28
|
+
}
|
|
29
|
+
function ownKeys(object, enumerableOnly) {
|
|
30
|
+
var keys = Object.keys(object);
|
|
31
|
+
if (Object.getOwnPropertySymbols) {
|
|
32
|
+
var symbols = Object.getOwnPropertySymbols(object);
|
|
33
|
+
if (enumerableOnly) {
|
|
34
|
+
symbols = symbols.filter(function(sym) {
|
|
35
|
+
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
keys.push.apply(keys, symbols);
|
|
39
|
+
}
|
|
40
|
+
return keys;
|
|
41
|
+
}
|
|
42
|
+
function _objectSpreadProps(target, source) {
|
|
43
|
+
source = source != null ? source : {};
|
|
44
|
+
if (Object.getOwnPropertyDescriptors) {
|
|
45
|
+
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
46
|
+
} else {
|
|
47
|
+
ownKeys(Object(source)).forEach(function(key) {
|
|
48
|
+
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
return target;
|
|
52
|
+
}
|
|
53
|
+
import path from "path";
|
|
54
|
+
import { fs } from "@modern-js/utils";
|
|
55
|
+
import { makeLegalIdentifier } from "../makeLegalIdentifier";
|
|
56
|
+
import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../constants";
|
|
57
|
+
import { replaceWithAlias } from "../utils";
|
|
58
|
+
import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
|
|
59
|
+
var compName = function(srcDirectory, filePath) {
|
|
60
|
+
var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
|
|
61
|
+
return "Comp_".concat(legalCompName);
|
|
62
|
+
};
|
|
63
|
+
var layoutNameAbbr = function(filePath) {
|
|
64
|
+
var prefix = "L_";
|
|
65
|
+
var dirName = path.dirname(filePath).split("/").pop() || "";
|
|
66
|
+
return "".concat(prefix).concat(makeLegalIdentifier(dirName));
|
|
67
|
+
};
|
|
68
|
+
var parents = [];
|
|
69
|
+
var recursiveReadDirLegacy = function(param) {
|
|
70
|
+
var dir = param.dir, routes = param.routes, _basePath = param.basePath, basePath = _basePath === void 0 ? "/" : _basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
|
|
71
|
+
var hasDynamicRoute = false;
|
|
72
|
+
var resetParent = false;
|
|
73
|
+
var parent = parents[parents.length - 1];
|
|
74
|
+
var layout = findLayout(dir);
|
|
75
|
+
if (layout) {
|
|
76
|
+
if (basePath === "/") {
|
|
77
|
+
throw new Error("should use _app instead of _layout in ".concat(dir));
|
|
78
|
+
} else {
|
|
79
|
+
var alias = replaceWithAlias(srcDirectory, layout, srcAlias);
|
|
80
|
+
var componentName = compName(srcDirectory, layout);
|
|
81
|
+
var route = {
|
|
82
|
+
path: "".concat(basePath.substring(0, basePath.length - 1)),
|
|
83
|
+
exact: false,
|
|
84
|
+
routes: [],
|
|
85
|
+
_component: alias,
|
|
86
|
+
component: componentName,
|
|
87
|
+
parent: parent
|
|
88
|
+
};
|
|
89
|
+
parent = route;
|
|
90
|
+
resetParent = true;
|
|
91
|
+
routes.push(route);
|
|
92
|
+
parents.push(route);
|
|
93
|
+
routes = route.routes;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
|
|
97
|
+
try {
|
|
98
|
+
for(var _iterator = fs.readdirSync(dir)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
|
|
99
|
+
var relative = _step.value;
|
|
100
|
+
var filePath = path.join(dir, relative);
|
|
101
|
+
if (!shouldSkip(filePath)) {
|
|
102
|
+
var filename = path.basename(filePath, path.extname(filePath));
|
|
103
|
+
var alias1 = replaceWithAlias(srcDirectory, filePath, srcAlias);
|
|
104
|
+
var componentName1 = compName(srcDirectory, filePath);
|
|
105
|
+
var dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
|
|
106
|
+
if (dynamicRouteMatched) {
|
|
107
|
+
if (hasDynamicRoute) {
|
|
108
|
+
throw new Error("Can't set two dynamic route in one directory: ".concat(dir));
|
|
109
|
+
} else {
|
|
110
|
+
hasDynamicRoute = true;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
var route1 = {
|
|
114
|
+
path: "".concat(basePath).concat(dynamicRouteMatched ? ":".concat(dynamicRouteMatched[1]).concat(dynamicRouteMatched[2]) : filename),
|
|
115
|
+
_component: alias1,
|
|
116
|
+
component: componentName1,
|
|
117
|
+
exact: true,
|
|
118
|
+
parent: parent
|
|
119
|
+
};
|
|
120
|
+
if (fs.statSync(filePath).isDirectory()) {
|
|
121
|
+
recursiveReadDirLegacy({
|
|
122
|
+
dir: filePath,
|
|
123
|
+
routes: routes,
|
|
124
|
+
basePath: "".concat(route1.path, "/"),
|
|
125
|
+
srcDirectory: srcDirectory,
|
|
126
|
+
srcAlias: srcAlias
|
|
127
|
+
});
|
|
128
|
+
continue;
|
|
129
|
+
}
|
|
130
|
+
if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
|
|
131
|
+
continue;
|
|
132
|
+
}
|
|
133
|
+
if (filename === FILE_SYSTEM_ROUTES_INDEX) {
|
|
134
|
+
route1.path = basePath === "/" ? basePath : "".concat(basePath.substring(0, basePath.length - 1));
|
|
135
|
+
}
|
|
136
|
+
if (filename === "404" && basePath === "/") {
|
|
137
|
+
route1.path = "*";
|
|
138
|
+
route1.exact = false;
|
|
139
|
+
}
|
|
140
|
+
routes.push(route1);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
} catch (err) {
|
|
144
|
+
_didIteratorError = true;
|
|
145
|
+
_iteratorError = err;
|
|
146
|
+
} finally{
|
|
147
|
+
try {
|
|
148
|
+
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
149
|
+
_iterator.return();
|
|
150
|
+
}
|
|
151
|
+
} finally{
|
|
152
|
+
if (_didIteratorError) {
|
|
153
|
+
throw _iteratorError;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
if (resetParent) {
|
|
158
|
+
parents.pop();
|
|
159
|
+
}
|
|
160
|
+
};
|
|
161
|
+
var normalizeNestedRoutes = function(nested, internalComponentsDir, internalDirectory, internalDirAlias) {
|
|
162
|
+
var flat = function(routes) {
|
|
163
|
+
return routes.reduce(function(memo, route) {
|
|
164
|
+
return memo.concat(Array.isArray(route.routes) ? flat(route.routes) : [
|
|
165
|
+
route
|
|
166
|
+
]);
|
|
167
|
+
}, []);
|
|
168
|
+
};
|
|
169
|
+
var generate = function(route) {
|
|
170
|
+
var codes = [];
|
|
171
|
+
var lastComponent = route.component;
|
|
172
|
+
var imports = [
|
|
173
|
+
"import React from 'react';",
|
|
174
|
+
"import ".concat(lastComponent, " from '").concat(route._component, "'")
|
|
175
|
+
];
|
|
176
|
+
while(route = route.parent){
|
|
177
|
+
var layoutComponent = route.component;
|
|
178
|
+
var layoutComponentAbbr = layoutNameAbbr(route._component);
|
|
179
|
+
imports.push("import ".concat(layoutComponent, " from '").concat(route._component, "';"));
|
|
180
|
+
var currentComponent = "".concat(layoutComponentAbbr, "_").concat(lastComponent);
|
|
181
|
+
codes.push("const ".concat(currentComponent, " = props => <").concat(layoutComponent, " Component={").concat(lastComponent, "} {...props} />;"));
|
|
182
|
+
lastComponent = currentComponent;
|
|
183
|
+
}
|
|
184
|
+
var file = path.resolve(internalComponentsDir, "".concat(lastComponent, ".jsx"));
|
|
185
|
+
fs.outputFileSync(file, "".concat(imports.join("\n"), "\n").concat(codes.join("\n"), "\nexport default ").concat(lastComponent));
|
|
186
|
+
return {
|
|
187
|
+
component: lastComponent,
|
|
188
|
+
_component: replaceWithAlias(internalDirectory, file, internalDirAlias)
|
|
189
|
+
};
|
|
190
|
+
};
|
|
191
|
+
var normalized = flat(nested).map(function(route) {
|
|
192
|
+
return route.parent ? _objectSpreadProps(_objectSpread({}, route, generate(route)), {
|
|
193
|
+
parent: void 0
|
|
194
|
+
}) : _objectSpreadProps(_objectSpread({}, route), {
|
|
195
|
+
parent: void 0
|
|
196
|
+
});
|
|
197
|
+
});
|
|
198
|
+
return normalized;
|
|
199
|
+
};
|
|
200
|
+
var getClientRoutes = function(param) {
|
|
201
|
+
var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias, internalDirectory = param.internalDirectory, internalDirAlias = param.internalDirAlias;
|
|
202
|
+
var entry = entrypoint.entry, entryName = entrypoint.entryName;
|
|
203
|
+
if (!fs.existsSync(entry)) {
|
|
204
|
+
throw new Error("generate file system routes error, ".concat(entry, " directory not found."));
|
|
205
|
+
}
|
|
206
|
+
if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
|
|
207
|
+
throw new Error("generate file system routes error, ".concat(entry, " should be directory."));
|
|
208
|
+
}
|
|
209
|
+
var routes = [];
|
|
210
|
+
recursiveReadDirLegacy({
|
|
211
|
+
dir: entry,
|
|
212
|
+
routes: routes,
|
|
213
|
+
basePath: "/",
|
|
214
|
+
srcDirectory: srcDirectory,
|
|
215
|
+
srcAlias: srcAlias
|
|
216
|
+
});
|
|
217
|
+
var internalComponentsDir = path.resolve(internalDirectory, "".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_COMPONENTS_DIR));
|
|
218
|
+
fs.emptyDirSync(internalComponentsDir);
|
|
219
|
+
routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
|
|
220
|
+
parents.length = 0;
|
|
221
|
+
routes.sort(function(a, b) {
|
|
222
|
+
var delta = getRouteWeight(a.path) - getRouteWeight(b.path);
|
|
223
|
+
if (delta === 0) {
|
|
224
|
+
return a.path.length - b.path.length;
|
|
225
|
+
}
|
|
226
|
+
return delta;
|
|
227
|
+
});
|
|
228
|
+
debug("fileSystem routes: %o", routes);
|
|
229
|
+
return routes;
|
|
230
|
+
};
|
|
231
|
+
export { getClientRoutes };
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import path from "path";
|
|
2
|
+
import { createDebugger, findExists, fs } from "@modern-js/utils";
|
|
3
|
+
import { JS_EXTENSIONS, FILE_SYSTEM_ROUTES_LAYOUT, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX } from "../constants";
|
|
4
|
+
var debug = createDebugger("get-client-routes");
|
|
5
|
+
var findLayout = function(dir) {
|
|
6
|
+
return findExists(JS_EXTENSIONS.map(function(ext) {
|
|
7
|
+
return path.resolve(dir, "".concat(FILE_SYSTEM_ROUTES_LAYOUT).concat(ext));
|
|
8
|
+
}));
|
|
9
|
+
};
|
|
10
|
+
var getRouteWeight = function(route) {
|
|
11
|
+
return route === "*" ? 999 : route.split(":").length - 1;
|
|
12
|
+
};
|
|
13
|
+
var shouldSkip = function(file) {
|
|
14
|
+
if (fs.statSync(file).isDirectory()) {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
var ext = path.extname(file);
|
|
18
|
+
if (FILE_SYSTEM_ROUTES_IGNORED_REGEX.test(file) || !JS_EXTENSIONS.includes(ext) || FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT === path.basename(file, ext)) {
|
|
19
|
+
return true;
|
|
20
|
+
}
|
|
21
|
+
return false;
|
|
22
|
+
};
|
|
23
|
+
export { debug, findLayout, getRouteWeight, shouldSkip };
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import fs from "fs";
|
|
2
|
+
import path from "path";
|
|
3
|
+
import { findExists, ensureAbsolutePath } from "@modern-js/utils";
|
|
4
|
+
import { isDefaultExportFunction } from "./isDefaultExportFunction";
|
|
5
|
+
import { JS_EXTENSIONS, INDEX_FILE_NAME, APP_FILE_NAME, PAGES_DIR_NAME, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, NESTED_ROUTES_DIR } from "./constants";
|
|
6
|
+
var hasIndex = function(dir) {
|
|
7
|
+
return findExists(JS_EXTENSIONS.map(function(ext) {
|
|
8
|
+
return path.resolve(dir, "".concat(INDEX_FILE_NAME).concat(ext));
|
|
9
|
+
}));
|
|
10
|
+
};
|
|
11
|
+
var hasApp = function(dir) {
|
|
12
|
+
return findExists(JS_EXTENSIONS.map(function(ext) {
|
|
13
|
+
return path.resolve(dir, "".concat(APP_FILE_NAME).concat(ext));
|
|
14
|
+
}));
|
|
15
|
+
};
|
|
16
|
+
var hasPages = function(dir) {
|
|
17
|
+
return fs.existsSync(path.join(dir, PAGES_DIR_NAME));
|
|
18
|
+
};
|
|
19
|
+
var hasNestedRoutes = function(dir) {
|
|
20
|
+
return fs.existsSync(path.join(dir, NESTED_ROUTES_DIR));
|
|
21
|
+
};
|
|
22
|
+
var isBundleEntry = function(dir) {
|
|
23
|
+
return hasApp(dir) || hasPages(dir) || hasIndex(dir) || hasNestedRoutes(dir);
|
|
24
|
+
};
|
|
25
|
+
var scanDir = function(dirs) {
|
|
26
|
+
return dirs.map(function(dir) {
|
|
27
|
+
var indexFile = hasIndex(dir);
|
|
28
|
+
var customBootstrap = isDefaultExportFunction(indexFile) ? indexFile : false;
|
|
29
|
+
var entryName = path.basename(dir);
|
|
30
|
+
if (indexFile && !customBootstrap) {
|
|
31
|
+
return {
|
|
32
|
+
entryName: entryName,
|
|
33
|
+
entry: indexFile,
|
|
34
|
+
absoluteEntryDir: path.resolve(dir),
|
|
35
|
+
isAutoMount: false
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
var isHasApp = hasApp(dir);
|
|
39
|
+
if (isHasApp) {
|
|
40
|
+
return {
|
|
41
|
+
entryName: entryName,
|
|
42
|
+
entry: path.join(dir, APP_FILE_NAME),
|
|
43
|
+
isAutoMount: true,
|
|
44
|
+
absoluteEntryDir: path.resolve(dir),
|
|
45
|
+
customBootstrap: customBootstrap
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
var isHasNestedRoutes = hasNestedRoutes(dir);
|
|
49
|
+
var isHasPages = hasPages(dir);
|
|
50
|
+
if (isHasNestedRoutes || isHasPages) {
|
|
51
|
+
var entrypoint = {
|
|
52
|
+
entryName: entryName,
|
|
53
|
+
entry: "",
|
|
54
|
+
fileSystemRoutes: {
|
|
55
|
+
globalApp: findExists(JS_EXTENSIONS.map(function(ext) {
|
|
56
|
+
return path.resolve(dir, "./".concat(PAGES_DIR_NAME, "/").concat(FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT).concat(ext));
|
|
57
|
+
}))
|
|
58
|
+
},
|
|
59
|
+
isAutoMount: true,
|
|
60
|
+
absoluteEntryDir: path.resolve(dir),
|
|
61
|
+
customBootstrap: customBootstrap
|
|
62
|
+
};
|
|
63
|
+
if (isHasPages) {
|
|
64
|
+
entrypoint.entry = path.join(dir, PAGES_DIR_NAME);
|
|
65
|
+
entrypoint.pageRoutesEntry = entrypoint.entry;
|
|
66
|
+
}
|
|
67
|
+
if (isHasNestedRoutes) {
|
|
68
|
+
entrypoint.entry = path.join(dir, NESTED_ROUTES_DIR);
|
|
69
|
+
entrypoint.nestedRoutesEntry = entrypoint.entry;
|
|
70
|
+
}
|
|
71
|
+
return entrypoint;
|
|
72
|
+
}
|
|
73
|
+
return {
|
|
74
|
+
entryName: entryName,
|
|
75
|
+
entry: indexFile,
|
|
76
|
+
absoluteEntryDir: path.resolve(dir),
|
|
77
|
+
isAutoMount: false
|
|
78
|
+
};
|
|
79
|
+
});
|
|
80
|
+
};
|
|
81
|
+
var getFileSystemEntry = function(appContext, config) {
|
|
82
|
+
var appDirectory = appContext.appDirectory;
|
|
83
|
+
var _source = config.source, entriesDir = _source.entriesDir, disableEntryDirs = _source.disableEntryDirs;
|
|
84
|
+
var disabledDirs = [];
|
|
85
|
+
if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
|
|
86
|
+
disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? void 0 : disableEntryDirs.map(function(dir) {
|
|
87
|
+
return ensureAbsolutePath(appDirectory, dir);
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
var src = ensureAbsolutePath(appDirectory, entriesDir || "");
|
|
91
|
+
if (fs.existsSync(src)) {
|
|
92
|
+
if (fs.statSync(src).isDirectory()) {
|
|
93
|
+
return scanDir(isBundleEntry(src) ? [
|
|
94
|
+
src
|
|
95
|
+
] : fs.readdirSync(src).map(function(file) {
|
|
96
|
+
return path.join(src, file);
|
|
97
|
+
}).filter(function(file) {
|
|
98
|
+
return fs.statSync(file).isDirectory() && isBundleEntry(file) && !disabledDirs.includes(file);
|
|
99
|
+
}));
|
|
100
|
+
} else {
|
|
101
|
+
throw Error("source.entriesDir accept a directory.");
|
|
102
|
+
}
|
|
103
|
+
} else {
|
|
104
|
+
throw Error("src dir ".concat(entriesDir, " not found."));
|
|
105
|
+
}
|
|
106
|
+
};
|
|
107
|
+
export { getFileSystemEntry };
|