@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-canary.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/dist/js/modern/analyze/constants.js +38 -18
- package/dist/js/modern/analyze/generateCode.js +261 -221
- package/dist/js/modern/analyze/getBundleEntry.js +31 -32
- package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +93 -49
- package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +89 -47
- package/dist/js/modern/analyze/getClientRoutes/index.js +6 -2
- package/dist/js/modern/analyze/getClientRoutes/utils.js +23 -10
- package/dist/js/modern/analyze/getFileSystemEntry.js +43 -22
- package/dist/js/modern/analyze/getHtmlTemplate.js +89 -49
- package/dist/js/modern/analyze/getServerRoutes.js +122 -126
- package/dist/js/modern/analyze/index.js +193 -159
- package/dist/js/modern/analyze/isDefaultExportFunction.js +30 -16
- package/dist/js/modern/analyze/makeLegalIdentifier.js +10 -11
- package/dist/js/modern/analyze/nestedRoutes.js +106 -60
- package/dist/js/modern/analyze/templates.js +161 -80
- package/dist/js/modern/analyze/utils.js +87 -66
- package/dist/js/modern/builder/builderPlugins/compatModern.js +121 -109
- package/dist/js/modern/builder/index.js +122 -83
- package/dist/js/modern/builder/loaders/routerLoader.js +9 -12
- package/dist/js/modern/builder/loaders/serverModuleLoader.js +4 -1
- package/dist/js/modern/builder/share.js +22 -20
- package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +23 -22
- package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +31 -27
- package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +98 -84
- package/dist/js/modern/commands/build.js +67 -42
- package/dist/js/modern/commands/deploy.js +27 -4
- package/dist/js/modern/commands/dev.js +77 -27
- package/dist/js/modern/commands/index.js +1 -1
- package/dist/js/modern/commands/inspect.js +30 -5
- package/dist/js/modern/commands/start.js +37 -15
- package/dist/js/modern/config/default.js +103 -113
- package/dist/js/modern/config/index.js +8 -2
- package/dist/js/modern/config/initial/createHtmlConfig.js +5 -2
- package/dist/js/modern/config/initial/createOutputConfig.js +9 -10
- package/dist/js/modern/config/initial/createSourceConfig.js +5 -2
- package/dist/js/modern/config/initial/createToolsConfig.js +7 -6
- package/dist/js/modern/config/initial/index.js +9 -4
- package/dist/js/modern/config/initial/inits.js +109 -73
- package/dist/js/modern/config/initial/transformNormalizedConfig.js +6 -3
- package/dist/js/modern/defineConfig.js +26 -11
- package/dist/js/modern/exports/server.js +4 -1
- package/dist/js/modern/hooks.js +10 -3
- package/dist/js/modern/index.js +140 -89
- package/dist/js/modern/initialize/index.js +98 -51
- package/dist/js/modern/locale/en.js +20 -21
- package/dist/js/modern/locale/index.js +6 -6
- package/dist/js/modern/locale/zh.js +21 -22
- package/dist/js/modern/schema/Schema.js +6 -5
- package/dist/js/modern/schema/index.js +51 -100
- package/dist/js/modern/schema/legacy.js +96 -231
- package/dist/js/modern/types/config/index.js +0 -1
- package/dist/js/modern/types/index.js +0 -1
- package/dist/js/modern/types/legacyConfig/output.js +0 -1
- package/dist/js/modern/utils/commands.js +5 -2
- package/dist/js/modern/utils/config.js +102 -41
- package/dist/js/modern/utils/createFileWatcher.js +84 -51
- package/dist/js/modern/utils/createServer.js +63 -17
- package/dist/js/modern/utils/getSpecifiedEntries.js +46 -19
- package/dist/js/modern/utils/language.js +6 -3
- package/dist/js/modern/utils/printInstructions.js +27 -8
- package/dist/js/modern/utils/restart.js +43 -16
- package/dist/js/modern/utils/routes.js +29 -12
- package/dist/js/node/analyze/constants.js +54 -39
- package/dist/js/node/analyze/generateCode.js +281 -239
- package/dist/js/node/analyze/getBundleEntry.js +55 -44
- package/dist/js/node/analyze/getClientRoutes/getRoutes.js +132 -76
- package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +128 -74
- package/dist/js/node/analyze/getClientRoutes/index.js +23 -17
- package/dist/js/node/analyze/getClientRoutes/utils.js +44 -21
- package/dist/js/node/analyze/getFileSystemEntry.js +70 -39
- package/dist/js/node/analyze/getHtmlTemplate.js +116 -61
- package/dist/js/node/analyze/getServerRoutes.js +143 -137
- package/dist/js/node/analyze/index.js +240 -174
- package/dist/js/node/analyze/isDefaultExportFunction.js +55 -26
- package/dist/js/node/analyze/makeLegalIdentifier.js +27 -15
- package/dist/js/node/analyze/nestedRoutes.js +137 -75
- package/dist/js/node/analyze/templates.js +183 -89
- package/dist/js/node/analyze/utils.js +114 -81
- package/dist/js/node/builder/builderPlugins/compatModern.js +149 -122
- package/dist/js/node/builder/index.js +150 -92
- package/dist/js/node/builder/loaders/routerLoader.js +27 -18
- package/dist/js/node/builder/loaders/serverModuleLoader.js +22 -7
- package/dist/js/node/builder/share.js +45 -25
- package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +39 -26
- package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +47 -31
- package/dist/js/node/builder/webpackPlugins/routerPlugin.js +116 -90
- package/dist/js/node/commands/build.js +89 -52
- package/dist/js/node/commands/deploy.js +45 -10
- package/dist/js/node/commands/dev.js +99 -41
- package/dist/js/node/commands/index.js +19 -38
- package/dist/js/node/commands/inspect.js +48 -11
- package/dist/js/node/commands/start.js +65 -26
- package/dist/js/node/config/default.js +119 -117
- package/dist/js/node/config/index.js +25 -29
- package/dist/js/node/config/initial/createHtmlConfig.js +22 -6
- package/dist/js/node/config/initial/createOutputConfig.js +26 -14
- package/dist/js/node/config/initial/createSourceConfig.js +22 -6
- package/dist/js/node/config/initial/createToolsConfig.js +24 -10
- package/dist/js/node/config/initial/index.js +28 -17
- package/dist/js/node/config/initial/inits.js +126 -81
- package/dist/js/node/config/initial/transformNormalizedConfig.js +31 -15
- package/dist/js/node/defineConfig.js +43 -17
- package/dist/js/node/exports/server.js +21 -10
- package/dist/js/node/hooks.js +44 -29
- package/dist/js/node/index.js +190 -130
- package/dist/js/node/initialize/index.js +116 -61
- package/dist/js/node/locale/en.js +36 -25
- package/dist/js/node/locale/index.js +27 -15
- package/dist/js/node/locale/zh.js +37 -26
- package/dist/js/node/schema/Schema.js +23 -10
- package/dist/js/node/schema/index.js +77 -114
- package/dist/js/node/schema/legacy.js +117 -240
- package/dist/js/node/types/config/index.js +17 -16
- package/dist/js/node/types/index.js +19 -38
- package/dist/js/node/types/legacyConfig/output.js +0 -5
- package/dist/js/node/utils/commands.js +21 -6
- package/dist/js/node/utils/config.js +120 -51
- package/dist/js/node/utils/createFileWatcher.js +104 -61
- package/dist/js/node/utils/createServer.js +86 -25
- package/dist/js/node/utils/getSpecifiedEntries.js +64 -25
- package/dist/js/node/utils/language.js +24 -8
- package/dist/js/node/utils/printInstructions.js +47 -16
- package/dist/js/node/utils/restart.js +61 -21
- package/dist/js/node/utils/routes.js +53 -18
- package/dist/js/treeshaking/analyze/constants.js +28 -18
- package/dist/js/treeshaking/analyze/generateCode.js +599 -406
- package/dist/js/treeshaking/analyze/getBundleEntry.js +52 -63
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +214 -168
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +215 -169
- package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -2
- package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +19 -20
- package/dist/js/treeshaking/analyze/getFileSystemEntry.js +89 -86
- package/dist/js/treeshaking/analyze/getHtmlTemplate.js +298 -125
- package/dist/js/treeshaking/analyze/getServerRoutes.js +210 -147
- package/dist/js/treeshaking/analyze/index.js +558 -303
- package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +45 -26
- package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -16
- package/dist/js/treeshaking/analyze/nestedRoutes.js +411 -200
- package/dist/js/treeshaking/analyze/templates.js +433 -236
- package/dist/js/treeshaking/analyze/utils.js +358 -153
- package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +281 -200
- package/dist/js/treeshaking/builder/index.js +371 -163
- package/dist/js/treeshaking/builder/loaders/routerLoader.js +11 -12
- package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +3 -2
- package/dist/js/treeshaking/builder/share.js +41 -44
- package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +108 -44
- package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +70 -39
- package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +332 -112
- package/dist/js/treeshaking/commands/build.js +286 -88
- package/dist/js/treeshaking/commands/deploy.js +153 -25
- package/dist/js/treeshaking/commands/dev.js +318 -131
- package/dist/js/treeshaking/commands/index.js +1 -1
- package/dist/js/treeshaking/commands/inspect.js +147 -32
- package/dist/js/treeshaking/commands/start.js +190 -67
- package/dist/js/treeshaking/config/default.js +210 -198
- package/dist/js/treeshaking/config/index.js +3 -2
- package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -31
- package/dist/js/treeshaking/config/initial/createOutputConfig.js +43 -70
- package/dist/js/treeshaking/config/initial/createSourceConfig.js +37 -40
- package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -38
- package/dist/js/treeshaking/config/initial/index.js +10 -9
- package/dist/js/treeshaking/config/initial/inits.js +205 -106
- package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +27 -34
- package/dist/js/treeshaking/defineConfig.js +60 -13
- package/dist/js/treeshaking/exports/server.js +2 -1
- package/dist/js/treeshaking/hooks.js +26 -25
- package/dist/js/treeshaking/index.js +465 -257
- package/dist/js/treeshaking/initialize/index.js +290 -112
- package/dist/js/treeshaking/locale/en.js +34 -33
- package/dist/js/treeshaking/locale/index.js +5 -5
- package/dist/js/treeshaking/locale/zh.js +34 -33
- package/dist/js/treeshaking/schema/Schema.js +267 -69
- package/dist/js/treeshaking/schema/index.js +165 -121
- package/dist/js/treeshaking/schema/legacy.js +323 -256
- 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 +0 -1
- 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 +0 -1
- 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 -1
- 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 +6 -5
- package/dist/js/treeshaking/utils/config.js +295 -117
- package/dist/js/treeshaking/utils/createFileWatcher.js +278 -118
- package/dist/js/treeshaking/utils/createServer.js +252 -67
- package/dist/js/treeshaking/utils/getSpecifiedEntries.js +182 -55
- package/dist/js/treeshaking/utils/language.js +6 -5
- package/dist/js/treeshaking/utils/printInstructions.js +151 -29
- package/dist/js/treeshaking/utils/restart.js +184 -42
- package/dist/js/treeshaking/utils/routes.js +151 -27
- package/dist/js/treeshaking/utils/types.js +1 -0
- package/dist/types/analyze/index.d.ts +2 -0
- package/dist/types/builder/builderPlugins/compatModern.d.ts +2 -1
- package/dist/types/builder/index.d.ts +2 -2
- package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +1 -7
- package/dist/types/defineConfig.d.ts +1 -0
- package/dist/types/index.d.ts +2 -0
- package/dist/types/initialize/index.d.ts +2 -0
- package/dist/types/types/config/index.d.ts +1 -0
- package/dist/types/types/config/output.d.ts +0 -1
- package/dist/types/types/config/source.d.ts +1 -0
- package/dist/types/types/config/tools.d.ts +2 -0
- package/dist/types/types/legacyConfig/dev.d.ts +1 -0
- package/dist/types/types/legacyConfig/output.d.ts +1 -1
- package/dist/types/types/legacyConfig/source.d.ts +1 -0
- package/dist/types/types/legacyConfig/tools.d.ts +1 -0
- package/dist/types/utils/config.d.ts +1 -0
- package/dist/types/utils/createServer.d.ts +1 -0
- package/dist/types/utils/restart.d.ts +1 -1
- package/package.json +9 -8
|
@@ -1,79 +1,148 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
6
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
+
var __export = (target, all) => {
|
|
8
|
+
for (var name in all)
|
|
9
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
10
|
+
};
|
|
11
|
+
var __copyProps = (to, from, except, desc) => {
|
|
12
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
13
|
+
for (let key of __getOwnPropNames(from))
|
|
14
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
15
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
16
|
+
}
|
|
17
|
+
return to;
|
|
18
|
+
};
|
|
19
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
20
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
21
|
+
mod
|
|
22
|
+
));
|
|
23
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
+
var stdin_exports = {};
|
|
25
|
+
__export(stdin_exports, {
|
|
26
|
+
buildServerConfig: () => buildServerConfig,
|
|
27
|
+
defineServerConfig: () => defineServerConfig,
|
|
28
|
+
emitResolvedConfig: () => emitResolvedConfig,
|
|
29
|
+
safeReplacer: () => safeReplacer
|
|
5
30
|
});
|
|
6
|
-
|
|
7
|
-
var path =
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
31
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
32
|
+
var path = __toESM(require("path"));
|
|
33
|
+
var import_node_bundle_require = require("@modern-js/node-bundle-require");
|
|
34
|
+
var import_utils = require("@modern-js/utils");
|
|
35
|
+
var __defProp2 = Object.defineProperty;
|
|
36
|
+
var __defProps = Object.defineProperties;
|
|
37
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
38
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
39
|
+
var __hasOwnProp2 = Object.prototype.hasOwnProperty;
|
|
40
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
41
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
42
|
+
var __spreadValues = (a, b) => {
|
|
43
|
+
for (var prop in b || (b = {}))
|
|
44
|
+
if (__hasOwnProp2.call(b, prop))
|
|
45
|
+
__defNormalProp(a, prop, b[prop]);
|
|
46
|
+
if (__getOwnPropSymbols)
|
|
47
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
48
|
+
if (__propIsEnum.call(b, prop))
|
|
49
|
+
__defNormalProp(a, prop, b[prop]);
|
|
50
|
+
}
|
|
51
|
+
return a;
|
|
52
|
+
};
|
|
53
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
54
|
+
var __async = (__this, __arguments, generator) => {
|
|
55
|
+
return new Promise((resolve, reject) => {
|
|
56
|
+
var fulfilled = (value) => {
|
|
57
|
+
try {
|
|
58
|
+
step(generator.next(value));
|
|
59
|
+
} catch (e) {
|
|
60
|
+
reject(e);
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
var rejected = (value) => {
|
|
64
|
+
try {
|
|
65
|
+
step(generator.throw(value));
|
|
66
|
+
} catch (e) {
|
|
67
|
+
reject(e);
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
71
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
72
|
+
});
|
|
73
|
+
};
|
|
74
|
+
const defineServerConfig = (config) => config;
|
|
75
|
+
const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
|
|
18
76
|
appDirectory,
|
|
19
77
|
distDirectory,
|
|
20
78
|
configFile,
|
|
21
79
|
options
|
|
22
|
-
})
|
|
23
|
-
const configFilePath =
|
|
24
|
-
const getOutputFile =
|
|
80
|
+
}) {
|
|
81
|
+
const configFilePath = yield (0, import_utils.getServerConfig)(appDirectory, configFile);
|
|
82
|
+
const getOutputFile = (filepath) => __async(void 0, null, function* () {
|
|
83
|
+
return path.resolve(
|
|
84
|
+
distDirectory,
|
|
85
|
+
`${filepath.replace(
|
|
86
|
+
new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")),
|
|
87
|
+
""
|
|
88
|
+
)}.js`
|
|
89
|
+
);
|
|
90
|
+
});
|
|
25
91
|
if (configFilePath) {
|
|
26
|
-
const configHelperFilePath = path.normalize(
|
|
92
|
+
const configHelperFilePath = path.normalize(
|
|
93
|
+
path.join(distDirectory, "./config-helper.js")
|
|
94
|
+
);
|
|
27
95
|
const helperCode = `
|
|
28
96
|
export const defineConfig = (config) => config;
|
|
29
97
|
`;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
98
|
+
yield import_utils.fs.ensureDir(distDirectory);
|
|
99
|
+
yield import_utils.fs.writeFile(configHelperFilePath, helperCode);
|
|
100
|
+
yield (0, import_node_bundle_require.bundle)(configFilePath, __spreadProps(__spreadValues({}, options), {
|
|
33
101
|
getOutputFile,
|
|
34
|
-
esbuildPlugins: [
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
ctx
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
102
|
+
esbuildPlugins: [
|
|
103
|
+
{
|
|
104
|
+
name: "native-build-config",
|
|
105
|
+
setup(ctx) {
|
|
106
|
+
ctx.onResolve(
|
|
107
|
+
{
|
|
108
|
+
filter: /app-tools\/server/
|
|
109
|
+
},
|
|
110
|
+
() => {
|
|
111
|
+
return {
|
|
112
|
+
path: configHelperFilePath
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
);
|
|
116
|
+
}
|
|
44
117
|
}
|
|
45
|
-
|
|
118
|
+
]
|
|
46
119
|
}));
|
|
47
120
|
}
|
|
48
|
-
};
|
|
49
|
-
|
|
50
|
-
/**
|
|
51
|
-
*
|
|
52
|
-
* 处理循环引用的 replacer
|
|
53
|
-
*/
|
|
54
|
-
exports.buildServerConfig = buildServerConfig;
|
|
121
|
+
});
|
|
55
122
|
const safeReplacer = () => {
|
|
56
123
|
const cache = [];
|
|
57
124
|
const keyCache = [];
|
|
58
|
-
return function
|
|
59
|
-
if (typeof value ===
|
|
125
|
+
return function(key, value) {
|
|
126
|
+
if (typeof value === "object" && value !== null) {
|
|
60
127
|
const index = cache.indexOf(value);
|
|
61
128
|
if (index !== -1) {
|
|
62
129
|
return `[Circular ${keyCache[index]}]`;
|
|
63
130
|
}
|
|
64
131
|
cache.push(value);
|
|
65
|
-
keyCache.push(key ||
|
|
132
|
+
keyCache.push(key || "root");
|
|
66
133
|
}
|
|
67
134
|
return value;
|
|
68
135
|
};
|
|
69
136
|
};
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
137
|
+
const emitResolvedConfig = (appDirectory, resolvedConfig) => __async(void 0, null, function* () {
|
|
138
|
+
var _a;
|
|
139
|
+
const outputPath = path.join(
|
|
140
|
+
appDirectory,
|
|
141
|
+
((_a = resolvedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
|
|
142
|
+
import_utils.OUTPUT_CONFIG_FILE
|
|
143
|
+
);
|
|
144
|
+
yield import_utils.fs.writeJSON(outputPath, resolvedConfig, {
|
|
75
145
|
spaces: 2,
|
|
76
146
|
replacer: safeReplacer()
|
|
77
147
|
});
|
|
78
|
-
};
|
|
79
|
-
exports.emitResolvedConfig = emitResolvedConfig;
|
|
148
|
+
});
|
|
@@ -1,91 +1,134 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
6
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
+
var __export = (target, all) => {
|
|
8
|
+
for (var name in all)
|
|
9
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
10
|
+
};
|
|
11
|
+
var __copyProps = (to, from, except, desc) => {
|
|
12
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
13
|
+
for (let key of __getOwnPropNames(from))
|
|
14
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
15
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
16
|
+
}
|
|
17
|
+
return to;
|
|
18
|
+
};
|
|
19
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
20
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
21
|
+
mod
|
|
22
|
+
));
|
|
23
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
+
var stdin_exports = {};
|
|
25
|
+
__export(stdin_exports, {
|
|
26
|
+
addServerConfigToDeps: () => addServerConfigToDeps,
|
|
27
|
+
createFileWatcher: () => createFileWatcher
|
|
5
28
|
});
|
|
6
|
-
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
29
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
30
|
+
var import_crypto = __toESM(require("crypto"));
|
|
31
|
+
var import_fs = __toESM(require("fs"));
|
|
32
|
+
var import_path = __toESM(require("path"));
|
|
33
|
+
var import_utils = require("@modern-js/utils");
|
|
34
|
+
var __async = (__this, __arguments, generator) => {
|
|
35
|
+
return new Promise((resolve, reject) => {
|
|
36
|
+
var fulfilled = (value) => {
|
|
37
|
+
try {
|
|
38
|
+
step(generator.next(value));
|
|
39
|
+
} catch (e) {
|
|
40
|
+
reject(e);
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
var rejected = (value) => {
|
|
44
|
+
try {
|
|
45
|
+
step(generator.throw(value));
|
|
46
|
+
} catch (e) {
|
|
47
|
+
reject(e);
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
51
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
52
|
+
});
|
|
53
|
+
};
|
|
18
54
|
const getPackageConfig = (appDirectory, packageJsonConfig) => {
|
|
19
|
-
const PACKAGE_JSON_CONFIG_NAME =
|
|
20
|
-
const json = JSON.parse(
|
|
21
|
-
|
|
55
|
+
const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
|
|
56
|
+
const json = JSON.parse(
|
|
57
|
+
import_fs.default.readFileSync(import_path.default.resolve(appDirectory, "./package.json"), "utf8")
|
|
58
|
+
);
|
|
59
|
+
return json[packageJsonConfig != null ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
|
|
22
60
|
};
|
|
23
|
-
const addServerConfigToDeps =
|
|
24
|
-
const serverConfig =
|
|
61
|
+
const addServerConfigToDeps = (dependencies, appDirectory, serverConfigFile) => __async(void 0, null, function* () {
|
|
62
|
+
const serverConfig = yield (0, import_utils.getServerConfig)(appDirectory, serverConfigFile);
|
|
25
63
|
if (serverConfig) {
|
|
26
64
|
dependencies.push(serverConfig);
|
|
27
65
|
}
|
|
28
|
-
};
|
|
29
|
-
|
|
30
|
-
const
|
|
31
|
-
const
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
const
|
|
37
|
-
|
|
66
|
+
});
|
|
67
|
+
const debug = (0, import_utils.createDebugger)("watch-files");
|
|
68
|
+
const md5 = (data) => import_crypto.default.createHash("md5").update(data).digest("hex");
|
|
69
|
+
const hashMap = /* @__PURE__ */ new Map();
|
|
70
|
+
const createFileWatcher = (appContext, configDir, hooksRunner) => __async(void 0, null, function* () {
|
|
71
|
+
if ((0, import_utils.isDev)() || (0, import_utils.isTest)()) {
|
|
72
|
+
const { appDirectory, configFile } = appContext;
|
|
73
|
+
const extraFiles = yield hooksRunner.watchFiles();
|
|
74
|
+
const configPath = import_path.default.join(appDirectory, configDir);
|
|
75
|
+
const dependencies = getPackageConfig(
|
|
76
|
+
appContext.appDirectory,
|
|
77
|
+
appContext.packageName
|
|
78
|
+
) ? [import_path.default.resolve(appDirectory, "./package.json")] : [];
|
|
79
|
+
yield addServerConfigToDeps(
|
|
80
|
+
dependencies,
|
|
81
|
+
appContext.appDirectory,
|
|
82
|
+
appContext.serverConfigFile
|
|
83
|
+
);
|
|
84
|
+
const watched = [
|
|
85
|
+
`${configPath}/html`,
|
|
86
|
+
...extraFiles,
|
|
87
|
+
...dependencies,
|
|
38
88
|
configFile
|
|
39
|
-
|
|
40
|
-
const extraFiles = await hooksRunner.watchFiles();
|
|
41
|
-
const configPath = _path.default.join(appDirectory, configDir);
|
|
42
|
-
const dependencies = getPackageConfig(appContext.appDirectory, appContext.packageName) ? [_path.default.resolve(appDirectory, './package.json')] : [];
|
|
43
|
-
|
|
44
|
-
// 将 server.config 加入到 loaded.dependencies,以便对文件监听做热更新
|
|
45
|
-
await addServerConfigToDeps(dependencies, appContext.appDirectory, appContext.serverConfigFile);
|
|
46
|
-
const watched = [`${configPath}/html`, ...extraFiles, ...dependencies, configFile].filter(Boolean);
|
|
89
|
+
].filter(Boolean);
|
|
47
90
|
debug(`watched: %o`, watched);
|
|
48
|
-
const watcher =
|
|
91
|
+
const watcher = import_utils.chokidar.watch(watched, {
|
|
49
92
|
cwd: appDirectory,
|
|
50
93
|
ignoreInitial: true,
|
|
51
94
|
ignorePermissionErrors: true,
|
|
52
|
-
ignored: [
|
|
95
|
+
ignored: [
|
|
96
|
+
/node_modules/,
|
|
97
|
+
"**/__test__/**",
|
|
98
|
+
"**/*.test.(js|jsx|ts|tsx)",
|
|
99
|
+
"**/*.spec.(js|jsx|ts|tsx)",
|
|
100
|
+
"**/*.stories.(js|jsx|ts|tsx)"
|
|
101
|
+
]
|
|
53
102
|
});
|
|
54
|
-
watcher.on(
|
|
103
|
+
watcher.on("change", (changed) => {
|
|
55
104
|
const lastHash = hashMap.get(changed);
|
|
56
|
-
const currentHash = md5(
|
|
105
|
+
const currentHash = md5(
|
|
106
|
+
import_fs.default.readFileSync(import_path.default.join(appDirectory, changed), "utf8")
|
|
107
|
+
);
|
|
57
108
|
if (currentHash !== lastHash) {
|
|
58
109
|
debug(`file change: %s`, changed);
|
|
59
110
|
hashMap.set(changed, currentHash);
|
|
60
|
-
hooksRunner.fileChange({
|
|
61
|
-
filename: changed,
|
|
62
|
-
eventType: 'change'
|
|
63
|
-
});
|
|
111
|
+
hooksRunner.fileChange({ filename: changed, eventType: "change" });
|
|
64
112
|
}
|
|
65
113
|
});
|
|
66
|
-
watcher.on(
|
|
114
|
+
watcher.on("add", (name) => {
|
|
67
115
|
debug(`add file: %s`, name);
|
|
68
|
-
const currentHash = md5(
|
|
116
|
+
const currentHash = md5(
|
|
117
|
+
import_fs.default.readFileSync(import_path.default.join(appDirectory, name), "utf8")
|
|
118
|
+
);
|
|
69
119
|
hashMap.set(name, currentHash);
|
|
70
|
-
hooksRunner.fileChange({
|
|
71
|
-
filename: name,
|
|
72
|
-
eventType: 'add'
|
|
73
|
-
});
|
|
120
|
+
hooksRunner.fileChange({ filename: name, eventType: "add" });
|
|
74
121
|
});
|
|
75
|
-
watcher.on(
|
|
122
|
+
watcher.on("unlink", (name) => {
|
|
76
123
|
debug(`remove file: %s`, name);
|
|
77
124
|
if (hashMap.has(name)) {
|
|
78
125
|
hashMap.delete(name);
|
|
79
126
|
}
|
|
80
|
-
hooksRunner.fileChange({
|
|
81
|
-
filename: name,
|
|
82
|
-
eventType: 'unlink'
|
|
83
|
-
});
|
|
127
|
+
hooksRunner.fileChange({ filename: name, eventType: "unlink" });
|
|
84
128
|
});
|
|
85
|
-
watcher.on(
|
|
129
|
+
watcher.on("error", (err) => {
|
|
86
130
|
throw err;
|
|
87
131
|
});
|
|
88
132
|
return watcher;
|
|
89
133
|
}
|
|
90
|
-
};
|
|
91
|
-
exports.createFileWatcher = createFileWatcher;
|
|
134
|
+
});
|
|
@@ -1,39 +1,100 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
6
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
+
var __export = (target, all) => {
|
|
8
|
+
for (var name in all)
|
|
9
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
10
|
+
};
|
|
11
|
+
var __copyProps = (to, from, except, desc) => {
|
|
12
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
13
|
+
for (let key of __getOwnPropNames(from))
|
|
14
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
15
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
16
|
+
}
|
|
17
|
+
return to;
|
|
18
|
+
};
|
|
19
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
20
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
21
|
+
mod
|
|
22
|
+
));
|
|
23
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
+
var stdin_exports = {};
|
|
25
|
+
__export(stdin_exports, {
|
|
26
|
+
closeServer: () => closeServer,
|
|
27
|
+
createServer: () => createServer,
|
|
28
|
+
getServer: () => getServer,
|
|
29
|
+
injectDataLoaderPlugin: () => injectDataLoaderPlugin,
|
|
30
|
+
setServer: () => setServer
|
|
5
31
|
});
|
|
6
|
-
|
|
7
|
-
var
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
32
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
33
|
+
var import_server = require("@modern-js/server");
|
|
34
|
+
var __defProp2 = Object.defineProperty;
|
|
35
|
+
var __defProps = Object.defineProperties;
|
|
36
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
37
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
38
|
+
var __hasOwnProp2 = Object.prototype.hasOwnProperty;
|
|
39
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
40
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
41
|
+
var __spreadValues = (a, b) => {
|
|
42
|
+
for (var prop in b || (b = {}))
|
|
43
|
+
if (__hasOwnProp2.call(b, prop))
|
|
44
|
+
__defNormalProp(a, prop, b[prop]);
|
|
45
|
+
if (__getOwnPropSymbols)
|
|
46
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
47
|
+
if (__propIsEnum.call(b, prop))
|
|
48
|
+
__defNormalProp(a, prop, b[prop]);
|
|
49
|
+
}
|
|
50
|
+
return a;
|
|
51
|
+
};
|
|
52
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
53
|
+
var __async = (__this, __arguments, generator) => {
|
|
54
|
+
return new Promise((resolve, reject) => {
|
|
55
|
+
var fulfilled = (value) => {
|
|
56
|
+
try {
|
|
57
|
+
step(generator.next(value));
|
|
58
|
+
} catch (e) {
|
|
59
|
+
reject(e);
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
var rejected = (value) => {
|
|
63
|
+
try {
|
|
64
|
+
step(generator.throw(value));
|
|
65
|
+
} catch (e) {
|
|
66
|
+
reject(e);
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
70
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
71
|
+
});
|
|
72
|
+
};
|
|
11
73
|
let server = null;
|
|
12
74
|
const getServer = () => server;
|
|
13
|
-
|
|
14
|
-
|
|
75
|
+
const setServer = (newServer) => {
|
|
76
|
+
server = newServer;
|
|
77
|
+
};
|
|
78
|
+
const closeServer = () => __async(void 0, null, function* () {
|
|
15
79
|
if (server) {
|
|
16
|
-
|
|
80
|
+
yield server.close();
|
|
17
81
|
server = null;
|
|
18
82
|
}
|
|
19
|
-
};
|
|
20
|
-
|
|
21
|
-
const createServer = async options => {
|
|
83
|
+
});
|
|
84
|
+
const createServer = (options) => __async(void 0, null, function* () {
|
|
22
85
|
if (server) {
|
|
23
|
-
|
|
86
|
+
yield server.close();
|
|
24
87
|
}
|
|
25
|
-
server = new
|
|
26
|
-
const app =
|
|
88
|
+
server = new import_server.Server(options);
|
|
89
|
+
const app = yield server.init();
|
|
27
90
|
return app;
|
|
28
|
-
};
|
|
29
|
-
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
'@modern-js/plugin-data-loader': {
|
|
91
|
+
});
|
|
92
|
+
const injectDataLoaderPlugin = (internalPlugins) => {
|
|
93
|
+
const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
|
|
94
|
+
return __spreadProps(__spreadValues({}, internalPlugins), {
|
|
95
|
+
"@modern-js/plugin-data-loader": {
|
|
34
96
|
path: DataLoaderPlugin,
|
|
35
97
|
forced: true
|
|
36
98
|
}
|
|
37
99
|
});
|
|
38
100
|
};
|
|
39
|
-
exports.injectDataLoaderPlugin = injectDataLoaderPlugin;
|
|
@@ -1,37 +1,76 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
getSpecifiedEntries: () => getSpecifiedEntries
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
|
|
9
|
-
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
23
|
+
var import_utils = require("@modern-js/utils");
|
|
24
|
+
var __async = (__this, __arguments, generator) => {
|
|
25
|
+
return new Promise((resolve, reject) => {
|
|
26
|
+
var fulfilled = (value) => {
|
|
27
|
+
try {
|
|
28
|
+
step(generator.next(value));
|
|
29
|
+
} catch (e) {
|
|
30
|
+
reject(e);
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
var rejected = (value) => {
|
|
34
|
+
try {
|
|
35
|
+
step(generator.throw(value));
|
|
36
|
+
} catch (e) {
|
|
37
|
+
reject(e);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
41
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
const getSpecifiedEntries = (entry, entrypoints) => __async(void 0, null, function* () {
|
|
45
|
+
const entryNames = entrypoints.map((e) => e.entryName);
|
|
10
46
|
if (!entry) {
|
|
11
47
|
return entryNames;
|
|
12
48
|
}
|
|
13
|
-
if (typeof entry ===
|
|
14
|
-
const {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
49
|
+
if (typeof entry === "boolean") {
|
|
50
|
+
const { selected } = yield import_utils.inquirer.prompt([
|
|
51
|
+
{
|
|
52
|
+
type: "checkbox",
|
|
53
|
+
name: "selected",
|
|
54
|
+
choices: entryNames,
|
|
55
|
+
message: "请选择需要构建的入口",
|
|
56
|
+
validate(answer) {
|
|
57
|
+
if (answer.length < 1) {
|
|
58
|
+
return "You must choose at least one topping.";
|
|
59
|
+
}
|
|
60
|
+
return true;
|
|
24
61
|
}
|
|
25
|
-
return true;
|
|
26
62
|
}
|
|
27
|
-
|
|
63
|
+
]);
|
|
28
64
|
return selected;
|
|
29
65
|
}
|
|
30
|
-
entry.forEach(name => {
|
|
66
|
+
entry.forEach((name) => {
|
|
31
67
|
if (!entryNames.includes(name)) {
|
|
32
|
-
throw new Error(
|
|
68
|
+
throw new Error(
|
|
69
|
+
`can not found entry ${name}, compiler entry should in ${entryNames.join(
|
|
70
|
+
", "
|
|
71
|
+
)}`
|
|
72
|
+
);
|
|
33
73
|
}
|
|
34
74
|
});
|
|
35
75
|
return entry;
|
|
36
|
-
};
|
|
37
|
-
exports.getSpecifiedEntries = getSpecifiedEntries;
|
|
76
|
+
});
|