@modern-js/app-tools 2.19.1 → 2.21.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 (116) hide show
  1. package/CHANGELOG.md +115 -0
  2. package/bin/modern.js +0 -1
  3. package/dist/cjs/analyze/generateCode.js +22 -48
  4. package/dist/cjs/analyze/getBundleEntry.js +3 -7
  5. package/dist/cjs/analyze/getClientRoutes/getRoutes.js +2 -6
  6. package/dist/cjs/analyze/getClientRoutes/getRoutesLegacy.js +2 -6
  7. package/dist/cjs/analyze/getClientRoutes/utils.js +2 -6
  8. package/dist/cjs/analyze/getFileSystemEntry.js +3 -7
  9. package/dist/cjs/analyze/getHtmlTemplate.js +4 -47
  10. package/dist/cjs/analyze/getServerRoutes.js +5 -7
  11. package/dist/cjs/analyze/index.js +11 -48
  12. package/dist/cjs/analyze/isDefaultExportFunction.js +5 -48
  13. package/dist/cjs/analyze/nestedRoutes.js +2 -41
  14. package/dist/cjs/analyze/templates.js +2 -6
  15. package/dist/cjs/analyze/utils.js +3 -7
  16. package/dist/cjs/builder/builder-rspack/adapterCopy.js +4 -21
  17. package/dist/cjs/builder/builder-webpack/index.js +2 -41
  18. package/dist/cjs/builder/generator/index.js +3 -42
  19. package/dist/cjs/builder/index.js +4 -43
  20. package/dist/cjs/builder/shared/builderPlugins/adapterHtml.js +6 -56
  21. package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js +6 -45
  22. package/dist/cjs/builder/shared/builderPlugins/index.js +4 -16
  23. package/dist/cjs/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +3 -15
  24. package/dist/cjs/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +5 -17
  25. package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js +2 -6
  26. package/dist/cjs/builder/shared/bundlerPlugins/index.js +4 -16
  27. package/dist/cjs/builder/shared/createCopyInfo.js +2 -6
  28. package/dist/cjs/builder/shared/index.js +4 -16
  29. package/dist/cjs/commands/index.js +4 -16
  30. package/dist/cjs/commands/serve.js +2 -6
  31. package/dist/cjs/config/index.js +4 -16
  32. package/dist/cjs/config/initialize/inits.js +2 -41
  33. package/dist/cjs/index.js +41 -80
  34. package/dist/cjs/schema/Schema.js +2 -14
  35. package/dist/cjs/schema/index.js +2 -6
  36. package/dist/cjs/types/config/index.js +2 -14
  37. package/dist/cjs/types/index.js +4 -16
  38. package/dist/cjs/utils/config.js +2 -41
  39. package/dist/cjs/utils/generateWatchFiles.js +2 -6
  40. package/dist/cjs/utils/routes.js +2 -6
  41. package/dist/esm/analyze/generateCode.js +13 -170
  42. package/dist/esm/analyze/getBundleEntry.js +1 -1
  43. package/dist/esm/analyze/getClientRoutes/getRoutes.js +2 -52
  44. package/dist/esm/analyze/getClientRoutes/getRoutesLegacy.js +2 -52
  45. package/dist/esm/analyze/getHtmlTemplate.js +6 -151
  46. package/dist/esm/analyze/getServerRoutes.js +6 -118
  47. package/dist/esm/analyze/index.js +19 -251
  48. package/dist/esm/analyze/nestedRoutes.js +5 -184
  49. package/dist/esm/analyze/templates.js +6 -242
  50. package/dist/esm/analyze/utils.js +6 -205
  51. package/dist/esm/builder/builder-rspack/adapterCopy.js +10 -235
  52. package/dist/esm/builder/builder-webpack/adapterModern.js +1 -34
  53. package/dist/esm/builder/builder-webpack/index.js +7 -219
  54. package/dist/esm/builder/generator/createBuilderProviderConfig.js +2 -52
  55. package/dist/esm/builder/generator/index.js +4 -133
  56. package/dist/esm/builder/index.js +3 -132
  57. package/dist/esm/builder/shared/builderPlugins/adapterHtml.js +9 -191
  58. package/dist/esm/builder/shared/builderPlugins/adapterSSR.js +10 -139
  59. package/dist/esm/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +4 -69
  60. package/dist/esm/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +3 -35
  61. package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js +7 -226
  62. package/dist/esm/commands/build.js +5 -184
  63. package/dist/esm/commands/deploy.js +3 -132
  64. package/dist/esm/commands/dev.js +6 -185
  65. package/dist/esm/commands/inspect.js +3 -132
  66. package/dist/esm/commands/serve.js +6 -185
  67. package/dist/esm/config/default.js +3 -52
  68. package/dist/esm/config/initialize/inits.js +3 -86
  69. package/dist/esm/defineConfig.js +2 -52
  70. package/dist/esm/index.js +49 -207
  71. package/dist/esm/initialize/index.js +6 -185
  72. package/dist/esm/schema/Schema.js +8 -213
  73. package/dist/esm/schema/index.js +1 -13
  74. package/dist/esm/schema/legacy.js +1 -13
  75. package/dist/esm/utils/config.js +7 -186
  76. package/dist/esm/utils/createServer.js +6 -185
  77. package/dist/esm/utils/generateWatchFiles.js +5 -167
  78. package/dist/esm/utils/getSelectedEntries.js +3 -132
  79. package/dist/esm/utils/getServerInternalPlugins.js +5 -184
  80. package/dist/esm/utils/printInstructions.js +3 -132
  81. package/dist/esm/utils/restart.js +3 -132
  82. package/dist/esm/utils/routes.js +3 -132
  83. package/dist/esm-node/analyze/generateCode.js +19 -2
  84. package/dist/esm-node/analyze/getBundleEntry.js +1 -1
  85. package/dist/esm-node/analyze/getServerRoutes.js +2 -0
  86. package/dist/esm-node/analyze/index.js +4 -2
  87. package/dist/esm-node/builder/builder-rspack/adapterCopy.js +1 -14
  88. package/dist/esm-node/builder/shared/builderPlugins/adapterHtml.js +2 -6
  89. package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js +5 -5
  90. package/dist/esm-node/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +1 -13
  91. package/dist/esm-node/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +1 -13
  92. package/dist/esm-node/index.js +22 -6
  93. package/dist/esm-node/schema/Schema.js +1 -13
  94. package/dist/types/analyze/index.d.ts +0 -2
  95. package/dist/types/builder/builder-rspack/index.d.ts +1 -1
  96. package/dist/types/builder/builder-webpack/adapterModern.d.ts +0 -1
  97. package/dist/types/builder/generator/index.d.ts +1 -2
  98. package/dist/types/builder/shared/builderPlugins/adapterBasic.d.ts +0 -1
  99. package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts +2 -3
  100. package/dist/types/defineConfig.d.ts +0 -1
  101. package/dist/types/index.d.ts +0 -2
  102. package/dist/types/initialize/index.d.ts +0 -2
  103. package/dist/types/types/config/index.d.ts +2 -2
  104. package/dist/types/types/config/output.d.ts +1 -0
  105. package/dist/types/types/config/security.d.ts +2 -0
  106. package/dist/types/types/config/source.d.ts +0 -1
  107. package/dist/types/types/config/tools.d.ts +0 -2
  108. package/dist/types/types/hooks.d.ts +3 -1
  109. package/dist/types/types/legacyConfig/dev.d.ts +0 -1
  110. package/dist/types/types/legacyConfig/output.d.ts +2 -3
  111. package/dist/types/types/legacyConfig/source.d.ts +0 -1
  112. package/dist/types/types/legacyConfig/tools.d.ts +0 -1
  113. package/dist/types/utils/config.d.ts +0 -1
  114. package/dist/types/utils/getSelectedEntries.d.ts +0 -1
  115. package/lib/types.d.ts +8 -8
  116. package/package.json +29 -29
@@ -19,17 +19,13 @@ _export(exports, {
19
19
  getServerLoadersFile: () => getServerLoadersFile,
20
20
  getServerCombinedModueFile: () => getServerCombinedModueFile
21
21
  });
22
- const _fs = /* @__PURE__ */ _interop_require_default(require("fs"));
23
- const _path = /* @__PURE__ */ _interop_require_default(require("path"));
22
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
23
+ const _fs = /* @__PURE__ */ _interop_require_default._(require("fs"));
24
+ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
24
25
  const _utils = require("@modern-js/utils");
25
26
  const _esbuild = require("esbuild");
26
27
  const _esmodulelexer = require("es-module-lexer");
27
28
  const _constants = require("./constants");
28
- function _interop_require_default(obj) {
29
- return obj && obj.__esModule ? obj : {
30
- default: obj
31
- };
32
- }
33
29
  const walkDirectory = (dir) => _fs.default.readdirSync(dir).reduce((previous, filename) => {
34
30
  const filePath = _path.default.join(dir, filename);
35
31
  if (_fs.default.statSync(filePath).isDirectory()) {
@@ -6,15 +6,11 @@ Object.defineProperty(exports, "builderPluginAdpaterCopy", {
6
6
  enumerable: true,
7
7
  get: () => builderPluginAdpaterCopy
8
8
  });
9
- const _path = /* @__PURE__ */ _interop_require_default(require("path"));
10
- const _fsextra = /* @__PURE__ */ _interop_require_default(require("@modern-js/utils/fs-extra"));
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
10
+ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
11
+ const _fsextra = /* @__PURE__ */ _interop_require_default._(require("@modern-js/utils/fs-extra"));
11
12
  const _utils = require("@modern-js/utils");
12
13
  const _shared = require("../shared");
13
- function _interop_require_default(obj) {
14
- return obj && obj.__esModule ? obj : {
15
- default: obj
16
- };
17
- }
18
14
  const builderPluginAdpaterCopy = (options) => {
19
15
  return {
20
16
  name: "builder-plugin-adapter-rspack-copy",
@@ -26,7 +22,7 @@ const builderPluginAdpaterCopy = (options) => {
26
22
  ...config.builtins || {},
27
23
  copy: {
28
24
  patterns: [
29
- ...transformCopy((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns),
25
+ ...((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || [],
30
26
  ...createConfigBuiltinCopy(options)
31
27
  ]
32
28
  }
@@ -61,19 +57,6 @@ const builderPluginAdpaterCopy = (options) => {
61
57
  }
62
58
  };
63
59
  };
64
- function transformCopy(patterns) {
65
- if (patterns) {
66
- patterns.map((value) => {
67
- if (typeof value === "string") {
68
- return {
69
- from: value
70
- };
71
- }
72
- return value;
73
- });
74
- }
75
- return [];
76
- }
77
60
  function createConfigBuiltinCopy(options) {
78
61
  const { normalizedConfig, appContext } = options;
79
62
  const { uploadDir, publicDir } = (0, _shared.createCopyInfo)(appContext, normalizedConfig);
@@ -6,50 +6,11 @@ Object.defineProperty(exports, "createWebpackBuilderForModern", {
6
6
  enumerable: true,
7
7
  get: () => createWebpackBuilderForModern
8
8
  });
9
+ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
9
10
  const _builderwebpackprovider = require("@modern-js/builder-webpack-provider");
10
11
  const _generator = require("../generator");
11
12
  const _adapterModern = require("./adapterModern");
12
13
  const _createCopyPattern = require("./createCopyPattern");
13
- function _getRequireWildcardCache(nodeInterop) {
14
- if (typeof WeakMap !== "function")
15
- return null;
16
- var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
17
- var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
18
- return (_getRequireWildcardCache = function(nodeInterop2) {
19
- return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
20
- })(nodeInterop);
21
- }
22
- function _interop_require_wildcard(obj, nodeInterop) {
23
- if (!nodeInterop && obj && obj.__esModule) {
24
- return obj;
25
- }
26
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
27
- return {
28
- default: obj
29
- };
30
- }
31
- var cache = _getRequireWildcardCache(nodeInterop);
32
- if (cache && cache.has(obj)) {
33
- return cache.get(obj);
34
- }
35
- var newObj = {};
36
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
37
- for (var key in obj) {
38
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
39
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
40
- if (desc && (desc.get || desc.set)) {
41
- Object.defineProperty(newObj, key, desc);
42
- } else {
43
- newObj[key] = obj[key];
44
- }
45
- }
46
- }
47
- newObj.default = obj;
48
- if (cache) {
49
- cache.set(obj, newObj);
50
- }
51
- return newObj;
52
- }
53
14
  function createWebpackBuilderForModern(options) {
54
15
  return (0, _generator.generateBuilder)(options, _builderwebpackprovider.builderWebpackProvider, {
55
16
  modifyBuilderConfig(config) {
@@ -80,7 +41,7 @@ async function applyBuilderPlugins(builder, options) {
80
41
  const { normalizedConfig } = options;
81
42
  if (normalizedConfig.tools.esbuild) {
82
43
  const { esbuild: esbuildOptions } = normalizedConfig.tools;
83
- const { builderPluginEsbuild } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("@modern-js/builder-plugin-esbuild")));
44
+ const { builderPluginEsbuild } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/builder-plugin-esbuild")));
84
45
  builder.addPlugins([
85
46
  builderPluginEsbuild(esbuildOptions)
86
47
  ]);
@@ -6,50 +6,11 @@ Object.defineProperty(exports, "generateBuilder", {
6
6
  enumerable: true,
7
7
  get: () => generateBuilder
8
8
  });
9
+ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
9
10
  const _builder = require("@modern-js/builder");
10
11
  const _createBuilderProviderConfig = require("./createBuilderProviderConfig");
11
12
  const _getBuilderTargets = require("./getBuilderTargets");
12
13
  const _createBuilderOptions = require("./createBuilderOptions");
13
- function _getRequireWildcardCache(nodeInterop) {
14
- if (typeof WeakMap !== "function")
15
- return null;
16
- var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
17
- var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
18
- return (_getRequireWildcardCache = function(nodeInterop2) {
19
- return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
20
- })(nodeInterop);
21
- }
22
- function _interop_require_wildcard(obj, nodeInterop) {
23
- if (!nodeInterop && obj && obj.__esModule) {
24
- return obj;
25
- }
26
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
27
- return {
28
- default: obj
29
- };
30
- }
31
- var cache = _getRequireWildcardCache(nodeInterop);
32
- if (cache && cache.has(obj)) {
33
- return cache.get(obj);
34
- }
35
- var newObj = {};
36
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
37
- for (var key in obj) {
38
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
39
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
40
- if (desc && (desc.get || desc.set)) {
41
- Object.defineProperty(newObj, key, desc);
42
- } else {
43
- newObj[key] = obj[key];
44
- }
45
- }
46
- }
47
- newObj.default = obj;
48
- if (cache) {
49
- cache.set(obj, newObj);
50
- }
51
- return newObj;
52
- }
53
14
  async function generateBuilder(options, generateProvider, utils) {
54
15
  const { normalizedConfig, appContext } = options;
55
16
  const { modifyBuilderConfig, modifyBuilderInstance } = utils || {};
@@ -65,7 +26,7 @@ async function generateBuilder(options, generateProvider, utils) {
65
26
  return builder;
66
27
  }
67
28
  async function applyBuilderPlugins(builder, options) {
68
- const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("../shared/builderPlugins")));
29
+ const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../shared/builderPlugins")));
69
30
  builder.addPlugins([
70
31
  builderPluginAdapterBasic(options),
71
32
  builderPluginAdapterSSR(options),
@@ -73,7 +34,7 @@ async function applyBuilderPlugins(builder, options) {
73
34
  ]);
74
35
  const { normalizedConfig } = options;
75
36
  if (!normalizedConfig.output.disableNodePolyfill) {
76
- const { builderPluginNodePolyfill } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("@modern-js/builder-plugin-node-polyfill")));
37
+ const { builderPluginNodePolyfill } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/builder-plugin-node-polyfill")));
77
38
  builder.addPlugins([
78
39
  builderPluginNodePolyfill()
79
40
  ]);
@@ -6,52 +6,13 @@ Object.defineProperty(exports, "createBuilderGenerator", {
6
6
  enumerable: true,
7
7
  get: () => createBuilderGenerator
8
8
  });
9
+ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
9
10
  const _utils = require("@modern-js/utils");
10
- function _getRequireWildcardCache(nodeInterop) {
11
- if (typeof WeakMap !== "function")
12
- return null;
13
- var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
14
- var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
15
- return (_getRequireWildcardCache = function(nodeInterop2) {
16
- return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
17
- })(nodeInterop);
18
- }
19
- function _interop_require_wildcard(obj, nodeInterop) {
20
- if (!nodeInterop && obj && obj.__esModule) {
21
- return obj;
22
- }
23
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
24
- return {
25
- default: obj
26
- };
27
- }
28
- var cache = _getRequireWildcardCache(nodeInterop);
29
- if (cache && cache.has(obj)) {
30
- return cache.get(obj);
31
- }
32
- var newObj = {};
33
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
34
- for (var key in obj) {
35
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
36
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
37
- if (desc && (desc.get || desc.set)) {
38
- Object.defineProperty(newObj, key, desc);
39
- } else {
40
- newObj[key] = obj[key];
41
- }
42
- }
43
- }
44
- newObj.default = obj;
45
- if (cache) {
46
- cache.set(obj, newObj);
47
- }
48
- return newObj;
49
- }
50
11
  async function createBuilderGenerator(bundler) {
51
12
  if (bundler === "rspack") {
52
13
  try {
53
- const { createRspackBuilderForModern } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./builder-rspack")));
54
- const { getRspackVersion } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("@modern-js/builder-rspack-provider")));
14
+ const { createRspackBuilderForModern } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./builder-rspack")));
15
+ const { getRspackVersion } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/builder-rspack-provider")));
55
16
  const version = await getRspackVersion();
56
17
  _utils.logger.info(`Using Rspack v${version} 🦀`);
57
18
  return createRspackBuilderForModern;
@@ -59,6 +20,6 @@ async function createBuilderGenerator(bundler) {
59
20
  throw new Error("Failed to use Rspack, please check if you have `@modern-js/builder-rspack-provider` installed");
60
21
  }
61
22
  }
62
- const { createWebpackBuilderForModern } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./builder-webpack")));
23
+ const { createWebpackBuilderForModern } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./builder-webpack")));
63
24
  return createWebpackBuilderForModern;
64
25
  }
@@ -2,71 +2,21 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- function _export(target, all) {
6
- for (var name in all)
7
- Object.defineProperty(target, name, {
8
- enumerable: true,
9
- get: all[name]
10
- });
11
- }
12
- _export(exports, {
13
- isHtmlEnabled: () => isHtmlEnabled,
14
- builderPluginAdapterHtml: () => builderPluginAdapterHtml
5
+ Object.defineProperty(exports, "builderPluginAdapterHtml", {
6
+ enumerable: true,
7
+ get: () => builderPluginAdapterHtml
15
8
  });
9
+ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
16
10
  const _buildershared = require("@modern-js/builder-shared");
17
11
  const _utils = require("@modern-js/utils");
18
12
  const _lodash = require("@modern-js/utils/lodash");
19
13
  const _bundlerPlugins = require("../bundlerPlugins");
20
- function _getRequireWildcardCache(nodeInterop) {
21
- if (typeof WeakMap !== "function")
22
- return null;
23
- var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
24
- var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
25
- return (_getRequireWildcardCache = function(nodeInterop2) {
26
- return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
27
- })(nodeInterop);
28
- }
29
- function _interop_require_wildcard(obj, nodeInterop) {
30
- if (!nodeInterop && obj && obj.__esModule) {
31
- return obj;
32
- }
33
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
34
- return {
35
- default: obj
36
- };
37
- }
38
- var cache = _getRequireWildcardCache(nodeInterop);
39
- if (cache && cache.has(obj)) {
40
- return cache.get(obj);
41
- }
42
- var newObj = {};
43
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
44
- for (var key in obj) {
45
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
46
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
47
- if (desc && (desc.get || desc.set)) {
48
- Object.defineProperty(newObj, key, desc);
49
- } else {
50
- newObj[key] = obj[key];
51
- }
52
- }
53
- }
54
- newObj.default = obj;
55
- if (cache) {
56
- cache.set(obj, newObj);
57
- }
58
- return newObj;
59
- }
60
- function isHtmlEnabled(config, target) {
61
- var _config_tools;
62
- return ((_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
63
- }
64
14
  const builderPluginAdapterHtml = (options) => ({
65
15
  name: "builder-plugin-adapter-modern-html",
66
16
  setup(api) {
67
17
  api.modifyBundlerChain(async (chain, { CHAIN_ID, target, HtmlPlugin: HtmlBundlerPlugin }) => {
68
18
  const builderConfig = api.getNormalizedConfig();
69
- if (isHtmlEnabled(builderConfig, target)) {
19
+ if (!(0, _buildershared.isHtmlDisabled)(builderConfig, target)) {
70
20
  applyBottomHtmlPlugin({
71
21
  api,
72
22
  options,
@@ -90,7 +40,7 @@ async function injectAssetPrefix({ api, chain }) {
90
40
  const isRspack = api.context.bundlerType === "rspack";
91
41
  if (isRspack) {
92
42
  const fileName = "rspack-asset-prefix";
93
- const { default: RspackVirtualModulePlugin } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("rspack-plugin-virtual-module")));
43
+ const { default: RspackVirtualModulePlugin } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("rspack-plugin-virtual-module")));
94
44
  entryNames.forEach((entryName) => {
95
45
  entries[entryName].prepend(fileName);
96
46
  chain.plugin("rspack-asset-prefix").use(RspackVirtualModulePlugin, [
@@ -6,52 +6,12 @@ Object.defineProperty(exports, "builderPluginAdapterSSR", {
6
6
  enumerable: true,
7
7
  get: () => builderPluginAdapterSSR
8
8
  });
9
- const _path = /* @__PURE__ */ _interop_require_wildcard(require("path"));
9
+ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
10
+ const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
10
11
  const _buildershared = require("@modern-js/builder-shared");
11
12
  const _utils = require("@modern-js/utils");
12
13
  const _bundlerPlugins = require("../bundlerPlugins");
13
14
  const _utils1 = require("../../../analyze/utils");
14
- const _adapterHtml = require("./adapterHtml");
15
- function _getRequireWildcardCache(nodeInterop) {
16
- if (typeof WeakMap !== "function")
17
- return null;
18
- var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
19
- var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
20
- return (_getRequireWildcardCache = function(nodeInterop2) {
21
- return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
22
- })(nodeInterop);
23
- }
24
- function _interop_require_wildcard(obj, nodeInterop) {
25
- if (!nodeInterop && obj && obj.__esModule) {
26
- return obj;
27
- }
28
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
29
- return {
30
- default: obj
31
- };
32
- }
33
- var cache = _getRequireWildcardCache(nodeInterop);
34
- if (cache && cache.has(obj)) {
35
- return cache.get(obj);
36
- }
37
- var newObj = {};
38
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
39
- for (var key in obj) {
40
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
41
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
42
- if (desc && (desc.get || desc.set)) {
43
- Object.defineProperty(newObj, key, desc);
44
- } else {
45
- newObj[key] = obj[key];
46
- }
47
- }
48
- }
49
- newObj.default = obj;
50
- if (cache) {
51
- cache.set(obj, newObj);
52
- }
53
- return newObj;
54
- }
55
15
  const builderPluginAdapterSSR = (options) => ({
56
16
  name: "builder-plugin-adapter-modern-ssr",
57
17
  setup(api) {
@@ -84,7 +44,7 @@ const builderPluginAdapterSSR = (options) => ({
84
44
  appNormalizedConfig: normalizedConfig2
85
45
  });
86
46
  }
87
- if ((0, _adapterHtml.isHtmlEnabled)(builderConfig, target)) {
47
+ if (!(0, _buildershared.isHtmlDisabled)(builderConfig, target)) {
88
48
  applyAsyncChunkHtmlPlugin({
89
49
  chain,
90
50
  modernConfig: options.normalizedConfig,
@@ -118,13 +78,14 @@ function applyAsyncChunkHtmlPlugin({ chain, modernConfig, CHAIN_ID, HtmlBundlerP
118
78
  }
119
79
  }
120
80
  function applyRouterPlugin(chain, options) {
121
- var _normalizedConfig_runtime;
81
+ var _normalizedConfig_runtime, _normalizedConfig_deploy_worker;
122
82
  const { appContext, normalizedConfig } = options;
123
83
  const { entrypoints } = appContext;
124
84
  const existNestedRoutes = entrypoints.some((entrypoint) => entrypoint.nestedRoutesEntry);
125
85
  const routerConfig = normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
126
86
  const routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
127
- if (existNestedRoutes || routerManifest) {
87
+ const workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
88
+ if (existNestedRoutes || routerManifest || workerSSR) {
128
89
  chain.plugin("route-plugin").use(_bundlerPlugins.RouterPlugin);
129
90
  }
130
91
  }
@@ -2,19 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- _export_star(require("./adapterBasic"), exports);
6
- _export_star(require("./adapterHtml"), exports);
7
- _export_star(require("./adapterSSR"), exports);
8
- function _export_star(from, to) {
9
- Object.keys(from).forEach(function(k) {
10
- if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
11
- Object.defineProperty(to, k, {
12
- enumerable: true,
13
- get: function() {
14
- return from[k];
15
- }
16
- });
17
- }
18
- });
19
- return from;
20
- }
5
+ const _export_star = require("@swc/helpers/_/_export_star");
6
+ _export_star._(require("./adapterBasic"), exports);
7
+ _export_star._(require("./adapterHtml"), exports);
8
+ _export_star._(require("./adapterSSR"), exports);
@@ -6,19 +6,7 @@ Object.defineProperty(exports, "HtmlAsyncChunkPlugin", {
6
6
  enumerable: true,
7
7
  get: () => HtmlAsyncChunkPlugin
8
8
  });
9
- function _define_property(obj, key, value) {
10
- if (key in obj) {
11
- Object.defineProperty(obj, key, {
12
- value,
13
- enumerable: true,
14
- configurable: true,
15
- writable: true
16
- });
17
- } else {
18
- obj[key] = value;
19
- }
20
- return obj;
21
- }
9
+ const _define_property = require("@swc/helpers/_/_define_property");
22
10
  class HtmlAsyncChunkPlugin {
23
11
  apply(compiler) {
24
12
  compiler.hooks.compilation.tap(this.name, (compilation) => {
@@ -42,8 +30,8 @@ class HtmlAsyncChunkPlugin {
42
30
  });
43
31
  }
44
32
  constructor(htmlWebpackPlugin) {
45
- _define_property(this, "name", void 0);
46
- _define_property(this, "htmlWebpackPlugin", void 0);
33
+ _define_property._(this, "name", void 0);
34
+ _define_property._(this, "htmlWebpackPlugin", void 0);
47
35
  this.name = "HtmlAsyncChunkPlugin";
48
36
  this.htmlWebpackPlugin = htmlWebpackPlugin;
49
37
  }
@@ -6,19 +6,7 @@ Object.defineProperty(exports, "BottomTemplatePlugin", {
6
6
  enumerable: true,
7
7
  get: () => BottomTemplatePlugin
8
8
  });
9
- function _define_property(obj, key, value) {
10
- if (key in obj) {
11
- Object.defineProperty(obj, key, {
12
- value,
13
- enumerable: true,
14
- configurable: true,
15
- writable: true
16
- });
17
- } else {
18
- obj[key] = value;
19
- }
20
- return obj;
21
- }
9
+ const _define_property = require("@swc/helpers/_/_define_property");
22
10
  class BottomTemplatePlugin {
23
11
  apply(compiler) {
24
12
  compiler.hooks.compilation.tap(this.name, (compilation) => {
@@ -41,10 +29,10 @@ ${match}`);
41
29
  });
42
30
  }
43
31
  constructor(htmlWebpackPlugin) {
44
- _define_property(this, "htmlWebpackPlugin", void 0);
45
- _define_property(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
46
- _define_property(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
47
- _define_property(this, "name", void 0);
32
+ _define_property._(this, "htmlWebpackPlugin", void 0);
33
+ _define_property._(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
34
+ _define_property._(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
35
+ _define_property._(this, "name", void 0);
48
36
  this.htmlWebpackPlugin = htmlWebpackPlugin;
49
37
  this.name = "bottom-template";
50
38
  }
@@ -6,14 +6,10 @@ Object.defineProperty(exports, "RouterPlugin", {
6
6
  enumerable: true,
7
7
  get: () => RouterPlugin
8
8
  });
9
- const _path = /* @__PURE__ */ _interop_require_default(require("path"));
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
10
+ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
10
11
  const _utils = require("@modern-js/utils");
11
12
  const _constants = require("@modern-js/utils/universal/constants");
12
- function _interop_require_default(obj) {
13
- return obj && obj.__esModule ? obj : {
14
- default: obj
15
- };
16
- }
17
13
  const PLUGIN_NAME = "ModernjsRoutePlugin";
18
14
  class RouterPlugin {
19
15
  apply(compiler) {
@@ -2,19 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- _export_star(require("./HtmlAsyncChunkPlugin"), exports);
6
- _export_star(require("./HtmlBottomTemplate"), exports);
7
- _export_star(require("./RouterPlugin"), exports);
8
- function _export_star(from, to) {
9
- Object.keys(from).forEach(function(k) {
10
- if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
11
- Object.defineProperty(to, k, {
12
- enumerable: true,
13
- get: function() {
14
- return from[k];
15
- }
16
- });
17
- }
18
- });
19
- return from;
20
- }
5
+ const _export_star = require("@swc/helpers/_/_export_star");
6
+ _export_star._(require("./HtmlAsyncChunkPlugin"), exports);
7
+ _export_star._(require("./HtmlBottomTemplate"), exports);
8
+ _export_star._(require("./RouterPlugin"), exports);
@@ -6,12 +6,8 @@ Object.defineProperty(exports, "createCopyInfo", {
6
6
  enumerable: true,
7
7
  get: () => createCopyInfo
8
8
  });
9
- const _path = /* @__PURE__ */ _interop_require_default(require("path"));
10
- function _interop_require_default(obj) {
11
- return obj && obj.__esModule ? obj : {
12
- default: obj
13
- };
14
- }
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
10
+ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
15
11
  function createCopyInfo(appContext, config) {
16
12
  const configDir = _path.default.resolve(appContext.appDirectory, config.source.configDir || "./config");
17
13
  const uploadDir = _path.default.posix.join(configDir.replace(/\\/g, "/"), "upload");
@@ -2,19 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- _export_star(require("./types"), exports);
6
- _export_star(require("./builderPlugins"), exports);
7
- _export_star(require("./createCopyInfo"), exports);
8
- function _export_star(from, to) {
9
- Object.keys(from).forEach(function(k) {
10
- if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
11
- Object.defineProperty(to, k, {
12
- enumerable: true,
13
- get: function() {
14
- return from[k];
15
- }
16
- });
17
- }
18
- });
19
- return from;
20
- }
5
+ const _export_star = require("@swc/helpers/_/_export_star");
6
+ _export_star._(require("./types"), exports);
7
+ _export_star._(require("./builderPlugins"), exports);
8
+ _export_star._(require("./createCopyInfo"), exports);
@@ -2,19 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- _export_star(require("./dev"), exports);
6
- _export_star(require("./build"), exports);
7
- _export_star(require("./serve"), exports);
8
- function _export_star(from, to) {
9
- Object.keys(from).forEach(function(k) {
10
- if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
11
- Object.defineProperty(to, k, {
12
- enumerable: true,
13
- get: function() {
14
- return from[k];
15
- }
16
- });
17
- }
18
- });
19
- return from;
20
- }
5
+ const _export_star = require("@swc/helpers/_/_export_star");
6
+ _export_star._(require("./dev"), exports);
7
+ _export_star._(require("./build"), exports);
8
+ _export_star._(require("./serve"), exports);
@@ -6,16 +6,12 @@ Object.defineProperty(exports, "start", {
6
6
  enumerable: true,
7
7
  get: () => start
8
8
  });
9
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
9
10
  const _utils = require("@modern-js/utils");
10
- const _prodserver = /* @__PURE__ */ _interop_require_default(require("@modern-js/prod-server"));
11
+ const _prodserver = /* @__PURE__ */ _interop_require_default._(require("@modern-js/prod-server"));
11
12
  const _printInstructions = require("../utils/printInstructions");
12
13
  const _createServer = require("../utils/createServer");
13
14
  const _getServerInternalPlugins = require("../utils/getServerInternalPlugins");
14
- function _interop_require_default(obj) {
15
- return obj && obj.__esModule ? obj : {
16
- default: obj
17
- };
18
- }
19
15
  const start = async (api) => {
20
16
  var _userConfig_source, _userConfig_output_distPath;
21
17
  const appContext = api.useAppContext();