@modern-js/app-tools 2.37.2 → 2.38.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.
@@ -264,18 +264,18 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
264
264
  if (route._component) {
265
265
  if (splitRouteChunks) {
266
266
  if (route.isRoot) {
267
- lazyImport = `async function(){const routeModule = await import('${route._component}'); if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
267
+ lazyImport = `() => import('${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
268
268
  rootLayoutCode = `import RootLayout from '${route._component}'`;
269
269
  component = `RootLayout`;
270
270
  } else if (ssrMode === "string") {
271
- lazyImport = `async function(){const routeModule = await import(/* webpackChunkName: "${route.id}" */ '${route._component}'); if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
271
+ lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
272
272
  component = `loadable(${lazyImport})`;
273
273
  } else {
274
- lazyImport = `async function(){const routeModule = await import(/* webpackChunkName: "${route.id}" */ '${route._component}'); if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
274
+ lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
275
275
  component = `lazy(${lazyImport})`;
276
276
  }
277
277
  } else {
278
- lazyImport = `async function(){const routeModule = await import(/* webpackMode: "eager" */ '${route._component}'); if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
278
+ lazyImport = `() => import(/* webpackMode: "eager" */ '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${import_constants.ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
279
279
  if (ssrMode === "string") {
280
280
  component = `loadable(${lazyImport})`;
281
281
  } else {
@@ -21,8 +21,10 @@ __export(deploy_exports, {
21
21
  deploy: () => deploy
22
22
  });
23
23
  module.exports = __toCommonJS(deploy_exports);
24
+ var import_getServerInternalPlugins = require("../utils/getServerInternalPlugins");
24
25
  const deploy = async (api, options) => {
25
26
  const hookRunners = api.useHookRunners();
27
+ await (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
26
28
  await hookRunners.beforeDeploy(options);
27
29
  await hookRunners.afterDeploy(options);
28
30
  };
@@ -210,18 +210,18 @@ var fileSystemRoutes = function() {
210
210
  if (route2._component) {
211
211
  if (splitRouteChunks) {
212
212
  if (route2.isRoot) {
213
- lazyImport = "async function(){const routeModule = await import('".concat(route2._component, `'); if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule;return routeModule;}');
213
+ lazyImport = "() => import('".concat(route2._component, `').then(routeModule => {if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule; return routeModule; }) ');
214
214
  rootLayoutCode = "import RootLayout from '".concat(route2._component, "'");
215
215
  component2 = "RootLayout";
216
216
  } else if (ssrMode === "string") {
217
- lazyImport = 'async function(){const routeModule = await import(/* webpackChunkName: "'.concat(route2.id, `" */ '`).concat(route2._component, `'); if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule;return routeModule;}');
217
+ lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */ '`).concat(route2._component, `').then(routeModule => {if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule; return routeModule; }) ');
218
218
  component2 = "loadable(".concat(lazyImport, ")");
219
219
  } else {
220
- lazyImport = 'async function(){const routeModule = await import(/* webpackChunkName: "'.concat(route2.id, `" */ '`).concat(route2._component, `'); if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule;return routeModule;}');
220
+ lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */ '`).concat(route2._component, `').then(routeModule => {if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule; return routeModule; }) ');
221
221
  component2 = "lazy(".concat(lazyImport, ")");
222
222
  }
223
223
  } else {
224
- lazyImport = `async function(){const routeModule = await import(/* webpackMode: "eager" */ '`.concat(route2._component, `'); if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule;return routeModule;}');
224
+ lazyImport = `() => import(/* webpackMode: "eager" */ '`.concat(route2._component, `').then(routeModule => {if(typeof document !== "undefined") window.`).concat(ROUTE_MODULES, '["').concat(route2.id, '"] = routeModule; return routeModule; }) ');
225
225
  if (ssrMode === "string") {
226
226
  component2 = "loadable(".concat(lazyImport, ")");
227
227
  } else {
@@ -1,5 +1,6 @@
1
1
  import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
2
2
  import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
3
+ import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
3
4
  var deploy = function() {
4
5
  var _ref = _async_to_generator(function(api, options) {
5
6
  var hookRunners;
@@ -9,15 +10,21 @@ var deploy = function() {
9
10
  hookRunners = api.useHookRunners();
10
11
  return [
11
12
  4,
12
- hookRunners.beforeDeploy(options)
13
+ getServerInternalPlugins(api)
13
14
  ];
14
15
  case 1:
15
16
  _state.sent();
16
17
  return [
17
18
  4,
18
- hookRunners.afterDeploy(options)
19
+ hookRunners.beforeDeploy(options)
19
20
  ];
20
21
  case 2:
22
+ _state.sent();
23
+ return [
24
+ 4,
25
+ hookRunners.afterDeploy(options)
26
+ ];
27
+ case 3:
21
28
  _state.sent();
22
29
  return [
23
30
  2
@@ -226,18 +226,18 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
226
226
  if (route._component) {
227
227
  if (splitRouteChunks) {
228
228
  if (route.isRoot) {
229
- lazyImport = `async function(){const routeModule = await import('${route._component}'); if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
229
+ lazyImport = `() => import('${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
230
230
  rootLayoutCode = `import RootLayout from '${route._component}'`;
231
231
  component = `RootLayout`;
232
232
  } else if (ssrMode === "string") {
233
- lazyImport = `async function(){const routeModule = await import(/* webpackChunkName: "${route.id}" */ '${route._component}'); if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
233
+ lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
234
234
  component = `loadable(${lazyImport})`;
235
235
  } else {
236
- lazyImport = `async function(){const routeModule = await import(/* webpackChunkName: "${route.id}" */ '${route._component}'); if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
236
+ lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
237
237
  component = `lazy(${lazyImport})`;
238
238
  }
239
239
  } else {
240
- lazyImport = `async function(){const routeModule = await import(/* webpackMode: "eager" */ '${route._component}'); if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule;return routeModule;}`;
240
+ lazyImport = `() => import(/* webpackMode: "eager" */ '${route._component}').then(routeModule => {if(typeof document !== "undefined") window.${ROUTE_MODULES}["${route.id}"] = routeModule; return routeModule; }) `;
241
241
  if (ssrMode === "string") {
242
242
  component = `loadable(${lazyImport})`;
243
243
  } else {
@@ -1,5 +1,7 @@
1
+ import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
1
2
  const deploy = async (api, options) => {
2
3
  const hookRunners = api.useHookRunners();
4
+ await getServerInternalPlugins(api);
3
5
  await hookRunners.beforeDeploy(options);
4
6
  await hookRunners.afterDeploy(options);
5
7
  };
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.37.2",
18
+ "version": "2.38.0",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -72,24 +72,24 @@
72
72
  "es-module-lexer": "^1.1.0",
73
73
  "esbuild": "0.17.19",
74
74
  "@swc/helpers": "0.5.1",
75
- "@modern-js/builder": "2.37.2",
76
- "@modern-js/builder-plugin-esbuild": "2.37.2",
77
- "@modern-js/builder-plugin-node-polyfill": "2.37.2",
78
- "@modern-js/builder-shared": "2.37.2",
79
- "@modern-js/builder-webpack-provider": "2.37.2",
80
- "@modern-js/core": "2.37.2",
81
- "@modern-js/new-action": "2.37.2",
82
- "@modern-js/node-bundle-require": "2.37.2",
83
- "@modern-js/plugin": "2.37.2",
84
- "@modern-js/plugin-data-loader": "2.37.2",
85
- "@modern-js/plugin-i18n": "2.37.2",
86
- "@modern-js/plugin-lint": "2.37.2",
87
- "@modern-js/prod-server": "2.37.2",
88
- "@modern-js/server": "2.37.2",
89
- "@modern-js/types": "2.37.2",
90
- "@modern-js/upgrade": "2.37.2",
91
- "@modern-js/utils": "2.37.2",
92
- "@modern-js/server-core": "2.37.2"
75
+ "@modern-js/builder": "2.38.0",
76
+ "@modern-js/builder-plugin-esbuild": "2.38.0",
77
+ "@modern-js/builder-plugin-node-polyfill": "2.38.0",
78
+ "@modern-js/builder-shared": "2.38.0",
79
+ "@modern-js/builder-webpack-provider": "2.38.0",
80
+ "@modern-js/core": "2.38.0",
81
+ "@modern-js/new-action": "2.38.0",
82
+ "@modern-js/node-bundle-require": "2.38.0",
83
+ "@modern-js/plugin": "2.38.0",
84
+ "@modern-js/plugin-data-loader": "2.38.0",
85
+ "@modern-js/plugin-i18n": "2.38.0",
86
+ "@modern-js/plugin-lint": "2.38.0",
87
+ "@modern-js/prod-server": "2.38.0",
88
+ "@modern-js/server": "2.38.0",
89
+ "@modern-js/types": "2.38.0",
90
+ "@modern-js/upgrade": "2.38.0",
91
+ "@modern-js/utils": "2.38.0",
92
+ "@modern-js/server-core": "2.38.0"
93
93
  },
94
94
  "devDependencies": {
95
95
  "@types/babel__traverse": "^7.14.2",
@@ -98,13 +98,13 @@
98
98
  "jest": "^29",
99
99
  "typescript": "^5",
100
100
  "webpack": "^5.88.1",
101
- "@modern-js/builder-plugin-swc": "2.37.2",
102
- "@modern-js/builder-rspack-provider": "2.37.2",
103
- "@scripts/build": "2.37.2",
104
- "@scripts/jest-config": "2.37.2"
101
+ "@modern-js/builder-plugin-swc": "2.38.0",
102
+ "@modern-js/builder-rspack-provider": "2.38.0",
103
+ "@scripts/build": "2.38.0",
104
+ "@scripts/jest-config": "2.38.0"
105
105
  },
106
106
  "peerDependencies": {
107
- "@modern-js/builder-rspack-provider": "^2.37.2"
107
+ "@modern-js/builder-rspack-provider": "^2.38.0"
108
108
  },
109
109
  "peerDependenciesMeta": {
110
110
  "@modern-js/builder-rspack-provider": {