@modern-js/app-tools 2.6.0 → 2.7.1-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 +52 -0
- package/README.md +2 -2
- package/dist/cjs/analyze/generateCode.js +7 -7
- package/dist/cjs/analyze/getClientRoutes/getRoutes.js +1 -1
- package/dist/cjs/analyze/getClientRoutes/getRoutesLegacy.js +1 -1
- package/dist/cjs/analyze/index.js +20 -2
- package/dist/cjs/analyze/nestedRoutes.js +1 -1
- package/dist/cjs/analyze/templates.js +6 -4
- package/dist/cjs/builder/builder-webpack/builderPlugins/compatModern.js +2 -13
- package/dist/cjs/builder/generator/index.js +10 -2
- package/dist/cjs/builder/shared/builderPlugins/adapterBasic.js +101 -0
- package/dist/cjs/builder/shared/builderPlugins/adapterHtml.js +91 -0
- package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js +140 -0
- package/dist/cjs/builder/shared/builderPlugins/index.js +19 -0
- package/dist/cjs/builder/{builder-webpack/webpackPlugins → shared/bundlerPlugins}/RouterPlugin.js +11 -5
- package/dist/cjs/builder/shared/bundlerPlugins/index.js +19 -0
- package/dist/cjs/builder/shared/index.js +1 -1
- package/dist/cjs/commands/dev.js +6 -0
- package/dist/cjs/commands/serve.js +17 -0
- package/dist/cjs/index.js +1 -1
- package/dist/cjs/locale/en.js +1 -0
- package/dist/cjs/locale/zh.js +1 -0
- package/dist/cjs/schema/index.js +4 -0
- package/dist/esm/analyze/generateCode.js +8 -9
- package/dist/esm/analyze/getClientRoutes/getRoutes.js +1 -1
- package/dist/esm/analyze/getClientRoutes/getRoutesLegacy.js +1 -1
- package/dist/esm/analyze/index.js +15 -3
- package/dist/esm/analyze/nestedRoutes.js +1 -1
- package/dist/esm/analyze/templates.js +6 -5
- package/dist/esm/builder/builder-webpack/builderPlugins/compatModern.js +0 -11
- package/dist/esm/builder/generator/index.js +6 -4
- package/dist/esm/builder/shared/builderPlugins/adapterBasic.js +101 -0
- package/dist/esm/builder/shared/builderPlugins/adapterHtml.js +120 -0
- package/dist/esm/builder/shared/builderPlugins/adapterSSR.js +131 -0
- package/dist/esm/builder/shared/builderPlugins/index.js +3 -0
- package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js +350 -0
- package/dist/esm/builder/shared/bundlerPlugins/index.js +3 -0
- package/dist/esm/builder/shared/index.js +1 -1
- package/dist/esm/commands/dev.js +6 -0
- package/dist/esm/commands/serve.js +6 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/locale/en.js +1 -0
- package/dist/esm/locale/zh.js +1 -0
- package/dist/esm/schema/index.js +7 -0
- package/dist/esm-node/analyze/generateCode.js +14 -9
- package/dist/esm-node/analyze/getClientRoutes/getRoutes.js +1 -1
- package/dist/esm-node/analyze/getClientRoutes/getRoutesLegacy.js +1 -1
- package/dist/esm-node/analyze/index.js +22 -3
- package/dist/esm-node/analyze/nestedRoutes.js +1 -1
- package/dist/esm-node/analyze/templates.js +6 -4
- package/dist/esm-node/builder/builder-webpack/builderPlugins/compatModern.js +2 -13
- package/dist/esm-node/builder/generator/index.js +10 -2
- package/dist/esm-node/builder/shared/builderPlugins/adapterBasic.js +67 -0
- package/dist/esm-node/builder/shared/builderPlugins/adapterHtml.js +67 -0
- package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js +119 -0
- package/dist/esm-node/builder/shared/builderPlugins/index.js +3 -0
- package/dist/esm-node/builder/{builder-webpack/webpackPlugins → shared/bundlerPlugins}/RouterPlugin.js +11 -5
- package/dist/esm-node/builder/shared/bundlerPlugins/index.js +3 -0
- package/dist/esm-node/builder/shared/index.js +1 -1
- package/dist/esm-node/commands/dev.js +6 -0
- package/dist/esm-node/commands/serve.js +18 -1
- package/dist/esm-node/index.js +1 -1
- package/dist/esm-node/locale/en.js +1 -0
- package/dist/esm-node/locale/zh.js +1 -0
- package/dist/esm-node/schema/index.js +4 -0
- package/dist/js/modern/analyze/constants.js +54 -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 +175 -0
- package/dist/js/modern/analyze/index.js +332 -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 +157 -0
- package/dist/js/modern/analyze/templates.js +334 -0
- package/dist/js/modern/analyze/utils.js +141 -0
- package/dist/{esm-node/builder/shared/builderPlugins/adapterModern.js → js/modern/builder/builderPlugins/compatModern.js} +135 -104
- package/dist/js/modern/builder/index.js +159 -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 +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 +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 +152 -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 -0
- package/dist/js/modern/hooks.js +35 -0
- package/dist/js/modern/index.js +211 -0
- package/dist/js/modern/initialize/index.js +124 -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/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 +98 -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 +194 -0
- package/dist/js/node/analyze/index.js +339 -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 +184 -0
- package/dist/js/node/analyze/templates.js +365 -0
- package/dist/js/node/analyze/utils.js +172 -0
- package/dist/{cjs/builder/shared/builderPlugins/adapterModern.js → js/node/builder/builderPlugins/compatModern.js} +137 -113
- 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 +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 +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 +175 -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 +27 -0
- package/dist/js/node/hooks.js +54 -0
- package/dist/js/node/index.js +235 -0
- package/dist/js/node/initialize/index.js +134 -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/{cjs/builder/builder-webpack/webpackPlugins → js/node/types/config}/index.js +3 -3
- 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/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 +40 -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 +222 -0
- package/dist/js/treeshaking/analyze/index.js +697 -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 +384 -0
- package/dist/js/treeshaking/analyze/templates.js +468 -0
- package/dist/js/treeshaking/analyze/utils.js +374 -0
- package/dist/{esm/builder/shared/builderPlugins/adapterModern.js → js/treeshaking/builder/builderPlugins/compatModern.js} +142 -138
- 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/{esm/builder/builder-webpack/webpackPlugins/RouterPlugin.js → js/treeshaking/builder/webpackPlugins/routerPlugin.js} +3 -6
- 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/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 +209 -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 +29 -0
- package/dist/js/treeshaking/index.js +706 -0
- package/dist/js/treeshaking/initialize/index.js +276 -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/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/dist/types/analyze/templates.d.ts +5 -3
- package/dist/types/builder/shared/builderPlugins/adapterBasic.d.ts +7 -0
- package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts +5 -0
- package/dist/types/builder/shared/builderPlugins/adapterSSR.d.ts +4 -0
- package/dist/types/builder/shared/builderPlugins/index.d.ts +3 -0
- package/dist/types/builder/shared/bundlerPlugins/RouterPlugin.d.ts +5 -0
- package/dist/types/builder/shared/bundlerPlugins/index.d.ts +3 -0
- package/dist/types/builder/shared/index.d.ts +1 -1
- package/dist/types/builder/shared/types.d.ts +7 -4
- package/dist/types/locale/en.d.ts +1 -0
- package/dist/types/locale/index.d.ts +2 -0
- package/dist/types/locale/zh.d.ts +1 -0
- package/dist/types/types/config/output.d.ts +3 -15
- package/lib/types.d.ts +1 -1
- package/package.json +28 -28
- package/dist/esm/builder/builder-webpack/webpackPlugins/index.js +0 -1
- package/dist/esm-node/builder/builder-webpack/webpackPlugins/index.js +0 -1
- package/dist/types/builder/builder-webpack/webpackPlugins/RouterPlugin.d.ts +0 -4
- package/dist/types/builder/builder-webpack/webpackPlugins/index.d.ts +0 -1
- package/dist/types/builder/shared/builderPlugins/adapterModern.d.ts +0 -13
|
@@ -7,9 +7,11 @@ import {
|
|
|
7
7
|
isApiOnly,
|
|
8
8
|
minimist,
|
|
9
9
|
getCommand,
|
|
10
|
-
isDevCommand
|
|
10
|
+
isDevCommand,
|
|
11
|
+
isSSGEntry
|
|
11
12
|
} from "@modern-js/utils";
|
|
12
13
|
import { cloneDeep } from "@modern-js/utils/lodash";
|
|
14
|
+
import { createVirtualModule } from "@modern-js/builder-shared";
|
|
13
15
|
import { printInstructions } from "../utils/printInstructions";
|
|
14
16
|
import { generateRoutes } from "../utils/routes";
|
|
15
17
|
import { emitResolvedConfig } from "../utils/config";
|
|
@@ -190,12 +192,21 @@ var analyze_default = ({
|
|
|
190
192
|
resolvedConfig.server.ssrByEntries,
|
|
191
193
|
packageName
|
|
192
194
|
);
|
|
193
|
-
|
|
195
|
+
const useSSG = isSSGEntry(
|
|
196
|
+
resolvedConfig,
|
|
197
|
+
entryName,
|
|
198
|
+
entrypoints
|
|
199
|
+
);
|
|
200
|
+
if (entrypoint.nestedRoutesEntry && (ssr || useSSG) && name === "server") {
|
|
201
|
+
const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
|
|
194
202
|
const serverLoadersFile = getServerLoadersFile(
|
|
195
203
|
internalDirectory,
|
|
196
204
|
entryName
|
|
197
205
|
);
|
|
198
|
-
|
|
206
|
+
const combinedModule = createVirtualModule(
|
|
207
|
+
`export * from "${serverLoaderRuntime}"; export * from "${serverLoadersFile}"`
|
|
208
|
+
);
|
|
209
|
+
chain.entry(`${entryName}-server-loaders`).add(combinedModule);
|
|
199
210
|
}
|
|
200
211
|
});
|
|
201
212
|
}
|
|
@@ -260,6 +271,14 @@ var analyze_default = ({
|
|
|
260
271
|
imports
|
|
261
272
|
};
|
|
262
273
|
},
|
|
274
|
+
validateSchema() {
|
|
275
|
+
return {
|
|
276
|
+
target: "output.splitRoutesChunks",
|
|
277
|
+
schema: {
|
|
278
|
+
type: "boolean"
|
|
279
|
+
}
|
|
280
|
+
};
|
|
281
|
+
},
|
|
263
282
|
async fileChange(e) {
|
|
264
283
|
const appContext = api.useAppContext();
|
|
265
284
|
const { appDirectory } = appContext;
|
|
@@ -144,12 +144,14 @@ const fileSystemRoutes = async ({
|
|
|
144
144
|
ssrMode,
|
|
145
145
|
nestedRoutesEntry,
|
|
146
146
|
entryName,
|
|
147
|
-
internalDirectory
|
|
147
|
+
internalDirectory,
|
|
148
|
+
splitRoutesChunks = true
|
|
148
149
|
}) => {
|
|
149
150
|
const loadings = [];
|
|
150
151
|
const errors = [];
|
|
151
152
|
const loaders = [];
|
|
152
153
|
const loadersMap = {};
|
|
154
|
+
const webpackMode = splitRoutesChunks ? "lazy" : "eager";
|
|
153
155
|
const loadersMapFile = path.join(
|
|
154
156
|
internalDirectory,
|
|
155
157
|
entryName,
|
|
@@ -208,15 +210,15 @@ const fileSystemRoutes = async ({
|
|
|
208
210
|
rootLayoutCode = `import RootLayout from '${route._component}'`;
|
|
209
211
|
component = `RootLayout`;
|
|
210
212
|
} else if (ssrMode === "string") {
|
|
211
|
-
lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ '${route._component}')`;
|
|
213
|
+
lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ /* webpackMode: "${webpackMode}" */ '${route._component}')`;
|
|
212
214
|
component = `loadable(${lazyImport})`;
|
|
213
215
|
} else {
|
|
214
|
-
lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ '${route._component}')`;
|
|
216
|
+
lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ /* webpackMode: "${webpackMode}" */ '${route._component}')`;
|
|
215
217
|
component = `lazy(${lazyImport})`;
|
|
216
218
|
}
|
|
217
219
|
}
|
|
218
220
|
} else if (route._component) {
|
|
219
|
-
lazyImport = `() => import('${route._component}')`;
|
|
221
|
+
lazyImport = `() => import( /* webpackMode: "${webpackMode}" */ '${route._component}')`;
|
|
220
222
|
component = `loadable(${lazyImport})`;
|
|
221
223
|
}
|
|
222
224
|
const finalRoute = {
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { join } from "path";
|
|
2
2
|
import { createCopyPattern } from "../../shared";
|
|
3
|
-
import { RouterPlugin } from "../webpackPlugins";
|
|
4
3
|
const builderPluginCompatModern = (options) => ({
|
|
5
4
|
name: "builder-plugin-compat-modern",
|
|
6
5
|
setup(api) {
|
|
7
6
|
const { normalizedConfig: modernConfig, appContext } = options;
|
|
8
7
|
api.modifyWebpackChain((chain, { CHAIN_ID }) => {
|
|
9
|
-
var _a;
|
|
10
8
|
chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
|
|
11
9
|
if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
|
|
12
10
|
const defaultCopyPattern = createCopyPattern(
|
|
@@ -16,23 +14,14 @@ const builderPluginCompatModern = (options) => ({
|
|
|
16
14
|
chain
|
|
17
15
|
);
|
|
18
16
|
chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
|
|
19
|
-
var
|
|
17
|
+
var _a;
|
|
20
18
|
return [
|
|
21
19
|
{
|
|
22
|
-
patterns: [...((
|
|
20
|
+
patterns: [...((_a = args[0]) == null ? void 0 : _a.patterns) || [], defaultCopyPattern]
|
|
23
21
|
}
|
|
24
22
|
];
|
|
25
23
|
});
|
|
26
24
|
}
|
|
27
|
-
const { entrypoints } = appContext;
|
|
28
|
-
const existNestedRoutes = entrypoints.some(
|
|
29
|
-
(entrypoint) => entrypoint.nestedRoutesEntry
|
|
30
|
-
);
|
|
31
|
-
const routerConfig = (_a = modernConfig == null ? void 0 : modernConfig.runtime) == null ? void 0 : _a.router;
|
|
32
|
-
const routerManifest = Boolean(routerConfig == null ? void 0 : routerConfig.manifest);
|
|
33
|
-
if (existNestedRoutes || routerManifest) {
|
|
34
|
-
chain.plugin("route-plugin").use(RouterPlugin);
|
|
35
|
-
}
|
|
36
25
|
});
|
|
37
26
|
}
|
|
38
27
|
});
|
|
@@ -21,8 +21,16 @@ async function generateBuilder(options, generateProvider, utils) {
|
|
|
21
21
|
return builder;
|
|
22
22
|
}
|
|
23
23
|
async function applyBuilderPlugins(builder, options) {
|
|
24
|
-
const {
|
|
25
|
-
|
|
24
|
+
const {
|
|
25
|
+
builderPluginAdapterBasic,
|
|
26
|
+
builderPluginAdapterHtml,
|
|
27
|
+
builderPluginAdapterSSR
|
|
28
|
+
} = await import("../shared/builderPlugins");
|
|
29
|
+
builder.addPlugins([
|
|
30
|
+
builderPluginAdapterBasic(options),
|
|
31
|
+
builderPluginAdapterSSR(options),
|
|
32
|
+
builderPluginAdapterHtml(options)
|
|
33
|
+
]);
|
|
26
34
|
}
|
|
27
35
|
export {
|
|
28
36
|
generateBuilder
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
const builderPluginAdapterBasic = (options) => ({
|
|
2
|
+
name: "builder-plugin-adapter-modern-basic",
|
|
3
|
+
setup(api) {
|
|
4
|
+
api.modifyBundlerChain((chain, { target, CHAIN_ID }) => {
|
|
5
|
+
if (target === "node") {
|
|
6
|
+
chain.name("server");
|
|
7
|
+
} else if (target === "service-worker") {
|
|
8
|
+
chain.name("service-worker");
|
|
9
|
+
} else if (target === "web-worker") {
|
|
10
|
+
chain.name("worker");
|
|
11
|
+
} else if (target === "modern-web") {
|
|
12
|
+
chain.name("modern");
|
|
13
|
+
} else {
|
|
14
|
+
chain.name("client");
|
|
15
|
+
}
|
|
16
|
+
if (target === "node" || target === "service-worker") {
|
|
17
|
+
applyNodeCompat(target, chain);
|
|
18
|
+
}
|
|
19
|
+
if (target === "web" || target === "modern-web") {
|
|
20
|
+
const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
|
|
21
|
+
chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
|
|
22
|
+
chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
applyCallbacks(api, options);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
function applyCallbacks(api, options) {
|
|
29
|
+
options.onAfterBuild && api.onAfterBuild(options.onAfterBuild);
|
|
30
|
+
options.onAfterCreateCompiler && api.onAfterCreateCompiler(options.onAfterCreateCompiler);
|
|
31
|
+
options.onAfterStartDevServer && api.onAfterStartDevServer(options.onAfterStartDevServer);
|
|
32
|
+
options.onBeforeBuild && api.onBeforeBuild(options.onBeforeBuild);
|
|
33
|
+
options.onBeforeCreateCompiler && api.onBeforeCreateCompiler(options.onBeforeCreateCompiler);
|
|
34
|
+
options.onBeforeStartDevServer && api.onBeforeStartDevServer(options.onBeforeStartDevServer);
|
|
35
|
+
options.onDevCompileDone && api.onDevCompileDone(options.onDevCompileDone);
|
|
36
|
+
options.onExit && api.onExit(options.onExit);
|
|
37
|
+
}
|
|
38
|
+
function applyNodeCompat(target, chain) {
|
|
39
|
+
const nodeExts = [
|
|
40
|
+
".node.js",
|
|
41
|
+
".node.jsx",
|
|
42
|
+
".node.ts",
|
|
43
|
+
".node.tsx",
|
|
44
|
+
".server.js",
|
|
45
|
+
".server.ts",
|
|
46
|
+
".server.ts",
|
|
47
|
+
".server.tsx"
|
|
48
|
+
];
|
|
49
|
+
const webWorkerExts = [
|
|
50
|
+
".worker.js",
|
|
51
|
+
".worker.jsx",
|
|
52
|
+
".worker.ts",
|
|
53
|
+
".worker.tsx"
|
|
54
|
+
];
|
|
55
|
+
for (const ext of nodeExts) {
|
|
56
|
+
chain.resolve.extensions.prepend(ext);
|
|
57
|
+
}
|
|
58
|
+
if (target === "service-worker") {
|
|
59
|
+
for (const ext of webWorkerExts) {
|
|
60
|
+
chain.resolve.extensions.prepend(ext);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
export {
|
|
65
|
+
applyCallbacks,
|
|
66
|
+
builderPluginAdapterBasic
|
|
67
|
+
};
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { getEntryOptions } from "@modern-js/utils";
|
|
2
|
+
import { template as lodashTemplate } from "@modern-js/utils/lodash";
|
|
3
|
+
import { BottomTemplatePlugin } from "../bundlerPlugins";
|
|
4
|
+
function isHtmlEnabled(config, target) {
|
|
5
|
+
var _a;
|
|
6
|
+
return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
|
|
7
|
+
}
|
|
8
|
+
const builderPluginAdapterHtml = (options) => ({
|
|
9
|
+
name: "builder-plugin-adpater-modern-html",
|
|
10
|
+
setup(api) {
|
|
11
|
+
api.modifyBundlerChain(
|
|
12
|
+
(chain, { CHAIN_ID, target, HtmlPlugin: HtmlBundlerPlugin }) => {
|
|
13
|
+
const builderConfig = api.getNormalizedConfig();
|
|
14
|
+
if (isHtmlEnabled(builderConfig, target)) {
|
|
15
|
+
applyBottomHtmlPlugin({
|
|
16
|
+
api,
|
|
17
|
+
options,
|
|
18
|
+
chain,
|
|
19
|
+
CHAIN_ID,
|
|
20
|
+
HtmlBundlerPlugin
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
);
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
function applyBottomHtmlPlugin({
|
|
28
|
+
api,
|
|
29
|
+
chain,
|
|
30
|
+
options,
|
|
31
|
+
CHAIN_ID,
|
|
32
|
+
HtmlBundlerPlugin
|
|
33
|
+
}) {
|
|
34
|
+
const { normalizedConfig: modernConfig, appContext } = options;
|
|
35
|
+
for (const entryName of Object.keys(api.context.entry)) {
|
|
36
|
+
const baseTemplateParams = {
|
|
37
|
+
entryName,
|
|
38
|
+
title: getEntryOptions(
|
|
39
|
+
entryName,
|
|
40
|
+
modernConfig.html.title,
|
|
41
|
+
modernConfig.html.titleByEntries,
|
|
42
|
+
appContext.packageName
|
|
43
|
+
),
|
|
44
|
+
mountId: modernConfig.html.mountId,
|
|
45
|
+
...getEntryOptions(
|
|
46
|
+
entryName,
|
|
47
|
+
modernConfig.html.templateParameters,
|
|
48
|
+
modernConfig.html.templateParametersByEntries,
|
|
49
|
+
appContext.packageName
|
|
50
|
+
)
|
|
51
|
+
};
|
|
52
|
+
chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args) => [
|
|
53
|
+
{
|
|
54
|
+
...args[0] || {},
|
|
55
|
+
__internal__: true,
|
|
56
|
+
bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && lodashTemplate(appContext.htmlTemplates[`__${entryName}-bottom__`])(
|
|
57
|
+
baseTemplateParams
|
|
58
|
+
)
|
|
59
|
+
}
|
|
60
|
+
]);
|
|
61
|
+
}
|
|
62
|
+
chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [HtmlBundlerPlugin]);
|
|
63
|
+
}
|
|
64
|
+
export {
|
|
65
|
+
builderPluginAdapterHtml,
|
|
66
|
+
isHtmlEnabled
|
|
67
|
+
};
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import {
|
|
2
|
+
mergeBuilderConfig
|
|
3
|
+
} from "@modern-js/builder-shared";
|
|
4
|
+
import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
|
|
5
|
+
import { isHtmlEnabled } from "./adapterHtml";
|
|
6
|
+
const builderPluginAdapterSSR = (options) => ({
|
|
7
|
+
name: "builder-plugin-adapter-modern-ssr",
|
|
8
|
+
setup(api) {
|
|
9
|
+
const { normalizedConfig } = options;
|
|
10
|
+
api.modifyBuilderConfig((config) => {
|
|
11
|
+
if (isStreamingSSR(normalizedConfig)) {
|
|
12
|
+
return mergeBuilderConfig(config, {
|
|
13
|
+
html: {
|
|
14
|
+
inject: "body"
|
|
15
|
+
}
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
return config;
|
|
19
|
+
});
|
|
20
|
+
api.modifyBundlerChain(
|
|
21
|
+
(chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin }) => {
|
|
22
|
+
const builderConfig = api.getNormalizedConfig();
|
|
23
|
+
applyRouterPlugin(chain, options);
|
|
24
|
+
if (["node", "service-worker"].includes(target)) {
|
|
25
|
+
applyFilterEntriesBySSRConfig({
|
|
26
|
+
isProd,
|
|
27
|
+
chain,
|
|
28
|
+
appNormalizedConfig: options.normalizedConfig
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
if (isHtmlEnabled(builderConfig, target)) {
|
|
32
|
+
applyAsyncChunkHtmlPlugin({
|
|
33
|
+
chain,
|
|
34
|
+
modernConfig: options.normalizedConfig,
|
|
35
|
+
CHAIN_ID,
|
|
36
|
+
HtmlBundlerPlugin
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
const isStreamingSSR = (userConfig) => {
|
|
44
|
+
const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
|
|
45
|
+
const { server } = userConfig;
|
|
46
|
+
if (isStreaming(server.ssr)) {
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
|
|
50
|
+
for (const name of Object.keys(server.ssrByEntries)) {
|
|
51
|
+
if (isStreaming(server.ssrByEntries[name])) {
|
|
52
|
+
return true;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return false;
|
|
57
|
+
};
|
|
58
|
+
function applyAsyncChunkHtmlPlugin({
|
|
59
|
+
chain,
|
|
60
|
+
modernConfig,
|
|
61
|
+
CHAIN_ID,
|
|
62
|
+
HtmlBundlerPlugin
|
|
63
|
+
}) {
|
|
64
|
+
if (isStreamingSSR(modernConfig)) {
|
|
65
|
+
chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [HtmlBundlerPlugin]);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
function applyRouterPlugin(chain, options) {
|
|
69
|
+
var _a;
|
|
70
|
+
const { appContext, normalizedConfig } = options;
|
|
71
|
+
const { entrypoints } = appContext;
|
|
72
|
+
const existNestedRoutes = entrypoints.some(
|
|
73
|
+
(entrypoint) => entrypoint.nestedRoutesEntry
|
|
74
|
+
);
|
|
75
|
+
const routerConfig = (_a = normalizedConfig == null ? void 0 : normalizedConfig.runtime) == null ? void 0 : _a.router;
|
|
76
|
+
const routerManifest = Boolean(routerConfig == null ? void 0 : routerConfig.manifest);
|
|
77
|
+
if (existNestedRoutes || routerManifest) {
|
|
78
|
+
chain.plugin("route-plugin").use(RouterPlugin);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
function applyFilterEntriesBySSRConfig({
|
|
82
|
+
isProd,
|
|
83
|
+
chain,
|
|
84
|
+
appNormalizedConfig
|
|
85
|
+
}) {
|
|
86
|
+
var _a;
|
|
87
|
+
const { server: serverConfig, output: outputConfig } = appNormalizedConfig;
|
|
88
|
+
const entries = chain.entryPoints.entries();
|
|
89
|
+
if (isProd && ((outputConfig == null ? void 0 : outputConfig.ssg) === true || typeof ((_a = outputConfig == null ? void 0 : outputConfig.ssg) == null ? void 0 : _a[0]) === "function")) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
if (typeof entries === "undefined") {
|
|
93
|
+
throw new Error(
|
|
94
|
+
"No entry found, one of src/routes/layout.tsx, src/App.tsx, src/index.tsx is required"
|
|
95
|
+
);
|
|
96
|
+
}
|
|
97
|
+
const entryNames = Object.keys(entries);
|
|
98
|
+
if (isProd && entryNames.length === 1 && (outputConfig == null ? void 0 : outputConfig.ssg)) {
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
const ssgEntries = [];
|
|
102
|
+
if (isProd && (outputConfig == null ? void 0 : outputConfig.ssg)) {
|
|
103
|
+
const { ssg } = outputConfig;
|
|
104
|
+
entryNames.forEach((name) => {
|
|
105
|
+
if (ssg[name]) {
|
|
106
|
+
ssgEntries.push(name);
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
const { ssr, ssrByEntries } = serverConfig || {};
|
|
111
|
+
entryNames.forEach((name) => {
|
|
112
|
+
if (!ssgEntries.includes(name) && (ssr && (ssrByEntries == null ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries == null ? void 0 : ssrByEntries[name]))) {
|
|
113
|
+
chain.entryPoints.delete(name);
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
export {
|
|
118
|
+
builderPluginAdapterSSR
|
|
119
|
+
};
|
|
@@ -38,7 +38,7 @@ class RouterPlugin {
|
|
|
38
38
|
chunkGroups: true,
|
|
39
39
|
chunks: true
|
|
40
40
|
});
|
|
41
|
-
const { publicPath } = stats;
|
|
41
|
+
const { publicPath, chunks = [] } = stats;
|
|
42
42
|
const routeAssets = {};
|
|
43
43
|
const { namedChunkGroups, assetsByChunkName } = stats;
|
|
44
44
|
if (!namedChunkGroups || !assetsByChunkName) {
|
|
@@ -71,17 +71,23 @@ class RouterPlugin {
|
|
|
71
71
|
const entryChunkIds = entrypointsArray.map(
|
|
72
72
|
(entrypoint) => entrypoint[0]
|
|
73
73
|
);
|
|
74
|
-
const entryChunks = [...
|
|
75
|
-
|
|
74
|
+
const entryChunks = [...chunks].filter((chunk) => {
|
|
75
|
+
var _a;
|
|
76
|
+
return (_a = chunk.names) == null ? void 0 : _a.some((name) => entryChunkIds.includes(name));
|
|
76
77
|
});
|
|
77
78
|
const entryChunkFiles = entryChunks.map(
|
|
78
|
-
(chunk) => [...chunk.files].find((fname) => fname.includes(".js"))
|
|
79
|
+
(chunk) => [...chunk.files || []].find((fname) => fname.includes(".js"))
|
|
79
80
|
);
|
|
80
81
|
for (const file of entryChunkFiles) {
|
|
81
82
|
const asset = compilation.assets[file];
|
|
82
83
|
const newContent = `${injectedContent}${asset.source().toString()}`;
|
|
83
84
|
newAssetsMap.set(path.join(outputPath, file), newContent);
|
|
84
|
-
compilation.updateAsset(
|
|
85
|
+
compilation.updateAsset(
|
|
86
|
+
file,
|
|
87
|
+
new RawSource(newContent),
|
|
88
|
+
// FIXME: The arguments third of updatgeAsset is a optional function in webpack.
|
|
89
|
+
void 0
|
|
90
|
+
);
|
|
85
91
|
}
|
|
86
92
|
const filename = path.join(outputPath, ROUTE_MINIFEST_FILE);
|
|
87
93
|
await fs.ensureFile(filename);
|
|
@@ -45,6 +45,12 @@ const dev = async (api, options) => {
|
|
|
45
45
|
host: normalizedConfig.dev.host,
|
|
46
46
|
...(_a = normalizedConfig.tools) == null ? void 0 : _a.devServer
|
|
47
47
|
},
|
|
48
|
+
appContext: {
|
|
49
|
+
appDirectory: appContext.appDirectory,
|
|
50
|
+
sharedDirectory: appContext.sharedDirectory,
|
|
51
|
+
apiDirectory: appContext.apiDirectory,
|
|
52
|
+
lambdaDirectory: appContext.lambdaDirectory
|
|
53
|
+
},
|
|
48
54
|
pwd: appDirectory,
|
|
49
55
|
config: normalizedConfig,
|
|
50
56
|
serverConfigFile,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { logger, chalk, isApiOnly } from "@modern-js/utils";
|
|
1
|
+
import { logger, chalk, isApiOnly, getTargetDir } from "@modern-js/utils";
|
|
2
2
|
import server from "@modern-js/prod-server";
|
|
3
3
|
import { printInstructions } from "../utils/printInstructions";
|
|
4
4
|
import { injectDataLoaderPlugin } from "../utils/createServer";
|
|
@@ -18,6 +18,23 @@ const start = async (api) => {
|
|
|
18
18
|
const app = await server({
|
|
19
19
|
pwd: appDirectory,
|
|
20
20
|
config: userConfig,
|
|
21
|
+
appContext: {
|
|
22
|
+
sharedDirectory: getTargetDir(
|
|
23
|
+
appContext.sharedDirectory,
|
|
24
|
+
appContext.appDirectory,
|
|
25
|
+
appContext.distDirectory
|
|
26
|
+
),
|
|
27
|
+
apiDirectory: getTargetDir(
|
|
28
|
+
appContext.apiDirectory,
|
|
29
|
+
appContext.appDirectory,
|
|
30
|
+
appContext.distDirectory
|
|
31
|
+
),
|
|
32
|
+
lambdaDirectory: getTargetDir(
|
|
33
|
+
appContext.lambdaDirectory,
|
|
34
|
+
appContext.appDirectory,
|
|
35
|
+
appContext.distDirectory
|
|
36
|
+
)
|
|
37
|
+
},
|
|
21
38
|
serverConfigFile,
|
|
22
39
|
internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
|
|
23
40
|
apiOnly
|
package/dist/esm-node/index.js
CHANGED
|
@@ -23,7 +23,7 @@ const upgradeModel = Import.lazy(
|
|
|
23
23
|
const devCommand = async (program, api) => {
|
|
24
24
|
const runner = api.useHookRunners();
|
|
25
25
|
const devToolMetas = await runner.registerDev();
|
|
26
|
-
const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).action(async (options) => {
|
|
26
|
+
const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(async (options) => {
|
|
27
27
|
const { dev } = await import("./commands/dev");
|
|
28
28
|
await dev(api, options);
|
|
29
29
|
});
|
|
@@ -8,6 +8,7 @@ const EN_LOCALE = {
|
|
|
8
8
|
describe: "start dev server",
|
|
9
9
|
entry: "compiler by entry",
|
|
10
10
|
apiOnly: "start api server only",
|
|
11
|
+
webOnly: "start web server only",
|
|
11
12
|
selectEntry: "Please select the entry that needs to be built",
|
|
12
13
|
requireEntry: "You must choose at least one entry"
|
|
13
14
|
},
|
|
@@ -0,0 +1,54 @@
|
|
|
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
|
+
};
|
|
28
|
+
const APP_CONFIG_NAME = "config";
|
|
29
|
+
const APP_INIT_EXPORTED = "init";
|
|
30
|
+
const APP_INIT_IMPORTED = "appInit";
|
|
31
|
+
export {
|
|
32
|
+
APP_CONFIG_NAME,
|
|
33
|
+
APP_FILE_NAME,
|
|
34
|
+
APP_INIT_EXPORTED,
|
|
35
|
+
APP_INIT_IMPORTED,
|
|
36
|
+
ENTRY_BOOTSTRAP_FILE_NAME,
|
|
37
|
+
ENTRY_POINT_FILE_NAME,
|
|
38
|
+
FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
|
|
39
|
+
FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
|
|
40
|
+
FILE_SYSTEM_ROUTES_FILE_NAME,
|
|
41
|
+
FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
|
|
42
|
+
FILE_SYSTEM_ROUTES_IGNORED_REGEX,
|
|
43
|
+
FILE_SYSTEM_ROUTES_INDEX,
|
|
44
|
+
FILE_SYSTEM_ROUTES_LAYOUT,
|
|
45
|
+
HTML_PARTIALS_EXTENSIONS,
|
|
46
|
+
HTML_PARTIALS_FOLDER,
|
|
47
|
+
INDEX_FILE_NAME,
|
|
48
|
+
JS_EXTENSIONS,
|
|
49
|
+
LOADER_EXPORT_NAME,
|
|
50
|
+
NESTED_ROUTE,
|
|
51
|
+
NESTED_ROUTES_DIR,
|
|
52
|
+
PAGES_DIR_NAME,
|
|
53
|
+
TEMP_LOADERS_DIR
|
|
54
|
+
};
|