@modern-js/app-tools 2.5.1-alpha.0 → 2.5.1-alpha.1

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.
Files changed (148) hide show
  1. package/dist/cjs/analyze/generateCode.js +19 -13
  2. package/dist/cjs/analyze/getBundleEntry.js +1 -1
  3. package/dist/cjs/builder/builder-webpack/builderPlugins/compatModern.js +3 -3
  4. package/dist/cjs/builder/builder-webpack/index.js +11 -5
  5. package/dist/cjs/builder/generator/getBuilderTargets.js +1 -1
  6. package/dist/cjs/commands/dev.js +12 -14
  7. package/dist/cjs/commands/serve.js +17 -0
  8. package/dist/cjs/config/legacy/createToolsConfig.js +1 -4
  9. package/dist/esm/analyze/generateCode.js +37 -26
  10. package/dist/esm/analyze/getBundleEntry.js +2 -2
  11. package/dist/esm/builder/builder-webpack/builderPlugins/compatModern.js +2 -2
  12. package/dist/esm/builder/builder-webpack/index.js +11 -7
  13. package/dist/esm/builder/generator/getBuilderTargets.js +1 -1
  14. package/dist/esm/commands/dev.js +9 -8
  15. package/dist/esm/commands/serve.js +6 -1
  16. package/dist/esm/config/legacy/createToolsConfig.js +1 -4
  17. package/dist/esm-node/analyze/generateCode.js +20 -14
  18. package/dist/esm-node/analyze/getBundleEntry.js +2 -3
  19. package/dist/esm-node/builder/builder-webpack/builderPlugins/compatModern.js +2 -2
  20. package/dist/esm-node/builder/builder-webpack/index.js +12 -6
  21. package/dist/esm-node/builder/generator/getBuilderTargets.js +1 -1
  22. package/dist/esm-node/commands/dev.js +12 -14
  23. package/dist/esm-node/commands/serve.js +18 -1
  24. package/dist/esm-node/config/legacy/createToolsConfig.js +1 -4
  25. package/dist/js/modern/analyze/constants.js +3 -1
  26. package/dist/js/modern/analyze/getServerRoutes.js +5 -2
  27. package/dist/js/modern/analyze/index.js +47 -46
  28. package/dist/js/modern/analyze/nestedRoutes.js +32 -3
  29. package/dist/js/modern/analyze/templates.js +4 -10
  30. package/dist/js/modern/builder/builder-rspack/index.js +8 -0
  31. package/dist/js/modern/builder/builder-webpack/builderPlugins/compatModern.js +41 -0
  32. package/dist/js/modern/builder/builder-webpack/index.js +93 -0
  33. package/dist/js/modern/builder/{webpackPlugins/routerPlugin.js → builder-webpack/webpackPlugins/RouterPlugin.js} +4 -1
  34. package/dist/js/modern/builder/builder-webpack/webpackPlugins/index.js +1 -0
  35. package/dist/js/modern/builder/generator/createBuilderOptions.js +24 -0
  36. package/dist/js/modern/builder/generator/createBuilderProviderConfig.js +39 -0
  37. package/dist/js/modern/builder/generator/getBuilderTargets.js +21 -0
  38. package/dist/js/modern/builder/generator/index.js +53 -0
  39. package/dist/js/modern/builder/index.js +13 -133
  40. package/dist/js/modern/builder/{builderPlugins/compatModern.js → shared/builderPlugins/adapterModern.js} +102 -116
  41. package/dist/js/modern/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +27 -0
  42. package/dist/js/modern/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +34 -0
  43. package/dist/js/modern/builder/shared/index.js +3 -0
  44. package/dist/js/modern/builder/shared/types.js +0 -0
  45. package/dist/js/modern/config/default.js +2 -2
  46. package/dist/js/modern/config/index.js +3 -8
  47. package/dist/js/modern/config/initialize/index.js +12 -0
  48. package/dist/js/modern/config/{initial → initialize}/inits.js +4 -2
  49. package/dist/js/modern/config/{initial/transformNormalizedConfig.js → legacy/index.js} +4 -0
  50. package/dist/js/modern/index.js +18 -8
  51. package/dist/js/modern/initialize/index.js +36 -28
  52. package/dist/js/modern/locale/zh.js +1 -1
  53. package/dist/js/modern/types/utils.js +0 -0
  54. package/dist/js/node/analyze/constants.js +3 -1
  55. package/dist/js/node/analyze/getServerRoutes.js +3 -1
  56. package/dist/js/node/analyze/index.js +48 -47
  57. package/dist/js/node/analyze/nestedRoutes.js +32 -3
  58. package/dist/js/node/analyze/templates.js +4 -10
  59. package/dist/js/node/{config/initial → builder/builder-rspack}/index.js +9 -19
  60. package/dist/js/node/builder/builder-webpack/builderPlugins/compatModern.js +64 -0
  61. package/dist/js/node/builder/builder-webpack/index.js +118 -0
  62. package/dist/js/node/builder/{webpackPlugins/routerPlugin.js → builder-webpack/webpackPlugins/RouterPlugin.js} +10 -5
  63. package/dist/js/node/builder/builder-webpack/webpackPlugins/index.js +17 -0
  64. package/dist/js/node/builder/generator/createBuilderOptions.js +47 -0
  65. package/dist/js/node/builder/generator/createBuilderProviderConfig.js +60 -0
  66. package/dist/js/node/builder/generator/getBuilderTargets.js +39 -0
  67. package/dist/js/node/builder/generator/index.js +82 -0
  68. package/dist/js/node/builder/index.js +14 -123
  69. package/dist/js/node/builder/{builderPlugins/compatModern.js → shared/builderPlugins/adapterModern.js} +107 -120
  70. package/dist/js/node/builder/{webpackPlugins/htmlAsyncChunkPlugin.js → shared/bundlerPlugins/HtmlAsyncChunkPlugin.js} +17 -20
  71. package/dist/js/node/builder/{webpackPlugins/htmlBottomTemplate.js → shared/bundlerPlugins/HtmlBottomTemplate.js} +21 -24
  72. package/dist/js/node/builder/{share.js → shared/createCopyPattern.js} +3 -3
  73. package/dist/js/node/builder/shared/index.js +19 -0
  74. package/dist/js/node/builder/shared/types.js +15 -0
  75. package/dist/js/node/config/default.js +2 -2
  76. package/dist/js/node/config/index.js +4 -19
  77. package/dist/js/node/{builder/loaders/routerLoader.js → config/initialize/index.js} +14 -17
  78. package/dist/js/node/config/{initial → initialize}/inits.js +4 -2
  79. package/dist/js/node/config/{initial/transformNormalizedConfig.js → legacy/index.js} +8 -3
  80. package/dist/js/node/index.js +18 -8
  81. package/dist/js/node/initialize/index.js +35 -28
  82. package/dist/js/node/locale/zh.js +1 -1
  83. package/dist/js/node/types/utils.js +15 -0
  84. package/dist/js/treeshaking/analyze/constants.js +3 -1
  85. package/dist/js/treeshaking/analyze/generateCode.js +14 -14
  86. package/dist/js/treeshaking/analyze/getBundleEntry.js +2 -2
  87. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +1 -1
  88. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +1 -1
  89. package/dist/js/treeshaking/analyze/getFileSystemEntry.js +1 -1
  90. package/dist/js/treeshaking/analyze/getServerRoutes.js +8 -6
  91. package/dist/js/treeshaking/analyze/index.js +142 -137
  92. package/dist/js/treeshaking/analyze/nestedRoutes.js +29 -4
  93. package/dist/js/treeshaking/analyze/templates.js +10 -13
  94. package/dist/js/treeshaking/analyze/utils.js +3 -3
  95. package/dist/js/treeshaking/builder/builder-rspack/index.js +6 -0
  96. package/dist/js/treeshaking/builder/builder-webpack/builderPlugins/compatModern.js +64 -0
  97. package/dist/js/treeshaking/builder/builder-webpack/index.js +301 -0
  98. package/dist/js/treeshaking/builder/{webpackPlugins/routerPlugin.js → builder-webpack/webpackPlugins/RouterPlugin.js} +6 -3
  99. package/dist/js/treeshaking/builder/builder-webpack/webpackPlugins/index.js +1 -0
  100. package/dist/js/treeshaking/builder/generator/createBuilderOptions.js +41 -0
  101. package/dist/js/treeshaking/builder/generator/createBuilderProviderConfig.js +70 -0
  102. package/dist/js/treeshaking/builder/generator/getBuilderTargets.js +16 -0
  103. package/dist/js/treeshaking/builder/generator/index.js +199 -0
  104. package/dist/js/treeshaking/builder/index.js +29 -228
  105. package/dist/js/treeshaking/builder/{builderPlugins/compatModern.js → shared/builderPlugins/adapterModern.js} +138 -142
  106. package/dist/js/treeshaking/builder/{webpackPlugins/htmlBottomTemplate.js → shared/bundlerPlugins/HtmlBottomTemplate.js} +2 -2
  107. package/dist/js/treeshaking/builder/shared/index.js +3 -0
  108. package/dist/js/treeshaking/builder/shared/types.js +1 -0
  109. package/dist/js/treeshaking/commands/dev.js +2 -2
  110. package/dist/js/treeshaking/commands/serve.js +2 -2
  111. package/dist/js/treeshaking/config/default.js +2 -2
  112. package/dist/js/treeshaking/config/index.js +3 -3
  113. package/dist/js/treeshaking/config/initialize/index.js +10 -0
  114. package/dist/js/treeshaking/config/{initial → initialize}/inits.js +6 -4
  115. package/dist/js/treeshaking/config/legacy/createHtmlConfig.js +19 -0
  116. package/dist/js/treeshaking/config/{initial → legacy}/createOutputConfig.js +1 -1
  117. package/dist/js/treeshaking/config/{initial → legacy}/createSourceConfig.js +1 -1
  118. package/dist/js/treeshaking/config/{initial → legacy}/createToolsConfig.js +1 -1
  119. package/dist/js/treeshaking/config/{initial/transformNormalizedConfig.js → legacy/index.js} +4 -1
  120. package/dist/js/treeshaking/index.js +19 -12
  121. package/dist/js/treeshaking/initialize/index.js +36 -28
  122. package/dist/js/treeshaking/locale/zh.js +1 -1
  123. package/dist/js/treeshaking/types/utils.js +1 -0
  124. package/dist/js/treeshaking/utils/config.js +2 -2
  125. package/dist/js/treeshaking/utils/getServerInternalPlugins.js +2 -2
  126. package/dist/types/builder/builder-webpack/builderPlugins/compatModern.d.ts +7 -1
  127. package/package.json +6 -6
  128. package/dist/js/modern/builder/loaders/routerLoader.js +0 -17
  129. package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +0 -30
  130. package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +0 -37
  131. package/dist/js/modern/config/initial/index.js +0 -16
  132. package/dist/js/treeshaking/builder/loaders/routerLoader.js +0 -13
  133. package/dist/js/treeshaking/config/initial/createHtmlConfig.js +0 -19
  134. package/dist/js/treeshaking/config/initial/index.js +0 -12
  135. /package/dist/js/modern/builder/{share.js → shared/createCopyPattern.js} +0 -0
  136. /package/dist/js/modern/builder/{loaders → shared/loaders}/serverModuleLoader.js +0 -0
  137. /package/dist/js/modern/config/{initial → legacy}/createHtmlConfig.js +0 -0
  138. /package/dist/js/modern/config/{initial → legacy}/createOutputConfig.js +0 -0
  139. /package/dist/js/modern/config/{initial → legacy}/createSourceConfig.js +0 -0
  140. /package/dist/js/modern/config/{initial → legacy}/createToolsConfig.js +0 -0
  141. /package/dist/js/node/builder/{loaders → shared/loaders}/serverModuleLoader.js +0 -0
  142. /package/dist/js/node/config/{initial → legacy}/createHtmlConfig.js +0 -0
  143. /package/dist/js/node/config/{initial → legacy}/createOutputConfig.js +0 -0
  144. /package/dist/js/node/config/{initial → legacy}/createSourceConfig.js +0 -0
  145. /package/dist/js/node/config/{initial → legacy}/createToolsConfig.js +0 -0
  146. /package/dist/js/treeshaking/builder/{webpackPlugins/htmlAsyncChunkPlugin.js → shared/bundlerPlugins/HtmlAsyncChunkPlugin.js} +0 -0
  147. /package/dist/js/treeshaking/builder/{share.js → shared/createCopyPattern.js} +0 -0
  148. /package/dist/js/treeshaking/builder/{loaders → shared/loaders}/serverModuleLoader.js +0 -0
@@ -0,0 +1,118 @@
1
+ var __create = Object.create;
2
+ var __defProp = Object.defineProperty;
3
+ var __defProps = Object.defineProperties;
4
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
6
+ var __getOwnPropNames = Object.getOwnPropertyNames;
7
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
8
+ var __getProtoOf = Object.getPrototypeOf;
9
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
10
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
11
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
12
+ var __spreadValues = (a, b) => {
13
+ for (var prop in b || (b = {}))
14
+ if (__hasOwnProp.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ if (__getOwnPropSymbols)
17
+ for (var prop of __getOwnPropSymbols(b)) {
18
+ if (__propIsEnum.call(b, prop))
19
+ __defNormalProp(a, prop, b[prop]);
20
+ }
21
+ return a;
22
+ };
23
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
24
+ var __export = (target, all) => {
25
+ for (var name in all)
26
+ __defProp(target, name, { get: all[name], enumerable: true });
27
+ };
28
+ var __copyProps = (to, from, except, desc) => {
29
+ if (from && typeof from === "object" || typeof from === "function") {
30
+ for (let key of __getOwnPropNames(from))
31
+ if (!__hasOwnProp.call(to, key) && key !== except)
32
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
33
+ }
34
+ return to;
35
+ };
36
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
37
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
38
+ mod
39
+ ));
40
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
41
+ var __async = (__this, __arguments, generator) => {
42
+ return new Promise((resolve, reject) => {
43
+ var fulfilled = (value) => {
44
+ try {
45
+ step(generator.next(value));
46
+ } catch (e) {
47
+ reject(e);
48
+ }
49
+ };
50
+ var rejected = (value) => {
51
+ try {
52
+ step(generator.throw(value));
53
+ } catch (e) {
54
+ reject(e);
55
+ }
56
+ };
57
+ var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
58
+ step((generator = generator.apply(__this, __arguments)).next());
59
+ });
60
+ };
61
+ var builder_webpack_exports = {};
62
+ __export(builder_webpack_exports, {
63
+ createWebpackBuilderForModern: () => createWebpackBuilderForModern
64
+ });
65
+ module.exports = __toCommonJS(builder_webpack_exports);
66
+ var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
67
+ var import_utils = require("@modern-js/utils");
68
+ var import_shared = require("../shared");
69
+ var import_generator = require("../generator");
70
+ var import_compatModern = require("./builderPlugins/compatModern");
71
+ function createWebpackBuilderForModern(options) {
72
+ return (0, import_generator.generateBuilder)(options, import_builder_webpack_provider.builderWebpackProvider, {
73
+ modifyBuilderConfig(config) {
74
+ modifyOutputConfig(config, options.appContext);
75
+ },
76
+ modifyBuilderInstance(builder) {
77
+ return __async(this, null, function* () {
78
+ yield applyBuilderPlugins(builder, options);
79
+ });
80
+ }
81
+ });
82
+ }
83
+ function modifyOutputConfig(config, appContext) {
84
+ config.output = createOutputConfig(config, appContext);
85
+ function createOutputConfig(config2, appContext2) {
86
+ const defaultCopyPattern = (0, import_shared.createCopyPattern)(appContext2, config2, "upload");
87
+ const { copy } = config2.output;
88
+ const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
89
+ const builderCopy = [...copyOptions || [], defaultCopyPattern];
90
+ return __spreadProps(__spreadValues({}, config2.output), {
91
+ copy: builderCopy
92
+ });
93
+ }
94
+ }
95
+ function applyBuilderPlugins(builder, options) {
96
+ return __async(this, null, function* () {
97
+ const { normalizedConfig } = options;
98
+ if (!normalizedConfig.output.disableNodePolyfill) {
99
+ const { PluginNodePolyfill } = yield Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-node-polyfill")));
100
+ builder.addPlugins([PluginNodePolyfill()]);
101
+ }
102
+ if (normalizedConfig.tools.esbuild) {
103
+ const { esbuild: esbuildOptions } = normalizedConfig.tools;
104
+ const { PluginEsbuild } = yield Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-esbuild")));
105
+ builder.addPlugins([
106
+ PluginEsbuild({
107
+ loader: false,
108
+ minimize: (0, import_utils.applyOptionsChain)({}, esbuildOptions)
109
+ })
110
+ ]);
111
+ }
112
+ builder.addPlugins([(0, import_compatModern.PluginCompatModern)(options)]);
113
+ });
114
+ }
115
+ // Annotate the CommonJS export names for ESM import in node:
116
+ 0 && (module.exports = {
117
+ createWebpackBuilderForModern
118
+ });
@@ -41,11 +41,11 @@ var __async = (__this, __arguments, generator) => {
41
41
  step((generator = generator.apply(__this, __arguments)).next());
42
42
  });
43
43
  };
44
- var routerPlugin_exports = {};
45
- __export(routerPlugin_exports, {
46
- default: () => RouterPlugin
44
+ var RouterPlugin_exports = {};
45
+ __export(RouterPlugin_exports, {
46
+ RouterPlugin: () => RouterPlugin
47
47
  });
48
- module.exports = __toCommonJS(routerPlugin_exports);
48
+ module.exports = __toCommonJS(RouterPlugin_exports);
49
49
  var import_path = __toESM(require("path"));
50
50
  var import_utils = require("@modern-js/utils");
51
51
  const PLUGIN_NAME = "ModernjsRoutePlugin";
@@ -55,6 +55,9 @@ class RouterPlugin {
55
55
  if (target === "node" || Array.isArray(target) && target.includes("node")) {
56
56
  return;
57
57
  }
58
+ if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
59
+ return;
60
+ }
58
61
  const { webpack } = compiler;
59
62
  const { Compilation, sources } = webpack;
60
63
  const { RawSource } = sources;
@@ -132,4 +135,6 @@ class RouterPlugin {
132
135
  }
133
136
  }
134
137
  // Annotate the CommonJS export names for ESM import in node:
135
- 0 && (module.exports = {});
138
+ 0 && (module.exports = {
139
+ RouterPlugin
140
+ });
@@ -0,0 +1,17 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
+ var __getOwnPropNames = Object.getOwnPropertyNames;
4
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
5
+ var __copyProps = (to, from, except, desc) => {
6
+ if (from && typeof from === "object" || typeof from === "function") {
7
+ for (let key of __getOwnPropNames(from))
8
+ if (!__hasOwnProp.call(to, key) && key !== except)
9
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
10
+ }
11
+ return to;
12
+ };
13
+ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
14
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
15
+ var webpackPlugins_exports = {};
16
+ module.exports = __toCommonJS(webpackPlugins_exports);
17
+ __reExport(webpackPlugins_exports, require("./RouterPlugin"), module.exports);
@@ -0,0 +1,47 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
+ var __getOwnPropNames = Object.getOwnPropertyNames;
4
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
5
+ var __export = (target, all) => {
6
+ for (var name in all)
7
+ __defProp(target, name, { get: all[name], enumerable: true });
8
+ };
9
+ var __copyProps = (to, from, except, desc) => {
10
+ if (from && typeof from === "object" || typeof from === "function") {
11
+ for (let key of __getOwnPropNames(from))
12
+ if (!__hasOwnProp.call(to, key) && key !== except)
13
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
14
+ }
15
+ return to;
16
+ };
17
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
+ var createBuilderOptions_exports = {};
19
+ __export(createBuilderOptions_exports, {
20
+ createBuilderOptions: () => createBuilderOptions
21
+ });
22
+ module.exports = __toCommonJS(createBuilderOptions_exports);
23
+ function createBuilderOptions(target, appContext) {
24
+ const entries = {};
25
+ const { entrypoints = [], checkedEntries } = appContext;
26
+ for (const { entryName, entry } of entrypoints) {
27
+ if (checkedEntries && !checkedEntries.includes(entryName)) {
28
+ continue;
29
+ }
30
+ if (entryName in entries) {
31
+ entries[entryName].push(entry);
32
+ } else {
33
+ entries[entryName] = [entry];
34
+ }
35
+ }
36
+ return {
37
+ cwd: appContext.appDirectory,
38
+ target,
39
+ configPath: appContext.configFile || void 0,
40
+ entry: entries,
41
+ framework: appContext.metaName
42
+ };
43
+ }
44
+ // Annotate the CommonJS export names for ESM import in node:
45
+ 0 && (module.exports = {
46
+ createBuilderOptions
47
+ });
@@ -0,0 +1,60 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
5
+ var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
7
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
9
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
10
+ var __spreadValues = (a, b) => {
11
+ for (var prop in b || (b = {}))
12
+ if (__hasOwnProp.call(b, prop))
13
+ __defNormalProp(a, prop, b[prop]);
14
+ if (__getOwnPropSymbols)
15
+ for (var prop of __getOwnPropSymbols(b)) {
16
+ if (__propIsEnum.call(b, prop))
17
+ __defNormalProp(a, prop, b[prop]);
18
+ }
19
+ return a;
20
+ };
21
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
22
+ var __export = (target, all) => {
23
+ for (var name in all)
24
+ __defProp(target, name, { get: all[name], enumerable: true });
25
+ };
26
+ var __copyProps = (to, from, except, desc) => {
27
+ if (from && typeof from === "object" || typeof from === "function") {
28
+ for (let key of __getOwnPropNames(from))
29
+ if (!__hasOwnProp.call(to, key) && key !== except)
30
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
31
+ }
32
+ return to;
33
+ };
34
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
35
+ var createBuilderProviderConfig_exports = {};
36
+ __export(createBuilderProviderConfig_exports, {
37
+ createBuilderProviderConfig: () => createBuilderProviderConfig
38
+ });
39
+ module.exports = __toCommonJS(createBuilderProviderConfig_exports);
40
+ function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderConfig) {
41
+ const htmlConfig = __spreadValues({}, resolveConfig.html);
42
+ if (!htmlConfig.template) {
43
+ htmlConfig.templateByEntries = __spreadValues(__spreadValues({}, htmlConfig.templateByEntries), appContext.htmlTemplates);
44
+ }
45
+ const config = __spreadProps(__spreadValues({}, resolveConfig), {
46
+ dev: __spreadProps(__spreadValues({}, resolveConfig.dev), {
47
+ port: appContext.port
48
+ }),
49
+ html: htmlConfig,
50
+ output: __spreadProps(__spreadValues({}, resolveConfig.output), {
51
+ cleanDistPath: false
52
+ })
53
+ });
54
+ modifyBuilderConfig == null ? void 0 : modifyBuilderConfig(config);
55
+ return config;
56
+ }
57
+ // Annotate the CommonJS export names for ESM import in node:
58
+ 0 && (module.exports = {
59
+ createBuilderProviderConfig
60
+ });
@@ -0,0 +1,39 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
+ var __getOwnPropNames = Object.getOwnPropertyNames;
4
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
5
+ var __export = (target, all) => {
6
+ for (var name in all)
7
+ __defProp(target, name, { get: all[name], enumerable: true });
8
+ };
9
+ var __copyProps = (to, from, except, desc) => {
10
+ if (from && typeof from === "object" || typeof from === "function") {
11
+ for (let key of __getOwnPropNames(from))
12
+ if (!__hasOwnProp.call(to, key) && key !== except)
13
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
14
+ }
15
+ return to;
16
+ };
17
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
+ var getBuilderTargets_exports = {};
19
+ __export(getBuilderTargets_exports, {
20
+ getBuilderTargets: () => getBuilderTargets
21
+ });
22
+ module.exports = __toCommonJS(getBuilderTargets_exports);
23
+ var import_utils = require("@modern-js/utils");
24
+ function getBuilderTargets(normalizedConfig) {
25
+ const targets = ["web"];
26
+ const useNodeTarget = (0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig);
27
+ if (useNodeTarget) {
28
+ targets.push("node");
29
+ }
30
+ const useWorkerTarget = (0, import_utils.isProd)() ? (0, import_utils.isServiceWorker)(normalizedConfig) : false;
31
+ if (useWorkerTarget) {
32
+ targets.push("service-worker");
33
+ }
34
+ return targets;
35
+ }
36
+ // Annotate the CommonJS export names for ESM import in node:
37
+ 0 && (module.exports = {
38
+ getBuilderTargets
39
+ });
@@ -0,0 +1,82 @@
1
+ var __create = Object.create;
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __getProtoOf = Object.getPrototypeOf;
6
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
7
+ var __export = (target, all) => {
8
+ for (var name in all)
9
+ __defProp(target, name, { get: all[name], enumerable: true });
10
+ };
11
+ var __copyProps = (to, from, except, desc) => {
12
+ if (from && typeof from === "object" || typeof from === "function") {
13
+ for (let key of __getOwnPropNames(from))
14
+ if (!__hasOwnProp.call(to, key) && key !== except)
15
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
+ }
17
+ return to;
18
+ };
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
+ mod
22
+ ));
23
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
+ var __async = (__this, __arguments, generator) => {
25
+ return new Promise((resolve, reject) => {
26
+ var fulfilled = (value) => {
27
+ try {
28
+ step(generator.next(value));
29
+ } catch (e) {
30
+ reject(e);
31
+ }
32
+ };
33
+ var rejected = (value) => {
34
+ try {
35
+ step(generator.throw(value));
36
+ } catch (e) {
37
+ reject(e);
38
+ }
39
+ };
40
+ var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
41
+ step((generator = generator.apply(__this, __arguments)).next());
42
+ });
43
+ };
44
+ var generator_exports = {};
45
+ __export(generator_exports, {
46
+ generateBuilder: () => generateBuilder
47
+ });
48
+ module.exports = __toCommonJS(generator_exports);
49
+ var import_builder = require("@modern-js/builder");
50
+ var import_createBuilderProviderConfig = require("./createBuilderProviderConfig");
51
+ var import_getBuilderTargets = require("./getBuilderTargets");
52
+ var import_createBuilderOptions = require("./createBuilderOptions");
53
+ function generateBuilder(options, generateProvider, utils) {
54
+ return __async(this, null, function* () {
55
+ const { normalizedConfig, appContext } = options;
56
+ const { modifyBuilderConfig, modifyBuilderInstance } = utils || {};
57
+ const builderConfig = (0, import_createBuilderProviderConfig.createBuilderProviderConfig)(
58
+ normalizedConfig,
59
+ appContext,
60
+ modifyBuilderConfig
61
+ );
62
+ const provider = generateProvider({
63
+ builderConfig
64
+ });
65
+ const target = (0, import_getBuilderTargets.getBuilderTargets)(normalizedConfig);
66
+ const builderOptions = (0, import_createBuilderOptions.createBuilderOptions)(target, appContext);
67
+ const builder = yield (0, import_builder.createBuilder)(provider, builderOptions);
68
+ yield applyBuilderPlugins(builder, options);
69
+ yield modifyBuilderInstance == null ? void 0 : modifyBuilderInstance(builder);
70
+ return builder;
71
+ });
72
+ }
73
+ function applyBuilderPlugins(builder, options) {
74
+ return __async(this, null, function* () {
75
+ const { builderPluginAdapterModern } = yield Promise.resolve().then(() => __toESM(require("../shared/builderPlugins/adapterModern")));
76
+ builder.addPlugins([builderPluginAdapterModern(options)]);
77
+ });
78
+ }
79
+ // Annotate the CommonJS export names for ESM import in node:
80
+ 0 && (module.exports = {
81
+ generateBuilder
82
+ });
@@ -1,26 +1,9 @@
1
1
  var __create = Object.create;
2
2
  var __defProp = Object.defineProperty;
3
- var __defProps = Object.defineProperties;
4
3
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
6
4
  var __getOwnPropNames = Object.getOwnPropertyNames;
7
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
8
5
  var __getProtoOf = Object.getPrototypeOf;
9
6
  var __hasOwnProp = Object.prototype.hasOwnProperty;
10
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
11
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
12
- var __spreadValues = (a, b) => {
13
- for (var prop in b || (b = {}))
14
- if (__hasOwnProp.call(b, prop))
15
- __defNormalProp(a, prop, b[prop]);
16
- if (__getOwnPropSymbols)
17
- for (var prop of __getOwnPropSymbols(b)) {
18
- if (__propIsEnum.call(b, prop))
19
- __defNormalProp(a, prop, b[prop]);
20
- }
21
- return a;
22
- };
23
- var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
24
7
  var __export = (target, all) => {
25
8
  for (var name in all)
26
9
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -60,118 +43,26 @@ var __async = (__this, __arguments, generator) => {
60
43
  };
61
44
  var builder_exports = {};
62
45
  __export(builder_exports, {
63
- createBuilderForModern: () => createBuilderForModern,
64
- createBuilderOptions: () => createBuilderOptions,
65
- createBuilderProviderConfig: () => createBuilderProviderConfig
46
+ createBuilderGenerator: () => createBuilderGenerator
66
47
  });
67
48
  module.exports = __toCommonJS(builder_exports);
68
- var import_builder = require("@modern-js/builder");
69
- var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
70
- var import_utils = require("@modern-js/utils");
71
- var import_compatModern = require("./builderPlugins/compatModern");
72
- var import_share = require("./share");
73
- function getBuilderTargets(normalizedConfig) {
74
- const targets = ["web"];
75
- const useNodeTarget = (0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig);
76
- if (useNodeTarget) {
77
- targets.push("node");
78
- }
79
- return targets;
80
- }
81
- function createBuilderForModern(_0) {
82
- return __async(this, arguments, function* ({
83
- normalizedConfig,
84
- appContext,
85
- compatPluginConfig
86
- }) {
87
- const builderConfig = createBuilderProviderConfig(
88
- normalizedConfig,
89
- appContext
90
- );
91
- const webpackProvider = (0, import_builder_webpack_provider.builderWebpackProvider)({
92
- builderConfig
93
- });
94
- const target = getBuilderTargets(normalizedConfig);
95
- const builderOptions = createBuilderOptions(target, appContext);
96
- const builder = yield (0, import_builder.createBuilder)(webpackProvider, builderOptions);
97
- yield applyBuilderPlugins(
98
- builder,
99
- normalizedConfig,
100
- appContext,
101
- compatPluginConfig
102
- );
103
- return builder;
104
- });
105
- }
106
- function createBuilderProviderConfig(normalizedConfig, appContext) {
107
- const output = createOutputConfig(normalizedConfig, appContext);
108
- const htmlConfig = __spreadValues({}, normalizedConfig.html);
109
- if (!htmlConfig.template) {
110
- htmlConfig.templateByEntries = __spreadValues(__spreadValues({}, htmlConfig.templateByEntries), appContext.htmlTemplates);
111
- }
112
- return __spreadProps(__spreadValues({}, normalizedConfig), {
113
- output,
114
- dev: __spreadProps(__spreadValues({}, normalizedConfig.dev), {
115
- port: appContext.port
116
- }),
117
- html: htmlConfig
118
- });
119
- function createOutputConfig(config, appContext2) {
120
- const defaultCopyPattern = (0, import_share.createCopyPattern)(appContext2, config, "upload");
121
- const { copy } = config.output;
122
- const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
123
- const builderCopy = [...copyOptions || [], defaultCopyPattern];
124
- return __spreadProps(__spreadValues({}, config.output), {
125
- copy: builderCopy,
126
- cleanDistPath: false
127
- });
128
- }
129
- }
130
- function createBuilderOptions(target, appContext) {
131
- const entries = {};
132
- const { entrypoints = [], checkedEntries } = appContext;
133
- for (const { entryName, entry } of entrypoints) {
134
- if (checkedEntries && !checkedEntries.includes(entryName)) {
135
- continue;
136
- }
137
- if (entryName in entries) {
138
- entries[entryName].push(entry);
139
- } else {
140
- entries[entryName] = [entry];
141
- }
142
- }
143
- return {
144
- cwd: appContext.appDirectory,
145
- target,
146
- configPath: appContext.configFile || void 0,
147
- entry: entries,
148
- framework: appContext.metaName
149
- };
150
- }
151
- function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
49
+ function createBuilderGenerator(bundler) {
152
50
  return __async(this, null, function* () {
153
- if (!normalizedConfig.output.disableNodePolyfill) {
154
- const { builderPluginNodePolyfill } = yield Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-node-polyfill")));
155
- builder.addPlugins([builderPluginNodePolyfill()]);
156
- }
157
- if (normalizedConfig.tools.esbuild) {
158
- const { esbuild: esbuildOptions } = normalizedConfig.tools;
159
- const { builderPluginEsbuild } = yield Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-esbuild")));
160
- builder.addPlugins([
161
- builderPluginEsbuild({
162
- loader: false,
163
- minimize: (0, import_utils.applyOptionsChain)({}, esbuildOptions)
164
- })
165
- ]);
51
+ if (bundler === "rspack") {
52
+ try {
53
+ const { createRspackBuilderForModern } = yield Promise.resolve().then(() => __toESM(require("./builder-rspack")));
54
+ return createRspackBuilderForModern;
55
+ } catch (_) {
56
+ throw new Error(
57
+ "Failed to use rspack, please check if you have `@modern-js/builder-rspack-provider` installed"
58
+ );
59
+ }
166
60
  }
167
- builder.addPlugins([
168
- (0, import_compatModern.PluginCompatModern)(appContext, normalizedConfig, compatPluginConfig)
169
- ]);
61
+ const { createWebpackBuilderForModern } = yield Promise.resolve().then(() => __toESM(require("./builder-webpack")));
62
+ return createWebpackBuilderForModern;
170
63
  });
171
64
  }
172
65
  // Annotate the CommonJS export names for ESM import in node:
173
66
  0 && (module.exports = {
174
- createBuilderForModern,
175
- createBuilderOptions,
176
- createBuilderProviderConfig
67
+ createBuilderGenerator
177
68
  });