@modern-js/app-tools 2.58.1 → 2.58.2

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 (283) hide show
  1. package/dist/cjs/builder/builder-webpack/createCopyPattern.js +0 -1
  2. package/dist/cjs/builder/builder-webpack/index.js +1 -1
  3. package/dist/cjs/builder/generator/index.js +2 -2
  4. package/dist/cjs/builder/index.js +2 -2
  5. package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js +1 -4
  6. package/dist/cjs/commands/build.js +19 -0
  7. package/dist/cjs/commands/dev.js +9 -0
  8. package/dist/cjs/commands/index.js +8 -8
  9. package/dist/cjs/config/initialize/inits.js +4 -4
  10. package/dist/cjs/esm/esbuild-loader.mjs +20 -0
  11. package/dist/cjs/esm/register-esm.mjs +67 -0
  12. package/dist/cjs/esm/ts-node-loader.mjs +21 -0
  13. package/dist/cjs/esm/utils.mjs +43 -0
  14. package/dist/cjs/index.js +1 -1
  15. package/dist/cjs/plugins/analyze/index.js +3 -3
  16. package/dist/cjs/plugins/deploy/dependencies/index.js +1 -0
  17. package/dist/cjs/plugins/deploy/dependencies/utils.js +11 -0
  18. package/dist/cjs/plugins/deploy/platforms/netlify-entry.js +3 -0
  19. package/dist/cjs/plugins/deploy/platforms/netlify-entry.mjs +1 -0
  20. package/dist/cjs/plugins/deploy/platforms/{netlifyEntry.js → netlify-handler.js} +6 -4
  21. package/dist/cjs/plugins/deploy/platforms/netlify.js +14 -5
  22. package/dist/cjs/plugins/deploy/platforms/node.js +13 -4
  23. package/dist/cjs/plugins/deploy/platforms/vercel-entry.js +3 -0
  24. package/dist/cjs/plugins/deploy/platforms/vercel-entry.mjs +3 -0
  25. package/dist/cjs/plugins/deploy/platforms/{vercelEntry.js → vercel-handler.js} +4 -1
  26. package/dist/cjs/plugins/deploy/platforms/vercel.js +14 -5
  27. package/dist/cjs/utils/config.js +1 -1
  28. package/dist/cjs/utils/loadPlugins.js +1 -1
  29. package/dist/cjs/utils/register.js +50 -23
  30. package/dist/types/builder/builder-rspack/adapterCopy.d.ts +2 -2
  31. package/dist/types/builder/builder-rspack/index.d.ts +1 -1
  32. package/dist/types/builder/builder-webpack/adapterModern.d.ts +2 -2
  33. package/dist/types/builder/builder-webpack/index.d.ts +1 -1
  34. package/dist/types/builder/generator/index.d.ts +2 -2
  35. package/dist/types/builder/index.d.ts +1 -1
  36. package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts +1 -1
  37. package/dist/types/builder/shared/builderPlugins/adapterSSR.d.ts +1 -1
  38. package/dist/types/builder/shared/createCopyInfo.d.ts +1 -1
  39. package/dist/types/commands/build.d.ts +1 -1
  40. package/dist/types/commands/dev.d.ts +3 -3
  41. package/dist/types/commands/index.d.ts +3 -3
  42. package/dist/types/config/default.d.ts +1 -1
  43. package/dist/types/config/initialize/inits.d.ts +1 -1
  44. package/dist/types/config/legacy/createHtmlConfig.d.ts +1 -1
  45. package/dist/types/config/legacy/createOutputConfig.d.ts +1 -1
  46. package/dist/types/config/legacy/createSourceConfig.d.ts +1 -1
  47. package/dist/types/config/legacy/createToolsConfig.d.ts +1 -1
  48. package/dist/types/esm/esbuild-loader.d.mts +6 -0
  49. package/dist/types/esm/register-esm.d.mts +5 -0
  50. package/dist/types/esm/ts-node-loader.d.mts +6 -0
  51. package/dist/types/esm/utils.d.mts +6 -0
  52. package/dist/types/exports/server.d.ts +1 -1
  53. package/dist/types/hooks.d.ts +1 -1
  54. package/dist/types/index.d.ts +2 -2
  55. package/dist/types/plugins/analyze/getBundleEntry.d.ts +1 -1
  56. package/dist/types/plugins/analyze/getFileSystemEntry.d.ts +1 -1
  57. package/dist/types/plugins/analyze/index.d.ts +1 -1
  58. package/dist/types/plugins/deploy/dependencies/utils.d.ts +1 -1
  59. package/dist/types/plugins/deploy/index.d.ts +2 -2
  60. package/dist/types/plugins/deploy/platforms/netlify-entry.d.cts +1 -0
  61. package/dist/types/plugins/deploy/platforms/netlify-entry.d.mts +1 -0
  62. package/dist/types/plugins/deploy/platforms/netlify-handler.d.cts +1 -0
  63. package/dist/types/plugins/deploy/platforms/netlify.d.ts +1 -1
  64. package/dist/types/plugins/deploy/platforms/node.d.ts +1 -1
  65. package/dist/types/plugins/deploy/platforms/platform.d.ts +2 -2
  66. package/dist/types/plugins/deploy/platforms/vercel-entry.d.mts +2 -0
  67. package/dist/types/plugins/deploy/platforms/vercel-entry.d.ts +2 -0
  68. package/dist/types/plugins/deploy/platforms/vercel-handler.d.cts +1 -0
  69. package/dist/types/plugins/deploy/platforms/vercel.d.ts +1 -1
  70. package/dist/types/plugins/deploy/utils.d.ts +1 -1
  71. package/dist/types/plugins/serverBuild.d.ts +1 -1
  72. package/dist/types/types/hooks.d.ts +1 -1
  73. package/dist/types/types/index.d.ts +1 -1
  74. package/dist/types/utils/createServer.d.ts +1 -1
  75. package/dist/types/utils/generateWatchFiles.d.ts +1 -1
  76. package/dist/types/utils/getSelectedEntries.d.ts +1 -1
  77. package/dist/types/utils/loadPlugins.d.ts +3 -3
  78. package/dist/types/utils/register.d.ts +2 -2
  79. package/dist/types/utils/restart.d.ts +2 -2
  80. package/lib/types.d.ts +15 -0
  81. package/package.json +20 -20
  82. package/dist/esm/builder/builder-rspack/adapterCopy.js +0 -166
  83. package/dist/esm/builder/builder-rspack/index.js +0 -34
  84. package/dist/esm/builder/builder-webpack/adapterModern.js +0 -29
  85. package/dist/esm/builder/builder-webpack/createCopyPattern.js +0 -44
  86. package/dist/esm/builder/builder-webpack/index.js +0 -52
  87. package/dist/esm/builder/generator/createBuilderProviderConfig.js +0 -37
  88. package/dist/esm/builder/generator/getBuilderEnvironments.js +0 -81
  89. package/dist/esm/builder/generator/index.js +0 -94
  90. package/dist/esm/builder/index.js +0 -45
  91. package/dist/esm/builder/shared/builderPlugins/adapterBasic.js +0 -85
  92. package/dist/esm/builder/shared/builderPlugins/adapterHtml.js +0 -126
  93. package/dist/esm/builder/shared/builderPlugins/adapterSSR.js +0 -270
  94. package/dist/esm/builder/shared/builderPlugins/adapterWorker.js +0 -43
  95. package/dist/esm/builder/shared/builderPlugins/index.js +0 -4
  96. package/dist/esm/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +0 -51
  97. package/dist/esm/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +0 -37
  98. package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js +0 -317
  99. package/dist/esm/builder/shared/bundlerPlugins/index.js +0 -3
  100. package/dist/esm/builder/shared/createCopyInfo.js +0 -14
  101. package/dist/esm/builder/shared/index.js +0 -3
  102. package/dist/esm/builder/shared/loaders/serverModuleLoader.js +0 -7
  103. package/dist/esm/builder/shared/types.js +0 -0
  104. package/dist/esm/commands/build.js +0 -117
  105. package/dist/esm/commands/deploy.js +0 -48
  106. package/dist/esm/commands/dev.js +0 -169
  107. package/dist/esm/commands/index.js +0 -411
  108. package/dist/esm/commands/inspect.js +0 -28
  109. package/dist/esm/commands/serve.js +0 -93
  110. package/dist/esm/config/default.js +0 -190
  111. package/dist/esm/config/index.js +0 -3
  112. package/dist/esm/config/initialize/index.js +0 -9
  113. package/dist/esm/config/initialize/inits.js +0 -85
  114. package/dist/esm/config/legacy/createHtmlConfig.js +0 -21
  115. package/dist/esm/config/legacy/createOutputConfig.js +0 -45
  116. package/dist/esm/config/legacy/createSourceConfig.js +0 -46
  117. package/dist/esm/config/legacy/createToolsConfig.js +0 -28
  118. package/dist/esm/config/legacy/index.js +0 -43
  119. package/dist/esm/defineConfig.js +0 -16
  120. package/dist/esm/exports/server.js +0 -4
  121. package/dist/esm/hooks.js +0 -34
  122. package/dist/esm/index.js +0 -239
  123. package/dist/esm/locale/en.js +0 -43
  124. package/dist/esm/locale/index.js +0 -12
  125. package/dist/esm/locale/zh.js +0 -43
  126. package/dist/esm/plugins/analyze/constants.js +0 -14
  127. package/dist/esm/plugins/analyze/getBundleEntry.js +0 -102
  128. package/dist/esm/plugins/analyze/getFileSystemEntry.js +0 -238
  129. package/dist/esm/plugins/analyze/getHtmlTemplate.js +0 -178
  130. package/dist/esm/plugins/analyze/getServerRoutes.js +0 -132
  131. package/dist/esm/plugins/analyze/index.js +0 -380
  132. package/dist/esm/plugins/analyze/isDefaultExportFunction.js +0 -49
  133. package/dist/esm/plugins/analyze/templates.js +0 -6
  134. package/dist/esm/plugins/analyze/utils.js +0 -101
  135. package/dist/esm/plugins/deploy/dependencies/index.js +0 -614
  136. package/dist/esm/plugins/deploy/dependencies/utils.js +0 -394
  137. package/dist/esm/plugins/deploy/exports.js +0 -4
  138. package/dist/esm/plugins/deploy/index.js +0 -135
  139. package/dist/esm/plugins/deploy/platforms/netlify.js +0 -299
  140. package/dist/esm/plugins/deploy/platforms/netlifyEntry.js +0 -203
  141. package/dist/esm/plugins/deploy/platforms/node.js +0 -133
  142. package/dist/esm/plugins/deploy/platforms/nodeEntry.js +0 -108
  143. package/dist/esm/plugins/deploy/platforms/platform.js +0 -0
  144. package/dist/esm/plugins/deploy/platforms/vercel.js +0 -233
  145. package/dist/esm/plugins/deploy/platforms/vercelEntry.js +0 -203
  146. package/dist/esm/plugins/deploy/utils.js +0 -47
  147. package/dist/esm/plugins/initialize/index.js +0 -119
  148. package/dist/esm/plugins/serverBuild.js +0 -87
  149. package/dist/esm/types/config/deploy.js +0 -0
  150. package/dist/esm/types/config/dev.js +0 -0
  151. package/dist/esm/types/config/experiments.js +0 -0
  152. package/dist/esm/types/config/html.js +0 -0
  153. package/dist/esm/types/config/index.js +0 -1
  154. package/dist/esm/types/config/output.js +0 -0
  155. package/dist/esm/types/config/performance.js +0 -0
  156. package/dist/esm/types/config/security.js +0 -0
  157. package/dist/esm/types/config/source.js +0 -0
  158. package/dist/esm/types/config/testing.js +0 -0
  159. package/dist/esm/types/config/tools.js +0 -0
  160. package/dist/esm/types/hooks.js +0 -0
  161. package/dist/esm/types/index.js +0 -3
  162. package/dist/esm/types/legacyConfig/deploy.js +0 -0
  163. package/dist/esm/types/legacyConfig/dev.js +0 -0
  164. package/dist/esm/types/legacyConfig/index.js +0 -0
  165. package/dist/esm/types/legacyConfig/output.js +0 -0
  166. package/dist/esm/types/legacyConfig/source.js +0 -0
  167. package/dist/esm/types/legacyConfig/testing.js +0 -0
  168. package/dist/esm/types/legacyConfig/tools.js +0 -0
  169. package/dist/esm/types/utils.js +0 -0
  170. package/dist/esm/utils/config.js +0 -122
  171. package/dist/esm/utils/createServer.js +0 -58
  172. package/dist/esm/utils/env.js +0 -16
  173. package/dist/esm/utils/generateWatchFiles.js +0 -71
  174. package/dist/esm/utils/getSelectedEntries.js +0 -67
  175. package/dist/esm/utils/loadPlugins.js +0 -69
  176. package/dist/esm/utils/printInstructions.js +0 -32
  177. package/dist/esm/utils/register.js +0 -129
  178. package/dist/esm/utils/restart.js +0 -67
  179. package/dist/esm/utils/routes.js +0 -42
  180. package/dist/esm/utils/types.js +0 -0
  181. package/dist/esm-node/builder/builder-rspack/adapterCopy.js +0 -67
  182. package/dist/esm-node/builder/builder-rspack/index.js +0 -12
  183. package/dist/esm-node/builder/builder-webpack/adapterModern.js +0 -26
  184. package/dist/esm-node/builder/builder-webpack/createCopyPattern.js +0 -42
  185. package/dist/esm-node/builder/builder-webpack/index.js +0 -20
  186. package/dist/esm-node/builder/generator/createBuilderProviderConfig.js +0 -44
  187. package/dist/esm-node/builder/generator/getBuilderEnvironments.js +0 -60
  188. package/dist/esm-node/builder/generator/index.js +0 -37
  189. package/dist/esm-node/builder/index.js +0 -11
  190. package/dist/esm-node/builder/shared/builderPlugins/adapterBasic.js +0 -48
  191. package/dist/esm-node/builder/shared/builderPlugins/adapterHtml.js +0 -60
  192. package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js +0 -156
  193. package/dist/esm-node/builder/shared/builderPlugins/adapterWorker.js +0 -27
  194. package/dist/esm-node/builder/shared/builderPlugins/index.js +0 -4
  195. package/dist/esm-node/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +0 -30
  196. package/dist/esm-node/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +0 -31
  197. package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js +0 -231
  198. package/dist/esm-node/builder/shared/bundlerPlugins/index.js +0 -3
  199. package/dist/esm-node/builder/shared/createCopyInfo.js +0 -14
  200. package/dist/esm-node/builder/shared/index.js +0 -3
  201. package/dist/esm-node/builder/shared/loaders/serverModuleLoader.js +0 -7
  202. package/dist/esm-node/builder/shared/types.js +0 -0
  203. package/dist/esm-node/commands/build.js +0 -55
  204. package/dist/esm-node/commands/deploy.js +0 -12
  205. package/dist/esm-node/commands/dev.js +0 -95
  206. package/dist/esm-node/commands/index.js +0 -92
  207. package/dist/esm-node/commands/inspect.js +0 -15
  208. package/dist/esm-node/commands/serve.js +0 -51
  209. package/dist/esm-node/config/default.js +0 -197
  210. package/dist/esm-node/config/index.js +0 -3
  211. package/dist/esm-node/config/initialize/index.js +0 -9
  212. package/dist/esm-node/config/initialize/inits.js +0 -79
  213. package/dist/esm-node/config/legacy/createHtmlConfig.js +0 -21
  214. package/dist/esm-node/config/legacy/createOutputConfig.js +0 -45
  215. package/dist/esm-node/config/legacy/createSourceConfig.js +0 -29
  216. package/dist/esm-node/config/legacy/createToolsConfig.js +0 -28
  217. package/dist/esm-node/config/legacy/index.js +0 -43
  218. package/dist/esm-node/defineConfig.js +0 -13
  219. package/dist/esm-node/exports/server.js +0 -4
  220. package/dist/esm-node/hooks.js +0 -34
  221. package/dist/esm-node/index.js +0 -124
  222. package/dist/esm-node/locale/en.js +0 -43
  223. package/dist/esm-node/locale/index.js +0 -12
  224. package/dist/esm-node/locale/zh.js +0 -43
  225. package/dist/esm-node/plugins/analyze/constants.js +0 -14
  226. package/dist/esm-node/plugins/analyze/getBundleEntry.js +0 -61
  227. package/dist/esm-node/plugins/analyze/getFileSystemEntry.js +0 -100
  228. package/dist/esm-node/plugins/analyze/getHtmlTemplate.js +0 -74
  229. package/dist/esm-node/plugins/analyze/getServerRoutes.js +0 -132
  230. package/dist/esm-node/plugins/analyze/index.js +0 -166
  231. package/dist/esm-node/plugins/analyze/isDefaultExportFunction.js +0 -47
  232. package/dist/esm-node/plugins/analyze/templates.js +0 -24
  233. package/dist/esm-node/plugins/analyze/utils.js +0 -68
  234. package/dist/esm-node/plugins/deploy/dependencies/index.js +0 -201
  235. package/dist/esm-node/plugins/deploy/dependencies/utils.js +0 -126
  236. package/dist/esm-node/plugins/deploy/exports.js +0 -4
  237. package/dist/esm-node/plugins/deploy/index.js +0 -44
  238. package/dist/esm-node/plugins/deploy/platforms/netlify.js +0 -108
  239. package/dist/esm-node/plugins/deploy/platforms/netlifyEntry.js +0 -69
  240. package/dist/esm-node/plugins/deploy/platforms/node.js +0 -63
  241. package/dist/esm-node/plugins/deploy/platforms/nodeEntry.js +0 -44
  242. package/dist/esm-node/plugins/deploy/platforms/platform.js +0 -0
  243. package/dist/esm-node/plugins/deploy/platforms/vercel.js +0 -120
  244. package/dist/esm-node/plugins/deploy/platforms/vercelEntry.js +0 -69
  245. package/dist/esm-node/plugins/deploy/utils.js +0 -44
  246. package/dist/esm-node/plugins/initialize/index.js +0 -84
  247. package/dist/esm-node/plugins/serverBuild.js +0 -58
  248. package/dist/esm-node/types/config/deploy.js +0 -0
  249. package/dist/esm-node/types/config/dev.js +0 -0
  250. package/dist/esm-node/types/config/experiments.js +0 -0
  251. package/dist/esm-node/types/config/html.js +0 -0
  252. package/dist/esm-node/types/config/index.js +0 -1
  253. package/dist/esm-node/types/config/output.js +0 -0
  254. package/dist/esm-node/types/config/performance.js +0 -0
  255. package/dist/esm-node/types/config/security.js +0 -0
  256. package/dist/esm-node/types/config/source.js +0 -0
  257. package/dist/esm-node/types/config/testing.js +0 -0
  258. package/dist/esm-node/types/config/tools.js +0 -0
  259. package/dist/esm-node/types/hooks.js +0 -0
  260. package/dist/esm-node/types/index.js +0 -3
  261. package/dist/esm-node/types/legacyConfig/deploy.js +0 -0
  262. package/dist/esm-node/types/legacyConfig/dev.js +0 -0
  263. package/dist/esm-node/types/legacyConfig/index.js +0 -0
  264. package/dist/esm-node/types/legacyConfig/output.js +0 -0
  265. package/dist/esm-node/types/legacyConfig/source.js +0 -0
  266. package/dist/esm-node/types/legacyConfig/testing.js +0 -0
  267. package/dist/esm-node/types/legacyConfig/tools.js +0 -0
  268. package/dist/esm-node/types/utils.js +0 -0
  269. package/dist/esm-node/utils/config.js +0 -49
  270. package/dist/esm-node/utils/createServer.js +0 -26
  271. package/dist/esm-node/utils/env.js +0 -16
  272. package/dist/esm-node/utils/generateWatchFiles.js +0 -30
  273. package/dist/esm-node/utils/getSelectedEntries.js +0 -34
  274. package/dist/esm-node/utils/loadPlugins.js +0 -22
  275. package/dist/esm-node/utils/printInstructions.js +0 -11
  276. package/dist/esm-node/utils/register.js +0 -69
  277. package/dist/esm-node/utils/restart.js +0 -22
  278. package/dist/esm-node/utils/routes.js +0 -21
  279. package/dist/esm-node/utils/types.js +0 -0
  280. package/dist/types/plugins/deploy/platforms/netlifyEntry.d.ts +0 -2
  281. package/dist/types/plugins/deploy/platforms/vercelEntry.d.ts +0 -2
  282. /package/dist/cjs/plugins/deploy/platforms/{nodeEntry.js → node-entry.js} +0 -0
  283. /package/dist/types/plugins/deploy/platforms/{nodeEntry.d.ts → node-entry.d.ts} +0 -0
@@ -33,7 +33,15 @@ __export(register_exports, {
33
33
  module.exports = __toCommonJS(register_exports);
34
34
  var import_node_path = __toESM(require("node:path"));
35
35
  var import_utils = require("@modern-js/utils");
36
- const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
36
+ const registerEsbuild = async ({ isTsProject, tsConfig, distDir }) => {
37
+ const esbuildRegister = await import("esbuild-register/dist/node");
38
+ esbuildRegister.register({
39
+ tsconfigRaw: isTsProject ? tsConfig : void 0,
40
+ hookIgnoreNodeModules: true,
41
+ hookMatcher: (fileName) => !fileName.startsWith(distDir)
42
+ });
43
+ };
44
+ const registerCompiler = async (appDir, distDir, alias) => {
37
45
  const TS_CONFIG_FILENAME = `tsconfig.json`;
38
46
  const tsconfigPath = import_node_path.default.resolve(appDir, TS_CONFIG_FILENAME);
39
47
  const isTsProject = await import_utils.fs.pathExists(tsconfigPath);
@@ -44,6 +52,17 @@ const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
44
52
  const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
45
53
  const tsPaths = Object.keys(paths).reduce((o, key) => {
46
54
  let tsPath = paths[key];
55
+ if (typeof tsPath === "string" && key.startsWith("@") && tsPath.startsWith("@")) {
56
+ try {
57
+ tsPath = require.resolve(tsPath, {
58
+ paths: [
59
+ process.cwd(),
60
+ ...module.paths
61
+ ]
62
+ });
63
+ } catch {
64
+ }
65
+ }
47
66
  if (typeof tsPath === "string" && import_node_path.default.isAbsolute(tsPath)) {
48
67
  tsPath = import_node_path.default.relative(absoluteBaseUrl, tsPath);
49
68
  }
@@ -61,32 +80,40 @@ const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
61
80
  if (isTsProject) {
62
81
  tsConfig = (0, import_utils.readTsConfigByFile)(tsconfigPath);
63
82
  }
64
- try {
65
- const tsNode = await Promise.resolve().then(() => __toESM(require("ts-node")));
66
- const tsNodeOptions = tsConfig["ts-node"];
67
- if (isTsProject) {
68
- tsNode.register({
69
- project: tsconfigPath,
70
- scope: true,
71
- // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
72
- files: true,
73
- transpileOnly: true,
74
- ignore: [
75
- "(?:^|/)node_modules/",
76
- `(?:^|/)${import_node_path.default.relative(appDir, distDir)}/`
77
- ],
78
- ...tsNodeOptions
83
+ const { MODERN_NODE_LOADER } = process.env;
84
+ if (MODERN_NODE_LOADER !== "esbuild") {
85
+ try {
86
+ const tsNode = await import("ts-node");
87
+ const tsNodeOptions = tsConfig["ts-node"];
88
+ if (isTsProject) {
89
+ tsNode.register({
90
+ project: tsconfigPath,
91
+ scope: true,
92
+ // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
93
+ files: true,
94
+ transpileOnly: true,
95
+ ignore: [
96
+ "(?:^|/)node_modules/",
97
+ `(?:^|/)${import_node_path.default.relative(appDir, distDir)}/`
98
+ ],
99
+ ...tsNodeOptions
100
+ });
101
+ }
102
+ } catch (error) {
103
+ await registerEsbuild({
104
+ isTsProject,
105
+ tsConfig,
106
+ distDir
79
107
  });
80
108
  }
81
- } catch (error) {
82
- const esbuildRegister = await Promise.resolve().then(() => __toESM(require("esbuild-register/dist/node")));
83
- esbuildRegister.register({
84
- tsconfigRaw: isTsProject ? tsConfig : void 0,
85
- hookIgnoreNodeModules: true,
86
- hookMatcher: (fileName) => !fileName.startsWith(distDir)
109
+ } else {
110
+ await registerEsbuild({
111
+ isTsProject,
112
+ tsConfig,
113
+ distDir
87
114
  });
88
115
  }
89
- const tsConfigPaths = await Promise.resolve().then(() => __toESM(require("@modern-js/utils/tsconfig-paths")));
116
+ const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
90
117
  if (await import_utils.fs.pathExists(appDir)) {
91
118
  const loaderRes = tsConfigPaths.loadConfig(appDir);
92
119
  if (loaderRes.resultType === "success") {
@@ -1,3 +1,3 @@
1
- import { RsbuildPlugin } from '@modern-js/uni-builder';
2
- import { BuilderOptions } from '../shared';
1
+ import type { RsbuildPlugin } from '@modern-js/uni-builder';
2
+ import { type BuilderOptions } from '../shared';
3
3
  export declare const builderPluginAdpaterCopy: (options: BuilderOptions<'rspack'>) => RsbuildPlugin;
@@ -1,2 +1,2 @@
1
- import { BuilderOptions } from '../shared';
1
+ import type { BuilderOptions } from '../shared';
2
2
  export declare function createRspackBuilderForModern(options: BuilderOptions<'rspack'>): Promise<import("@modern-js/uni-builder").UniBuilderInstance>;
@@ -1,5 +1,5 @@
1
- import { RsbuildPlugin } from '@modern-js/uni-builder';
2
- import { BuilderOptions } from '../shared';
1
+ import type { RsbuildPlugin } from '@modern-js/uni-builder';
2
+ import type { BuilderOptions } from '../shared';
3
3
  /**
4
4
  * Provides default configuration consistent with modern.js v1
5
5
  */
@@ -1,2 +1,2 @@
1
- import { BuilderOptions } from '../shared';
1
+ import type { BuilderOptions } from '../shared';
2
2
  export declare function createWebpackBuilderForModern(options: BuilderOptions<'webpack'>): Promise<import("@modern-js/uni-builder").UniBuilderInstance>;
@@ -1,6 +1,6 @@
1
1
  import { type UniBuilderInstance, type BundlerType } from '@modern-js/uni-builder';
2
- import { BuilderOptions } from '../shared';
3
- import { Bundler } from '../../types';
2
+ import type { BuilderOptions } from '../shared';
3
+ import type { Bundler } from '../../types';
4
4
  /**
5
5
  * @param options BuilderOptions
6
6
  * @param bundlerType BundlerType
@@ -1 +1 @@
1
- export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack").createRspackBuilderForModern>;
1
+ export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack/index.js").createRspackBuilderForModern>;
@@ -1,4 +1,4 @@
1
1
  import type { RsbuildPlugin } from '@rsbuild/core';
2
- import { Bundler } from '../../../types';
2
+ import type { Bundler } from '../../../types';
3
3
  import type { BuilderOptions } from '../types';
4
4
  export declare const builderPluginAdapterHtml: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;
@@ -1,4 +1,4 @@
1
- import { RsbuildPlugin } from '@rsbuild/core';
1
+ import { type RsbuildPlugin } from '@rsbuild/core';
2
2
  import type { Bundler } from '../../../types';
3
3
  import type { BuilderOptions } from '../types';
4
4
  export declare const builderPluginAdapterSSR: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;
@@ -1,4 +1,4 @@
1
- import { AppNormalizedConfig, IAppContext } from '../../types';
1
+ import type { AppNormalizedConfig, IAppContext } from '../../types';
2
2
  export declare function createCopyInfo(appContext: IAppContext, config: AppNormalizedConfig<'shared'>): {
3
3
  configDir: string;
4
4
  uploadDir: string;
@@ -1,4 +1,4 @@
1
- import { PluginAPI } from '@modern-js/core';
1
+ import { type PluginAPI } from '@modern-js/core';
2
2
  import type { BuildOptions } from '../utils/types';
3
3
  import type { AppTools } from '../types';
4
4
  export declare const build: (api: PluginAPI<AppTools<'shared'>>, options?: BuildOptions) => Promise<void>;
@@ -1,6 +1,6 @@
1
- import { PluginAPI } from '@modern-js/core';
2
- import { ApplyPlugins } from '@modern-js/server';
3
- import { DevOptions } from '../utils/types';
1
+ import { type PluginAPI } from '@modern-js/core';
2
+ import { type ApplyPlugins } from '@modern-js/server';
3
+ import type { DevOptions } from '../utils/types';
4
4
  import type { AppTools } from '../types';
5
5
  export interface ExtraServerOptions {
6
6
  applyPlugins?: ApplyPlugins;
@@ -1,6 +1,6 @@
1
- import { PluginAPI } from '@modern-js/core';
2
- import { Command } from '@modern-js/utils';
3
- import { AppTools } from '../types';
1
+ import type { PluginAPI } from '@modern-js/core';
2
+ import { type Command } from '@modern-js/utils';
3
+ import type { AppTools } from '../types';
4
4
  export declare const devCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
5
5
  export declare const buildCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
6
6
  export declare const serverCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => void;
@@ -1,3 +1,3 @@
1
- import { IAppContext, AppUserConfig, AppLegacyUserConfig } from '../types';
1
+ import type { IAppContext, AppUserConfig, AppLegacyUserConfig } from '../types';
2
2
  export declare function createDefaultConfig(appContext: IAppContext): AppUserConfig<'webpack'> | AppUserConfig<'rspack'>;
3
3
  export declare function createLegacyDefaultConfig(appContext: IAppContext): AppLegacyUserConfig;
@@ -1,4 +1,4 @@
1
- import { AppNormalizedConfig, IAppContext } from '../../types';
1
+ import type { AppNormalizedConfig, IAppContext } from '../../types';
2
2
  export declare function initHtmlConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext): AppNormalizedConfig<'shared'>['html'];
3
3
  export declare function initSourceConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext, bundler: 'webpack' | 'rspack'): void;
4
4
  export declare function createBuilderModuleScope(config: AppNormalizedConfig<'webpack'>): (string | RegExp)[] | undefined;
@@ -1,2 +1,2 @@
1
- import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
1
+ import type { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
2
2
  export declare function createHtmlConfig(config: Readonly<AppLegacyNormalizedConfig>): AppNormalizedConfig<'webpack'>['html'];
@@ -1,2 +1,2 @@
1
- import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
1
+ import type { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
2
2
  export declare function createOutputConfig(config: Readonly<AppLegacyNormalizedConfig>): AppNormalizedConfig<'webpack'>['output'];
@@ -1,2 +1,2 @@
1
- import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
1
+ import type { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
2
2
  export declare function createSourceConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig<'webpack'>['source'];
@@ -1,2 +1,2 @@
1
- import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
1
+ import type { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
2
2
  export declare function createToolsConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig<'webpack'>['tools'];
@@ -0,0 +1,6 @@
1
+ export function initialize({ appDir, alias, tsconfigPath }: {
2
+ appDir: any;
3
+ alias: any;
4
+ tsconfigPath: any;
5
+ }): Promise<void>;
6
+ export function resolve(specifier: any, context: any, defaultResolve: any): any;
@@ -0,0 +1,5 @@
1
+ export function registerEsm({ appDir, distDir, alias }: {
2
+ appDir: any;
3
+ distDir: any;
4
+ alias: any;
5
+ }): Promise<void>;
@@ -0,0 +1,6 @@
1
+ export function initialize({ appDir, alias, tsconfigPath }: {
2
+ appDir: any;
3
+ alias: any;
4
+ tsconfigPath: any;
5
+ }): Promise<void>;
6
+ export function resolve(specifier: any, context: any, defaultResolve: any): any;
@@ -0,0 +1,6 @@
1
+ export function createMatchPath({ alias, appDir, tsconfigPath }: {
2
+ alias: any;
3
+ appDir: any;
4
+ tsconfigPath: any;
5
+ }): tsConfigPaths.MatchPath;
6
+ import tsConfigPaths from '@modern-js/utils/tsconfig-paths';
@@ -1,4 +1,4 @@
1
- import { UnstableMiddleware, UnstableMiddlewareContext, UnstableNext } from '@modern-js/types';
1
+ import type { UnstableMiddleware, UnstableMiddlewareContext, UnstableNext } from '@modern-js/types';
2
2
  export type { ServerPlugin } from '@modern-js/server-core';
3
3
  export type RenderMiddleware = UnstableMiddleware;
4
4
  export type RenderMiddlewareContext = UnstableMiddlewareContext;
@@ -1,2 +1,2 @@
1
- import { AppToolsHooks } from './types/hooks';
1
+ import type { AppToolsHooks } from './types/hooks';
2
2
  export declare const hooks: AppToolsHooks;
@@ -1,5 +1,5 @@
1
- import { CliPlugin } from '@modern-js/core';
2
- import { AppTools } from './types';
1
+ import type { CliPlugin } from '@modern-js/core';
2
+ import type { AppTools } from './types';
3
3
  export { dev } from './commands/dev';
4
4
  export type { DevOptions } from './utils/types';
5
5
  export { mergeConfig } from '@modern-js/core';
@@ -1,4 +1,4 @@
1
1
  import type { Entrypoint } from '@modern-js/types';
2
- import { CliHooksRunner } from '@modern-js/core';
2
+ import type { CliHooksRunner } from '@modern-js/core';
3
3
  import type { AppNormalizedConfig, AppTools, IAppContext } from '../../types';
4
4
  export declare const getBundleEntry: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<Entrypoint[]>;
@@ -1,5 +1,5 @@
1
1
  import type { Entrypoint } from '@modern-js/types';
2
- import { CliHooksRunner } from '@modern-js/core';
2
+ import type { CliHooksRunner } from '@modern-js/core';
3
3
  import type { AppNormalizedConfig, AppTools, IAppContext } from '../../types';
4
4
  export type { Entrypoint };
5
5
  export declare const getFileSystemEntry: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<Entrypoint[]>;
@@ -1,5 +1,5 @@
1
1
  import type { CliPlugin } from '@modern-js/core';
2
- import { AppTools } from '../../types';
2
+ import type { AppTools } from '../../types';
3
3
  declare const _default: ({ bundler, }: {
4
4
  bundler: 'webpack' | 'rspack';
5
5
  }) => CliPlugin<AppTools<'shared'>>;
@@ -1,5 +1,5 @@
1
1
  import type { PackageJson } from 'pkg-types';
2
- import { NodeFileTraceOptions } from '@vercel/nft';
2
+ import { type NodeFileTraceOptions } from '@vercel/nft';
3
3
  export type TracedPackage = {
4
4
  name: string;
5
5
  versions: Record<string, {
@@ -1,4 +1,4 @@
1
- import { CliPlugin } from '@modern-js/core';
2
- import { AppTools } from '../../types';
1
+ import type { CliPlugin } from '@modern-js/core';
2
+ import type { AppTools } from '../../types';
3
3
  declare const _default: () => CliPlugin<AppTools>;
4
4
  export default _default;
@@ -0,0 +1 @@
1
+ export default handler;
@@ -0,0 +1 @@
1
+ export { handler as default } from "./netlify-handler.cjs";
@@ -0,0 +1 @@
1
+ export function handler(request: any, context: any): Promise<any>;
@@ -1,2 +1,2 @@
1
- import { CreatePreset } from './platform';
1
+ import type { CreatePreset } from './platform';
2
2
  export declare const createNetlifyPreset: CreatePreset;
@@ -1,2 +1,2 @@
1
- import { CreatePreset } from './platform';
1
+ import type { CreatePreset } from './platform';
2
2
  export declare const createNodePreset: CreatePreset;
@@ -1,5 +1,5 @@
1
- import { IAppContext, NormalizedConfig } from '@modern-js/core';
2
- import { AppTools } from '../../../types';
1
+ import type { IAppContext, NormalizedConfig } from '@modern-js/core';
2
+ import type { AppTools } from '../../../types';
3
3
  export type CreatePreset = (appContext: IAppContext, config: NormalizedConfig<AppTools>, needModernServer?: boolean) => DeployPreset;
4
4
  type DeployPreset = {
5
5
  prepare?: () => Promise<void>;
@@ -0,0 +1,2 @@
1
+ export default handler;
2
+ import { handler } from './vercel-handler.cjs';
@@ -0,0 +1,2 @@
1
+ export = handler;
2
+ import { handler } from "./vercel-handler.cjs";
@@ -0,0 +1 @@
1
+ export function handler(req: any, res: any): Promise<any>;
@@ -1,2 +1,2 @@
1
- import { CreatePreset } from './platform';
1
+ import type { CreatePreset } from './platform';
2
2
  export declare const createVercelPreset: CreatePreset;
@@ -1,4 +1,4 @@
1
- import { IAppContext } from '@modern-js/core';
1
+ import type { IAppContext } from '@modern-js/core';
2
2
  export type ServerAppContext = {
3
3
  sharedDirectory: string;
4
4
  apiDirectory: string;
@@ -1,3 +1,3 @@
1
- import { CliPlugin, AppTools } from '../types';
1
+ import type { CliPlugin, AppTools } from '../types';
2
2
  declare const _default: () => CliPlugin<AppTools>;
3
3
  export default _default;
@@ -2,7 +2,7 @@ import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow } from '@modern-js
2
2
  import type { Entrypoint, HtmlPartials, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
3
3
  import type { RegisterBuildPlatformResult, DevToolData } from '@modern-js/core';
4
4
  import type { Rspack, webpack, Stats, MultiStats } from '@modern-js/uni-builder';
5
- import { Bundler } from './utils';
5
+ import type { Bundler } from './utils';
6
6
  export interface ImportSpecifier {
7
7
  local?: string;
8
8
  imported?: string;
@@ -2,7 +2,7 @@ import type { NormalizedConfig, UserConfig } from '@modern-js/core';
2
2
  import type { AppToolsUserConfig, AppToolsNormalizedConfig } from './config';
3
3
  import type { AppToolsHooks } from './hooks';
4
4
  import type { AppToolsLegacyUserConfig, AppToolsLegacyNormalizedConfig } from './legacyConfig';
5
- import { Bundler } from './utils';
5
+ import type { Bundler } from './utils';
6
6
  export * from './hooks';
7
7
  export * from './config';
8
8
  export * from './legacyConfig';
@@ -1,6 +1,6 @@
1
1
  /// <reference types="node" />
2
2
  import type { Server } from 'node:http';
3
- import { ModernDevServerOptions } from '@modern-js/server';
3
+ import { type ModernDevServerOptions } from '@modern-js/server';
4
4
  export declare const getServer: () => Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | null;
5
5
  export declare const setServer: (newServer: Server) => void;
6
6
  export declare const closeServer: () => Promise<void>;
@@ -1,3 +1,3 @@
1
- import { IAppContext } from '../types';
1
+ import type { IAppContext } from '../types';
2
2
  export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
3
3
  export declare function generateWatchFiles(appContext: IAppContext, configDir?: string): Promise<string[]>;
@@ -1,4 +1,4 @@
1
- import { Entrypoint } from '@modern-js/types';
1
+ import type { Entrypoint } from '@modern-js/types';
2
2
  /**
3
3
  * Allow user to select entrypoints to build.
4
4
  */
@@ -1,5 +1,5 @@
1
- import { ServerPlugin as ServerPluginInstance } from '@modern-js/server-core';
2
- import { ServerPlugin } from '@modern-js/types';
3
- import { AppTools, PluginAPI } from '../types';
1
+ import type { ServerPlugin as ServerPluginInstance } from '@modern-js/server-core';
2
+ import type { ServerPlugin } from '@modern-js/types';
3
+ import type { AppTools, PluginAPI } from '../types';
4
4
  export declare function getServerPlugins(api: PluginAPI<AppTools<'shared'>>, metaName?: string): Promise<ServerPlugin[]>;
5
5
  export declare function loadServerPlugins(api: PluginAPI<AppTools<'shared'>>, appDirectory: string, metaName: string): Promise<ServerPluginInstance[]>;
@@ -1,3 +1,3 @@
1
- import { Alias } from '@modern-js/utils';
1
+ import { type Alias } from '@modern-js/utils';
2
2
  import type { ConfigChain } from '@rsbuild/core';
3
- export declare const registerCompiler: (appDir: string | undefined, distDir: string, alias?: ConfigChain<Alias>) => Promise<void>;
3
+ export declare const registerCompiler: (appDir: string, distDir: string, alias?: ConfigChain<Alias>) => Promise<void>;
@@ -1,3 +1,3 @@
1
- import { ToRunners } from '@modern-js/core';
2
- import { AppToolsHooks } from '../types/hooks';
1
+ import { type ToRunners } from '@modern-js/core';
2
+ import type { AppToolsHooks } from '../types/hooks';
3
3
  export declare function restart(hooksRunner: ToRunners<AppToolsHooks>, filename: string): Promise<void>;
package/lib/types.d.ts CHANGED
@@ -36,6 +36,11 @@ declare module '*.png' {
36
36
  export default src;
37
37
  }
38
38
 
39
+ declare module '*.avif' {
40
+ const src: string;
41
+ export default src;
42
+ }
43
+
39
44
  declare module '*.ico' {
40
45
  const src: string;
41
46
  export default src;
@@ -91,6 +96,11 @@ declare module '*.png?inline' {
91
96
  export default src;
92
97
  }
93
98
 
99
+ declare module '*.avif?inline' {
100
+ const src: string;
101
+ export default src;
102
+ }
103
+
94
104
  declare module '*.ico?inline' {
95
105
  const src: string;
96
106
  export default src;
@@ -137,6 +147,11 @@ declare module '*.png?url' {
137
147
  export default src;
138
148
  }
139
149
 
150
+ declare module '*.avif?url' {
151
+ const src: string;
152
+ export default src;
153
+ }
154
+
140
155
  declare module '*.ico?url' {
141
156
  const src: string;
142
157
  export default src;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.58.1",
18
+ "version": "2.58.2",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -77,7 +77,7 @@
77
77
  "@babel/parser": "^7.22.15",
78
78
  "@babel/traverse": "^7.23.2",
79
79
  "@babel/types": "^7.24.7",
80
- "@rsbuild/core": "1.0.1-beta.13",
80
+ "@rsbuild/core": "1.0.1-beta.14",
81
81
  "@rsbuild/plugin-node-polyfill": "1.0.4",
82
82
  "@swc/helpers": "0.5.3",
83
83
  "@vercel/nft": "^0.26.4",
@@ -88,33 +88,33 @@
88
88
  "mlly": "^1.6.1",
89
89
  "pkg-types": "^1.1.0",
90
90
  "std-env": "^3.7.0",
91
- "@modern-js/core": "2.58.1",
92
- "@modern-js/node-bundle-require": "2.58.1",
93
- "@modern-js/plugin": "2.58.1",
94
- "@modern-js/plugin-data-loader": "2.58.1",
95
- "@modern-js/plugin-i18n": "2.58.1",
96
- "@modern-js/prod-server": "2.58.1",
97
- "@modern-js/plugin-lint": "2.58.1",
98
- "@modern-js/server": "2.58.1",
99
- "@modern-js/rsbuild-plugin-esbuild": "2.58.1",
100
- "@modern-js/server-utils": "2.58.1",
101
- "@modern-js/server-core": "2.58.1",
102
- "@modern-js/types": "2.58.1",
103
- "@modern-js/uni-builder": "2.58.1",
104
- "@modern-js/utils": "2.58.1"
91
+ "@modern-js/core": "2.58.2",
92
+ "@modern-js/node-bundle-require": "2.58.2",
93
+ "@modern-js/plugin": "2.58.2",
94
+ "@modern-js/plugin-i18n": "2.58.2",
95
+ "@modern-js/plugin-data-loader": "2.58.2",
96
+ "@modern-js/plugin-lint": "2.58.2",
97
+ "@modern-js/prod-server": "2.58.2",
98
+ "@modern-js/server": "2.58.2",
99
+ "@modern-js/rsbuild-plugin-esbuild": "2.58.2",
100
+ "@modern-js/server-core": "2.58.2",
101
+ "@modern-js/types": "2.58.2",
102
+ "@modern-js/server-utils": "2.58.2",
103
+ "@modern-js/uni-builder": "2.58.2",
104
+ "@modern-js/utils": "2.58.2"
105
105
  },
106
106
  "devDependencies": {
107
- "@rsbuild/plugin-swc": "1.0.1-beta.13",
107
+ "@rsbuild/plugin-swc": "1.0.1-beta.14",
108
108
  "@types/babel__traverse": "7.18.5",
109
109
  "@types/jest": "^29",
110
- "@types/node": "^14",
110
+ "@types/node": "^16",
111
111
  "jest": "^29",
112
112
  "ts-node": "^10.9.1",
113
113
  "tsconfig-paths": "^4.2.0",
114
114
  "typescript": "^5",
115
115
  "webpack": "^5.93.0",
116
- "@scripts/build": "2.58.1",
117
- "@scripts/jest-config": "2.58.1"
116
+ "@scripts/jest-config": "2.58.2",
117
+ "@scripts/build": "2.58.2"
118
118
  },
119
119
  "sideEffects": false,
120
120
  "publishConfig": {