@modern-js/app-tools 2.0.0-beta.2 → 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/CHANGELOG.md +251 -0
- package/bin/modern.js +10 -1
- package/dist/js/modern/analyze/constants.js +38 -16
- package/dist/js/modern/analyze/generateCode.js +271 -211
- 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 +110 -53
- package/dist/js/modern/analyze/templates.js +190 -77
- package/dist/js/modern/analyze/utils.js +98 -51
- package/dist/js/modern/builder/builderPlugins/compatModern.js +124 -107
- package/dist/js/modern/builder/index.js +123 -86
- 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 +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 +93 -47
- 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 -16
- package/dist/js/modern/config/default.js +103 -114
- 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 +11 -9
- 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 -35
- package/dist/js/node/analyze/generateCode.js +290 -228
- 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 +140 -67
- package/dist/js/node/analyze/templates.js +211 -84
- package/dist/js/node/analyze/utils.js +123 -62
- package/dist/js/node/builder/builderPlugins/compatModern.js +152 -120
- package/dist/js/node/builder/index.js +151 -95
- package/dist/js/node/builder/loaders/routerLoader.js +36 -0
- package/dist/js/node/builder/loaders/serverModuleLoader.js +26 -0
- 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 +115 -61
- 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 -27
- package/dist/js/node/config/default.js +119 -118
- 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 +28 -13
- 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 -60
- 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 -16
- package/dist/js/treeshaking/analyze/generateCode.js +604 -355
- 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 -146
- 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 +414 -160
- package/dist/js/treeshaking/analyze/templates.js +432 -161
- package/dist/js/treeshaking/analyze/utils.js +361 -80
- package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +281 -195
- package/dist/js/treeshaking/builder/index.js +371 -165
- 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 +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 -132
- 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 -68
- package/dist/js/treeshaking/config/default.js +210 -199
- 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 -67
- 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/constants.d.ts +2 -0
- package/dist/types/analyze/index.d.ts +2 -0
- package/dist/types/analyze/templates.d.ts +8 -7
- package/dist/types/analyze/utils.d.ts +9 -1
- package/dist/types/builder/builderPlugins/compatModern.d.ts +2 -1
- package/dist/types/builder/index.d.ts +2 -2
- package/dist/types/builder/loaders/routerLoader.d.ts +3 -0
- package/dist/types/builder/loaders/serverModuleLoader.d.ts +3 -0
- 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 +10 -1
- package/dist/types/types/hooks.d.ts +2 -1
- 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/createFileWatcher.d.ts +2 -1
- package/dist/types/utils/createServer.d.ts +1 -0
- package/dist/types/utils/restart.d.ts +1 -1
- package/lib/types.d.ts +1 -1
- package/package.json +27 -23
|
@@ -1,67 +1,128 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __defProps = Object.defineProperties;
|
|
3
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
4
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
7
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
8
|
+
var __spreadValues = (a, b) => {
|
|
9
|
+
for (var prop in b || (b = {}))
|
|
10
|
+
if (__hasOwnProp.call(b, prop))
|
|
11
|
+
__defNormalProp(a, prop, b[prop]);
|
|
12
|
+
if (__getOwnPropSymbols)
|
|
13
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
14
|
+
if (__propIsEnum.call(b, prop))
|
|
15
|
+
__defNormalProp(a, prop, b[prop]);
|
|
16
|
+
}
|
|
17
|
+
return a;
|
|
18
|
+
};
|
|
19
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
|
+
var __async = (__this, __arguments, generator) => {
|
|
21
|
+
return new Promise((resolve, reject) => {
|
|
22
|
+
var fulfilled = (value) => {
|
|
23
|
+
try {
|
|
24
|
+
step(generator.next(value));
|
|
25
|
+
} catch (e) {
|
|
26
|
+
reject(e);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
var rejected = (value) => {
|
|
30
|
+
try {
|
|
31
|
+
step(generator.throw(value));
|
|
32
|
+
} catch (e) {
|
|
33
|
+
reject(e);
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
37
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
import * as path from "path";
|
|
41
|
+
import { bundle } from "@modern-js/node-bundle-require";
|
|
42
|
+
import {
|
|
43
|
+
CONFIG_FILE_EXTENSIONS,
|
|
44
|
+
fs,
|
|
45
|
+
getServerConfig,
|
|
46
|
+
OUTPUT_CONFIG_FILE
|
|
47
|
+
} from "@modern-js/utils";
|
|
48
|
+
const defineServerConfig = (config) => config;
|
|
49
|
+
const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
|
|
9
50
|
appDirectory,
|
|
10
51
|
distDirectory,
|
|
11
52
|
configFile,
|
|
12
53
|
options
|
|
13
|
-
})
|
|
14
|
-
const configFilePath =
|
|
15
|
-
const getOutputFile =
|
|
54
|
+
}) {
|
|
55
|
+
const configFilePath = yield getServerConfig(appDirectory, configFile);
|
|
56
|
+
const getOutputFile = (filepath) => __async(void 0, null, function* () {
|
|
57
|
+
return path.resolve(
|
|
58
|
+
distDirectory,
|
|
59
|
+
`${filepath.replace(
|
|
60
|
+
new RegExp(CONFIG_FILE_EXTENSIONS.join("|")),
|
|
61
|
+
""
|
|
62
|
+
)}.js`
|
|
63
|
+
);
|
|
64
|
+
});
|
|
16
65
|
if (configFilePath) {
|
|
17
|
-
const configHelperFilePath = path.normalize(
|
|
66
|
+
const configHelperFilePath = path.normalize(
|
|
67
|
+
path.join(distDirectory, "./config-helper.js")
|
|
68
|
+
);
|
|
18
69
|
const helperCode = `
|
|
19
70
|
export const defineConfig = (config) => config;
|
|
20
71
|
`;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
72
|
+
yield fs.ensureDir(distDirectory);
|
|
73
|
+
yield fs.writeFile(configHelperFilePath, helperCode);
|
|
74
|
+
yield bundle(configFilePath, __spreadProps(__spreadValues({}, options), {
|
|
24
75
|
getOutputFile,
|
|
25
|
-
esbuildPlugins: [
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
ctx
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
76
|
+
esbuildPlugins: [
|
|
77
|
+
{
|
|
78
|
+
name: "native-build-config",
|
|
79
|
+
setup(ctx) {
|
|
80
|
+
ctx.onResolve(
|
|
81
|
+
{
|
|
82
|
+
filter: /app-tools\/server/
|
|
83
|
+
},
|
|
84
|
+
() => {
|
|
85
|
+
return {
|
|
86
|
+
path: configHelperFilePath
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
);
|
|
90
|
+
}
|
|
35
91
|
}
|
|
36
|
-
|
|
92
|
+
]
|
|
37
93
|
}));
|
|
38
94
|
}
|
|
39
|
-
};
|
|
40
|
-
|
|
41
|
-
/**
|
|
42
|
-
*
|
|
43
|
-
* 处理循环引用的 replacer
|
|
44
|
-
*/
|
|
45
|
-
export const safeReplacer = () => {
|
|
95
|
+
});
|
|
96
|
+
const safeReplacer = () => {
|
|
46
97
|
const cache = [];
|
|
47
98
|
const keyCache = [];
|
|
48
|
-
return function
|
|
49
|
-
if (typeof value ===
|
|
99
|
+
return function(key, value) {
|
|
100
|
+
if (typeof value === "object" && value !== null) {
|
|
50
101
|
const index = cache.indexOf(value);
|
|
51
102
|
if (index !== -1) {
|
|
52
103
|
return `[Circular ${keyCache[index]}]`;
|
|
53
104
|
}
|
|
54
105
|
cache.push(value);
|
|
55
|
-
keyCache.push(key ||
|
|
106
|
+
keyCache.push(key || "root");
|
|
56
107
|
}
|
|
57
108
|
return value;
|
|
58
109
|
};
|
|
59
110
|
};
|
|
60
|
-
|
|
61
|
-
var
|
|
62
|
-
const outputPath = path.join(
|
|
63
|
-
|
|
111
|
+
const emitResolvedConfig = (appDirectory, resolvedConfig) => __async(void 0, null, function* () {
|
|
112
|
+
var _a;
|
|
113
|
+
const outputPath = path.join(
|
|
114
|
+
appDirectory,
|
|
115
|
+
((_a = resolvedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
|
|
116
|
+
OUTPUT_CONFIG_FILE
|
|
117
|
+
);
|
|
118
|
+
yield fs.writeJSON(outputPath, resolvedConfig, {
|
|
64
119
|
spaces: 2,
|
|
65
120
|
replacer: safeReplacer()
|
|
66
121
|
});
|
|
67
|
-
};
|
|
122
|
+
});
|
|
123
|
+
export {
|
|
124
|
+
buildServerConfig,
|
|
125
|
+
defineServerConfig,
|
|
126
|
+
emitResolvedConfig,
|
|
127
|
+
safeReplacer
|
|
128
|
+
};
|
|
@@ -1,82 +1,115 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
1
|
+
var __async = (__this, __arguments, generator) => {
|
|
2
|
+
return new Promise((resolve, reject) => {
|
|
3
|
+
var fulfilled = (value) => {
|
|
4
|
+
try {
|
|
5
|
+
step(generator.next(value));
|
|
6
|
+
} catch (e) {
|
|
7
|
+
reject(e);
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
var rejected = (value) => {
|
|
11
|
+
try {
|
|
12
|
+
step(generator.throw(value));
|
|
13
|
+
} catch (e) {
|
|
14
|
+
reject(e);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
18
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
import crypto from "crypto";
|
|
22
|
+
import fs from "fs";
|
|
23
|
+
import path from "path";
|
|
24
|
+
import {
|
|
25
|
+
isDev,
|
|
26
|
+
chokidar,
|
|
27
|
+
createDebugger,
|
|
28
|
+
isTest,
|
|
29
|
+
getServerConfig
|
|
30
|
+
} from "@modern-js/utils";
|
|
11
31
|
const getPackageConfig = (appDirectory, packageJsonConfig) => {
|
|
12
|
-
const PACKAGE_JSON_CONFIG_NAME =
|
|
13
|
-
const json = JSON.parse(
|
|
14
|
-
|
|
32
|
+
const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
|
|
33
|
+
const json = JSON.parse(
|
|
34
|
+
fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8")
|
|
35
|
+
);
|
|
36
|
+
return json[packageJsonConfig != null ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
|
|
15
37
|
};
|
|
16
|
-
const addServerConfigToDeps =
|
|
17
|
-
const serverConfig =
|
|
38
|
+
const addServerConfigToDeps = (dependencies, appDirectory, serverConfigFile) => __async(void 0, null, function* () {
|
|
39
|
+
const serverConfig = yield getServerConfig(appDirectory, serverConfigFile);
|
|
18
40
|
if (serverConfig) {
|
|
19
41
|
dependencies.push(serverConfig);
|
|
20
42
|
}
|
|
21
|
-
};
|
|
22
|
-
const debug = createDebugger(
|
|
23
|
-
const md5 = data => crypto.createHash(
|
|
24
|
-
const hashMap = new Map();
|
|
25
|
-
|
|
26
|
-
// only add fs watcher on dev mode.
|
|
43
|
+
});
|
|
44
|
+
const debug = createDebugger("watch-files");
|
|
45
|
+
const md5 = (data) => crypto.createHash("md5").update(data).digest("hex");
|
|
46
|
+
const hashMap = /* @__PURE__ */ new Map();
|
|
47
|
+
const createFileWatcher = (appContext, configDir, hooksRunner) => __async(void 0, null, function* () {
|
|
27
48
|
if (isDev() || isTest()) {
|
|
28
|
-
const {
|
|
29
|
-
|
|
30
|
-
configFile
|
|
31
|
-
} = appContext;
|
|
32
|
-
const extraFiles = await hooksRunner.watchFiles();
|
|
49
|
+
const { appDirectory, configFile } = appContext;
|
|
50
|
+
const extraFiles = yield hooksRunner.watchFiles();
|
|
33
51
|
const configPath = path.join(appDirectory, configDir);
|
|
34
|
-
const dependencies = getPackageConfig(
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
52
|
+
const dependencies = getPackageConfig(
|
|
53
|
+
appContext.appDirectory,
|
|
54
|
+
appContext.packageName
|
|
55
|
+
) ? [path.resolve(appDirectory, "./package.json")] : [];
|
|
56
|
+
yield addServerConfigToDeps(
|
|
57
|
+
dependencies,
|
|
58
|
+
appContext.appDirectory,
|
|
59
|
+
appContext.serverConfigFile
|
|
60
|
+
);
|
|
61
|
+
const watched = [
|
|
62
|
+
`${configPath}/html`,
|
|
63
|
+
...extraFiles,
|
|
64
|
+
...dependencies,
|
|
65
|
+
configFile
|
|
66
|
+
].filter(Boolean);
|
|
39
67
|
debug(`watched: %o`, watched);
|
|
40
68
|
const watcher = chokidar.watch(watched, {
|
|
41
69
|
cwd: appDirectory,
|
|
42
70
|
ignoreInitial: true,
|
|
43
71
|
ignorePermissionErrors: true,
|
|
44
|
-
ignored: [
|
|
72
|
+
ignored: [
|
|
73
|
+
/node_modules/,
|
|
74
|
+
"**/__test__/**",
|
|
75
|
+
"**/*.test.(js|jsx|ts|tsx)",
|
|
76
|
+
"**/*.spec.(js|jsx|ts|tsx)",
|
|
77
|
+
"**/*.stories.(js|jsx|ts|tsx)"
|
|
78
|
+
]
|
|
45
79
|
});
|
|
46
|
-
watcher.on(
|
|
80
|
+
watcher.on("change", (changed) => {
|
|
47
81
|
const lastHash = hashMap.get(changed);
|
|
48
|
-
const currentHash = md5(
|
|
82
|
+
const currentHash = md5(
|
|
83
|
+
fs.readFileSync(path.join(appDirectory, changed), "utf8")
|
|
84
|
+
);
|
|
49
85
|
if (currentHash !== lastHash) {
|
|
50
86
|
debug(`file change: %s`, changed);
|
|
51
87
|
hashMap.set(changed, currentHash);
|
|
52
|
-
hooksRunner.fileChange({
|
|
53
|
-
filename: changed,
|
|
54
|
-
eventType: 'change'
|
|
55
|
-
});
|
|
88
|
+
hooksRunner.fileChange({ filename: changed, eventType: "change" });
|
|
56
89
|
}
|
|
57
90
|
});
|
|
58
|
-
watcher.on(
|
|
91
|
+
watcher.on("add", (name) => {
|
|
59
92
|
debug(`add file: %s`, name);
|
|
60
|
-
const currentHash = md5(
|
|
93
|
+
const currentHash = md5(
|
|
94
|
+
fs.readFileSync(path.join(appDirectory, name), "utf8")
|
|
95
|
+
);
|
|
61
96
|
hashMap.set(name, currentHash);
|
|
62
|
-
hooksRunner.fileChange({
|
|
63
|
-
filename: name,
|
|
64
|
-
eventType: 'add'
|
|
65
|
-
});
|
|
97
|
+
hooksRunner.fileChange({ filename: name, eventType: "add" });
|
|
66
98
|
});
|
|
67
|
-
watcher.on(
|
|
99
|
+
watcher.on("unlink", (name) => {
|
|
68
100
|
debug(`remove file: %s`, name);
|
|
69
101
|
if (hashMap.has(name)) {
|
|
70
102
|
hashMap.delete(name);
|
|
71
103
|
}
|
|
72
|
-
hooksRunner.fileChange({
|
|
73
|
-
filename: name,
|
|
74
|
-
eventType: 'unlink'
|
|
75
|
-
});
|
|
104
|
+
hooksRunner.fileChange({ filename: name, eventType: "unlink" });
|
|
76
105
|
});
|
|
77
|
-
watcher.on(
|
|
106
|
+
watcher.on("error", (err) => {
|
|
78
107
|
throw err;
|
|
79
108
|
});
|
|
80
109
|
return watcher;
|
|
81
110
|
}
|
|
82
|
-
};
|
|
111
|
+
});
|
|
112
|
+
export {
|
|
113
|
+
addServerConfigToDeps,
|
|
114
|
+
createFileWatcher
|
|
115
|
+
};
|
|
@@ -1,29 +1,75 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __defProps = Object.defineProperties;
|
|
3
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
4
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
7
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
8
|
+
var __spreadValues = (a, b) => {
|
|
9
|
+
for (var prop in b || (b = {}))
|
|
10
|
+
if (__hasOwnProp.call(b, prop))
|
|
11
|
+
__defNormalProp(a, prop, b[prop]);
|
|
12
|
+
if (__getOwnPropSymbols)
|
|
13
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
14
|
+
if (__propIsEnum.call(b, prop))
|
|
15
|
+
__defNormalProp(a, prop, b[prop]);
|
|
16
|
+
}
|
|
17
|
+
return a;
|
|
18
|
+
};
|
|
19
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
|
+
var __async = (__this, __arguments, generator) => {
|
|
21
|
+
return new Promise((resolve, reject) => {
|
|
22
|
+
var fulfilled = (value) => {
|
|
23
|
+
try {
|
|
24
|
+
step(generator.next(value));
|
|
25
|
+
} catch (e) {
|
|
26
|
+
reject(e);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
var rejected = (value) => {
|
|
30
|
+
try {
|
|
31
|
+
step(generator.throw(value));
|
|
32
|
+
} catch (e) {
|
|
33
|
+
reject(e);
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
37
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
import { Server } from "@modern-js/server";
|
|
5
41
|
let server = null;
|
|
6
|
-
|
|
7
|
-
|
|
42
|
+
const getServer = () => server;
|
|
43
|
+
const setServer = (newServer) => {
|
|
44
|
+
server = newServer;
|
|
45
|
+
};
|
|
46
|
+
const closeServer = () => __async(void 0, null, function* () {
|
|
8
47
|
if (server) {
|
|
9
|
-
|
|
48
|
+
yield server.close();
|
|
10
49
|
server = null;
|
|
11
50
|
}
|
|
12
|
-
};
|
|
13
|
-
|
|
51
|
+
});
|
|
52
|
+
const createServer = (options) => __async(void 0, null, function* () {
|
|
14
53
|
if (server) {
|
|
15
|
-
|
|
54
|
+
yield server.close();
|
|
16
55
|
}
|
|
17
56
|
server = new Server(options);
|
|
18
|
-
const app =
|
|
57
|
+
const app = yield server.init();
|
|
19
58
|
return app;
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
const DataLoaderPlugin = require.resolve(
|
|
23
|
-
return
|
|
24
|
-
|
|
59
|
+
});
|
|
60
|
+
const injectDataLoaderPlugin = (internalPlugins) => {
|
|
61
|
+
const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
|
|
62
|
+
return __spreadProps(__spreadValues({}, internalPlugins), {
|
|
63
|
+
"@modern-js/plugin-data-loader": {
|
|
25
64
|
path: DataLoaderPlugin,
|
|
26
65
|
forced: true
|
|
27
66
|
}
|
|
28
67
|
});
|
|
29
|
-
};
|
|
68
|
+
};
|
|
69
|
+
export {
|
|
70
|
+
closeServer,
|
|
71
|
+
createServer,
|
|
72
|
+
getServer,
|
|
73
|
+
injectDataLoaderPlugin,
|
|
74
|
+
setServer
|
|
75
|
+
};
|
|
@@ -1,30 +1,57 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
var __async = (__this, __arguments, generator) => {
|
|
2
|
+
return new Promise((resolve, reject) => {
|
|
3
|
+
var fulfilled = (value) => {
|
|
4
|
+
try {
|
|
5
|
+
step(generator.next(value));
|
|
6
|
+
} catch (e) {
|
|
7
|
+
reject(e);
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
var rejected = (value) => {
|
|
11
|
+
try {
|
|
12
|
+
step(generator.throw(value));
|
|
13
|
+
} catch (e) {
|
|
14
|
+
reject(e);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
18
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
import { inquirer } from "@modern-js/utils";
|
|
22
|
+
const getSpecifiedEntries = (entry, entrypoints) => __async(void 0, null, function* () {
|
|
23
|
+
const entryNames = entrypoints.map((e) => e.entryName);
|
|
4
24
|
if (!entry) {
|
|
5
25
|
return entryNames;
|
|
6
26
|
}
|
|
7
|
-
if (typeof entry ===
|
|
8
|
-
const {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
27
|
+
if (typeof entry === "boolean") {
|
|
28
|
+
const { selected } = yield inquirer.prompt([
|
|
29
|
+
{
|
|
30
|
+
type: "checkbox",
|
|
31
|
+
name: "selected",
|
|
32
|
+
choices: entryNames,
|
|
33
|
+
message: "请选择需要构建的入口",
|
|
34
|
+
validate(answer) {
|
|
35
|
+
if (answer.length < 1) {
|
|
36
|
+
return "You must choose at least one topping.";
|
|
37
|
+
}
|
|
38
|
+
return true;
|
|
18
39
|
}
|
|
19
|
-
return true;
|
|
20
40
|
}
|
|
21
|
-
|
|
41
|
+
]);
|
|
22
42
|
return selected;
|
|
23
43
|
}
|
|
24
|
-
entry.forEach(name => {
|
|
44
|
+
entry.forEach((name) => {
|
|
25
45
|
if (!entryNames.includes(name)) {
|
|
26
|
-
throw new Error(
|
|
46
|
+
throw new Error(
|
|
47
|
+
`can not found entry ${name}, compiler entry should in ${entryNames.join(
|
|
48
|
+
", "
|
|
49
|
+
)}`
|
|
50
|
+
);
|
|
27
51
|
}
|
|
28
52
|
});
|
|
29
53
|
return entry;
|
|
30
|
-
};
|
|
54
|
+
});
|
|
55
|
+
export {
|
|
56
|
+
getSpecifiedEntries
|
|
57
|
+
};
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
import { I18CLILanguageDetector } from
|
|
2
|
-
|
|
1
|
+
import { I18CLILanguageDetector } from "@modern-js/plugin-i18n/language-detector";
|
|
2
|
+
function getLocaleLanguage() {
|
|
3
3
|
const detector = new I18CLILanguageDetector();
|
|
4
4
|
return detector.detect();
|
|
5
|
-
}
|
|
5
|
+
}
|
|
6
|
+
export {
|
|
7
|
+
getLocaleLanguage
|
|
8
|
+
};
|
|
@@ -1,12 +1,31 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
var __async = (__this, __arguments, generator) => {
|
|
2
|
+
return new Promise((resolve, reject) => {
|
|
3
|
+
var fulfilled = (value) => {
|
|
4
|
+
try {
|
|
5
|
+
step(generator.next(value));
|
|
6
|
+
} catch (e) {
|
|
7
|
+
reject(e);
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
var rejected = (value) => {
|
|
11
|
+
try {
|
|
12
|
+
step(generator.throw(value));
|
|
13
|
+
} catch (e) {
|
|
14
|
+
reject(e);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
18
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
import { prettyInstructions, logger } from "@modern-js/utils";
|
|
22
|
+
const printInstructions = (hookRunners, appContext, config) => __async(void 0, null, function* () {
|
|
3
23
|
const message = prettyInstructions(appContext, config);
|
|
4
|
-
|
|
5
|
-
// call beforePrintInstructions hook.
|
|
6
|
-
const {
|
|
7
|
-
instructions
|
|
8
|
-
} = await hookRunners.beforePrintInstructions({
|
|
24
|
+
const { instructions } = yield hookRunners.beforePrintInstructions({
|
|
9
25
|
instructions: message
|
|
10
26
|
});
|
|
11
27
|
logger.info(instructions);
|
|
12
|
-
};
|
|
28
|
+
});
|
|
29
|
+
export {
|
|
30
|
+
printInstructions
|
|
31
|
+
};
|
|
@@ -1,17 +1,44 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
1
|
+
var __async = (__this, __arguments, generator) => {
|
|
2
|
+
return new Promise((resolve, reject) => {
|
|
3
|
+
var fulfilled = (value) => {
|
|
4
|
+
try {
|
|
5
|
+
step(generator.next(value));
|
|
6
|
+
} catch (e) {
|
|
7
|
+
reject(e);
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
var rejected = (value) => {
|
|
11
|
+
try {
|
|
12
|
+
step(generator.throw(value));
|
|
13
|
+
} catch (e) {
|
|
14
|
+
reject(e);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
18
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
import { cli } from "@modern-js/core";
|
|
22
|
+
import { chalk, clearConsole, logger, program } from "@modern-js/utils";
|
|
23
|
+
function restart(hooksRunner, filename) {
|
|
24
|
+
return __async(this, null, function* () {
|
|
25
|
+
clearConsole();
|
|
26
|
+
logger.info(`Restart because ${chalk.yellow(filename)} is changed...
|
|
27
|
+
`);
|
|
28
|
+
let hasGetError = false;
|
|
29
|
+
yield hooksRunner.beforeRestart();
|
|
30
|
+
try {
|
|
31
|
+
yield cli.init(cli.getPrevInitOptions());
|
|
32
|
+
} catch (err) {
|
|
33
|
+
console.error(err);
|
|
34
|
+
hasGetError = true;
|
|
35
|
+
} finally {
|
|
36
|
+
if (!hasGetError) {
|
|
37
|
+
program.parse(process.argv);
|
|
38
|
+
}
|
|
15
39
|
}
|
|
16
|
-
}
|
|
17
|
-
}
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
export {
|
|
43
|
+
restart
|
|
44
|
+
};
|
|
@@ -1,13 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
1
|
+
var __async = (__this, __arguments, generator) => {
|
|
2
|
+
return new Promise((resolve, reject) => {
|
|
3
|
+
var fulfilled = (value) => {
|
|
4
|
+
try {
|
|
5
|
+
step(generator.next(value));
|
|
6
|
+
} catch (e) {
|
|
7
|
+
reject(e);
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
var rejected = (value) => {
|
|
11
|
+
try {
|
|
12
|
+
step(generator.throw(value));
|
|
13
|
+
} catch (e) {
|
|
14
|
+
reject(e);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
18
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
import path from "path";
|
|
22
|
+
import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
|
|
23
|
+
const generateRoutes = (appContext) => __async(void 0, null, function* () {
|
|
24
|
+
const { serverRoutes, distDirectory } = appContext;
|
|
25
|
+
const output = JSON.stringify({ routes: serverRoutes }, null, 2);
|
|
26
|
+
yield fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
|
|
27
|
+
});
|
|
28
|
+
export {
|
|
29
|
+
generateRoutes
|
|
12
30
|
};
|
|
13
|
-
export { generateRoutes };
|