@modern-js/app-tools 2.19.0 → 2.20.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 +69 -0
- package/dist/cjs/analyze/generateCode.js +4 -47
- package/dist/cjs/analyze/getBundleEntry.js +2 -6
- package/dist/cjs/analyze/getClientRoutes/getRoutes.js +2 -6
- package/dist/cjs/analyze/getClientRoutes/getRoutesLegacy.js +2 -6
- package/dist/cjs/analyze/getClientRoutes/utils.js +2 -6
- package/dist/cjs/analyze/getFileSystemEntry.js +3 -7
- package/dist/cjs/analyze/getHtmlTemplate.js +4 -47
- package/dist/cjs/analyze/getServerRoutes.js +5 -7
- package/dist/cjs/analyze/index.js +7 -46
- package/dist/cjs/analyze/isDefaultExportFunction.js +5 -48
- package/dist/cjs/analyze/nestedRoutes.js +2 -41
- package/dist/cjs/analyze/templates.js +2 -6
- package/dist/cjs/analyze/utils.js +3 -7
- package/dist/cjs/builder/builder-rspack/adapterCopy.js +3 -7
- package/dist/cjs/builder/builder-webpack/index.js +2 -41
- package/dist/cjs/builder/generator/index.js +3 -42
- package/dist/cjs/builder/index.js +4 -43
- package/dist/cjs/builder/shared/builderPlugins/adapterHtml.js +2 -41
- package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js +5 -43
- package/dist/cjs/builder/shared/builderPlugins/index.js +4 -16
- package/dist/cjs/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +3 -15
- package/dist/cjs/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +5 -17
- package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js +2 -6
- package/dist/cjs/builder/shared/bundlerPlugins/index.js +4 -16
- package/dist/cjs/builder/shared/createCopyInfo.js +2 -6
- package/dist/cjs/builder/shared/index.js +4 -16
- package/dist/cjs/commands/index.js +4 -16
- package/dist/cjs/commands/serve.js +2 -6
- package/dist/cjs/config/index.js +4 -16
- package/dist/cjs/config/initialize/inits.js +2 -41
- package/dist/cjs/index.js +30 -74
- package/dist/cjs/schema/Schema.js +2 -14
- package/dist/cjs/schema/index.js +2 -6
- package/dist/cjs/types/config/index.js +2 -14
- package/dist/cjs/types/index.js +4 -16
- package/dist/cjs/utils/config.js +2 -41
- package/dist/cjs/utils/generateWatchFiles.js +2 -6
- package/dist/cjs/utils/routes.js +2 -6
- package/dist/esm/analyze/generateCode.js +5 -167
- package/dist/esm/analyze/getClientRoutes/getRoutes.js +2 -52
- package/dist/esm/analyze/getClientRoutes/getRoutesLegacy.js +2 -52
- package/dist/esm/analyze/getHtmlTemplate.js +6 -151
- package/dist/esm/analyze/getServerRoutes.js +6 -118
- package/dist/esm/analyze/index.js +13 -249
- package/dist/esm/analyze/nestedRoutes.js +5 -184
- package/dist/esm/analyze/templates.js +6 -242
- package/dist/esm/analyze/utils.js +6 -205
- package/dist/esm/builder/builder-rspack/adapterCopy.js +9 -221
- package/dist/esm/builder/builder-webpack/adapterModern.js +1 -34
- package/dist/esm/builder/builder-webpack/index.js +7 -219
- package/dist/esm/builder/generator/createBuilderProviderConfig.js +2 -52
- package/dist/esm/builder/generator/index.js +4 -133
- package/dist/esm/builder/index.js +3 -132
- package/dist/esm/builder/shared/builderPlugins/adapterHtml.js +7 -185
- package/dist/esm/builder/shared/builderPlugins/adapterSSR.js +8 -136
- package/dist/esm/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +4 -69
- package/dist/esm/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +3 -35
- package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js +7 -226
- package/dist/esm/commands/build.js +5 -184
- package/dist/esm/commands/deploy.js +3 -132
- package/dist/esm/commands/dev.js +6 -185
- package/dist/esm/commands/inspect.js +3 -132
- package/dist/esm/commands/serve.js +6 -185
- package/dist/esm/config/default.js +3 -52
- package/dist/esm/config/initialize/inits.js +3 -86
- package/dist/esm/defineConfig.js +2 -52
- package/dist/esm/index.js +36 -198
- package/dist/esm/initialize/index.js +6 -185
- package/dist/esm/schema/Schema.js +8 -213
- package/dist/esm/schema/index.js +1 -13
- package/dist/esm/schema/legacy.js +1 -13
- package/dist/esm/utils/config.js +7 -186
- package/dist/esm/utils/createServer.js +6 -185
- package/dist/esm/utils/generateWatchFiles.js +5 -167
- package/dist/esm/utils/getSelectedEntries.js +3 -132
- package/dist/esm/utils/getServerInternalPlugins.js +5 -184
- package/dist/esm/utils/printInstructions.js +3 -132
- package/dist/esm/utils/restart.js +3 -132
- package/dist/esm/utils/routes.js +3 -132
- package/dist/esm-node/analyze/getServerRoutes.js +2 -0
- package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js +3 -2
- package/dist/esm-node/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +1 -13
- package/dist/esm-node/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +1 -13
- package/dist/esm-node/index.js +11 -0
- package/dist/esm-node/schema/Schema.js +1 -13
- package/dist/types/types/config/output.d.ts +1 -0
- package/dist/types/types/legacyConfig/output.d.ts +2 -2
- package/lib/types.d.ts +8 -8
- package/package.json +25 -25
package/dist/cjs/index.js
CHANGED
|
@@ -15,84 +15,29 @@ _export(exports, {
|
|
|
15
15
|
buildCommand: () => buildCommand,
|
|
16
16
|
default: () => _default
|
|
17
17
|
});
|
|
18
|
-
const
|
|
19
|
-
const
|
|
18
|
+
const _export_star = require("@swc/helpers/_/_export_star");
|
|
19
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
20
|
+
const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
|
|
21
|
+
const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
|
|
22
|
+
const _pluginlint = /* @__PURE__ */ _interop_require_default._(require("@modern-js/plugin-lint"));
|
|
20
23
|
const _utils = require("@modern-js/utils");
|
|
21
24
|
const _lodash = require("@modern-js/utils/lodash");
|
|
22
25
|
const _languagedetector = require("@modern-js/plugin-i18n/language-detector");
|
|
23
|
-
const _analyze = /* @__PURE__ */ _interop_require_default(require("./analyze"));
|
|
24
|
-
const _initialize = /* @__PURE__ */ _interop_require_default(require("./initialize"));
|
|
26
|
+
const _analyze = /* @__PURE__ */ _interop_require_default._(require("./analyze"));
|
|
27
|
+
const _initialize = /* @__PURE__ */ _interop_require_default._(require("./initialize"));
|
|
25
28
|
const _hooks = require("./hooks");
|
|
26
29
|
const _locale = require("./locale");
|
|
27
30
|
const _restart = require("./utils/restart");
|
|
28
31
|
const _generateWatchFiles = require("./utils/generateWatchFiles");
|
|
29
32
|
const _core = require("@modern-js/core");
|
|
30
|
-
_export_star(require("./defineConfig"), exports);
|
|
31
|
-
_export_star(require("./types"), exports);
|
|
32
|
-
function _export_star(from, to) {
|
|
33
|
-
Object.keys(from).forEach(function(k) {
|
|
34
|
-
if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
|
|
35
|
-
Object.defineProperty(to, k, {
|
|
36
|
-
enumerable: true,
|
|
37
|
-
get: function() {
|
|
38
|
-
return from[k];
|
|
39
|
-
}
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
return from;
|
|
44
|
-
}
|
|
45
|
-
function _interop_require_default(obj) {
|
|
46
|
-
return obj && obj.__esModule ? obj : {
|
|
47
|
-
default: obj
|
|
48
|
-
};
|
|
49
|
-
}
|
|
50
|
-
function _getRequireWildcardCache(nodeInterop) {
|
|
51
|
-
if (typeof WeakMap !== "function")
|
|
52
|
-
return null;
|
|
53
|
-
var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
|
|
54
|
-
var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
|
|
55
|
-
return (_getRequireWildcardCache = function(nodeInterop2) {
|
|
56
|
-
return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
|
|
57
|
-
})(nodeInterop);
|
|
58
|
-
}
|
|
59
|
-
function _interop_require_wildcard(obj, nodeInterop) {
|
|
60
|
-
if (!nodeInterop && obj && obj.__esModule) {
|
|
61
|
-
return obj;
|
|
62
|
-
}
|
|
63
|
-
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
64
|
-
return {
|
|
65
|
-
default: obj
|
|
66
|
-
};
|
|
67
|
-
}
|
|
68
|
-
var cache = _getRequireWildcardCache(nodeInterop);
|
|
69
|
-
if (cache && cache.has(obj)) {
|
|
70
|
-
return cache.get(obj);
|
|
71
|
-
}
|
|
72
|
-
var newObj = {};
|
|
73
|
-
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
74
|
-
for (var key in obj) {
|
|
75
|
-
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
76
|
-
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
77
|
-
if (desc && (desc.get || desc.set)) {
|
|
78
|
-
Object.defineProperty(newObj, key, desc);
|
|
79
|
-
} else {
|
|
80
|
-
newObj[key] = obj[key];
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
newObj.default = obj;
|
|
85
|
-
if (cache) {
|
|
86
|
-
cache.set(obj, newObj);
|
|
87
|
-
}
|
|
88
|
-
return newObj;
|
|
89
|
-
}
|
|
33
|
+
_export_star._(require("./defineConfig"), exports);
|
|
34
|
+
_export_star._(require("./types"), exports);
|
|
90
35
|
const upgradeModel = _utils.Import.lazy("@modern-js/upgrade", require);
|
|
91
36
|
const devCommand = async (program, api) => {
|
|
92
37
|
const runner = api.useHookRunners();
|
|
93
38
|
const devToolMetas = await runner.registerDev();
|
|
94
39
|
const devProgram = program.command("dev").alias("start").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.dev.describe)).option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).option("-e --entry [entry...]", _locale.i18n.t(_locale.localeKeys.command.dev.entry)).option("--analyze", _locale.i18n.t(_locale.localeKeys.command.shared.analyze)).option("--api-only", _locale.i18n.t(_locale.localeKeys.command.dev.apiOnly)).option("--web-only", _locale.i18n.t(_locale.localeKeys.command.dev.webOnly)).action(async (options) => {
|
|
95
|
-
const { dev } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/dev")));
|
|
40
|
+
const { dev } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/dev")));
|
|
96
41
|
await dev(api, options);
|
|
97
42
|
});
|
|
98
43
|
for (const meta of devToolMetas) {
|
|
@@ -102,7 +47,7 @@ const devCommand = async (program, api) => {
|
|
|
102
47
|
for (const subCmd of meta.subCommands) {
|
|
103
48
|
devProgram.command(subCmd).action(async (options = {}) => {
|
|
104
49
|
const { appDirectory } = api.useAppContext();
|
|
105
|
-
const { isTypescript } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("@modern-js/utils")));
|
|
50
|
+
const { isTypescript } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils")));
|
|
106
51
|
await runner.beforeDevTask(meta);
|
|
107
52
|
await meta.action(options, {
|
|
108
53
|
isTsProject: isTypescript(appDirectory)
|
|
@@ -115,7 +60,7 @@ const buildCommand = async (program, api) => {
|
|
|
115
60
|
const runner = api.useHookRunners();
|
|
116
61
|
const platformBuilders = await runner.registerBuildPlatform();
|
|
117
62
|
const buildProgram = program.command("build").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.build.describe)).option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).option("--analyze", _locale.i18n.t(_locale.localeKeys.command.shared.analyze)).action(async (options) => {
|
|
118
|
-
const { build } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/build")));
|
|
63
|
+
const { build } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/build")));
|
|
119
64
|
await build(api, options);
|
|
120
65
|
});
|
|
121
66
|
for (const platformBuilder of platformBuilders) {
|
|
@@ -123,7 +68,7 @@ const buildCommand = async (program, api) => {
|
|
|
123
68
|
for (const platform of platforms) {
|
|
124
69
|
buildProgram.command(platform).action(async () => {
|
|
125
70
|
const { appDirectory } = api.useAppContext();
|
|
126
|
-
const { isTypescript } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("@modern-js/utils")));
|
|
71
|
+
const { isTypescript } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils")));
|
|
127
72
|
await runner.beforeBuildPlatform(platformBuilders);
|
|
128
73
|
await platformBuilder.build(platform, {
|
|
129
74
|
isTsProject: isTypescript(appDirectory)
|
|
@@ -163,29 +108,40 @@ const _default = (options = {
|
|
|
163
108
|
locale
|
|
164
109
|
});
|
|
165
110
|
return {
|
|
111
|
+
async beforeConfig() {
|
|
112
|
+
var _userConfig_output;
|
|
113
|
+
const userConfig = api.useConfigContext();
|
|
114
|
+
const appContext = api.useAppContext();
|
|
115
|
+
if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
|
|
116
|
+
api.setAppContext({
|
|
117
|
+
...appContext,
|
|
118
|
+
internalDirectory: _path.default.resolve(appContext.appDirectory, userConfig.output.tempDir)
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
},
|
|
166
122
|
async commands({ program }) {
|
|
167
123
|
await devCommand(program, api);
|
|
168
124
|
await buildCommand(program, api);
|
|
169
125
|
program.command("serve").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.serve.describe)).option("--api-only", _locale.i18n.t(_locale.localeKeys.command.dev.apiOnly)).option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).action(async () => {
|
|
170
|
-
const { start } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/serve")));
|
|
126
|
+
const { start } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/serve")));
|
|
171
127
|
await start(api);
|
|
172
128
|
});
|
|
173
129
|
program.command("deploy").usage("[options]").option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).description(_locale.i18n.t(_locale.localeKeys.command.deploy.describe)).action(async (options2) => {
|
|
174
|
-
const { build } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/build")));
|
|
130
|
+
const { build } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/build")));
|
|
175
131
|
await build(api);
|
|
176
|
-
const { deploy } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/deploy")));
|
|
132
|
+
const { deploy } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/deploy")));
|
|
177
133
|
await deploy(api, options2);
|
|
178
134
|
process.exit(0);
|
|
179
135
|
});
|
|
180
136
|
program.command("new").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.new.describe)).option("--lang <lang>", _locale.i18n.t(_locale.localeKeys.command.new.lang)).option("-c, --config <config>", _locale.i18n.t(_locale.localeKeys.command.new.config)).option("-d, --debug", _locale.i18n.t(_locale.localeKeys.command.new.debug), false).option("--dist-tag <tag>", _locale.i18n.t(_locale.localeKeys.command.new.distTag)).option("--registry", _locale.i18n.t(_locale.localeKeys.command.new.registry)).action(async (options2) => {
|
|
181
|
-
const { MWANewAction } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("@modern-js/new-action")));
|
|
137
|
+
const { MWANewAction } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/new-action")));
|
|
182
138
|
await MWANewAction({
|
|
183
139
|
...options2,
|
|
184
140
|
locale: options2.lang || locale
|
|
185
141
|
});
|
|
186
142
|
});
|
|
187
143
|
program.command("inspect").description("inspect the internal configs").option(`--env <env>`, _locale.i18n.t(_locale.localeKeys.command.inspect.env), "development").option("--output <output>", _locale.i18n.t(_locale.localeKeys.command.inspect.output), "/").option("--verbose", _locale.i18n.t(_locale.localeKeys.command.inspect.verbose)).option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).action(async (options2) => {
|
|
188
|
-
const { inspect } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/inspect")));
|
|
144
|
+
const { inspect } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/inspect")));
|
|
189
145
|
inspect(api, options2);
|
|
190
146
|
});
|
|
191
147
|
upgradeModel.defineCommand(program.command("upgrade"));
|
|
@@ -212,7 +168,7 @@ const _default = (options = {
|
|
|
212
168
|
const { appDirectory, srcDirectory } = appContext;
|
|
213
169
|
const absolutePath = _path.default.resolve(appDirectory, filename);
|
|
214
170
|
if (!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")) {
|
|
215
|
-
const { closeServer } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./utils/createServer")));
|
|
171
|
+
const { closeServer } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./utils/createServer")));
|
|
216
172
|
await closeServer();
|
|
217
173
|
await (0, _restart.restart)(api.useHookRunners(), filename);
|
|
218
174
|
}
|
|
@@ -6,20 +6,8 @@ Object.defineProperty(exports, "Schema", {
|
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: () => Schema
|
|
8
8
|
});
|
|
9
|
+
const _define_property = require("@swc/helpers/_/_define_property");
|
|
9
10
|
const _lodash = require("@modern-js/utils/lodash");
|
|
10
|
-
function _define_property(obj, key, value) {
|
|
11
|
-
if (key in obj) {
|
|
12
|
-
Object.defineProperty(obj, key, {
|
|
13
|
-
value,
|
|
14
|
-
enumerable: true,
|
|
15
|
-
configurable: true,
|
|
16
|
-
writable: true
|
|
17
|
-
});
|
|
18
|
-
} else {
|
|
19
|
-
obj[key] = value;
|
|
20
|
-
}
|
|
21
|
-
return obj;
|
|
22
|
-
}
|
|
23
11
|
class Schema extends Map {
|
|
24
12
|
setSchema(key, object) {
|
|
25
13
|
Object.entries(object).forEach(([k, v]) => {
|
|
@@ -53,7 +41,7 @@ class Schema extends Map {
|
|
|
53
41
|
}
|
|
54
42
|
constructor(baseSchema = {}) {
|
|
55
43
|
super();
|
|
56
|
-
_define_property(this, "schema", void 0);
|
|
44
|
+
_define_property._(this, "schema", void 0);
|
|
57
45
|
this.schema = baseSchema;
|
|
58
46
|
}
|
|
59
47
|
}
|
package/dist/cjs/schema/index.js
CHANGED
|
@@ -13,14 +13,10 @@ _export(exports, {
|
|
|
13
13
|
legacySchema: () => _legacy.default,
|
|
14
14
|
schema: () => schema
|
|
15
15
|
});
|
|
16
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
16
17
|
const _utils = require("@modern-js/utils");
|
|
17
18
|
const _Schema = require("./Schema");
|
|
18
|
-
const _legacy = /* @__PURE__ */ _interop_require_default(require("./legacy"));
|
|
19
|
-
function _interop_require_default(obj) {
|
|
20
|
-
return obj && obj.__esModule ? obj : {
|
|
21
|
-
default: obj
|
|
22
|
-
};
|
|
23
|
-
}
|
|
19
|
+
const _legacy = /* @__PURE__ */ _interop_require_default._(require("./legacy"));
|
|
24
20
|
const source = {
|
|
25
21
|
entries: {
|
|
26
22
|
type: "object",
|
|
@@ -2,17 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
_export_star
|
|
6
|
-
|
|
7
|
-
Object.keys(from).forEach(function(k) {
|
|
8
|
-
if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
|
|
9
|
-
Object.defineProperty(to, k, {
|
|
10
|
-
enumerable: true,
|
|
11
|
-
get: function() {
|
|
12
|
-
return from[k];
|
|
13
|
-
}
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
});
|
|
17
|
-
return from;
|
|
18
|
-
}
|
|
5
|
+
const _export_star = require("@swc/helpers/_/_export_star");
|
|
6
|
+
_export_star._(require("./output"), exports);
|
package/dist/cjs/types/index.js
CHANGED
|
@@ -2,19 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
_export_star
|
|
6
|
-
_export_star(require("./
|
|
7
|
-
_export_star(require("./
|
|
8
|
-
|
|
9
|
-
Object.keys(from).forEach(function(k) {
|
|
10
|
-
if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
|
|
11
|
-
Object.defineProperty(to, k, {
|
|
12
|
-
enumerable: true,
|
|
13
|
-
get: function() {
|
|
14
|
-
return from[k];
|
|
15
|
-
}
|
|
16
|
-
});
|
|
17
|
-
}
|
|
18
|
-
});
|
|
19
|
-
return from;
|
|
20
|
-
}
|
|
5
|
+
const _export_star = require("@swc/helpers/_/_export_star");
|
|
6
|
+
_export_star._(require("./hooks"), exports);
|
|
7
|
+
_export_star._(require("./config"), exports);
|
|
8
|
+
_export_star._(require("./legacyConfig"), exports);
|
package/dist/cjs/utils/config.js
CHANGED
|
@@ -15,49 +15,10 @@ _export(exports, {
|
|
|
15
15
|
safeReplacer: () => safeReplacer,
|
|
16
16
|
emitResolvedConfig: () => emitResolvedConfig
|
|
17
17
|
});
|
|
18
|
-
const
|
|
18
|
+
const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
|
|
19
|
+
const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
|
|
19
20
|
const _nodebundlerequire = require("@modern-js/node-bundle-require");
|
|
20
21
|
const _utils = require("@modern-js/utils");
|
|
21
|
-
function _getRequireWildcardCache(nodeInterop) {
|
|
22
|
-
if (typeof WeakMap !== "function")
|
|
23
|
-
return null;
|
|
24
|
-
var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
|
|
25
|
-
var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
|
|
26
|
-
return (_getRequireWildcardCache = function(nodeInterop2) {
|
|
27
|
-
return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
|
|
28
|
-
})(nodeInterop);
|
|
29
|
-
}
|
|
30
|
-
function _interop_require_wildcard(obj, nodeInterop) {
|
|
31
|
-
if (!nodeInterop && obj && obj.__esModule) {
|
|
32
|
-
return obj;
|
|
33
|
-
}
|
|
34
|
-
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
35
|
-
return {
|
|
36
|
-
default: obj
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
var cache = _getRequireWildcardCache(nodeInterop);
|
|
40
|
-
if (cache && cache.has(obj)) {
|
|
41
|
-
return cache.get(obj);
|
|
42
|
-
}
|
|
43
|
-
var newObj = {};
|
|
44
|
-
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
45
|
-
for (var key in obj) {
|
|
46
|
-
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
47
|
-
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
48
|
-
if (desc && (desc.get || desc.set)) {
|
|
49
|
-
Object.defineProperty(newObj, key, desc);
|
|
50
|
-
} else {
|
|
51
|
-
newObj[key] = obj[key];
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
newObj.default = obj;
|
|
56
|
-
if (cache) {
|
|
57
|
-
cache.set(obj, newObj);
|
|
58
|
-
}
|
|
59
|
-
return newObj;
|
|
60
|
-
}
|
|
61
22
|
const defineServerConfig = (config) => config;
|
|
62
23
|
const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options }) => {
|
|
63
24
|
const configFilePath = await (0, _utils.getServerConfig)(appDirectory, configFile);
|
|
@@ -13,13 +13,9 @@ _export(exports, {
|
|
|
13
13
|
addServerConfigToDeps: () => addServerConfigToDeps,
|
|
14
14
|
generateWatchFiles: () => generateWatchFiles
|
|
15
15
|
});
|
|
16
|
-
const
|
|
16
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
17
|
+
const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
|
|
17
18
|
const _utils = require("@modern-js/utils");
|
|
18
|
-
function _interop_require_default(obj) {
|
|
19
|
-
return obj && obj.__esModule ? obj : {
|
|
20
|
-
default: obj
|
|
21
|
-
};
|
|
22
|
-
}
|
|
23
19
|
const getPackageConfig = (appDirectory, packageJsonConfig) => {
|
|
24
20
|
const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
|
|
25
21
|
const json = JSON.parse(_utils.fs.readFileSync(_path.default.resolve(appDirectory, "./package.json"), "utf8"));
|
package/dist/cjs/utils/routes.js
CHANGED
|
@@ -6,13 +6,9 @@ Object.defineProperty(exports, "generateRoutes", {
|
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: () => generateRoutes
|
|
8
8
|
});
|
|
9
|
-
const
|
|
9
|
+
const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
10
|
+
const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
|
|
10
11
|
const _utils = require("@modern-js/utils");
|
|
11
|
-
function _interop_require_default(obj) {
|
|
12
|
-
return obj && obj.__esModule ? obj : {
|
|
13
|
-
default: obj
|
|
14
|
-
};
|
|
15
|
-
}
|
|
16
12
|
const generateRoutes = async (appContext) => {
|
|
17
13
|
const { serverRoutes, distDirectory } = appContext;
|
|
18
14
|
const output = JSON.stringify({
|
|
@@ -1,168 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
5
|
-
arr2[i] = arr[i];
|
|
6
|
-
return arr2;
|
|
7
|
-
}
|
|
8
|
-
function _array_without_holes(arr) {
|
|
9
|
-
if (Array.isArray(arr))
|
|
10
|
-
return _array_like_to_array(arr);
|
|
11
|
-
}
|
|
12
|
-
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
13
|
-
try {
|
|
14
|
-
var info = gen[key](arg);
|
|
15
|
-
var value = info.value;
|
|
16
|
-
} catch (error) {
|
|
17
|
-
reject(error);
|
|
18
|
-
return;
|
|
19
|
-
}
|
|
20
|
-
if (info.done) {
|
|
21
|
-
resolve(value);
|
|
22
|
-
} else {
|
|
23
|
-
Promise.resolve(value).then(_next, _throw);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
function _async_to_generator(fn) {
|
|
27
|
-
return function() {
|
|
28
|
-
var self = this, args = arguments;
|
|
29
|
-
return new Promise(function(resolve, reject) {
|
|
30
|
-
var gen = fn.apply(self, args);
|
|
31
|
-
function _next(value) {
|
|
32
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
33
|
-
}
|
|
34
|
-
function _throw(err) {
|
|
35
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
36
|
-
}
|
|
37
|
-
_next(void 0);
|
|
38
|
-
});
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
|
-
function _iterable_to_array(iter) {
|
|
42
|
-
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
|
|
43
|
-
return Array.from(iter);
|
|
44
|
-
}
|
|
45
|
-
function _non_iterable_spread() {
|
|
46
|
-
throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
47
|
-
}
|
|
48
|
-
function _to_consumable_array(arr) {
|
|
49
|
-
return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
|
|
50
|
-
}
|
|
51
|
-
function _unsupported_iterable_to_array(o, minLen) {
|
|
52
|
-
if (!o)
|
|
53
|
-
return;
|
|
54
|
-
if (typeof o === "string")
|
|
55
|
-
return _array_like_to_array(o, minLen);
|
|
56
|
-
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
57
|
-
if (n === "Object" && o.constructor)
|
|
58
|
-
n = o.constructor.name;
|
|
59
|
-
if (n === "Map" || n === "Set")
|
|
60
|
-
return Array.from(n);
|
|
61
|
-
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
|
|
62
|
-
return _array_like_to_array(o, minLen);
|
|
63
|
-
}
|
|
64
|
-
var __generator = function(thisArg, body) {
|
|
65
|
-
var f, y, t, g, _ = {
|
|
66
|
-
label: 0,
|
|
67
|
-
sent: function() {
|
|
68
|
-
if (t[0] & 1)
|
|
69
|
-
throw t[1];
|
|
70
|
-
return t[1];
|
|
71
|
-
},
|
|
72
|
-
trys: [],
|
|
73
|
-
ops: []
|
|
74
|
-
};
|
|
75
|
-
return g = {
|
|
76
|
-
next: verb(0),
|
|
77
|
-
"throw": verb(1),
|
|
78
|
-
"return": verb(2)
|
|
79
|
-
}, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
|
|
80
|
-
return this;
|
|
81
|
-
}), g;
|
|
82
|
-
function verb(n) {
|
|
83
|
-
return function(v) {
|
|
84
|
-
return step([
|
|
85
|
-
n,
|
|
86
|
-
v
|
|
87
|
-
]);
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
|
-
function step(op) {
|
|
91
|
-
if (f)
|
|
92
|
-
throw new TypeError("Generator is already executing.");
|
|
93
|
-
while (_)
|
|
94
|
-
try {
|
|
95
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
|
|
96
|
-
return t;
|
|
97
|
-
if (y = 0, t)
|
|
98
|
-
op = [
|
|
99
|
-
op[0] & 2,
|
|
100
|
-
t.value
|
|
101
|
-
];
|
|
102
|
-
switch (op[0]) {
|
|
103
|
-
case 0:
|
|
104
|
-
case 1:
|
|
105
|
-
t = op;
|
|
106
|
-
break;
|
|
107
|
-
case 4:
|
|
108
|
-
_.label++;
|
|
109
|
-
return {
|
|
110
|
-
value: op[1],
|
|
111
|
-
done: false
|
|
112
|
-
};
|
|
113
|
-
case 5:
|
|
114
|
-
_.label++;
|
|
115
|
-
y = op[1];
|
|
116
|
-
op = [
|
|
117
|
-
0
|
|
118
|
-
];
|
|
119
|
-
continue;
|
|
120
|
-
case 7:
|
|
121
|
-
op = _.ops.pop();
|
|
122
|
-
_.trys.pop();
|
|
123
|
-
continue;
|
|
124
|
-
default:
|
|
125
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
126
|
-
_ = 0;
|
|
127
|
-
continue;
|
|
128
|
-
}
|
|
129
|
-
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
130
|
-
_.label = op[1];
|
|
131
|
-
break;
|
|
132
|
-
}
|
|
133
|
-
if (op[0] === 6 && _.label < t[1]) {
|
|
134
|
-
_.label = t[1];
|
|
135
|
-
t = op;
|
|
136
|
-
break;
|
|
137
|
-
}
|
|
138
|
-
if (t && _.label < t[2]) {
|
|
139
|
-
_.label = t[2];
|
|
140
|
-
_.ops.push(op);
|
|
141
|
-
break;
|
|
142
|
-
}
|
|
143
|
-
if (t[2])
|
|
144
|
-
_.ops.pop();
|
|
145
|
-
_.trys.pop();
|
|
146
|
-
continue;
|
|
147
|
-
}
|
|
148
|
-
op = body.call(thisArg, _);
|
|
149
|
-
} catch (e) {
|
|
150
|
-
op = [
|
|
151
|
-
6,
|
|
152
|
-
e
|
|
153
|
-
];
|
|
154
|
-
y = 0;
|
|
155
|
-
} finally {
|
|
156
|
-
f = t = 0;
|
|
157
|
-
}
|
|
158
|
-
if (op[0] & 5)
|
|
159
|
-
throw op[1];
|
|
160
|
-
return {
|
|
161
|
-
value: op[0] ? op[1] : void 0,
|
|
162
|
-
done: true
|
|
163
|
-
};
|
|
164
|
-
}
|
|
165
|
-
};
|
|
1
|
+
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
|
+
import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
|
|
3
|
+
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
166
4
|
import path from "path";
|
|
167
5
|
import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
|
|
168
6
|
import * as templates from "./templates";
|
|
@@ -263,7 +101,7 @@ export var generateCode = function() {
|
|
|
263
101
|
function _generateEntryCode() {
|
|
264
102
|
_generateEntryCode = _async_to_generator(function(entrypoint) {
|
|
265
103
|
var entryName, isAutoMount, customBootstrap, fileSystemRoutes, _config_output, initialRoutes, nestedRoute, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile, _ref2, importStatements, plugins, _ref1, renderFunction, exportStatement, code2, entryFile, _ref22, asyncEntryCode, bootstrapFile;
|
|
266
|
-
return
|
|
104
|
+
return _ts_generator(this, function(_state) {
|
|
267
105
|
switch (_state.label) {
|
|
268
106
|
case 0:
|
|
269
107
|
entryName = entrypoint.entryName, isAutoMount = entrypoint.isAutoMount, customBootstrap = entrypoint.customBootstrap, fileSystemRoutes = entrypoint.fileSystemRoutes;
|
|
@@ -483,7 +321,7 @@ export var generateCode = function() {
|
|
|
483
321
|
});
|
|
484
322
|
return _generateEntryCode.apply(this, arguments);
|
|
485
323
|
}
|
|
486
|
-
return
|
|
324
|
+
return _ts_generator(this, function(_state) {
|
|
487
325
|
switch (_state.label) {
|
|
488
326
|
case 0:
|
|
489
327
|
internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
|
|
@@ -1,55 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(obj, key, {
|
|
4
|
-
value: value,
|
|
5
|
-
enumerable: true,
|
|
6
|
-
configurable: true,
|
|
7
|
-
writable: true
|
|
8
|
-
});
|
|
9
|
-
} else {
|
|
10
|
-
obj[key] = value;
|
|
11
|
-
}
|
|
12
|
-
return obj;
|
|
13
|
-
}
|
|
14
|
-
function _object_spread(target) {
|
|
15
|
-
for (var i = 1; i < arguments.length; i++) {
|
|
16
|
-
var source = arguments[i] != null ? arguments[i] : {};
|
|
17
|
-
var ownKeys2 = Object.keys(source);
|
|
18
|
-
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
19
|
-
ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
20
|
-
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
21
|
-
}));
|
|
22
|
-
}
|
|
23
|
-
ownKeys2.forEach(function(key) {
|
|
24
|
-
_define_property(target, key, source[key]);
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
return target;
|
|
28
|
-
}
|
|
29
|
-
function ownKeys(object, enumerableOnly) {
|
|
30
|
-
var keys = Object.keys(object);
|
|
31
|
-
if (Object.getOwnPropertySymbols) {
|
|
32
|
-
var symbols = Object.getOwnPropertySymbols(object);
|
|
33
|
-
if (enumerableOnly) {
|
|
34
|
-
symbols = symbols.filter(function(sym) {
|
|
35
|
-
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
keys.push.apply(keys, symbols);
|
|
39
|
-
}
|
|
40
|
-
return keys;
|
|
41
|
-
}
|
|
42
|
-
function _object_spread_props(target, source) {
|
|
43
|
-
source = source != null ? source : {};
|
|
44
|
-
if (Object.getOwnPropertyDescriptors) {
|
|
45
|
-
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
46
|
-
} else {
|
|
47
|
-
ownKeys(Object(source)).forEach(function(key) {
|
|
48
|
-
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
return target;
|
|
52
|
-
}
|
|
1
|
+
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
2
|
+
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
53
3
|
import path from "path";
|
|
54
4
|
import { fs } from "@modern-js/utils";
|
|
55
5
|
import { makeLegalIdentifier } from "../makeLegalIdentifier";
|
|
@@ -1,55 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(obj, key, {
|
|
4
|
-
value: value,
|
|
5
|
-
enumerable: true,
|
|
6
|
-
configurable: true,
|
|
7
|
-
writable: true
|
|
8
|
-
});
|
|
9
|
-
} else {
|
|
10
|
-
obj[key] = value;
|
|
11
|
-
}
|
|
12
|
-
return obj;
|
|
13
|
-
}
|
|
14
|
-
function _object_spread(target) {
|
|
15
|
-
for (var i = 1; i < arguments.length; i++) {
|
|
16
|
-
var source = arguments[i] != null ? arguments[i] : {};
|
|
17
|
-
var ownKeys2 = Object.keys(source);
|
|
18
|
-
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
19
|
-
ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
20
|
-
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
21
|
-
}));
|
|
22
|
-
}
|
|
23
|
-
ownKeys2.forEach(function(key) {
|
|
24
|
-
_define_property(target, key, source[key]);
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
return target;
|
|
28
|
-
}
|
|
29
|
-
function ownKeys(object, enumerableOnly) {
|
|
30
|
-
var keys = Object.keys(object);
|
|
31
|
-
if (Object.getOwnPropertySymbols) {
|
|
32
|
-
var symbols = Object.getOwnPropertySymbols(object);
|
|
33
|
-
if (enumerableOnly) {
|
|
34
|
-
symbols = symbols.filter(function(sym) {
|
|
35
|
-
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
keys.push.apply(keys, symbols);
|
|
39
|
-
}
|
|
40
|
-
return keys;
|
|
41
|
-
}
|
|
42
|
-
function _object_spread_props(target, source) {
|
|
43
|
-
source = source != null ? source : {};
|
|
44
|
-
if (Object.getOwnPropertyDescriptors) {
|
|
45
|
-
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
46
|
-
} else {
|
|
47
|
-
ownKeys(Object(source)).forEach(function(key) {
|
|
48
|
-
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
return target;
|
|
52
|
-
}
|
|
1
|
+
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
2
|
+
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
53
3
|
import path from "path";
|
|
54
4
|
import { fs } from "@modern-js/utils";
|
|
55
5
|
import { makeLegalIdentifier } from "../makeLegalIdentifier";
|