@modern-js/app-tools 2.3.1-alpha.2 → 3.0.0-beta.0
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +87 -0
- package/README.md +14 -18
- package/dist/js/modern/analyze/getServerRoutes.js +5 -2
- package/dist/js/modern/analyze/index.js +47 -46
- 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/{webpackPlugins/routerPlugin.js → builder-webpack/webpackPlugins/RouterPlugin.js} +4 -1
- 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 +13 -133
- package/dist/js/modern/builder/{builderPlugins/compatModern.js → shared/builderPlugins/adapterModern.js} +102 -116
- 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/{share.js → shared/createCopyPattern.js} +0 -0
- package/dist/js/modern/builder/shared/index.js +3 -0
- package/dist/js/modern/builder/{loaders → shared/loaders}/serverModuleLoader.js +0 -0
- package/dist/js/modern/builder/shared/types.js +0 -0
- package/dist/js/modern/config/default.js +2 -2
- package/dist/js/modern/config/index.js +3 -8
- package/dist/js/modern/config/initialize/index.js +12 -0
- package/dist/js/modern/config/{initial → initialize}/inits.js +4 -2
- package/dist/js/modern/config/{initial → legacy}/createHtmlConfig.js +0 -0
- package/dist/js/modern/config/{initial → legacy}/createOutputConfig.js +0 -0
- package/dist/js/modern/config/{initial → legacy}/createSourceConfig.js +0 -0
- package/dist/js/modern/config/{initial → legacy}/createToolsConfig.js +0 -0
- package/dist/js/modern/config/{initial/transformNormalizedConfig.js → legacy/index.js} +4 -0
- package/dist/js/modern/index.js +18 -8
- package/dist/js/modern/initialize/index.js +36 -28
- package/dist/js/modern/locale/zh.js +1 -1
- package/dist/js/modern/types/utils.js +0 -0
- package/dist/js/node/analyze/getServerRoutes.js +3 -1
- package/dist/js/node/analyze/index.js +48 -47
- 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/{webpackPlugins/routerPlugin.js → builder-webpack/webpackPlugins/RouterPlugin.js} +10 -5
- 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 +14 -123
- package/dist/js/node/builder/{builderPlugins/compatModern.js → shared/builderPlugins/adapterModern.js} +107 -120
- package/dist/js/node/builder/{webpackPlugins/htmlAsyncChunkPlugin.js → shared/bundlerPlugins/HtmlAsyncChunkPlugin.js} +17 -20
- package/dist/js/node/builder/{webpackPlugins/htmlBottomTemplate.js → shared/bundlerPlugins/HtmlBottomTemplate.js} +21 -24
- package/dist/js/node/builder/{share.js → shared/createCopyPattern.js} +3 -3
- package/dist/js/node/builder/shared/index.js +19 -0
- package/dist/js/node/builder/{loaders → shared/loaders}/serverModuleLoader.js +0 -0
- package/dist/js/node/builder/shared/types.js +15 -0
- package/dist/js/node/config/default.js +2 -2
- package/dist/js/node/config/index.js +4 -19
- package/dist/js/node/config/{initial → initialize}/index.js +10 -16
- package/dist/js/node/config/{initial → initialize}/inits.js +4 -2
- package/dist/js/node/config/{initial → legacy}/createHtmlConfig.js +0 -0
- package/dist/js/node/config/{initial → legacy}/createOutputConfig.js +0 -0
- package/dist/js/node/config/{initial → legacy}/createSourceConfig.js +0 -0
- package/dist/js/node/config/{initial → legacy}/createToolsConfig.js +0 -0
- package/dist/js/node/config/{initial/transformNormalizedConfig.js → legacy/index.js} +8 -3
- package/dist/js/node/index.js +18 -8
- package/dist/js/node/initialize/index.js +35 -28
- package/dist/js/node/locale/zh.js +1 -1
- package/dist/js/node/types/utils.js +15 -0
- package/dist/js/treeshaking/analyze/generateCode.js +14 -14
- package/dist/js/treeshaking/analyze/getBundleEntry.js +2 -2
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +1 -1
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +1 -1
- package/dist/js/treeshaking/analyze/getFileSystemEntry.js +1 -1
- package/dist/js/treeshaking/analyze/getServerRoutes.js +8 -6
- package/dist/js/treeshaking/analyze/index.js +142 -137
- package/dist/js/treeshaking/analyze/nestedRoutes.js +5 -5
- package/dist/js/treeshaking/analyze/templates.js +6 -6
- package/dist/js/treeshaking/analyze/utils.js +3 -3
- 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/{webpackPlugins/routerPlugin.js → builder-webpack/webpackPlugins/RouterPlugin.js} +6 -3
- 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 +29 -228
- package/dist/js/treeshaking/builder/{builderPlugins/compatModern.js → shared/builderPlugins/adapterModern.js} +138 -142
- package/dist/js/treeshaking/builder/{webpackPlugins/htmlAsyncChunkPlugin.js → shared/bundlerPlugins/HtmlAsyncChunkPlugin.js} +0 -0
- package/dist/js/treeshaking/builder/{webpackPlugins/htmlBottomTemplate.js → shared/bundlerPlugins/HtmlBottomTemplate.js} +2 -2
- package/dist/js/treeshaking/builder/{share.js → shared/createCopyPattern.js} +0 -0
- package/dist/js/treeshaking/builder/shared/index.js +3 -0
- package/dist/js/treeshaking/builder/{loaders → shared/loaders}/serverModuleLoader.js +0 -0
- package/dist/js/treeshaking/builder/shared/types.js +1 -0
- package/dist/js/treeshaking/commands/dev.js +2 -2
- package/dist/js/treeshaking/commands/serve.js +2 -2
- package/dist/js/treeshaking/config/default.js +2 -2
- package/dist/js/treeshaking/config/index.js +3 -3
- package/dist/js/treeshaking/config/initialize/index.js +10 -0
- package/dist/js/treeshaking/config/{initial → initialize}/inits.js +6 -4
- package/dist/js/treeshaking/config/legacy/createHtmlConfig.js +19 -0
- package/dist/js/treeshaking/config/{initial → legacy}/createOutputConfig.js +1 -1
- package/dist/js/treeshaking/config/{initial → legacy}/createSourceConfig.js +1 -1
- package/dist/js/treeshaking/config/{initial → legacy}/createToolsConfig.js +1 -1
- package/dist/js/treeshaking/config/{initial/transformNormalizedConfig.js → legacy/index.js} +4 -1
- package/dist/js/treeshaking/index.js +19 -12
- package/dist/js/treeshaking/initialize/index.js +36 -28
- package/dist/js/treeshaking/locale/zh.js +1 -1
- package/dist/js/treeshaking/types/utils.js +1 -0
- package/dist/js/treeshaking/utils/config.js +2 -2
- package/dist/js/treeshaking/utils/getServerInternalPlugins.js +2 -2
- package/dist/types/analyze/generateCode.d.ts +1 -1
- package/dist/types/analyze/getBundleEntry.d.ts +1 -1
- package/dist/types/analyze/getFileSystemEntry.d.ts +1 -1
- package/dist/types/analyze/getHtmlTemplate.d.ts +2 -2
- package/dist/types/analyze/getServerRoutes.d.ts +1 -1
- package/dist/types/analyze/index.d.ts +5 -1
- package/dist/types/builder/builder-rspack/index.d.ts +2 -0
- package/dist/types/builder/{builderPlugins → builder-webpack/builderPlugins}/compatModern.d.ts +2 -2
- package/dist/types/builder/builder-webpack/index.d.ts +4 -0
- package/dist/types/builder/{webpackPlugins/routerPlugin.d.ts → builder-webpack/webpackPlugins/RouterPlugin.d.ts} +1 -1
- package/dist/types/builder/builder-webpack/webpackPlugins/index.d.ts +1 -0
- package/dist/types/builder/generator/createBuilderOptions.d.ts +3 -0
- package/dist/types/builder/generator/createBuilderProviderConfig.d.ts +2 -0
- package/dist/types/builder/generator/getBuilderTargets.d.ts +3 -0
- package/dist/types/builder/generator/index.d.ts +17 -0
- package/dist/types/builder/index.d.ts +1 -18
- package/dist/types/builder/shared/builderPlugins/adapterModern.d.ts +13 -0
- package/dist/types/builder/{webpackPlugins/htmlAsyncChunkPlugin.d.ts → shared/bundlerPlugins/HtmlAsyncChunkPlugin.d.ts} +2 -1
- package/dist/types/builder/{webpackPlugins/htmlBottomTemplate.d.ts → shared/bundlerPlugins/HtmlBottomTemplate.d.ts} +2 -1
- package/dist/types/builder/{share.d.ts → shared/createCopyPattern.d.ts} +1 -1
- package/dist/types/builder/shared/index.d.ts +3 -0
- package/dist/types/builder/shared/loaders/serverModuleLoader.d.ts +4 -0
- package/dist/types/builder/shared/types.d.ts +16 -0
- package/dist/types/commands/build.d.ts +1 -1
- package/dist/types/commands/deploy.d.ts +1 -1
- package/dist/types/commands/dev.d.ts +1 -1
- package/dist/types/commands/inspect.d.ts +1 -1
- package/dist/types/commands/serve.d.ts +1 -1
- package/dist/types/config/default.d.ts +1 -1
- package/dist/types/config/index.d.ts +3 -2
- package/dist/types/config/initialize/index.d.ts +2 -0
- package/dist/types/config/{initial → initialize}/inits.d.ts +3 -3
- package/dist/types/config/{initial → legacy}/createHtmlConfig.d.ts +1 -1
- package/dist/types/config/{initial → legacy}/createOutputConfig.d.ts +1 -1
- package/dist/types/config/{initial → legacy}/createSourceConfig.d.ts +1 -1
- package/dist/types/config/{initial → legacy}/createToolsConfig.d.ts +1 -1
- package/dist/types/config/legacy/index.d.ts +3 -0
- package/dist/types/defineConfig.d.ts +2 -2
- package/dist/types/index.d.ts +7 -3
- package/dist/types/initialize/index.d.ts +6 -2
- package/dist/types/types/config/deploy.d.ts +1 -2
- package/dist/types/types/config/dev.d.ts +2 -3
- package/dist/types/types/config/experiments.d.ts +1 -2
- package/dist/types/types/config/html.d.ts +5 -3
- package/dist/types/types/config/index.d.ts +41 -48
- package/dist/types/types/config/output.d.ts +8 -3
- package/dist/types/types/config/performance.d.ts +6 -3
- package/dist/types/types/config/security.d.ts +3 -3
- package/dist/types/types/config/source.d.ts +7 -3
- package/dist/types/types/config/tools.d.ts +10 -4
- package/dist/types/types/hooks.d.ts +6 -4
- package/dist/types/types/index.d.ts +19 -7
- package/dist/types/types/utils.d.ts +7 -0
- package/dist/types/utils/config.d.ts +1 -1
- package/dist/types/utils/getServerInternalPlugins.d.ts +1 -1
- package/dist/types/utils/printInstructions.d.ts +1 -1
- package/package.json +34 -25
- package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +0 -30
- package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +0 -37
- package/dist/js/modern/config/initial/index.js +0 -16
- package/dist/js/treeshaking/config/initial/createHtmlConfig.js +0 -19
- package/dist/js/treeshaking/config/initial/index.js +0 -12
- package/dist/types/builder/loaders/serverModuleLoader.d.ts +0 -3
- package/dist/types/config/initial/index.d.ts +0 -4
- package/dist/types/config/initial/transformNormalizedConfig.d.ts +0 -2
@@ -104,7 +104,7 @@ function _unsupportedIterableToArray(o, minLen) {
|
|
104
104
|
}
|
105
105
|
import path from "path";
|
106
106
|
import fs from "fs";
|
107
|
-
import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash } from "@modern-js/utils";
|
107
|
+
import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
|
108
108
|
import { walkDirectory } from "./utils";
|
109
109
|
var applyBaseUrl = function(baseUrl, routes) {
|
110
110
|
if (baseUrl) {
|
@@ -130,8 +130,8 @@ var applyRouteOptions = function(original, routeOptions) {
|
|
130
130
|
var routes;
|
131
131
|
if (route) {
|
132
132
|
if (Array.isArray(route)) {
|
133
|
-
var
|
134
|
-
|
133
|
+
var _route_map;
|
134
|
+
_route_map = route.map(function(url) {
|
135
135
|
if (isPlainObject(url)) {
|
136
136
|
var urlPath = url.path, other = _objectWithoutProperties(url, [
|
137
137
|
"path"
|
@@ -144,7 +144,7 @@ var applyRouteOptions = function(original, routeOptions) {
|
|
144
144
|
urlPath: url
|
145
145
|
});
|
146
146
|
}
|
147
|
-
}), routes =
|
147
|
+
}), routes = _route_map, _route_map;
|
148
148
|
} else if (isPlainObject(route)) {
|
149
149
|
var urlPath = route.path, other = _objectWithoutProperties(route, [
|
150
150
|
"path"
|
@@ -169,12 +169,13 @@ var applyRouteOptions = function(original, routeOptions) {
|
|
169
169
|
return routes;
|
170
170
|
};
|
171
171
|
var collectHtmlRoutes = function(entrypoints, appContext, config) {
|
172
|
-
var disableHtmlFolder = config.html.disableHtmlFolder,
|
172
|
+
var disableHtmlFolder = config.html.disableHtmlFolder, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, worker = _config_server.worker;
|
173
173
|
var packageName = appContext.packageName;
|
174
174
|
var htmlRoutes = entrypoints.reduce(function(previous, param) {
|
175
175
|
var entryName = param.entryName;
|
176
176
|
var entryOptions = getEntryOptions(entryName, ssr, ssrByEntries, packageName);
|
177
177
|
var isSSR = Boolean(entryOptions);
|
178
|
+
var isWorker = Boolean(worker);
|
178
179
|
var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
|
179
180
|
var route = {
|
180
181
|
urlPath: "/".concat(entryName === MAIN_ENTRY_NAME ? "" : entryName),
|
@@ -183,6 +184,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
|
|
183
184
|
isSPA: true,
|
184
185
|
isSSR: isSSR,
|
185
186
|
responseHeaders: resHeaders,
|
187
|
+
worker: isWorker ? "".concat(SERVER_WORKER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0,
|
186
188
|
bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0
|
187
189
|
};
|
188
190
|
if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
|
@@ -200,7 +202,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
|
|
200
202
|
};
|
201
203
|
var collectStaticRoutes = function(appContext, config) {
|
202
204
|
var appDirectory = appContext.appDirectory;
|
203
|
-
var configDir = config.source.configDir,
|
205
|
+
var configDir = config.source.configDir, _config_server = config.server, _config_server_publicRoutes = _config_server.publicRoutes, publicRoutes = _config_server_publicRoutes === void 0 ? {} : _config_server_publicRoutes;
|
204
206
|
var publicFolder = path.resolve(appDirectory, configDir || "", "public");
|
205
207
|
return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(function(filePath) {
|
206
208
|
var urlPath = "".concat(urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length)));
|
@@ -223,16 +223,17 @@ var __generator = this && this.__generator || function(thisArg, body) {
|
|
223
223
|
import * as path from "path";
|
224
224
|
import { createDebugger, findExists, fs, getEntryOptions, isApiOnly, minimist, getCommand, isDevCommand } from "@modern-js/utils";
|
225
225
|
import { cloneDeep } from "@modern-js/utils/lodash";
|
226
|
-
import { createBuilderForModern } from "../builder";
|
227
226
|
import { printInstructions } from "../utils/printInstructions";
|
228
227
|
import { generateRoutes } from "../utils/routes";
|
229
228
|
import { emitResolvedConfig } from "../utils/config";
|
230
229
|
import { getSelectedEntries } from "../utils/getSelectedEntries";
|
231
230
|
import { initialNormalizedConfig } from "../config";
|
231
|
+
import { createBuilderGenerator } from "../builder";
|
232
232
|
import { getServerLoadersFile, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
|
233
233
|
import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
|
234
234
|
var debug = createDebugger("plugin-analyze");
|
235
|
-
var analyze_default = function() {
|
235
|
+
var analyze_default = function(param) {
|
236
|
+
var bundler = param.bundler;
|
236
237
|
return {
|
237
238
|
name: "@modern-js/plugin-analyze",
|
238
239
|
setup: function(api) {
|
@@ -242,7 +243,7 @@ var analyze_default = function() {
|
|
242
243
|
return {
|
243
244
|
prepare: function prepare() {
|
244
245
|
return _asyncToGenerator(function() {
|
245
|
-
var
|
246
|
+
var _resolvedConfig_source, appContext, resolvedConfig, hookRunners, apiOnly, _ref, routes2, _ref1, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, initialRoutes, routes, htmlTemplates, checkedEntries, entry, command, buildCommands, normalizedConfig, createBuilderForModern, builder;
|
246
247
|
return __generator(this, function(_state) {
|
247
248
|
switch(_state.label){
|
248
249
|
case 0:
|
@@ -254,7 +255,7 @@ var analyze_default = function() {
|
|
254
255
|
} catch (e) {}
|
255
256
|
return [
|
256
257
|
4,
|
257
|
-
isApiOnly(appContext.appDirectory, (
|
258
|
+
isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir)
|
258
259
|
];
|
259
260
|
case 1:
|
260
261
|
apiOnly = _state.sent();
|
@@ -275,7 +276,7 @@ var analyze_default = function() {
|
|
275
276
|
})
|
276
277
|
];
|
277
278
|
case 3:
|
278
|
-
|
279
|
+
_ref = _state.sent(), routes2 = _ref.routes;
|
279
280
|
debug("server routes: %o", routes2);
|
280
281
|
appContext = _objectSpreadProps(_objectSpread({}, appContext), {
|
281
282
|
apiOnly: apiOnly,
|
@@ -296,10 +297,10 @@ var analyze_default = function() {
|
|
296
297
|
])
|
297
298
|
];
|
298
299
|
case 5:
|
299
|
-
|
300
|
+
_ref1 = _slicedToArray.apply(void 0, [
|
300
301
|
_state.sent(),
|
301
302
|
4
|
302
|
-
]), getBundleEntry =
|
303
|
+
]), getBundleEntry = _ref1[0].getBundleEntry, getServerRoutes = _ref1[1].getServerRoutes, generateCode = _ref1[2].generateCode, getHtmlTemplate = _ref1[3].getHtmlTemplate;
|
303
304
|
entrypoints = getBundleEntry(appContext, resolvedConfig);
|
304
305
|
debug("entrypoints: %o", entrypoints);
|
305
306
|
initialRoutes = getServerRoutes(entrypoints, {
|
@@ -384,149 +385,153 @@ var analyze_default = function() {
|
|
384
385
|
];
|
385
386
|
if (!buildCommands.includes(command)) return [
|
386
387
|
3,
|
387
|
-
|
388
|
+
14
|
388
389
|
];
|
389
390
|
normalizedConfig = api.useResolvedConfigContext();
|
391
|
+
return [
|
392
|
+
4,
|
393
|
+
createBuilderGenerator(bundler)
|
394
|
+
];
|
395
|
+
case 12:
|
396
|
+
createBuilderForModern = _state.sent();
|
390
397
|
return [
|
391
398
|
4,
|
392
399
|
createBuilderForModern({
|
393
400
|
normalizedConfig: normalizedConfig,
|
394
401
|
appContext: appContext,
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
416
|
-
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
|
430
|
-
|
431
|
-
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
|
444
|
-
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
461
|
-
|
462
|
-
|
463
|
-
printInstructions(hookRunners2, appContext, normalizedConfig);
|
464
|
-
}
|
402
|
+
onBeforeBuild: function onBeforeBuild(param) {
|
403
|
+
var bundlerConfigs = param.bundlerConfigs;
|
404
|
+
return _asyncToGenerator(function() {
|
405
|
+
var hookRunners2;
|
406
|
+
return __generator(this, function(_state) {
|
407
|
+
switch(_state.label){
|
408
|
+
case 0:
|
409
|
+
hookRunners2 = api.useHookRunners();
|
410
|
+
return [
|
411
|
+
4,
|
412
|
+
generateRoutes(appContext)
|
413
|
+
];
|
414
|
+
case 1:
|
415
|
+
_state.sent();
|
416
|
+
return [
|
417
|
+
4,
|
418
|
+
hookRunners2.beforeBuild({
|
419
|
+
bundlerConfigs: bundlerConfigs
|
420
|
+
})
|
421
|
+
];
|
422
|
+
case 2:
|
423
|
+
_state.sent();
|
424
|
+
return [
|
425
|
+
2
|
426
|
+
];
|
427
|
+
}
|
428
|
+
});
|
429
|
+
})();
|
430
|
+
},
|
431
|
+
onAfterBuild: function onAfterBuild(param) {
|
432
|
+
var stats = param.stats;
|
433
|
+
return _asyncToGenerator(function() {
|
434
|
+
var hookRunners2;
|
435
|
+
return __generator(this, function(_state) {
|
436
|
+
switch(_state.label){
|
437
|
+
case 0:
|
438
|
+
hookRunners2 = api.useHookRunners();
|
439
|
+
return [
|
440
|
+
4,
|
441
|
+
hookRunners2.afterBuild({
|
442
|
+
stats: stats
|
443
|
+
})
|
444
|
+
];
|
445
|
+
case 1:
|
446
|
+
_state.sent();
|
447
|
+
return [
|
448
|
+
4,
|
449
|
+
emitResolvedConfig(appContext.appDirectory, normalizedConfig)
|
450
|
+
];
|
451
|
+
case 2:
|
452
|
+
_state.sent();
|
453
|
+
return [
|
454
|
+
2
|
455
|
+
];
|
456
|
+
}
|
457
|
+
});
|
458
|
+
})();
|
459
|
+
},
|
460
|
+
onDevCompileDone: function onDevCompileDone(param) {
|
461
|
+
var isFirstCompile = param.isFirstCompile;
|
462
|
+
return _asyncToGenerator(function() {
|
463
|
+
var hookRunners2;
|
464
|
+
return __generator(this, function(_state) {
|
465
|
+
hookRunners2 = api.useHookRunners();
|
466
|
+
if (process.stdout.isTTY || isFirstCompile) {
|
467
|
+
hookRunners2.afterDev();
|
468
|
+
if (isFirstCompile) {
|
469
|
+
printInstructions(hookRunners2, appContext, normalizedConfig);
|
465
470
|
}
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
})
|
471
|
-
}
|
472
|
-
|
473
|
-
|
474
|
-
|
475
|
-
|
476
|
-
|
477
|
-
|
478
|
-
|
479
|
-
|
480
|
-
|
481
|
-
|
482
|
-
|
483
|
-
|
484
|
-
|
485
|
-
|
486
|
-
|
487
|
-
|
488
|
-
|
489
|
-
|
490
|
-
|
491
|
-
|
492
|
-
}
|
493
|
-
})
|
494
|
-
}
|
495
|
-
|
496
|
-
|
497
|
-
|
498
|
-
|
499
|
-
|
500
|
-
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
|
506
|
-
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
514
|
-
|
515
|
-
}
|
516
|
-
})
|
517
|
-
}
|
471
|
+
}
|
472
|
+
return [
|
473
|
+
2
|
474
|
+
];
|
475
|
+
});
|
476
|
+
})();
|
477
|
+
},
|
478
|
+
onBeforeCreateCompiler: function onBeforeCreateCompiler(param) {
|
479
|
+
var bundlerConfigs = param.bundlerConfigs;
|
480
|
+
return _asyncToGenerator(function() {
|
481
|
+
var hookRunners2;
|
482
|
+
return __generator(this, function(_state) {
|
483
|
+
switch(_state.label){
|
484
|
+
case 0:
|
485
|
+
hookRunners2 = api.useHookRunners();
|
486
|
+
return [
|
487
|
+
4,
|
488
|
+
hookRunners2.beforeCreateCompiler({
|
489
|
+
bundlerConfigs: bundlerConfigs
|
490
|
+
})
|
491
|
+
];
|
492
|
+
case 1:
|
493
|
+
_state.sent();
|
494
|
+
return [
|
495
|
+
2
|
496
|
+
];
|
497
|
+
}
|
498
|
+
});
|
499
|
+
})();
|
500
|
+
},
|
501
|
+
onAfterCreateCompiler: function onAfterCreateCompiler(param) {
|
502
|
+
var compiler = param.compiler;
|
503
|
+
return _asyncToGenerator(function() {
|
504
|
+
var hookRunners2;
|
505
|
+
return __generator(this, function(_state) {
|
506
|
+
switch(_state.label){
|
507
|
+
case 0:
|
508
|
+
hookRunners2 = api.useHookRunners();
|
509
|
+
return [
|
510
|
+
4,
|
511
|
+
hookRunners2.afterCreateCompiler({
|
512
|
+
compiler: compiler
|
513
|
+
})
|
514
|
+
];
|
515
|
+
case 1:
|
516
|
+
_state.sent();
|
517
|
+
return [
|
518
|
+
2
|
519
|
+
];
|
520
|
+
}
|
521
|
+
});
|
522
|
+
})();
|
518
523
|
}
|
519
524
|
})
|
520
525
|
];
|
521
|
-
case
|
526
|
+
case 13:
|
522
527
|
builder = _state.sent();
|
523
528
|
builder.addPlugins(resolvedConfig.builderPlugins);
|
524
529
|
appContext = _objectSpreadProps(_objectSpread({}, appContext), {
|
525
530
|
builder: builder
|
526
531
|
});
|
527
532
|
api.setAppContext(appContext);
|
528
|
-
_state.label =
|
529
|
-
case
|
533
|
+
_state.label = 14;
|
534
|
+
case 14:
|
530
535
|
return [
|
531
536
|
2
|
532
537
|
];
|
@@ -560,7 +565,7 @@ var analyze_default = function() {
|
|
560
565
|
resolvedConfig: function resolvedConfig(param) {
|
561
566
|
var resolved = param.resolved;
|
562
567
|
var appContext = api.useAppContext();
|
563
|
-
var config = initialNormalizedConfig(resolved, appContext);
|
568
|
+
var config = initialNormalizedConfig(resolved, appContext, bundler);
|
564
569
|
return {
|
565
570
|
resolved: config
|
566
571
|
};
|
@@ -568,7 +573,7 @@ var analyze_default = function() {
|
|
568
573
|
modifyEntryImports: function modifyEntryImports(param) {
|
569
574
|
var entrypoint = param.entrypoint, imports = param.imports;
|
570
575
|
return _asyncToGenerator(function() {
|
571
|
-
var appContext, srcDirectory, internalSrcAlias, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout,
|
576
|
+
var appContext, srcDirectory, internalSrcAlias, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, _ref, moduleExports, hasAppConfig, generateLayoutPath, hasAppInit;
|
572
577
|
return __generator(this, function(_state) {
|
573
578
|
switch(_state.label){
|
574
579
|
case 0:
|
@@ -607,10 +612,10 @@ var analyze_default = function() {
|
|
607
612
|
})
|
608
613
|
];
|
609
614
|
case 2:
|
610
|
-
|
615
|
+
_ref = _slicedToArray.apply(void 0, [
|
611
616
|
_state.sent(),
|
612
617
|
2
|
613
|
-
]), moduleExports =
|
618
|
+
]), moduleExports = _ref[1];
|
614
619
|
hasAppConfig = moduleExports.some(function(e) {
|
615
620
|
return e.n === APP_CONFIG_NAME;
|
616
621
|
});
|
@@ -197,7 +197,7 @@ var createRoute = function(routeInfo, rootDir, filename, entryName) {
|
|
197
197
|
};
|
198
198
|
var walk = function() {
|
199
199
|
var _ref = _asyncToGenerator(function(dirname, rootDir, alias, entryName) {
|
200
|
-
var
|
200
|
+
var _route_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, _route_children1, _route_children2, _route_children3, err, finalRoute, childRoute1, path2;
|
201
201
|
return __generator(this, function(_state) {
|
202
202
|
switch(_state.label){
|
203
203
|
case 0:
|
@@ -288,7 +288,7 @@ var walk = function() {
|
|
288
288
|
childRoute = _state.sent();
|
289
289
|
if (childRoute) {
|
290
290
|
;
|
291
|
-
(
|
291
|
+
(_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(childRoute);
|
292
292
|
}
|
293
293
|
_state.label = 8;
|
294
294
|
case 8:
|
@@ -317,7 +317,7 @@ var walk = function() {
|
|
317
317
|
if (pageLoaderFile) {
|
318
318
|
pageRoute.loader = pageLoaderFile;
|
319
319
|
}
|
320
|
-
(
|
320
|
+
(_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(pageRoute);
|
321
321
|
}
|
322
322
|
if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
|
323
323
|
splatLoaderFile = itemPath;
|
@@ -331,7 +331,7 @@ var walk = function() {
|
|
331
331
|
if (splatLoaderFile) {
|
332
332
|
splatRoute.loader = splatLoaderFile;
|
333
333
|
}
|
334
|
-
(
|
334
|
+
(_route_children3 = route.children) === null || _route_children3 === void 0 ? void 0 : _route_children3.push(splatRoute);
|
335
335
|
}
|
336
336
|
if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
|
337
337
|
route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
|
@@ -377,7 +377,7 @@ var walk = function() {
|
|
377
377
|
if (isPathlessLayout) {
|
378
378
|
delete finalRoute.path;
|
379
379
|
}
|
380
|
-
route.children = (
|
380
|
+
route.children = (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.filter(function(childRoute) {
|
381
381
|
return childRoute;
|
382
382
|
});
|
383
383
|
if (route.children && route.children.length === 0 && !route.index) {
|
@@ -243,8 +243,8 @@ var routesForServer = function(param) {
|
|
243
243
|
var traverseRouteTree = function(route) {
|
244
244
|
var children;
|
245
245
|
if ("children" in route && route.children) {
|
246
|
-
var
|
247
|
-
children = route === null || route === void 0 ? void 0 : (
|
246
|
+
var _route_children;
|
247
|
+
children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
|
248
248
|
}
|
249
249
|
var loader;
|
250
250
|
if (route.type === "nested") {
|
@@ -296,7 +296,7 @@ var routesForServer = function(param) {
|
|
296
296
|
};
|
297
297
|
var fileSystemRoutes = function() {
|
298
298
|
var _ref = _asyncToGenerator(function(param) {
|
299
|
-
var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1,
|
299
|
+
var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
|
300
300
|
return __generator(this, function(_state) {
|
301
301
|
switch(_state.label){
|
302
302
|
case 0:
|
@@ -321,8 +321,8 @@ var fileSystemRoutes = function() {
|
|
321
321
|
traverseRouteTree = function(route) {
|
322
322
|
var children;
|
323
323
|
if ("children" in route && route.children) {
|
324
|
-
var
|
325
|
-
children = route === null || route === void 0 ? void 0 : (
|
324
|
+
var _route_children;
|
325
|
+
children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
|
326
326
|
}
|
327
327
|
var loading;
|
328
328
|
var error;
|
@@ -417,7 +417,7 @@ var fileSystemRoutes = function() {
|
|
417
417
|
_iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
|
418
418
|
try {
|
419
419
|
for(_iterator1 = Object.entries(loadersMap)[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
|
420
|
-
|
420
|
+
_step_value = _slicedToArray(_step1.value, 2), key = _step_value[0], loaderInfo = _step_value[1];
|
421
421
|
if (loaderInfo.inline) {
|
422
422
|
importLoadersCode += "import { loader as ".concat(key, ' } from "').concat(getDataLoaderPath(key)).concat(slash(loaderInfo.filePath), '";\n');
|
423
423
|
} else {
|
@@ -333,7 +333,7 @@ var parseModule = function() {
|
|
333
333
|
}();
|
334
334
|
var hasLoader = function() {
|
335
335
|
var _ref = _asyncToGenerator(function(filename) {
|
336
|
-
var source,
|
336
|
+
var source, _ref, moduleExports;
|
337
337
|
return __generator(this, function(_state) {
|
338
338
|
switch(_state.label){
|
339
339
|
case 0:
|
@@ -351,10 +351,10 @@ var hasLoader = function() {
|
|
351
351
|
})
|
352
352
|
];
|
353
353
|
case 2:
|
354
|
-
|
354
|
+
_ref = _slicedToArray.apply(void 0, [
|
355
355
|
_state.sent(),
|
356
356
|
2
|
357
|
-
]), moduleExports =
|
357
|
+
]), moduleExports = _ref[1];
|
358
358
|
return [
|
359
359
|
2,
|
360
360
|
moduleExports.some(function(e) {
|
@@ -0,0 +1,6 @@
|
|
1
|
+
import { builderRspackProvider } from "@modern-js/builder-rspack-provider";
|
2
|
+
import { generateBuilder } from "../generator";
|
3
|
+
function createRspackBuilderForModern(options) {
|
4
|
+
return generateBuilder(options, builderRspackProvider);
|
5
|
+
}
|
6
|
+
export { createRspackBuilderForModern };
|
@@ -0,0 +1,64 @@
|
|
1
|
+
function _arrayLikeToArray(arr, len) {
|
2
|
+
if (len == null || len > arr.length) len = arr.length;
|
3
|
+
for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
|
4
|
+
return arr2;
|
5
|
+
}
|
6
|
+
function _arrayWithoutHoles(arr) {
|
7
|
+
if (Array.isArray(arr)) return _arrayLikeToArray(arr);
|
8
|
+
}
|
9
|
+
function _iterableToArray(iter) {
|
10
|
+
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
|
11
|
+
}
|
12
|
+
function _nonIterableSpread() {
|
13
|
+
throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
14
|
+
}
|
15
|
+
function _toConsumableArray(arr) {
|
16
|
+
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
|
17
|
+
}
|
18
|
+
function _unsupportedIterableToArray(o, minLen) {
|
19
|
+
if (!o) return;
|
20
|
+
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
|
21
|
+
var n = Object.prototype.toString.call(o).slice(8, -1);
|
22
|
+
if (n === "Object" && o.constructor) n = o.constructor.name;
|
23
|
+
if (n === "Map" || n === "Set") return Array.from(n);
|
24
|
+
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
|
25
|
+
}
|
26
|
+
import { join } from "path";
|
27
|
+
import { createCopyPattern } from "../../shared";
|
28
|
+
import { RouterPlugin } from "../webpackPlugins";
|
29
|
+
var PluginCompatModern = function(options) {
|
30
|
+
return {
|
31
|
+
name: "builder-plugin-compat-modern",
|
32
|
+
setup: function setup(api) {
|
33
|
+
var modernConfig = options.normalizedConfig, appContext = options.appContext;
|
34
|
+
api.modifyWebpackChain(function(chain, param) {
|
35
|
+
var CHAIN_ID = param.CHAIN_ID;
|
36
|
+
var _modernConfig_runtime;
|
37
|
+
chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
|
38
|
+
if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
|
39
|
+
var defaultCopyPattern = createCopyPattern(appContext, modernConfig, "public", chain);
|
40
|
+
chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function(args) {
|
41
|
+
var _args_;
|
42
|
+
return [
|
43
|
+
{
|
44
|
+
patterns: _toConsumableArray(((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || []).concat([
|
45
|
+
defaultCopyPattern
|
46
|
+
])
|
47
|
+
}
|
48
|
+
];
|
49
|
+
});
|
50
|
+
}
|
51
|
+
var entrypoints = appContext.entrypoints;
|
52
|
+
var existNestedRoutes = entrypoints.some(function(entrypoint) {
|
53
|
+
return entrypoint.nestedRoutesEntry;
|
54
|
+
});
|
55
|
+
var routerConfig = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_runtime = modernConfig.runtime) === null || _modernConfig_runtime === void 0 ? void 0 : _modernConfig_runtime.router;
|
56
|
+
var routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
|
57
|
+
if (existNestedRoutes || routerManifest) {
|
58
|
+
chain.plugin("route-plugin").use(RouterPlugin);
|
59
|
+
}
|
60
|
+
});
|
61
|
+
}
|
62
|
+
};
|
63
|
+
};
|
64
|
+
export { PluginCompatModern };
|