@modern-js/app-tools 2.56.2 → 2.57.0

package/dist/cjs/commands/dev.js

@@ -42,8 +42,8 @@ var import_printInstructions = require("../utils/printInstructions");
 var import_createServer = require("../utils/createServer");
 var import_routes = require("../utils/routes");
 var import_config = require("../utils/config");
-const dev = async (api, options, devServerOptions = {}) => {
-  var _normalizedConfig_source, _normalizedConfig_tools;
+const dev = async (api, options, devServerOptions) => {
+  var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
@@ -93,13 +93,12 @@ const dev = async (api, options, devServerOptions = {}) => {
     plugins: pluginInstances,
     ...devServerOptions
   };
+  const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || import_utils.DEFAULT_DEV_HOST;
   if (apiOnly) {
-    var _normalizedConfig_dev;
-    const server = await (0, import_server.createDevServer)({
+    const { server } = await (0, import_server.createDevServer)({
       ...serverOptions,
       runCompile: false
-    }, import_prod_server.applyPlugins);
-    const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || import_utils.DEFAULT_DEV_HOST;
+    }, (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || import_prod_server.applyPlugins);
     server.listen({
       port,
       host
@@ -107,10 +106,20 @@ const dev = async (api, options, devServerOptions = {}) => {
       (0, import_printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
     });
   } else {
-    const server = await (0, import_server.createDevServer)({
+    const { server, afterListen } = await (0, import_server.createDevServer)({
       ...serverOptions,
       builder: appContext.builder
-    }, import_prod_server.applyPlugins);
+    }, (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || import_prod_server.applyPlugins);
+    server.listen({
+      port,
+      host
+    }, async (err) => {
+      if (err) {
+        import_utils.logger.error("Occur error %s, when start dev server", err);
+      }
+      import_utils.logger.debug("listen dev server done");
+      await afterListen();
+    });
     (0, import_createServer.setServer)(server);
   }
 };

package/dist/cjs/index.js

@@ -84,7 +84,6 @@ const appTools = (options = {
       ...appContext,
       toolsType: "app-tools"
     });
-    const nestedRoutes = {};
     const locale = (0, import_language_detector.getLocaleLanguage)();
     import_locale.i18n.changeLanguage({
       locale
@@ -149,21 +148,6 @@ const appTools = (options = {
         (0, import_utils.cleanRequireCache)([
           require.resolve("./plugins/analyze")
         ]);
-      },
-      async modifyFileSystemRoutes({ entrypoint, routes }) {
-        nestedRoutes[entrypoint.entryName] = routes;
-        return {
-          entrypoint,
-          routes
-        };
-      },
-      async beforeGenerateRoutes({ entrypoint, code }) {
-        const { distDirectory } = api.useAppContext();
-        await import_utils.fs.outputJSON(import_path.default.resolve(distDirectory, import_utils.NESTED_ROUTE_SPEC_FILE), nestedRoutes);
-        return {
-          entrypoint,
-          code
-        };
       }
     };
   }

package/dist/cjs/utils/createServer.js

@@ -41,7 +41,7 @@ const createServer = async (options) => {
   if (server) {
     server.close();
   }
-  server = await (0, import_server.createDevServer)(options, import_prod_server.applyPlugins);
+  server = (await (0, import_server.createDevServer)(options, import_prod_server.applyPlugins)).server;
   return server;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/esm/commands/dev.js

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { ResolvedConfigContext } from "@modern-js/core";
-import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta } from "@modern-js/utils";
+import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta, logger } from "@modern-js/utils";
 import { createDevServer } from "@modern-js/server";
 import { applyPlugins } from "@modern-js/prod-server";
 import { loadServerPlugins } from "../utils/loadPlugins";
@@ -14,13 +14,11 @@ import { setServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 var dev = function() {
-  var _ref = _async_to_generator(function(api, options) {
-    var devServerOptions, _normalizedConfig_source, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, serverOptions, _normalizedConfig_dev, server, host, server1;
-    var _arguments = arguments;
+  var _ref = _async_to_generator(function(api, options, devServerOptions) {
+    var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, serverOptions, host, server, _ref2, server1, afterListen;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          devServerOptions = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
           if (options.analyze) {
             process.env.BUNDLE_ANALYZE = "true";
           }
@@ -92,6 +90,7 @@ var dev = function() {
             serverConfigFile,
             plugins: pluginInstances
           }, devServerOptions);
+          host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
           if (!apiOnly)
             return [
               3,
@@ -101,11 +100,10 @@ var dev = function() {
             4,
             createDevServer(_object_spread_props(_object_spread({}, serverOptions), {
               runCompile: false
-            }), applyPlugins)
+            }), (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins)
           ];
         case 6:
-          server = _state.sent();
-          host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
+          server = _state.sent().server;
           server.listen({
             port,
             host
@@ -121,10 +119,38 @@ var dev = function() {
             4,
             createDevServer(_object_spread_props(_object_spread({}, serverOptions), {
               builder: appContext.builder
-            }), applyPlugins)
+            }), (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins)
           ];
         case 8:
-          server1 = _state.sent();
+          _ref2 = _state.sent(), server1 = _ref2.server, afterListen = _ref2.afterListen;
+          server1.listen({
+            port,
+            host
+          }, function() {
+            var _ref3 = _async_to_generator(function(err) {
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    if (err) {
+                      logger.error("Occur error %s, when start dev server", err);
+                    }
+                    logger.debug("listen dev server done");
+                    return [
+                      4,
+                      afterListen()
+                    ];
+                  case 1:
+                    _state2.sent();
+                    return [
+                      2
+                    ];
+                }
+              });
+            });
+            return function(err) {
+              return _ref3.apply(this, arguments);
+            };
+          }());
           setServer(server1);
           _state.label = 9;
         case 9:
@@ -134,7 +160,7 @@ var dev = function() {
       }
     });
   });
-  return function dev2(api, options) {
+  return function dev2(api, options, devServerOptions) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/index.js

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import initializePlugin from "./plugins/initialize";
 import analyzePlugin from "./plugins/analyze";
@@ -52,7 +52,6 @@ var appTools = function() {
       api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
         toolsType: "app-tools"
       }));
-      var nestedRoutes = {};
       var locale = getLocaleLanguage();
       i18n.changeLanguage({
         locale
@@ -226,46 +225,6 @@ var appTools = function() {
               ];
             });
           })();
-        },
-        modifyFileSystemRoutes: function modifyFileSystemRoutes(param) {
-          var entrypoint = param.entrypoint, routes = param.routes;
-          return _async_to_generator(function() {
-            return _ts_generator(this, function(_state) {
-              nestedRoutes[entrypoint.entryName] = routes;
-              return [
-                2,
-                {
-                  entrypoint,
-                  routes
-                }
-              ];
-            });
-          })();
-        },
-        beforeGenerateRoutes: function beforeGenerateRoutes(param) {
-          var entrypoint = param.entrypoint, code = param.code;
-          return _async_to_generator(function() {
-            var distDirectory;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  distDirectory = api.useAppContext().distDirectory;
-                  return [
-                    4,
-                    fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes)
-                  ];
-                case 1:
-                  _state.sent();
-                  return [
-                    2,
-                    {
-                      entrypoint,
-                      code
-                    }
-                  ];
-              }
-            });
-          })();
         }
       };
     }

package/dist/esm/utils/createServer.js

@@ -38,7 +38,7 @@ var createServer = function() {
             createDevServer(options, applyPlugins)
           ];
         case 1:
-          server = _state.sent();
+          server = _state.sent().server;
           return [
             2,
             server

package/dist/esm-node/commands/dev.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { ResolvedConfigContext } from "@modern-js/core";
-import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta } from "@modern-js/utils";
+import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta, logger } from "@modern-js/utils";
 import { createDevServer } from "@modern-js/server";
 import { applyPlugins } from "@modern-js/prod-server";
 import { loadServerPlugins } from "../utils/loadPlugins";
@@ -9,8 +9,8 @@ import { printInstructions } from "../utils/printInstructions";
 import { setServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
-const dev = async (api, options, devServerOptions = {}) => {
-  var _normalizedConfig_source, _normalizedConfig_tools;
+const dev = async (api, options, devServerOptions) => {
+  var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
@@ -60,13 +60,12 @@ const dev = async (api, options, devServerOptions = {}) => {
     plugins: pluginInstances,
     ...devServerOptions
   };
+  const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
   if (apiOnly) {
-    var _normalizedConfig_dev;
-    const server = await createDevServer({
+    const { server } = await createDevServer({
       ...serverOptions,
       runCompile: false
-    }, applyPlugins);
-    const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
+    }, (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins);
     server.listen({
       port,
       host
@@ -74,10 +73,20 @@ const dev = async (api, options, devServerOptions = {}) => {
       printInstructions(hookRunners, appContext, normalizedConfig);
     });
   } else {
-    const server = await createDevServer({
+    const { server, afterListen } = await createDevServer({
       ...serverOptions,
       builder: appContext.builder
-    }, applyPlugins);
+    }, (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins);
+    server.listen({
+      port,
+      host
+    }, async (err) => {
+      if (err) {
+        logger.error("Occur error %s, when start dev server", err);
+      }
+      logger.debug("listen dev server done");
+      await afterListen();
+    });
     setServer(server);
   }
 };

package/dist/esm-node/index.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import initializePlugin from "./plugins/initialize";
 import analyzePlugin from "./plugins/analyze";
@@ -47,7 +47,6 @@ const appTools = (options = {
       ...appContext,
       toolsType: "app-tools"
     });
-    const nestedRoutes = {};
     const locale = getLocaleLanguage();
     i18n.changeLanguage({
       locale
@@ -112,21 +111,6 @@ const appTools = (options = {
         cleanRequireCache([
           require.resolve("./plugins/analyze")
         ]);
-      },
-      async modifyFileSystemRoutes({ entrypoint, routes }) {
-        nestedRoutes[entrypoint.entryName] = routes;
-        return {
-          entrypoint,
-          routes
-        };
-      },
-      async beforeGenerateRoutes({ entrypoint, code }) {
-        const { distDirectory } = api.useAppContext();
-        await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes);
-        return {
-          entrypoint,
-          code
-        };
       }
     };
   }

package/dist/esm-node/utils/createServer.js

@@ -15,7 +15,7 @@ const createServer = async (options) => {
   if (server) {
     server.close();
   }
-  server = await createDevServer(options, applyPlugins);
+  server = (await createDevServer(options, applyPlugins)).server;
   return server;
 };
 export {

package/dist/types/commands/dev.d.ts

@@ -1,7 +1,8 @@
 import { PluginAPI } from '@modern-js/core';
+import { ApplyPlugins } from '@modern-js/server';
 import { DevOptions } from '../utils/types';
 import type { AppTools } from '../types';
 export interface ExtraServerOptions {
-    useSSRWorker?: boolean;
+    applyPlugins?: ApplyPlugins;
 }
 export declare const dev: (api: PluginAPI<AppTools<'shared'>>, options: DevOptions, devServerOptions?: ExtraServerOptions) => Promise<void>;

package/dist/types/index.d.ts

@@ -1,6 +1,7 @@
 import { CliPlugin } from '@modern-js/core';
 import { AppTools } from './types';
 export { dev } from './commands/dev';
+export type { DevOptions } from './utils/types';
 export { mergeConfig } from '@modern-js/core';
 export * from './defineConfig';
 export * from './types';

package/dist/types/types/config/index.d.ts

@@ -1,5 +1,5 @@
 import type { ServerUserConfig, BffUserConfig } from '@modern-js/server-core';
-import type { UniBuilderPlugin } from '@modern-js/uni-builder';
+import type { UniBuilderPlugin, LooseRsbuildPlugin } from '@modern-js/uni-builder';
 import type { RsbuildConfig } from '@rsbuild/core';
 import type { Bundler } from '../utils';
 import type { OutputUserConfig } from './output';
@@ -38,7 +38,7 @@ export interface AppToolsUserConfig<B extends Bundler> {
     tools?: ToolsUserConfig<B>;
     security?: SecurityUserConfig;
     testing?: TestingUserConfig;
-    builderPlugins?: UniBuilderPlugin[];
+    builderPlugins?: Array<LooseRsbuildPlugin | UniBuilderPlugin>;
     performance?: PerformanceUserConfig;
     devtools?: any;
     environments?: RsbuildConfig['environments'];

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.56.2",
+  "version": "2.57.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -87,20 +87,20 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.56.2",
-    "@modern-js/node-bundle-require": "2.56.2",
-    "@modern-js/plugin": "2.56.2",
-    "@modern-js/plugin-data-loader": "2.56.2",
-    "@modern-js/plugin-i18n": "2.56.2",
-    "@modern-js/plugin-lint": "2.56.2",
-    "@modern-js/prod-server": "2.56.2",
-    "@modern-js/rsbuild-plugin-esbuild": "2.56.2",
-    "@modern-js/server": "2.56.2",
-    "@modern-js/server-core": "2.56.2",
-    "@modern-js/server-utils": "2.56.2",
-    "@modern-js/types": "2.56.2",
-    "@modern-js/utils": "2.56.2",
-    "@modern-js/uni-builder": "2.56.2"
+    "@modern-js/core": "2.57.0",
+    "@modern-js/node-bundle-require": "2.57.0",
+    "@modern-js/plugin": "2.57.0",
+    "@modern-js/plugin-data-loader": "2.57.0",
+    "@modern-js/plugin-i18n": "2.57.0",
+    "@modern-js/plugin-lint": "2.57.0",
+    "@modern-js/prod-server": "2.57.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.57.0",
+    "@modern-js/server-utils": "2.57.0",
+    "@modern-js/server": "2.57.0",
+    "@modern-js/server-core": "2.57.0",
+    "@modern-js/types": "2.57.0",
+    "@modern-js/uni-builder": "2.57.0",
+    "@modern-js/utils": "2.57.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "1.0.1-beta.3",
@@ -112,8 +112,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@scripts/build": "2.56.2",
-    "@scripts/jest-config": "2.56.2"
+    "@scripts/jest-config": "2.57.0",
+    "@scripts/build": "2.57.0"
   },
   "sideEffects": false,
   "publishConfig": {