@bleedingdev/modern-js-app-tools 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21
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/cjs/builder/generator/createCopyPattern.js +2 -1
- package/dist/cjs/builder/generator/index.js +0 -1
- package/dist/cjs/builder/shared/builderPlugins/adapterHtml.js +2 -1
- package/dist/cjs/builder/shared/builderPlugins/index.js +4 -11
- package/dist/cjs/builder/shared/lazyCompilation.js +26 -0
- package/dist/cjs/commands/index.js +6 -2
- package/dist/cjs/compat/hooks.js +1 -1
- package/dist/cjs/config/index.js +4 -11
- package/dist/cjs/index.js +70 -87
- package/dist/cjs/plugins/analyze/getFileSystemEntry.js +1 -1
- package/dist/cjs/plugins/analyze/getServerRoutes.js +1 -1
- package/dist/cjs/plugins/analyze/utils.js +2 -2
- package/dist/cjs/plugins/deploy/index.js +7 -28
- package/dist/cjs/plugins/deploy/platforms/netlify.js +2 -1
- package/dist/cjs/plugins/deploy/platforms/node.js +12 -16
- package/dist/cjs/plugins/deploy/platforms/vercel.js +2 -1
- package/dist/cjs/plugins/deploy/utils/generator.js +1 -1
- package/dist/cjs/plugins/deploy/utils/index.js +15 -12
- package/dist/cjs/plugins/initialize/index.js +3 -1
- package/dist/cjs/plugins/serverBuild.js +2 -3
- package/dist/cjs/{plugins/backendFederationBuild.js → server-plugin.js} +4 -7
- package/dist/cjs/utils/loadPlugins.js +1 -6
- package/dist/esm/builder/generator/createCopyPattern.mjs +2 -1
- package/dist/esm/builder/generator/index.mjs +1 -2
- package/dist/esm/builder/shared/builderPlugins/adapterHtml.mjs +2 -1
- package/dist/esm/builder/shared/builderPlugins/index.mjs +0 -1
- package/dist/esm/builder/shared/lazyCompilation.mjs +14 -1
- package/dist/esm/commands/index.mjs +6 -2
- package/dist/esm/compat/hooks.mjs +1 -1
- package/dist/esm/config/index.mjs +0 -1
- package/dist/esm/index.mjs +9 -6
- package/dist/esm/plugins/analyze/getFileSystemEntry.mjs +1 -1
- package/dist/esm/plugins/analyze/getServerRoutes.mjs +1 -1
- package/dist/esm/plugins/analyze/utils.mjs +2 -2
- package/dist/esm/plugins/deploy/index.mjs +5 -21
- package/dist/esm/plugins/deploy/platforms/netlify.mjs +2 -1
- package/dist/esm/plugins/deploy/platforms/node.mjs +12 -16
- package/dist/esm/plugins/deploy/platforms/vercel.mjs +2 -1
- package/dist/esm/plugins/deploy/utils/generator.mjs +1 -1
- package/dist/esm/plugins/deploy/utils/index.mjs +17 -14
- package/dist/esm/plugins/initialize/index.mjs +3 -1
- package/dist/esm/plugins/serverBuild.mjs +2 -3
- package/dist/esm/server-plugin.mjs +1 -0
- package/dist/esm/utils/loadPlugins.mjs +2 -7
- package/dist/esm-node/builder/generator/createCopyPattern.mjs +2 -1
- package/dist/esm-node/builder/generator/index.mjs +1 -2
- package/dist/esm-node/builder/shared/builderPlugins/adapterHtml.mjs +2 -1
- package/dist/esm-node/builder/shared/builderPlugins/index.mjs +0 -1
- package/dist/esm-node/builder/shared/lazyCompilation.mjs +14 -1
- package/dist/esm-node/commands/index.mjs +6 -2
- package/dist/esm-node/compat/hooks.mjs +1 -1
- package/dist/esm-node/config/index.mjs +0 -1
- package/dist/esm-node/index.mjs +9 -6
- package/dist/esm-node/plugins/analyze/getFileSystemEntry.mjs +1 -1
- package/dist/esm-node/plugins/analyze/getServerRoutes.mjs +1 -1
- package/dist/esm-node/plugins/analyze/utils.mjs +2 -2
- package/dist/esm-node/plugins/deploy/index.mjs +5 -21
- package/dist/esm-node/plugins/deploy/platforms/netlify.mjs +2 -1
- package/dist/esm-node/plugins/deploy/platforms/node.mjs +12 -16
- package/dist/esm-node/plugins/deploy/platforms/vercel.mjs +2 -1
- package/dist/esm-node/plugins/deploy/utils/generator.mjs +1 -1
- package/dist/esm-node/plugins/deploy/utils/index.mjs +17 -15
- package/dist/esm-node/plugins/initialize/index.mjs +3 -1
- package/dist/esm-node/plugins/serverBuild.mjs +2 -3
- package/dist/esm-node/server-plugin.mjs +2 -0
- package/dist/esm-node/utils/loadPlugins.mjs +2 -7
- package/dist/types/builder/shared/builderPlugins/index.d.ts +0 -1
- package/dist/types/builder/shared/lazyCompilation.d.ts +15 -0
- package/dist/types/config/index.d.ts +0 -1
- package/dist/types/index.d.ts +2 -2
- package/dist/types/plugins/deploy/index.d.ts +1 -4
- package/dist/types/plugins/deploy/utils/generator.d.ts +1 -1
- package/dist/types/plugins/deploy/utils/index.d.ts +1 -1
- package/dist/types/server-plugin.d.ts +10 -0
- package/dist/types/types/config/output.d.ts +0 -9
- package/dist/types/types/index.d.ts +1 -1
- package/dist/types/types/plugin.d.ts +58 -2
- package/dist/types/utils/initAppContext.d.ts +3 -2
- package/docs/apis/app/commands.md +1 -0
- package/docs/configure/app/bff/effect.md +34 -36
- package/docs/configure/app/source/react-compiler.md +2 -0
- package/docs/guides/advanced-features/bff/data-platform.md +2 -2
- package/docs/guides/advanced-features/bff/frameworks.md +36 -24
- package/docs/guides/advanced-features/bff/function.md +2 -2
- package/docs/guides/advanced-features/bff/operators.md +17 -17
- package/docs/guides/basic-features/render/ssr-cache.md +14 -1
- package/docs/guides/get-started/quick-start.md +2 -6
- package/docs/guides/get-started/ultramodern.md +14 -97
- package/docs/llms.txt +3 -3
- package/docs/plugin/server-plugins/api.md +1 -0
- package/package.json +38 -36
- package/dist/cjs/builder/shared/builderPlugins/adapterPrecompress.js +0 -125
- package/dist/cjs/config/build-environment.js +0 -268
- package/dist/cjs/config/public.js +0 -46
- package/dist/cjs/plugins/backend-federation/codegen.js +0 -256
- package/dist/cjs/plugins/backend-federation/config.js +0 -204
- package/dist/cjs/plugins/backend-federation/emit.js +0 -150
- package/dist/cjs/plugins/deploy/platforms/cloudflare-output-verifier/index.js +0 -62
- package/dist/cjs/plugins/deploy/utils/npmAliases.js +0 -226
- package/dist/cjs/plugins/ultramodernReleaseEnvelope.js +0 -44
- package/dist/cjs/presetUltramodern.js +0 -168
- package/dist/cjs/types/config/precompress.js +0 -18
- package/dist/esm/builder/shared/builderPlugins/adapterPrecompress.mjs +0 -77
- package/dist/esm/config/build-environment.mjs +0 -224
- package/dist/esm/config/public.mjs +0 -1
- package/dist/esm/plugins/backend-federation/codegen.mjs +0 -205
- package/dist/esm/plugins/backend-federation/config.mjs +0 -128
- package/dist/esm/plugins/backend-federation/emit.mjs +0 -99
- package/dist/esm/plugins/backendFederationBuild.mjs +0 -1
- package/dist/esm/plugins/deploy/platforms/cloudflare-output-verifier/index.mjs +0 -1
- package/dist/esm/plugins/deploy/utils/npmAliases.mjs +0 -174
- package/dist/esm/plugins/ultramodernReleaseEnvelope.mjs +0 -6
- package/dist/esm/presetUltramodern.mjs +0 -112
- package/dist/esm/types/config/precompress.mjs +0 -0
- package/dist/esm-node/builder/shared/builderPlugins/adapterPrecompress.mjs +0 -78
- package/dist/esm-node/config/build-environment.mjs +0 -225
- package/dist/esm-node/config/public.mjs +0 -2
- package/dist/esm-node/plugins/backend-federation/codegen.mjs +0 -206
- package/dist/esm-node/plugins/backend-federation/config.mjs +0 -129
- package/dist/esm-node/plugins/backend-federation/emit.mjs +0 -100
- package/dist/esm-node/plugins/backendFederationBuild.mjs +0 -2
- package/dist/esm-node/plugins/deploy/platforms/cloudflare-output-verifier/index.mjs +0 -2
- package/dist/esm-node/plugins/deploy/utils/npmAliases.mjs +0 -175
- package/dist/esm-node/plugins/ultramodernReleaseEnvelope.mjs +0 -7
- package/dist/esm-node/presetUltramodern.mjs +0 -113
- package/dist/esm-node/types/config/precompress.mjs +0 -1
- package/dist/types/builder/shared/builderPlugins/adapterPrecompress.d.ts +0 -3
- package/dist/types/config/build-environment.d.ts +0 -22
- package/dist/types/config/public.d.ts +0 -2
- package/dist/types/plugins/backend-federation/codegen.d.ts +0 -86
- package/dist/types/plugins/backend-federation/config.d.ts +0 -103
- package/dist/types/plugins/backend-federation/emit.d.ts +0 -13
- package/dist/types/plugins/backendFederationBuild.d.ts +0 -2
- package/dist/types/plugins/deploy/platforms/cloudflare-output-verifier/index.d.ts +0 -1
- package/dist/types/plugins/deploy/utils/npmAliases.d.ts +0 -14
- package/dist/types/plugins/ultramodernReleaseEnvelope.d.ts +0 -3
- package/dist/types/presetUltramodern.d.ts +0 -87
- package/dist/types/types/config/precompress.d.ts +0 -20
|
@@ -47,7 +47,8 @@ function createPublicPattern(appContext, config, chain) {
|
|
|
47
47
|
noErrorOnMissing: true,
|
|
48
48
|
transform: (content, absoluteFrom)=>{
|
|
49
49
|
if (!/\.html?$/.test(absoluteFrom)) return content;
|
|
50
|
-
|
|
50
|
+
const publicPath = chain.output.get('publicPath');
|
|
51
|
+
return content.toString('utf8').replace(/<%=\s*assetPrefix\s*%>/g, (0, utils_namespaceObject.removeTailSlash)('string' == typeof publicPath ? publicPath : ''));
|
|
51
52
|
}
|
|
52
53
|
};
|
|
53
54
|
}
|
|
@@ -72,7 +72,6 @@ async function applyBuilderPlugins(builder, options) {
|
|
|
72
72
|
(0, index_js_namespaceObject.builderPluginAdapterBasic)(options),
|
|
73
73
|
(0, index_js_namespaceObject.builderPluginAdapterSSR)(options),
|
|
74
74
|
(0, index_js_namespaceObject.builderPluginAdapterHtml)(options),
|
|
75
|
-
(0, index_js_namespaceObject.builderPluginAdapterPrecompress)(options),
|
|
76
75
|
(0, index_js_namespaceObject.builderPluginAdapterHooks)(options)
|
|
77
76
|
]);
|
|
78
77
|
builder.addPlugins([
|
|
@@ -58,7 +58,8 @@ const builderPluginAdapterHtml = (options)=>({
|
|
|
58
58
|
async function injectAssetPrefix({ chain }) {
|
|
59
59
|
const entries = chain.entryPoints.entries() || {};
|
|
60
60
|
const entryNames = Object.keys(entries);
|
|
61
|
-
const
|
|
61
|
+
const publicPath = chain.output.get('publicPath');
|
|
62
|
+
const assetPrefix = (0, utils_namespaceObject.removeTailSlash)('string' == typeof publicPath ? publicPath : '');
|
|
62
63
|
const code = `window.__assetPrefix__ = '${assetPrefix}';`;
|
|
63
64
|
entryNames.forEach((entryName)=>{
|
|
64
65
|
entries[entryName].prepend(createVirtualModule(code));
|
|
@@ -6,9 +6,6 @@ var __webpack_modules__ = {
|
|
|
6
6
|
"./adapterHtml" (module) {
|
|
7
7
|
module.exports = require("./adapterHtml.js");
|
|
8
8
|
},
|
|
9
|
-
"./adapterPrecompress" (module) {
|
|
10
|
-
module.exports = require("./adapterPrecompress.js");
|
|
11
|
-
},
|
|
12
9
|
"./adapterSSR" (module) {
|
|
13
10
|
module.exports = require("./adapterSSR.js");
|
|
14
11
|
},
|
|
@@ -71,17 +68,13 @@ var __webpack_exports__ = {};
|
|
|
71
68
|
var __rspack_reexport = {};
|
|
72
69
|
for(const __rspack_import_key in _adapterHtml__rspack_import_1)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_adapterHtml__rspack_import_1[__rspack_import_key];
|
|
73
70
|
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
74
|
-
var
|
|
75
|
-
var __rspack_reexport = {};
|
|
76
|
-
for(const __rspack_import_key in _adapterPrecompress__rspack_import_2)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_adapterPrecompress__rspack_import_2[__rspack_import_key];
|
|
77
|
-
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
78
|
-
var _adapterSSR__rspack_import_3 = __webpack_require__("./adapterSSR");
|
|
71
|
+
var _adapterSSR__rspack_import_2 = __webpack_require__("./adapterSSR");
|
|
79
72
|
var __rspack_reexport = {};
|
|
80
|
-
for(const __rspack_import_key in
|
|
73
|
+
for(const __rspack_import_key in _adapterSSR__rspack_import_2)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_adapterSSR__rspack_import_2[__rspack_import_key];
|
|
81
74
|
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
82
|
-
var
|
|
75
|
+
var _builderHooks__rspack_import_3 = __webpack_require__("./builderHooks");
|
|
83
76
|
var __rspack_reexport = {};
|
|
84
|
-
for(const __rspack_import_key in
|
|
77
|
+
for(const __rspack_import_key in _builderHooks__rspack_import_3)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_builderHooks__rspack_import_3[__rspack_import_key];
|
|
85
78
|
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
86
79
|
})();
|
|
87
80
|
for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __webpack_require__ = {};
|
|
3
|
+
(()=>{
|
|
4
|
+
__webpack_require__.n = (module)=>{
|
|
5
|
+
var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
|
|
6
|
+
__webpack_require__.d(getter, {
|
|
7
|
+
a: getter
|
|
8
|
+
});
|
|
9
|
+
return getter;
|
|
10
|
+
};
|
|
11
|
+
})();
|
|
3
12
|
(()=>{
|
|
4
13
|
__webpack_require__.d = (exports1, getters, values)=>{
|
|
5
14
|
var define = (defs, kind)=>{
|
|
@@ -29,11 +38,14 @@ var __webpack_exports__ = {};
|
|
|
29
38
|
__webpack_require__.r(__webpack_exports__);
|
|
30
39
|
__webpack_require__.d(__webpack_exports__, {
|
|
31
40
|
aggregateEagerRouteComponentFiles: ()=>aggregateEagerRouteComponentFiles,
|
|
41
|
+
buildDefaultLazyCompilationTest: ()=>buildDefaultLazyCompilationTest,
|
|
32
42
|
buildSSRLazyCompilationTest: ()=>buildSSRLazyCompilationTest,
|
|
33
43
|
collectRouteComponentFiles: ()=>utils_namespaceObject.collectRouteComponentFiles,
|
|
34
44
|
normalizeModulePath: ()=>utils_namespaceObject.normalizeModulePath,
|
|
35
45
|
planSSRLazyCompilation: ()=>planSSRLazyCompilation
|
|
36
46
|
});
|
|
47
|
+
const external_node_path_namespaceObject = require("node:path");
|
|
48
|
+
var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
|
|
37
49
|
const utils_namespaceObject = require("@modern-js/utils");
|
|
38
50
|
function aggregateEagerRouteComponentFiles(byEntry) {
|
|
39
51
|
const files = new Set();
|
|
@@ -56,6 +68,18 @@ function buildSSRLazyCompilationTest(eagerRouteFiles, userTest) {
|
|
|
56
68
|
return userTestFn(m);
|
|
57
69
|
};
|
|
58
70
|
}
|
|
71
|
+
function buildDefaultLazyCompilationTest(appDirectory, internalDirectory) {
|
|
72
|
+
let dirs;
|
|
73
|
+
return (m)=>{
|
|
74
|
+
if (!('resource' in m) || 'string' != typeof m.resource) return true;
|
|
75
|
+
dirs ??= {
|
|
76
|
+
app: (0, utils_namespaceObject.normalizeModulePath)(appDirectory),
|
|
77
|
+
internal: (0, utils_namespaceObject.normalizeModulePath)(internalDirectory)
|
|
78
|
+
};
|
|
79
|
+
const file = m.resource.split('?')[0].split(external_node_path_default().sep).join('/');
|
|
80
|
+
return file.startsWith(`${dirs.app}/`) && !file.startsWith(`${dirs.internal}/`) && !file.slice(dirs.app.length).includes('/node_modules/');
|
|
81
|
+
};
|
|
82
|
+
}
|
|
59
83
|
function planSSRLazyCompilation(current, info) {
|
|
60
84
|
if (!current) return {
|
|
61
85
|
apply: false
|
|
@@ -78,12 +102,14 @@ function planSSRLazyCompilation(current, info) {
|
|
|
78
102
|
};
|
|
79
103
|
}
|
|
80
104
|
exports.aggregateEagerRouteComponentFiles = __webpack_exports__.aggregateEagerRouteComponentFiles;
|
|
105
|
+
exports.buildDefaultLazyCompilationTest = __webpack_exports__.buildDefaultLazyCompilationTest;
|
|
81
106
|
exports.buildSSRLazyCompilationTest = __webpack_exports__.buildSSRLazyCompilationTest;
|
|
82
107
|
exports.collectRouteComponentFiles = __webpack_exports__.collectRouteComponentFiles;
|
|
83
108
|
exports.normalizeModulePath = __webpack_exports__.normalizeModulePath;
|
|
84
109
|
exports.planSSRLazyCompilation = __webpack_exports__.planSSRLazyCompilation;
|
|
85
110
|
for(var __rspack_i in __webpack_exports__)if (-1 === [
|
|
86
111
|
"aggregateEagerRouteComponentFiles",
|
|
112
|
+
"buildDefaultLazyCompilationTest",
|
|
87
113
|
"buildSSRLazyCompilationTest",
|
|
88
114
|
"collectRouteComponentFiles",
|
|
89
115
|
"normalizeModulePath",
|
|
@@ -36,6 +36,10 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
36
36
|
serverCommand: ()=>serverCommand
|
|
37
37
|
});
|
|
38
38
|
const index_js_namespaceObject = require("../locale/index.js");
|
|
39
|
+
const deployTargetOption = [
|
|
40
|
+
'--deploy-target <target>',
|
|
41
|
+
'deploy target; overrides deploy.target and MODERNJS_DEPLOY'
|
|
42
|
+
];
|
|
39
43
|
const devCommand = async (program, api)=>{
|
|
40
44
|
program.command('dev').alias('start').usage('[options]').description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.dev.describe)).option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('-e --entry [entry...]', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.dev.entry)).option('--analyze', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.analyze)).option('--api-only', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.dev.apiOnly)).option('--web-only', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.dev.webOnly)).action(async (options)=>{
|
|
41
45
|
const { dev } = await import("./dev.js");
|
|
@@ -43,7 +47,7 @@ const devCommand = async (program, api)=>{
|
|
|
43
47
|
});
|
|
44
48
|
};
|
|
45
49
|
const buildCommand = async (program, api)=>{
|
|
46
|
-
program.command('build').usage('[options]').description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.build.describe)).option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('--analyze', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.analyze)).option('-w --watch', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.build.watch)).action(async (options)=>{
|
|
50
|
+
program.command('build').usage('[options]').description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.build.describe)).option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('--analyze', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.analyze)).option('-w --watch', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.build.watch)).option(...deployTargetOption).action(async (options)=>{
|
|
47
51
|
const { build } = await import("./build.js");
|
|
48
52
|
await build(api, options);
|
|
49
53
|
});
|
|
@@ -55,7 +59,7 @@ const serverCommand = (program, api)=>{
|
|
|
55
59
|
});
|
|
56
60
|
};
|
|
57
61
|
const deployCommand = (program, api)=>{
|
|
58
|
-
program.command('deploy').usage('[options]').option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('-s --skip-build', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.skipBuild)).description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.deploy.describe)).action(async (options)=>{
|
|
62
|
+
program.command('deploy').usage('[options]').option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('-s --skip-build', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.skipBuild)).option(...deployTargetOption).description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.deploy.describe)).action(async (options)=>{
|
|
59
63
|
const { deploy } = await import("./deploy.js");
|
|
60
64
|
await deploy(api, options);
|
|
61
65
|
process.exit(0);
|
package/dist/cjs/compat/hooks.js
CHANGED
|
@@ -92,7 +92,7 @@ function handleSetupResult(setupResult, api) {
|
|
|
92
92
|
if (newAPI && api[newAPI]) api[newAPI](async (...params)=>{
|
|
93
93
|
const { isMultiple, params: transformParams } = (0, external_utils_js_namespaceObject.transformHookParams)(key, params);
|
|
94
94
|
if (isMultiple) return (0, external_utils_js_namespaceObject.transformHookResult)(key, await fn(...transformParams));
|
|
95
|
-
return (0, external_utils_js_namespaceObject.transformHookResult)(key, await fn(transformParams));
|
|
95
|
+
else return (0, external_utils_js_namespaceObject.transformHookResult)(key, await fn(transformParams));
|
|
96
96
|
});
|
|
97
97
|
}
|
|
98
98
|
});
|
package/dist/cjs/config/index.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __webpack_modules__ = {
|
|
3
|
-
"./build-environment" (module) {
|
|
4
|
-
module.exports = require("./build-environment.js");
|
|
5
|
-
},
|
|
6
3
|
"./default" (module) {
|
|
7
4
|
module.exports = require("./default.js");
|
|
8
5
|
},
|
|
@@ -57,17 +54,13 @@ function __webpack_require__(moduleId) {
|
|
|
57
54
|
var __webpack_exports__ = {};
|
|
58
55
|
(()=>{
|
|
59
56
|
__webpack_require__.r(__webpack_exports__);
|
|
60
|
-
var
|
|
61
|
-
var __rspack_reexport = {};
|
|
62
|
-
for(const __rspack_import_key in _build_environment__rspack_import_0)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_build_environment__rspack_import_0[__rspack_import_key];
|
|
63
|
-
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
64
|
-
var _default__rspack_import_1 = __webpack_require__("./default");
|
|
57
|
+
var _default__rspack_import_0 = __webpack_require__("./default");
|
|
65
58
|
var __rspack_reexport = {};
|
|
66
|
-
for(const __rspack_import_key in
|
|
59
|
+
for(const __rspack_import_key in _default__rspack_import_0)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_default__rspack_import_0[__rspack_import_key];
|
|
67
60
|
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
68
|
-
var
|
|
61
|
+
var _initialize__rspack_import_1 = __webpack_require__("./initialize");
|
|
69
62
|
var __rspack_reexport = {};
|
|
70
|
-
for(const __rspack_import_key in
|
|
63
|
+
for(const __rspack_import_key in _initialize__rspack_import_1)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_initialize__rspack_import_1[__rspack_import_key];
|
|
71
64
|
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
72
65
|
})();
|
|
73
66
|
for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
|
package/dist/cjs/index.js
CHANGED
|
@@ -30,9 +30,6 @@ var __webpack_modules__ = {
|
|
|
30
30
|
"./plugins/analyze" (module) {
|
|
31
31
|
module.exports = require("./plugins/analyze/index.js");
|
|
32
32
|
},
|
|
33
|
-
"./plugins/backendFederationBuild" (module) {
|
|
34
|
-
module.exports = require("./plugins/backendFederationBuild.js");
|
|
35
|
-
},
|
|
36
33
|
"./plugins/deploy" (module) {
|
|
37
34
|
module.exports = require("./plugins/deploy/index.js");
|
|
38
35
|
},
|
|
@@ -45,9 +42,6 @@ var __webpack_modules__ = {
|
|
|
45
42
|
"./plugins/serverRuntime" (module) {
|
|
46
43
|
module.exports = require("./plugins/serverRuntime.js");
|
|
47
44
|
},
|
|
48
|
-
"./presetUltramodern" (module) {
|
|
49
|
-
module.exports = require("./presetUltramodern.js");
|
|
50
|
-
},
|
|
51
45
|
"./rsbuild" (module) {
|
|
52
46
|
module.exports = require("./rsbuild.js");
|
|
53
47
|
},
|
|
@@ -66,8 +60,11 @@ var __webpack_modules__ = {
|
|
|
66
60
|
"./utils/restart" (module) {
|
|
67
61
|
module.exports = require("./utils/restart.js");
|
|
68
62
|
},
|
|
69
|
-
"@modern-js/app-tools-extensions/
|
|
70
|
-
module.exports = require("@modern-js/app-tools-extensions/
|
|
63
|
+
"@modern-js/app-tools-extensions/deploy-output/target" (module) {
|
|
64
|
+
module.exports = require("@modern-js/app-tools-extensions/deploy-output/target");
|
|
65
|
+
},
|
|
66
|
+
"@modern-js/app-tools-extensions/policy-defaults" (module) {
|
|
67
|
+
module.exports = require("@modern-js/app-tools-extensions/policy-defaults");
|
|
71
68
|
},
|
|
72
69
|
"@modern-js/builder" (module) {
|
|
73
70
|
module.exports = require("@modern-js/builder");
|
|
@@ -135,21 +132,20 @@ function __webpack_require__(moduleId) {
|
|
|
135
132
|
var __webpack_exports__ = {};
|
|
136
133
|
(()=>{
|
|
137
134
|
__webpack_require__.r(__webpack_exports__);
|
|
138
|
-
var
|
|
139
|
-
var
|
|
140
|
-
var
|
|
141
|
-
var
|
|
142
|
-
var
|
|
143
|
-
var
|
|
144
|
-
var
|
|
145
|
-
var
|
|
146
|
-
var
|
|
147
|
-
var
|
|
148
|
-
var
|
|
149
|
-
var
|
|
150
|
-
var
|
|
151
|
-
var
|
|
152
|
-
var _plugins_backendFederationBuild__rspack_import_11_default = /*#__PURE__*/ __webpack_require__.n(_plugins_backendFederationBuild__rspack_import_11);
|
|
135
|
+
var _modern_js_app_tools_extensions_deploy_output_target__rspack_import_0 = __webpack_require__("@modern-js/app-tools-extensions/deploy-output/target");
|
|
136
|
+
var _modern_js_app_tools_extensions_policy_defaults__rspack_import_1 = __webpack_require__("@modern-js/app-tools-extensions/policy-defaults");
|
|
137
|
+
var _modern_js_builder__rspack_import_2 = __webpack_require__("@modern-js/builder");
|
|
138
|
+
var _modern_js_i18n_utils_language_detector__rspack_import_3 = __webpack_require__("@modern-js/i18n-utils/language-detector");
|
|
139
|
+
var _modern_js_plugin__rspack_import_4 = __webpack_require__("@modern-js/plugin");
|
|
140
|
+
var _modern_js_utils__rspack_import_5 = __webpack_require__("@modern-js/utils");
|
|
141
|
+
var path__rspack_import_6 = __webpack_require__("path");
|
|
142
|
+
var path__rspack_import_6_default = /*#__PURE__*/ __webpack_require__.n(path__rspack_import_6);
|
|
143
|
+
var _commands__rspack_import_7 = __webpack_require__("./commands");
|
|
144
|
+
var _compat__rspack_import_8 = __webpack_require__("./compat");
|
|
145
|
+
var _constants__rspack_import_9 = __webpack_require__("./constants");
|
|
146
|
+
var _locale__rspack_import_10 = __webpack_require__("./locale");
|
|
147
|
+
var _plugins_analyze__rspack_import_11 = __webpack_require__("./plugins/analyze");
|
|
148
|
+
var _plugins_analyze__rspack_import_11_default = /*#__PURE__*/ __webpack_require__.n(_plugins_analyze__rspack_import_11);
|
|
153
149
|
var _plugins_deploy__rspack_import_12 = __webpack_require__("./plugins/deploy");
|
|
154
150
|
var _plugins_deploy__rspack_import_12_default = /*#__PURE__*/ __webpack_require__.n(_plugins_deploy__rspack_import_12);
|
|
155
151
|
var _plugins_initialize__rspack_import_13 = __webpack_require__("./plugins/initialize");
|
|
@@ -178,31 +174,14 @@ var __webpack_exports__ = {};
|
|
|
178
174
|
"closeServer"
|
|
179
175
|
].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_defineConfig__rspack_import_19[__rspack_import_key];
|
|
180
176
|
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
181
|
-
var
|
|
182
|
-
var
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
"appTools",
|
|
188
|
-
"default",
|
|
189
|
-
"serve",
|
|
190
|
-
"generateWatchFiles",
|
|
191
|
-
"initAppContext",
|
|
192
|
-
"deploy",
|
|
193
|
-
"defineConfig",
|
|
194
|
-
"build",
|
|
195
|
-
"closeServer"
|
|
196
|
-
].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_presetUltramodern__rspack_import_20[__rspack_import_key];
|
|
197
|
-
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
198
|
-
var _commands_build__rspack_import_21 = __webpack_require__("./commands/build");
|
|
199
|
-
var _commands_deploy__rspack_import_22 = __webpack_require__("./commands/deploy");
|
|
200
|
-
var _commands_dev__rspack_import_23 = __webpack_require__("./commands/dev");
|
|
201
|
-
var _commands_serve__rspack_import_24 = __webpack_require__("./commands/serve");
|
|
202
|
-
var _rsbuild__rspack_import_25 = __webpack_require__("./rsbuild");
|
|
203
|
-
var _types__rspack_import_26 = __webpack_require__("./types?6efa");
|
|
177
|
+
var _commands_build__rspack_import_20 = __webpack_require__("./commands/build");
|
|
178
|
+
var _commands_deploy__rspack_import_21 = __webpack_require__("./commands/deploy");
|
|
179
|
+
var _commands_dev__rspack_import_22 = __webpack_require__("./commands/dev");
|
|
180
|
+
var _commands_serve__rspack_import_23 = __webpack_require__("./commands/serve");
|
|
181
|
+
var _rsbuild__rspack_import_24 = __webpack_require__("./rsbuild");
|
|
182
|
+
var _types__rspack_import_25 = __webpack_require__("./types?6efa");
|
|
204
183
|
var __rspack_reexport = {};
|
|
205
|
-
for(const __rspack_import_key in
|
|
184
|
+
for(const __rspack_import_key in _types__rspack_import_25)if ([
|
|
206
185
|
"dev",
|
|
207
186
|
"resolveModernRsbuildConfig",
|
|
208
187
|
"mergeConfig",
|
|
@@ -215,21 +194,20 @@ var __webpack_exports__ = {};
|
|
|
215
194
|
"defineConfig",
|
|
216
195
|
"build",
|
|
217
196
|
"closeServer"
|
|
218
|
-
].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>
|
|
197
|
+
].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_types__rspack_import_25[__rspack_import_key];
|
|
219
198
|
__webpack_require__.d(__webpack_exports__, __rspack_reexport);
|
|
220
|
-
var
|
|
221
|
-
var
|
|
222
|
-
const appTools = ()=>({
|
|
199
|
+
var _utils_createServer__rspack_import_26 = __webpack_require__("./utils/createServer");
|
|
200
|
+
var _modern_js_plugin_cli__rspack_import_27 = __webpack_require__("@modern-js/plugin/cli");
|
|
201
|
+
const appTools = (options = {})=>({
|
|
223
202
|
name: '@modern-js/app-tools',
|
|
224
203
|
usePlugins: [
|
|
225
204
|
_plugins_serverRuntime__rspack_import_15_default()(),
|
|
226
|
-
(0,
|
|
205
|
+
(0, _compat__rspack_import_8.compatPlugin)(),
|
|
227
206
|
_plugins_initialize__rspack_import_13_default()(),
|
|
228
|
-
|
|
207
|
+
_plugins_analyze__rspack_import_11_default()(),
|
|
229
208
|
_plugins_serverBuild__rspack_import_14_default()(),
|
|
230
|
-
_plugins_backendFederationBuild__rspack_import_11_default()(),
|
|
231
209
|
_plugins_deploy__rspack_import_12_default()(),
|
|
232
|
-
(0,
|
|
210
|
+
(0, _modern_js_app_tools_extensions_policy_defaults__rspack_import_1.createPolicyDefaultsPlugin)(options)
|
|
233
211
|
],
|
|
234
212
|
post: [
|
|
235
213
|
'@modern-js/plugin-initialize',
|
|
@@ -240,48 +218,53 @@ var __webpack_exports__ = {};
|
|
|
240
218
|
'@modern-js/plugin-polyfill'
|
|
241
219
|
],
|
|
242
220
|
registryHooks: {
|
|
243
|
-
onAfterPrepare: (0,
|
|
244
|
-
deploy: (0,
|
|
245
|
-
checkEntryPoint: (0,
|
|
246
|
-
modifyEntrypoints: (0,
|
|
247
|
-
modifyBuilderEnvironments: (0,
|
|
248
|
-
modifyFileSystemRoutes: (0,
|
|
249
|
-
generateEntryCode: (0,
|
|
250
|
-
onBeforeGenerateRoutes: (0,
|
|
251
|
-
onBeforePrintInstructions: (0,
|
|
221
|
+
onAfterPrepare: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
|
|
222
|
+
deploy: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
|
|
223
|
+
checkEntryPoint: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
|
|
224
|
+
modifyEntrypoints: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
|
|
225
|
+
modifyBuilderEnvironments: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
|
|
226
|
+
modifyFileSystemRoutes: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
|
|
227
|
+
generateEntryCode: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
|
|
228
|
+
onBeforeGenerateRoutes: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)(),
|
|
229
|
+
onBeforePrintInstructions: (0, _modern_js_plugin__rspack_import_4.createAsyncHook)()
|
|
252
230
|
},
|
|
253
231
|
setup: (api)=>{
|
|
254
232
|
const context = api.getAppContext();
|
|
255
233
|
const userConfig = api.getConfig();
|
|
256
|
-
const locale = (0,
|
|
257
|
-
|
|
234
|
+
const locale = (0, _modern_js_i18n_utils_language_detector__rspack_import_3.getLocaleLanguage)();
|
|
235
|
+
_locale__rspack_import_10.i18n.changeLanguage({
|
|
258
236
|
locale
|
|
259
237
|
});
|
|
260
238
|
api.updateAppContext((0, _utils_initAppContext__rspack_import_17.initAppContext)({
|
|
261
239
|
metaName: context.metaName,
|
|
262
240
|
appDirectory: context.appDirectory,
|
|
263
|
-
runtimeConfigFile:
|
|
241
|
+
runtimeConfigFile: _constants__rspack_import_9.DEFAULT_RUNTIME_CONFIG_FILE,
|
|
264
242
|
options: {
|
|
265
243
|
bffRuntimeFramework: userConfig.bff?.runtimeFramework
|
|
266
244
|
},
|
|
267
245
|
tempDir: userConfig.output?.tempDir
|
|
268
246
|
}));
|
|
269
247
|
api.addCommand(async ({ program })=>{
|
|
270
|
-
await (0,
|
|
271
|
-
await (0,
|
|
272
|
-
(0,
|
|
273
|
-
(0,
|
|
274
|
-
(0,
|
|
275
|
-
(0,
|
|
276
|
-
(0,
|
|
248
|
+
await (0, _commands__rspack_import_7.devCommand)(program, api);
|
|
249
|
+
await (0, _commands__rspack_import_7.buildCommand)(program, api);
|
|
250
|
+
(0, _commands__rspack_import_7.serverCommand)(program, api);
|
|
251
|
+
(0, _commands__rspack_import_7.deployCommand)(program, api);
|
|
252
|
+
(0, _commands__rspack_import_7.inspectCommand)(program, api);
|
|
253
|
+
(0, _commands__rspack_import_7.infoCommand)(program, api);
|
|
254
|
+
(0, _modern_js_utils__rspack_import_5.deprecatedCommands)(program);
|
|
277
255
|
});
|
|
278
256
|
api.onPrepare(async ()=>{
|
|
279
|
-
|
|
257
|
+
api.updateAppContext({
|
|
258
|
+
deployTarget: (0, _modern_js_app_tools_extensions_deploy_output_target__rspack_import_0.resolveDeployTarget)({
|
|
259
|
+
configTarget: api.getNormalizedConfig().deploy?.target
|
|
260
|
+
})
|
|
261
|
+
});
|
|
262
|
+
const command = (0, _modern_js_utils__rspack_import_5.getCommand)();
|
|
280
263
|
if ('deploy' === command) {
|
|
281
264
|
const isSkipBuild = [
|
|
282
265
|
'-s',
|
|
283
266
|
'--skip-build'
|
|
284
|
-
].some((tag)=>(0,
|
|
267
|
+
].some((tag)=>(0, _modern_js_utils__rspack_import_5.getArgv)().includes(tag));
|
|
285
268
|
if (isSkipBuild) return;
|
|
286
269
|
}
|
|
287
270
|
const { command: contextCommand } = api.getAppContext();
|
|
@@ -299,7 +282,7 @@ var __webpack_exports__ = {};
|
|
|
299
282
|
const resolvedConfig = api.getNormalizedConfig();
|
|
300
283
|
if (resolvedConfig.output.cleanDistPath) {
|
|
301
284
|
const appContext = api.getAppContext();
|
|
302
|
-
await (0,
|
|
285
|
+
await (0, _modern_js_utils__rspack_import_5.emptyDir)(appContext.distDirectory);
|
|
303
286
|
}
|
|
304
287
|
}
|
|
305
288
|
});
|
|
@@ -307,7 +290,7 @@ var __webpack_exports__ = {};
|
|
|
307
290
|
const appContext = api.getAppContext();
|
|
308
291
|
const config = api.getNormalizedConfig();
|
|
309
292
|
const files = await (0, _utils_generateWatchFiles__rspack_import_16.generateWatchFiles)(appContext, config.source.configDir);
|
|
310
|
-
const watchFiles = (0,
|
|
293
|
+
const watchFiles = (0, _modern_js_builder__rspack_import_2.castArray)(config.dev.watchFiles);
|
|
311
294
|
watchFiles.forEach(({ type, paths })=>{
|
|
312
295
|
if ('reload-server' === type) files.push(...Array.isArray(paths) ? paths : [
|
|
313
296
|
paths
|
|
@@ -318,7 +301,7 @@ var __webpack_exports__ = {};
|
|
|
318
301
|
api.onFileChanged(async (e)=>{
|
|
319
302
|
const { filename, eventType, isPrivate } = e;
|
|
320
303
|
const { appDirectory, apiDirectory } = api.getAppContext();
|
|
321
|
-
const relativeApiPath =
|
|
304
|
+
const relativeApiPath = path__rspack_import_6_default().relative(appDirectory, apiDirectory);
|
|
322
305
|
const isApiProject = filename.startsWith(`${relativeApiPath}/`);
|
|
323
306
|
if (!isPrivate && ('change' === eventType || 'unlink' === eventType) && !isApiProject) {
|
|
324
307
|
const { closeServer } = await import("./utils/createServer.js");
|
|
@@ -327,7 +310,7 @@ var __webpack_exports__ = {};
|
|
|
327
310
|
}
|
|
328
311
|
});
|
|
329
312
|
api.onBeforeRestart(()=>{
|
|
330
|
-
(0,
|
|
313
|
+
(0, _modern_js_utils__rspack_import_5.cleanRequireCache)([
|
|
331
314
|
require.resolve('./plugins/analyze')
|
|
332
315
|
]);
|
|
333
316
|
});
|
|
@@ -335,16 +318,16 @@ var __webpack_exports__ = {};
|
|
|
335
318
|
});
|
|
336
319
|
const __rspack_default_export = appTools;
|
|
337
320
|
__webpack_require__.d(__webpack_exports__, {
|
|
338
|
-
build: ()=>
|
|
339
|
-
closeServer: ()=>
|
|
321
|
+
build: ()=>_commands_build__rspack_import_20.build,
|
|
322
|
+
closeServer: ()=>_utils_createServer__rspack_import_26.closeServer,
|
|
340
323
|
defineConfig: ()=>_defineConfig__rspack_import_19.defineConfig,
|
|
341
|
-
deploy: ()=>
|
|
342
|
-
dev: ()=>
|
|
324
|
+
deploy: ()=>_commands_deploy__rspack_import_21.deploy,
|
|
325
|
+
dev: ()=>_commands_dev__rspack_import_22.dev,
|
|
343
326
|
generateWatchFiles: ()=>_utils_generateWatchFiles__rspack_import_16.generateWatchFiles,
|
|
344
327
|
initAppContext: ()=>_utils_initAppContext__rspack_import_17.initAppContext,
|
|
345
|
-
mergeConfig: ()=>
|
|
346
|
-
resolveModernRsbuildConfig: ()=>
|
|
347
|
-
serve: ()=>
|
|
328
|
+
mergeConfig: ()=>_modern_js_plugin_cli__rspack_import_27.mergeConfig,
|
|
329
|
+
resolveModernRsbuildConfig: ()=>_rsbuild__rspack_import_24.resolveModernRsbuildConfig,
|
|
330
|
+
serve: ()=>_commands_serve__rspack_import_23.serve
|
|
348
331
|
}, {
|
|
349
332
|
appTools: appTools,
|
|
350
333
|
default: __rspack_default_export
|
|
@@ -106,7 +106,7 @@ const getFileSystemEntry = async (hooks, appContext, config)=>{
|
|
|
106
106
|
}));
|
|
107
107
|
return scanDir(hooks, dirs);
|
|
108
108
|
} else throw Error("source.entriesDir accept a directory.");
|
|
109
|
-
throw Error(`src dir ${entriesDir} not found.`);
|
|
109
|
+
else throw Error(`src dir ${entriesDir} not found.`);
|
|
110
110
|
};
|
|
111
111
|
exports.getFileSystemEntry = __webpack_exports__.getFileSystemEntry;
|
|
112
112
|
exports.hasEntry = __webpack_exports__.hasEntry;
|
|
@@ -58,14 +58,14 @@ const walkDirectory = (dir)=>external_fs_default().readdirSync(dir).reduce((prev
|
|
|
58
58
|
...previous,
|
|
59
59
|
...walkDirectory(filePath)
|
|
60
60
|
];
|
|
61
|
-
return [
|
|
61
|
+
else return [
|
|
62
62
|
...previous,
|
|
63
63
|
filePath
|
|
64
64
|
];
|
|
65
65
|
}, []);
|
|
66
66
|
const replaceWithAlias = (base, filePath, alias)=>{
|
|
67
67
|
if (filePath.includes(base)) return (0, utils_namespaceObject.normalizeToPosixPath)(external_path_default().join(alias, external_path_default().relative(base, filePath)));
|
|
68
|
-
return filePath;
|
|
68
|
+
else return filePath;
|
|
69
69
|
};
|
|
70
70
|
const parseModule = async ({ source, filename })=>{
|
|
71
71
|
let content = source;
|
|
@@ -28,12 +28,10 @@ var __webpack_require__ = {};
|
|
|
28
28
|
var __webpack_exports__ = {};
|
|
29
29
|
__webpack_require__.r(__webpack_exports__);
|
|
30
30
|
__webpack_require__.d(__webpack_exports__, {
|
|
31
|
-
default: ()=>deploy
|
|
32
|
-
getSupportedDeployTargets: ()=>getSupportedDeployTargets,
|
|
33
|
-
resolveDeployTarget: ()=>resolveDeployTarget
|
|
31
|
+
default: ()=>deploy
|
|
34
32
|
});
|
|
35
33
|
const cloudflare_namespaceObject = require("@modern-js/app-tools-extensions/cloudflare");
|
|
36
|
-
const
|
|
34
|
+
const target_namespaceObject = require("@modern-js/app-tools-extensions/deploy-output/target");
|
|
37
35
|
const gh_pages_js_namespaceObject = require("./platforms/gh-pages.js");
|
|
38
36
|
const netlify_js_namespaceObject = require("./platforms/netlify.js");
|
|
39
37
|
const node_js_namespaceObject = require("./platforms/node.js");
|
|
@@ -46,24 +44,11 @@ const deployPresets = {
|
|
|
46
44
|
ghPages: gh_pages_js_namespaceObject.createGhPagesPreset,
|
|
47
45
|
cloudflare: cloudflare_namespaceObject.createCloudflarePreset
|
|
48
46
|
};
|
|
49
|
-
const getSupportedDeployTargets = ()=>Object.keys(deployPresets);
|
|
50
|
-
const isDeployTarget = (target)=>Object.prototype.hasOwnProperty.call(deployPresets, target);
|
|
51
|
-
const providerDeployTargets = {
|
|
52
|
-
vercel: 'vercel',
|
|
53
|
-
netlify: 'netlify',
|
|
54
|
-
cloudflare: 'cloudflare',
|
|
55
|
-
cloudflare_pages: 'cloudflare',
|
|
56
|
-
cloudflare_workers: 'cloudflare'
|
|
57
|
-
};
|
|
58
|
-
const normalizeDetectedProvider = (value)=>value ? providerDeployTargets[value] : void 0;
|
|
59
|
-
const resolveDeployTarget = (modernConfig, envDeployTarget = process.env.MODERNJS_DEPLOY, detectedProvider = external_std_env_namespaceObject.provider)=>modernConfig.deploy?.target || envDeployTarget || normalizeDetectedProvider(detectedProvider) || 'node';
|
|
60
47
|
async function getDeployPreset(appContext, modernConfig, deployTarget, api) {
|
|
61
48
|
const { appDirectory, distDirectory, metaName } = appContext;
|
|
62
49
|
const { useSSR, useAPI, useWebServer } = (0, index_js_namespaceObject.getProjectUsage)(appDirectory, distDirectory, metaName);
|
|
63
50
|
const needModernServer = useSSR || useAPI || useWebServer;
|
|
64
|
-
|
|
65
|
-
const createPreset = deployPresets[deployTarget];
|
|
66
|
-
return createPreset({
|
|
51
|
+
return deployPresets[deployTarget]({
|
|
67
52
|
appContext,
|
|
68
53
|
modernConfig,
|
|
69
54
|
needModernServer,
|
|
@@ -75,11 +60,9 @@ const deploy = ()=>({
|
|
|
75
60
|
setup: (api)=>{
|
|
76
61
|
api.deploy(async ()=>{
|
|
77
62
|
const appContext = api.getAppContext();
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
const
|
|
81
|
-
if ('modern-js' !== metaName && !modernConfig.deploy?.target && !process.env.MODERNJS_DEPLOY) return;
|
|
82
|
-
const deployPreset = await getDeployPreset(appContext, modernConfig, deployTarget, api);
|
|
63
|
+
const deployTarget = (0, target_namespaceObject.getDeployingTarget)(appContext);
|
|
64
|
+
if (!deployTarget) return;
|
|
65
|
+
const deployPreset = await getDeployPreset(appContext, api.getNormalizedConfig(), deployTarget, api);
|
|
83
66
|
deployPreset?.prepare && await deployPreset?.prepare();
|
|
84
67
|
deployPreset?.writeOutput && await deployPreset?.writeOutput();
|
|
85
68
|
deployPreset?.genEntry && await deployPreset?.genEntry();
|
|
@@ -88,12 +71,8 @@ const deploy = ()=>({
|
|
|
88
71
|
}
|
|
89
72
|
});
|
|
90
73
|
exports["default"] = __webpack_exports__["default"];
|
|
91
|
-
exports.getSupportedDeployTargets = __webpack_exports__.getSupportedDeployTargets;
|
|
92
|
-
exports.resolveDeployTarget = __webpack_exports__.resolveDeployTarget;
|
|
93
74
|
for(var __rspack_i in __webpack_exports__)if (-1 === [
|
|
94
|
-
"default"
|
|
95
|
-
"getSupportedDeployTargets",
|
|
96
|
-
"resolveDeployTarget"
|
|
75
|
+
"default"
|
|
97
76
|
].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
|
|
98
77
|
Object.defineProperty(exports, '__esModule', {
|
|
99
78
|
value: true
|
|
@@ -41,6 +41,7 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
41
41
|
});
|
|
42
42
|
const external_node_path_namespaceObject = require("node:path");
|
|
43
43
|
var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
|
|
44
|
+
const trace_files_namespaceObject = require("@modern-js/app-tools-extensions/deploy-output/trace-files");
|
|
44
45
|
const utils_namespaceObject = require("@modern-js/utils");
|
|
45
46
|
const external_ndepe_namespaceObject = require("ndepe");
|
|
46
47
|
const routes_js_namespaceObject = require("../../../utils/routes.js");
|
|
@@ -113,8 +114,8 @@ const createNetlifyPreset = ({ appContext, modernConfig, needModernServer })=>{
|
|
|
113
114
|
if (!needModernServer) return;
|
|
114
115
|
const entry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server') : require.resolve('@modern-js/prod-server');
|
|
115
116
|
const netlifyEntry = isEsmProject ? await (0, index_js_namespaceObject.resolveESMDependency)('@modern-js/prod-server/netlify') : require.resolve('@modern-js/prod-server/netlify');
|
|
116
|
-
if (!entry || !netlifyEntry) throw new Error('Cannot find @modern-js/prod-server');
|
|
117
117
|
await (0, external_ndepe_namespaceObject.nodeDepEmit)({
|
|
118
|
+
traceFiles: trace_files_namespaceObject.traceDeployFiles,
|
|
118
119
|
appDir: appDirectory,
|
|
119
120
|
sourceDir: funcsDirectory,
|
|
120
121
|
includeEntries: [
|