@modern-js/app-tools 2.0.0-canary.0 → 2.0.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.
Files changed (183) hide show
  1. package/CHANGELOG.md +724 -0
  2. package/bin/modern.js +3 -0
  3. package/dist/js/modern/analyze/Builder.js +39 -0
  4. package/dist/js/modern/analyze/constants.js +16 -0
  5. package/dist/js/modern/analyze/generateCode.js +14 -15
  6. package/dist/js/modern/analyze/getBundleEntry.js +5 -1
  7. package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +9 -6
  8. package/dist/js/modern/analyze/getFileSystemEntry.js +11 -3
  9. package/dist/js/modern/analyze/index.js +79 -8
  10. package/dist/js/modern/analyze/nestedRoutes.js +29 -22
  11. package/dist/js/modern/analyze/templates.js +28 -7
  12. package/dist/js/modern/analyze/utils.js +21 -4
  13. package/dist/js/modern/builder/builderPlugins/compatModern.js +12 -5
  14. package/dist/js/modern/builder/index.js +14 -16
  15. package/dist/js/modern/builder/share.js +4 -4
  16. package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +3 -1
  17. package/dist/js/modern/commands/dev.js +6 -9
  18. package/dist/js/modern/commands/index.js +1 -1
  19. package/dist/js/modern/commands/{start.js → serve.js} +3 -1
  20. package/dist/js/modern/config/default.js +38 -61
  21. package/dist/js/modern/config/initial/createOutputConfig.js +1 -3
  22. package/dist/js/modern/config/initial/createSourceConfig.js +5 -1
  23. package/dist/js/modern/config/initial/inits.js +7 -0
  24. package/dist/js/modern/config/initial/transformNormalizedConfig.js +5 -1
  25. package/dist/js/modern/hooks.js +6 -1
  26. package/dist/js/modern/index.js +96 -59
  27. package/dist/js/modern/initialize/index.js +5 -4
  28. package/dist/js/modern/locale/en.js +1 -1
  29. package/dist/js/modern/locale/zh.js +1 -1
  30. package/dist/js/modern/schema/index.js +6 -8
  31. package/dist/js/modern/schema/legacy.js +2 -3
  32. package/dist/js/modern/utils/commands.js +6 -1
  33. package/dist/js/modern/utils/env.js +15 -0
  34. package/dist/js/modern/utils/getServerInternalPlugins.js +58 -0
  35. package/dist/js/node/analyze/Builder.js +64 -0
  36. package/dist/js/node/analyze/constants.js +44 -3
  37. package/dist/js/node/analyze/generateCode.js +33 -29
  38. package/dist/js/node/analyze/getBundleEntry.js +12 -4
  39. package/dist/js/node/analyze/getClientRoutes/getRoutes.js +33 -28
  40. package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +24 -22
  41. package/dist/js/node/analyze/getClientRoutes/index.js +8 -3
  42. package/dist/js/node/analyze/getClientRoutes/utils.js +10 -3
  43. package/dist/js/node/analyze/getFileSystemEntry.js +18 -6
  44. package/dist/js/node/analyze/getHtmlTemplate.js +18 -14
  45. package/dist/js/node/analyze/getServerRoutes.js +36 -34
  46. package/dist/js/node/analyze/index.js +105 -59
  47. package/dist/js/node/analyze/isDefaultExportFunction.js +7 -3
  48. package/dist/js/node/analyze/makeLegalIdentifier.js +7 -3
  49. package/dist/js/node/analyze/nestedRoutes.js +58 -49
  50. package/dist/js/node/analyze/templates.js +64 -37
  51. package/dist/js/node/analyze/utils.js +40 -18
  52. package/dist/js/node/builder/builderPlugins/compatModern.js +36 -27
  53. package/dist/js/node/builder/index.js +42 -55
  54. package/dist/js/node/builder/loaders/routerLoader.js +5 -3
  55. package/dist/js/node/builder/loaders/serverModuleLoader.js +5 -3
  56. package/dist/js/node/builder/share.js +11 -7
  57. package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +7 -3
  58. package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +7 -3
  59. package/dist/js/node/builder/webpackPlugins/routerPlugin.js +12 -8
  60. package/dist/js/node/commands/build.js +30 -28
  61. package/dist/js/node/commands/deploy.js +9 -5
  62. package/dist/js/node/commands/dev.js +39 -40
  63. package/dist/js/node/commands/index.js +5 -5
  64. package/dist/js/node/commands/inspect.js +10 -6
  65. package/dist/js/node/commands/{start.js → serve.js} +16 -10
  66. package/dist/js/node/config/default.js +44 -64
  67. package/dist/js/node/config/index.js +10 -3
  68. package/dist/js/node/config/initial/createHtmlConfig.js +7 -3
  69. package/dist/js/node/config/initial/createOutputConfig.js +8 -6
  70. package/dist/js/node/config/initial/createSourceConfig.js +12 -4
  71. package/dist/js/node/config/initial/createToolsConfig.js +7 -3
  72. package/dist/js/node/config/initial/index.js +9 -3
  73. package/dist/js/node/config/initial/inits.js +33 -22
  74. package/dist/js/node/config/initial/transformNormalizedConfig.js +12 -4
  75. package/dist/js/node/defineConfig.js +25 -22
  76. package/dist/js/node/exports/server.js +7 -3
  77. package/dist/js/node/hooks.js +13 -4
  78. package/dist/js/node/index.js +135 -111
  79. package/dist/js/node/initialize/index.js +33 -32
  80. package/dist/js/node/locale/en.js +8 -4
  81. package/dist/js/node/locale/index.js +8 -3
  82. package/dist/js/node/locale/zh.js +8 -4
  83. package/dist/js/node/schema/Schema.js +7 -3
  84. package/dist/js/node/schema/index.js +14 -11
  85. package/dist/js/node/schema/legacy.js +7 -6
  86. package/dist/js/node/types/config/deploy.js +15 -0
  87. package/dist/js/node/types/config/dev.js +15 -0
  88. package/dist/js/node/types/config/experiments.js +15 -0
  89. package/dist/js/node/types/config/html.js +15 -0
  90. package/dist/js/node/types/config/index.js +3 -3
  91. package/dist/js/node/types/config/output.js +15 -0
  92. package/dist/js/node/types/config/performance.js +15 -0
  93. package/dist/js/node/types/config/security.js +15 -0
  94. package/dist/js/node/types/config/source.js +15 -0
  95. package/dist/js/node/types/config/tools.js +15 -0
  96. package/dist/js/node/types/hooks.js +15 -0
  97. package/dist/js/node/types/index.js +5 -5
  98. package/dist/js/node/types/legacyConfig/deploy.js +15 -0
  99. package/dist/js/node/types/legacyConfig/dev.js +15 -0
  100. package/dist/js/node/types/legacyConfig/index.js +15 -0
  101. package/dist/js/node/types/legacyConfig/output.js +15 -0
  102. package/dist/js/node/types/legacyConfig/source.js +15 -0
  103. package/dist/js/node/types/legacyConfig/tools.js +15 -0
  104. package/dist/js/node/utils/commands.js +14 -4
  105. package/dist/js/node/utils/config.js +35 -30
  106. package/dist/js/node/utils/createFileWatcher.js +15 -10
  107. package/dist/js/node/utils/createServer.js +35 -29
  108. package/dist/js/node/utils/env.js +38 -0
  109. package/dist/js/node/utils/getServerInternalPlugins.js +79 -0
  110. package/dist/js/node/utils/getSpecifiedEntries.js +10 -6
  111. package/dist/js/node/utils/language.js +7 -3
  112. package/dist/js/node/utils/printInstructions.js +10 -6
  113. package/dist/js/node/utils/restart.js +11 -7
  114. package/dist/js/node/utils/routes.js +11 -7
  115. package/dist/js/node/utils/types.js +15 -0
  116. package/dist/js/treeshaking/analyze/Builder.js +199 -0
  117. package/dist/js/treeshaking/analyze/constants.js +13 -1
  118. package/dist/js/treeshaking/analyze/generateCode.js +14 -17
  119. package/dist/js/treeshaking/analyze/getBundleEntry.js +5 -1
  120. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +9 -6
  121. package/dist/js/treeshaking/analyze/getFileSystemEntry.js +11 -3
  122. package/dist/js/treeshaking/analyze/index.js +110 -7
  123. package/dist/js/treeshaking/analyze/nestedRoutes.js +30 -23
  124. package/dist/js/treeshaking/analyze/templates.js +13 -8
  125. package/dist/js/treeshaking/analyze/utils.js +15 -4
  126. package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +6 -1
  127. package/dist/js/treeshaking/builder/index.js +13 -20
  128. package/dist/js/treeshaking/builder/share.js +1 -4
  129. package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +3 -1
  130. package/dist/js/treeshaking/commands/dev.js +19 -24
  131. package/dist/js/treeshaking/commands/index.js +1 -1
  132. package/dist/js/treeshaking/commands/{start.js → serve.js} +10 -3
  133. package/dist/js/treeshaking/config/default.js +53 -56
  134. package/dist/js/treeshaking/config/initial/createOutputConfig.js +1 -3
  135. package/dist/js/treeshaking/config/initial/createSourceConfig.js +5 -1
  136. package/dist/js/treeshaking/config/initial/inits.js +7 -0
  137. package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +5 -1
  138. package/dist/js/treeshaking/hooks.js +6 -1
  139. package/dist/js/treeshaking/index.js +349 -132
  140. package/dist/js/treeshaking/initialize/index.js +6 -5
  141. package/dist/js/treeshaking/locale/en.js +1 -1
  142. package/dist/js/treeshaking/locale/zh.js +1 -1
  143. package/dist/js/treeshaking/schema/index.js +11 -12
  144. package/dist/js/treeshaking/schema/legacy.js +1 -4
  145. package/dist/js/treeshaking/utils/commands.js +5 -1
  146. package/dist/js/treeshaking/utils/env.js +13 -0
  147. package/dist/js/treeshaking/utils/getServerInternalPlugins.js +210 -0
  148. package/dist/types/analyze/Builder.d.ts +8 -0
  149. package/dist/types/analyze/constants.d.ts +13 -1
  150. package/dist/types/analyze/templates.d.ts +3 -1
  151. package/dist/types/analyze/utils.d.ts +2 -1
  152. package/dist/types/builder/builderPlugins/compatModern.d.ts +3 -3
  153. package/dist/types/builder/index.d.ts +2 -2
  154. package/dist/types/commands/index.d.ts +1 -1
  155. package/dist/types/commands/{start.d.ts → serve.d.ts} +0 -0
  156. package/dist/types/index.d.ts +5 -1
  157. package/dist/types/locale/en.d.ts +1 -1
  158. package/dist/types/locale/index.d.ts +2 -2
  159. package/dist/types/locale/zh.d.ts +1 -1
  160. package/dist/types/schema/Schema.d.ts +1 -1
  161. package/dist/types/types/config/deploy.d.ts +1 -1
  162. package/dist/types/types/config/dev.d.ts +4 -4
  163. package/dist/types/types/config/experiments.d.ts +3 -3
  164. package/dist/types/types/config/html.d.ts +3 -3
  165. package/dist/types/types/config/index.d.ts +6 -3
  166. package/dist/types/types/config/output.d.ts +6 -6
  167. package/dist/types/types/config/performance.d.ts +3 -3
  168. package/dist/types/types/config/security.d.ts +3 -3
  169. package/dist/types/types/config/source.d.ts +6 -5
  170. package/dist/types/types/config/tools.d.ts +3 -3
  171. package/dist/types/types/hooks.d.ts +9 -1
  172. package/dist/types/types/index.d.ts +6 -6
  173. package/dist/types/types/legacyConfig/deploy.d.ts +1 -1
  174. package/dist/types/types/legacyConfig/dev.d.ts +2 -2
  175. package/dist/types/types/legacyConfig/index.d.ts +1 -1
  176. package/dist/types/types/legacyConfig/output.d.ts +2 -2
  177. package/dist/types/types/legacyConfig/source.d.ts +1 -2
  178. package/dist/types/types/legacyConfig/tools.d.ts +2 -2
  179. package/dist/types/utils/commands.d.ts +2 -1
  180. package/dist/types/utils/env.d.ts +2 -0
  181. package/dist/types/utils/getServerInternalPlugins.d.ts +2 -0
  182. package/dist/types/utils/types.d.ts +5 -5
  183. package/package.json +27 -24
@@ -1,46 +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 __export = (target, all) => {
6
- for (var name in all)
7
- __defProp(target, name, { get: all[name], enumerable: true });
8
- };
9
- var __copyProps = (to, from, except, desc) => {
10
- if (from && typeof from === "object" || typeof from === "function") {
11
- for (let key of __getOwnPropNames(from))
12
- if (!__hasOwnProp.call(to, key) && key !== except)
13
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
14
- }
15
- return to;
16
- };
17
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
20
- createBuilderForEdenX: () => createBuilderForEdenX,
21
- createBuilderOptions: () => createBuilderOptions,
22
- createBuilderProviderConfig: () => createBuilderProviderConfig
23
- });
24
- module.exports = __toCommonJS(stdin_exports);
25
- var import_builder = require("@modern-js/builder");
26
- var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
27
- var import_utils = require("@modern-js/utils");
28
- var import_compatModern = require("./builderPlugins/compatModern");
29
- var import_share = require("./share");
30
1
  var __create = Object.create;
31
- var __defProp2 = Object.defineProperty;
2
+ var __defProp = Object.defineProperty;
32
3
  var __defProps = Object.defineProperties;
33
- var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
34
5
  var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
35
- var __getOwnPropNames2 = Object.getOwnPropertyNames;
6
+ var __getOwnPropNames = Object.getOwnPropertyNames;
36
7
  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
37
8
  var __getProtoOf = Object.getPrototypeOf;
38
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
9
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
39
10
  var __propIsEnum = Object.prototype.propertyIsEnumerable;
40
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
11
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
41
12
  var __spreadValues = (a, b) => {
42
13
  for (var prop in b || (b = {}))
43
- if (__hasOwnProp2.call(b, prop))
14
+ if (__hasOwnProp.call(b, prop))
44
15
  __defNormalProp(a, prop, b[prop]);
45
16
  if (__getOwnPropSymbols)
46
17
  for (var prop of __getOwnPropSymbols(b)) {
@@ -50,18 +21,23 @@ var __spreadValues = (a, b) => {
50
21
  return a;
51
22
  };
52
23
  var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
53
- var __copyProps2 = (to, from, except, desc) => {
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) => {
54
29
  if (from && typeof from === "object" || typeof from === "function") {
55
- for (let key of __getOwnPropNames2(from))
56
- if (!__hasOwnProp2.call(to, key) && key !== except)
57
- __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
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 });
58
33
  }
59
34
  return to;
60
35
  };
61
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps2(
62
- isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
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,
63
38
  mod
64
39
  ));
40
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
65
41
  var __async = (__this, __arguments, generator) => {
66
42
  return new Promise((resolve, reject) => {
67
43
  var fulfilled = (value) => {
@@ -82,14 +58,27 @@ var __async = (__this, __arguments, generator) => {
82
58
  step((generator = generator.apply(__this, __arguments)).next());
83
59
  });
84
60
  };
61
+ var builder_exports = {};
62
+ __export(builder_exports, {
63
+ createBuilderForModern: () => createBuilderForModern,
64
+ createBuilderOptions: () => createBuilderOptions,
65
+ createBuilderProviderConfig: () => createBuilderProviderConfig
66
+ });
67
+ 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");
85
73
  function getBuilderTargets(normalizedConfig) {
86
74
  const targets = ["web"];
87
- if ((0, import_utils.isUseSSRBundle)(normalizedConfig)) {
75
+ const useNodeTarget = (0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig);
76
+ if (useNodeTarget) {
88
77
  targets.push("node");
89
78
  }
90
79
  return targets;
91
80
  }
92
- function createBuilderForEdenX(_0) {
81
+ function createBuilderForModern(_0) {
93
82
  return __async(this, arguments, function* ({
94
83
  normalizedConfig,
95
84
  appContext,
@@ -122,19 +111,11 @@ function createBuilderProviderConfig(normalizedConfig, appContext) {
122
111
  htmlConfig.templateByEntries = __spreadValues(__spreadValues({}, htmlConfig.templateByEntries), appContext.htmlTemplates);
123
112
  }
124
113
  return __spreadProps(__spreadValues({}, normalizedConfig), {
125
- source: __spreadProps(__spreadValues({}, normalizedConfig.source), {
126
- resolveExtensionPrefix: ".web"
127
- }),
128
114
  output,
129
- dev: {
130
- port: (_a = normalizedConfig.server) == null ? void 0 : _a.port,
131
- https: normalizedConfig.dev.https,
132
- assetPrefix: normalizedConfig.dev.assetPrefix
133
- },
134
- html: htmlConfig,
135
- performance: __spreadProps(__spreadValues({}, normalizedConfig.performance), {
136
- removeMomentLocale: true
137
- })
115
+ dev: __spreadProps(__spreadValues({}, normalizedConfig.dev), {
116
+ port: (_a = normalizedConfig.server) == null ? void 0 : _a.port
117
+ }),
118
+ html: htmlConfig
138
119
  });
139
120
  function createOutputConfig(config, appContext2) {
140
121
  const defaultCopyPattern = (0, import_share.createCopyPattern)(appContext2, config, "upload");
@@ -189,3 +170,9 @@ function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPlugin
189
170
  ]);
190
171
  });
191
172
  }
173
+ // Annotate the CommonJS export names for ESM import in node:
174
+ 0 && (module.exports = {
175
+ createBuilderForModern,
176
+ createBuilderOptions,
177
+ createBuilderProviderConfig
178
+ });
@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
15
15
  return to;
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
18
+ var routerLoader_exports = {};
19
+ __export(routerLoader_exports, {
20
20
  default: () => routerLoader_default
21
21
  });
22
- module.exports = __toCommonJS(stdin_exports);
22
+ module.exports = __toCommonJS(routerLoader_exports);
23
23
  var import_utils = require("@modern-js/utils");
24
24
  function loader(source) {
25
25
  this.cacheable();
@@ -34,3 +34,5 @@ function loader(source) {
34
34
  return code;
35
35
  }
36
36
  var routerLoader_default = loader;
37
+ // Annotate the CommonJS export names for ESM import in node:
38
+ 0 && (module.exports = {});
@@ -15,12 +15,14 @@ var __copyProps = (to, from, except, desc) => {
15
15
  return to;
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
18
+ var serverModuleLoader_exports = {};
19
+ __export(serverModuleLoader_exports, {
20
20
  default: () => serverModuleLoader_default
21
21
  });
22
- module.exports = __toCommonJS(stdin_exports);
22
+ module.exports = __toCommonJS(serverModuleLoader_exports);
23
23
  function loader() {
24
24
  return `module.exports = {}`;
25
25
  }
26
26
  var serverModuleLoader_default = loader;
27
+ // Annotate the CommonJS export names for ESM import in node:
28
+ 0 && (module.exports = {});
@@ -21,13 +21,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
21
  mod
22
22
  ));
23
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
24
+ var share_exports = {};
25
+ __export(share_exports, {
26
26
  createCopyPattern: () => createCopyPattern
27
27
  });
28
- module.exports = __toCommonJS(stdin_exports);
28
+ module.exports = __toCommonJS(share_exports);
29
29
  var import_path = __toESM(require("path"));
30
- var import_lodash = require("@modern-js/utils/lodash");
31
30
  var import_utils = require("@modern-js/utils");
32
31
  function createCopyPattern(appContext, config, patternsType, chain) {
33
32
  const configDir = import_path.default.resolve(
@@ -54,9 +53,10 @@ function createCopyPattern(appContext, config, patternsType, chain) {
54
53
  if (!/\.html?$/.test(absoluteFrom)) {
55
54
  return content;
56
55
  }
57
- return (0, import_lodash.template)(content.toString("utf8"))({
58
- assetPrefix: (0, import_utils.removeTailSlash)(chain.output.get("publicPath"))
59
- });
56
+ return content.toString("utf8").replace(
57
+ /<%=\s*assetPrefix\s*%>/g,
58
+ (0, import_utils.removeTailSlash)(chain.output.get("publicPath"))
59
+ );
60
60
  }
61
61
  };
62
62
  } else {
@@ -69,3 +69,7 @@ function createCopyPattern(appContext, config, patternsType, chain) {
69
69
  };
70
70
  }
71
71
  }
72
+ // Annotate the CommonJS export names for ESM import in node:
73
+ 0 && (module.exports = {
74
+ createCopyPattern
75
+ });
@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
15
15
  return to;
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
18
+ var htmlAsyncChunkPlugin_exports = {};
19
+ __export(htmlAsyncChunkPlugin_exports, {
20
20
  HtmlAsyncChunkPlugin: () => HtmlAsyncChunkPlugin
21
21
  });
22
- module.exports = __toCommonJS(stdin_exports);
22
+ module.exports = __toCommonJS(htmlAsyncChunkPlugin_exports);
23
23
  class HtmlAsyncChunkPlugin {
24
24
  constructor(htmlWebpackPlugin) {
25
25
  this.name = "HtmlAsyncChunkPlugin";
@@ -47,3 +47,7 @@ class HtmlAsyncChunkPlugin {
47
47
  );
48
48
  }
49
49
  }
50
+ // Annotate the CommonJS export names for ESM import in node:
51
+ 0 && (module.exports = {
52
+ HtmlAsyncChunkPlugin
53
+ });
@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
15
15
  return to;
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
18
+ var htmlBottomTemplate_exports = {};
19
+ __export(htmlBottomTemplate_exports, {
20
20
  BottomTemplatePlugin: () => BottomTemplatePlugin
21
21
  });
22
- module.exports = __toCommonJS(stdin_exports);
22
+ module.exports = __toCommonJS(htmlBottomTemplate_exports);
23
23
  class BottomTemplatePlugin {
24
24
  constructor(htmlWebpackPlugin) {
25
25
  this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
@@ -54,3 +54,7 @@ ${match}`
54
54
  );
55
55
  }
56
56
  }
57
+ // Annotate the CommonJS export names for ESM import in node:
58
+ 0 && (module.exports = {
59
+ BottomTemplatePlugin
60
+ });
@@ -21,13 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
21
  mod
22
22
  ));
23
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
26
- default: () => RouterPlugin
27
- });
28
- module.exports = __toCommonJS(stdin_exports);
29
- var import_path = __toESM(require("path"));
30
- var import_utils = require("@modern-js/utils");
31
24
  var __async = (__this, __arguments, generator) => {
32
25
  return new Promise((resolve, reject) => {
33
26
  var fulfilled = (value) => {
@@ -48,6 +41,13 @@ var __async = (__this, __arguments, generator) => {
48
41
  step((generator = generator.apply(__this, __arguments)).next());
49
42
  });
50
43
  };
44
+ var routerPlugin_exports = {};
45
+ __export(routerPlugin_exports, {
46
+ default: () => RouterPlugin
47
+ });
48
+ module.exports = __toCommonJS(routerPlugin_exports);
49
+ var import_path = __toESM(require("path"));
50
+ var import_utils = require("@modern-js/utils");
51
51
  const PLUGIN_NAME = "ModernjsRoutePlugin";
52
52
  class RouterPlugin {
53
53
  apply(compiler) {
@@ -114,7 +114,9 @@ class RouterPlugin {
114
114
  const entryChunks = [...compilation.chunks].filter((chunk) => {
115
115
  return entryChunkIds.includes(chunk.name);
116
116
  });
117
- const entryChunkFiles = entryChunks.map((chunk) => [...chunk.files][0]);
117
+ const entryChunkFiles = entryChunks.map(
118
+ (chunk) => [...chunk.files].find((fname) => fname.includes(".js"))
119
+ );
118
120
  for (const file of entryChunkFiles) {
119
121
  const asset = compilation.assets[file];
120
122
  const newContent = `${injectedContent}${asset.source().toString()}`;
@@ -129,3 +131,5 @@ class RouterPlugin {
129
131
  });
130
132
  }
131
133
  }
134
+ // Annotate the CommonJS export names for ESM import in node:
135
+ 0 && (module.exports = {});
@@ -1,7 +1,24 @@
1
1
  var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
2
3
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
3
5
  var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
4
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));
5
22
  var __export = (target, all) => {
6
23
  for (var name in all)
7
24
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,34 +32,6 @@ var __copyProps = (to, from, except, desc) => {
15
32
  return to;
16
33
  };
17
34
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
20
- build: () => build
21
- });
22
- module.exports = __toCommonJS(stdin_exports);
23
- var import_core = require("@modern-js/core");
24
- var import_utils = require("@modern-js/utils");
25
- var import_routes = require("../utils/routes");
26
- var import_config = require("../utils/config");
27
- var __defProp2 = Object.defineProperty;
28
- var __defProps = Object.defineProperties;
29
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
30
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
31
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
32
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
33
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
34
- var __spreadValues = (a, b) => {
35
- for (var prop in b || (b = {}))
36
- if (__hasOwnProp2.call(b, prop))
37
- __defNormalProp(a, prop, b[prop]);
38
- if (__getOwnPropSymbols)
39
- for (var prop of __getOwnPropSymbols(b)) {
40
- if (__propIsEnum.call(b, prop))
41
- __defNormalProp(a, prop, b[prop]);
42
- }
43
- return a;
44
- };
45
- var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
46
35
  var __async = (__this, __arguments, generator) => {
47
36
  return new Promise((resolve, reject) => {
48
37
  var fulfilled = (value) => {
@@ -63,6 +52,15 @@ var __async = (__this, __arguments, generator) => {
63
52
  step((generator = generator.apply(__this, __arguments)).next());
64
53
  });
65
54
  };
55
+ var build_exports = {};
56
+ __export(build_exports, {
57
+ build: () => build
58
+ });
59
+ module.exports = __toCommonJS(build_exports);
60
+ var import_core = require("@modern-js/core");
61
+ var import_utils = require("@modern-js/utils");
62
+ var import_routes = require("../utils/routes");
63
+ var import_config = require("../utils/config");
66
64
  const build = (api, options) => __async(void 0, null, function* () {
67
65
  if (options == null ? void 0 : options.analyze) {
68
66
  process.env.BUNDLE_ANALYZE = "true";
@@ -108,3 +106,7 @@ const build = (api, options) => __async(void 0, null, function* () {
108
106
  process.exit(1);
109
107
  }
110
108
  });
109
+ // Annotate the CommonJS export names for ESM import in node:
110
+ 0 && (module.exports = {
111
+ build
112
+ });
@@ -15,11 +15,6 @@ var __copyProps = (to, from, except, desc) => {
15
15
  return to;
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
20
- deploy: () => deploy
21
- });
22
- module.exports = __toCommonJS(stdin_exports);
23
18
  var __async = (__this, __arguments, generator) => {
24
19
  return new Promise((resolve, reject) => {
25
20
  var fulfilled = (value) => {
@@ -40,8 +35,17 @@ var __async = (__this, __arguments, generator) => {
40
35
  step((generator = generator.apply(__this, __arguments)).next());
41
36
  });
42
37
  };
38
+ var deploy_exports = {};
39
+ __export(deploy_exports, {
40
+ deploy: () => deploy
41
+ });
42
+ module.exports = __toCommonJS(deploy_exports);
43
43
  const deploy = (api, options) => __async(void 0, null, function* () {
44
44
  const hookRunners = api.useHookRunners();
45
45
  yield hookRunners.beforeDeploy(options);
46
46
  yield hookRunners.afterDeploy(options);
47
47
  });
48
+ // Annotate the CommonJS export names for ESM import in node:
49
+ 0 && (module.exports = {
50
+ deploy
51
+ });
@@ -1,7 +1,24 @@
1
1
  var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
2
3
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
3
5
  var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
4
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));
5
22
  var __export = (target, all) => {
6
23
  for (var name in all)
7
24
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,37 +32,6 @@ var __copyProps = (to, from, except, desc) => {
15
32
  return to;
16
33
  };
17
34
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
20
- dev: () => dev
21
- });
22
- module.exports = __toCommonJS(stdin_exports);
23
- var import_core = require("@modern-js/core");
24
- var import_createFileWatcher = require("../utils/createFileWatcher");
25
- var import_printInstructions = require("../utils/printInstructions");
26
- var import_createServer = require("../utils/createServer");
27
- var import_routes = require("../utils/routes");
28
- var import_getSpecifiedEntries = require("../utils/getSpecifiedEntries");
29
- var import_config = require("../utils/config");
30
- var __defProp2 = Object.defineProperty;
31
- var __defProps = Object.defineProperties;
32
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
33
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
34
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
35
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
36
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
37
- var __spreadValues = (a, b) => {
38
- for (var prop in b || (b = {}))
39
- if (__hasOwnProp2.call(b, prop))
40
- __defNormalProp(a, prop, b[prop]);
41
- if (__getOwnPropSymbols)
42
- for (var prop of __getOwnPropSymbols(b)) {
43
- if (__propIsEnum.call(b, prop))
44
- __defNormalProp(a, prop, b[prop]);
45
- }
46
- return a;
47
- };
48
- var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
49
35
  var __async = (__this, __arguments, generator) => {
50
36
  return new Promise((resolve, reject) => {
51
37
  var fulfilled = (value) => {
@@ -66,6 +52,19 @@ var __async = (__this, __arguments, generator) => {
66
52
  step((generator = generator.apply(__this, __arguments)).next());
67
53
  });
68
54
  };
55
+ var dev_exports = {};
56
+ __export(dev_exports, {
57
+ dev: () => dev
58
+ });
59
+ module.exports = __toCommonJS(dev_exports);
60
+ var import_core = require("@modern-js/core");
61
+ var import_createFileWatcher = require("../utils/createFileWatcher");
62
+ var import_printInstructions = require("../utils/printInstructions");
63
+ var import_createServer = require("../utils/createServer");
64
+ var import_routes = require("../utils/routes");
65
+ var import_getSpecifiedEntries = require("../utils/getSpecifiedEntries");
66
+ var import_config = require("../utils/config");
67
+ var import_getServerInternalPlugins = require("../utils/getServerInternalPlugins");
69
68
  const dev = (api, options) => __async(void 0, null, function* () {
70
69
  var _a;
71
70
  if (options.analyze) {
@@ -82,8 +81,7 @@ const dev = (api, options) => __async(void 0, null, function* () {
82
81
  port,
83
82
  apiOnly,
84
83
  entrypoints,
85
- serverConfigFile,
86
- serverInternalPlugins
84
+ serverConfigFile
87
85
  } = appContext;
88
86
  const checkedEntries = yield (0, import_getSpecifiedEntries.getSpecifiedEntries)(
89
87
  options.entry || false,
@@ -104,29 +102,27 @@ const dev = (api, options) => __async(void 0, null, function* () {
104
102
  }
105
103
  });
106
104
  yield hookRunners.beforeDev();
107
- let compiler;
108
105
  if (!appContext.builder && !apiOnly) {
109
106
  throw new Error(
110
107
  "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
111
108
  );
112
109
  }
113
- if (!apiOnly) {
114
- compiler = yield appContext.builder.createCompiler();
115
- }
116
110
  yield (0, import_routes.generateRoutes)(appContext);
111
+ const serverInternalPlugins = yield (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
117
112
  const serverOptions = {
118
113
  dev: __spreadValues({
119
114
  port,
120
115
  https: normalizedConfig.dev.https
121
116
  }, (_a = normalizedConfig.tools) == null ? void 0 : _a.devServer),
122
- compiler: compiler || null,
123
117
  pwd: appDirectory,
124
118
  config: normalizedConfig,
125
119
  serverConfigFile,
126
120
  internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins)
127
121
  };
128
122
  if (apiOnly) {
129
- const app = yield (0, import_createServer.createServer)(serverOptions);
123
+ const app = yield (0, import_createServer.createServer)(__spreadProps(__spreadValues({}, serverOptions), {
124
+ compiler: null
125
+ }));
130
126
  app.listen(port, (err) => __async(void 0, null, function* () {
131
127
  if (err) {
132
128
  throw err;
@@ -135,7 +131,6 @@ const dev = (api, options) => __async(void 0, null, function* () {
135
131
  }));
136
132
  } else {
137
133
  const { server } = yield appContext.builder.startDevServer({
138
- compiler,
139
134
  printURLs: false,
140
135
  serverOptions
141
136
  });
@@ -147,3 +142,7 @@ const dev = (api, options) => __async(void 0, null, function* () {
147
142
  hookRunners
148
143
  );
149
144
  });
145
+ // Annotate the CommonJS export names for ESM import in node:
146
+ 0 && (module.exports = {
147
+ dev
148
+ });
@@ -12,8 +12,8 @@ var __copyProps = (to, from, except, desc) => {
12
12
  };
13
13
  var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
14
14
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
15
- var stdin_exports = {};
16
- module.exports = __toCommonJS(stdin_exports);
17
- __reExport(stdin_exports, require("./dev"), module.exports);
18
- __reExport(stdin_exports, require("./build"), module.exports);
19
- __reExport(stdin_exports, require("./start"), module.exports);
15
+ var commands_exports = {};
16
+ module.exports = __toCommonJS(commands_exports);
17
+ __reExport(commands_exports, require("./dev"), module.exports);
18
+ __reExport(commands_exports, require("./build"), module.exports);
19
+ __reExport(commands_exports, require("./serve"), module.exports);
@@ -15,12 +15,6 @@ var __copyProps = (to, from, except, desc) => {
15
15
  return to;
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
20
- inspect: () => inspect
21
- });
22
- module.exports = __toCommonJS(stdin_exports);
23
- var import_path = require("path");
24
18
  var __async = (__this, __arguments, generator) => {
25
19
  return new Promise((resolve, reject) => {
26
20
  var fulfilled = (value) => {
@@ -41,6 +35,12 @@ var __async = (__this, __arguments, generator) => {
41
35
  step((generator = generator.apply(__this, __arguments)).next());
42
36
  });
43
37
  };
38
+ var inspect_exports = {};
39
+ __export(inspect_exports, {
40
+ inspect: () => inspect
41
+ });
42
+ module.exports = __toCommonJS(inspect_exports);
43
+ var import_path = require("path");
44
44
  const inspect = (api, options) => __async(void 0, null, function* () {
45
45
  const appContext = api.useAppContext();
46
46
  if (!appContext.builder) {
@@ -55,3 +55,7 @@ const inspect = (api, options) => __async(void 0, null, function* () {
55
55
  writeToDisk: true
56
56
  });
57
57
  });
58
+ // Annotate the CommonJS export names for ESM import in node:
59
+ 0 && (module.exports = {
60
+ inspect
61
+ });
@@ -21,15 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
21
  mod
22
22
  ));
23
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
26
- start: () => start
27
- });
28
- module.exports = __toCommonJS(stdin_exports);
29
- var import_utils = require("@modern-js/utils");
30
- var import_prod_server = __toESM(require("@modern-js/prod-server"));
31
- var import_printInstructions = require("../utils/printInstructions");
32
- var import_createServer = require("../utils/createServer");
33
24
  var __async = (__this, __arguments, generator) => {
34
25
  return new Promise((resolve, reject) => {
35
26
  var fulfilled = (value) => {
@@ -50,6 +41,16 @@ var __async = (__this, __arguments, generator) => {
50
41
  step((generator = generator.apply(__this, __arguments)).next());
51
42
  });
52
43
  };
44
+ var serve_exports = {};
45
+ __export(serve_exports, {
46
+ start: () => start
47
+ });
48
+ module.exports = __toCommonJS(serve_exports);
49
+ var import_utils = require("@modern-js/utils");
50
+ var import_prod_server = __toESM(require("@modern-js/prod-server"));
51
+ var import_printInstructions = require("../utils/printInstructions");
52
+ var import_createServer = require("../utils/createServer");
53
+ var import_getServerInternalPlugins = require("../utils/getServerInternalPlugins");
53
54
  const start = (api) => __async(void 0, null, function* () {
54
55
  var _a;
55
56
  const appContext = api.useAppContext();
@@ -61,11 +62,12 @@ const start = (api) => __async(void 0, null, function* () {
61
62
  appContext.appDirectory,
62
63
  (_a = userConfig == null ? void 0 : userConfig.source) == null ? void 0 : _a.entriesDir
63
64
  );
65
+ const serverInternalPlugins = yield (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
64
66
  const app = yield (0, import_prod_server.default)({
65
67
  pwd: appDirectory,
66
68
  config: userConfig,
67
69
  serverConfigFile,
68
- internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(appContext.serverInternalPlugins),
70
+ internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins),
69
71
  apiOnly
70
72
  });
71
73
  app.listen(port, (err) => __async(void 0, null, function* () {
@@ -75,3 +77,7 @@ const start = (api) => __async(void 0, null, function* () {
75
77
  yield (0, import_printInstructions.printInstructions)(hookRunners, appContext, userConfig);
76
78
  }));
77
79
  });
80
+ // Annotate the CommonJS export names for ESM import in node:
81
+ 0 && (module.exports = {
82
+ start
83
+ });