@modern-js/app-tools 2.63.6 → 2.64.0

package/dist/cjs/commands/dev.js

@@ -115,6 +115,7 @@ const dev = async (api, options, devServerOptions) => {
     }, () => {
       (0, import_printInstructions.printInstructions)(hooks, appContext, normalizedConfig);
     });
+    (0, import_createServer.setServer)(server);
   } else {
     const { server, afterListen } = await (0, import_server.createDevServer)({
       ...serverOptions,

package/dist/cjs/commands/serve.js

@@ -42,6 +42,7 @@ const start = async (api) => {
   const userConfig = api.getNormalizedConfig();
   const hooks = api.getHooks();
   const { distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile } = appContext;
+  const { isCrossProjectServer } = (userConfig === null || userConfig === void 0 ? void 0 : userConfig.bff) || {};
   import_utils.logger.info(`Starting production server...`);
   const apiOnly = await (0, import_utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory);
   let runMode;
@@ -71,8 +72,8 @@ const start = async (api) => {
       appDirectory,
       internalDirectory,
       sharedDirectory: (0, import_utils.getTargetDir)(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
-      apiDirectory: (0, import_utils.getTargetDir)(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
-      lambdaDirectory: (0, import_utils.getTargetDir)(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
+      apiDirectory: isCrossProjectServer ? appContext.apiDirectory : (0, import_utils.getTargetDir)(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
+      lambdaDirectory: isCrossProjectServer ? appContext.lambdaDirectory : (0, import_utils.getTargetDir)(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
     },
     runMode
   });

package/dist/cjs/compat/hooks.js

@@ -122,7 +122,7 @@ function getHookRunners(context) {
       return hooks.onBeforeDev.call();
     },
     afterDev: async (params) => {
-      return hooks.onAfterDev.call(params);
+      return hooks.onDevCompileDone.call(params);
     },
     beforeDeploy: async (options) => {
       return hooks.onBeforeDeploy.call(options);

package/dist/cjs/compat/utils.js

@@ -56,7 +56,7 @@ function transformHookRunner(hookRunnerName) {
     case "beforeDev":
       return "onBeforeDev";
     case "afterDev":
-      return "onAfterDev";
+      return "onDevCompileDone";
     case "beforeDeploy":
       return "onBeforeDeploy";
     case "afterDeploy":

package/dist/cjs/index.js

@@ -34,10 +34,12 @@ __export(src_exports, {
   defineConfig: () => import_defineConfig.defineConfig,
   defineLegacyConfig: () => import_defineConfig.defineLegacyConfig,
   dev: () => import_dev.dev,
+  generateWatchFiles: () => import_generateWatchFiles2.generateWatchFiles,
   initAppContext: () => import_initAppContext.initAppContext,
   mergeConfig: () => import_core.mergeConfig
 });
 module.exports = __toCommonJS(src_exports);
+var import_path = __toESM(require("path"));
 var import_language_detector = require("@modern-js/plugin-i18n/language-detector");
 var import_plugin_v2 = require("@modern-js/plugin-v2");
 var import_uni_builder = require("@modern-js/uni-builder");
@@ -57,6 +59,7 @@ __reExport(src_exports, require("./defineConfig"), module.exports);
 var import_defineConfig = require("./defineConfig");
 var import_core = require("@modern-js/core");
 var import_dev = require("./commands/dev");
+var import_generateWatchFiles2 = require("./utils/generateWatchFiles");
 __reExport(src_exports, require("./types"), module.exports);
 const appTools = (options = {
   // default webpack to be compatible with original projects
@@ -168,7 +171,10 @@ const appTools = (options = {
     });
     api.onFileChanged(async (e) => {
       const { filename, eventType, isPrivate } = e;
-      if (!isPrivate && (eventType === "change" || eventType === "unlink")) {
+      const { appDirectory, apiDirectory } = api.getAppContext();
+      const relativeApiPath = import_path.default.relative(appDirectory, apiDirectory);
+      const isApiProject = filename.startsWith(`${relativeApiPath}/`);
+      if (!isPrivate && (eventType === "change" || eventType === "unlink") && !isApiProject) {
         const { closeServer } = await import("./utils/createServer.js");
         await closeServer();
         await (0, import_restart.restart)(api.getHooks(), filename);
@@ -188,6 +194,7 @@ var src_default = appTools;
   defineConfig,
   defineLegacyConfig,
   dev,
+  generateWatchFiles,
   initAppContext,
   mergeConfig,
   ...require("./defineConfig"),

package/dist/cjs/plugins/analyze/index.js

@@ -166,9 +166,11 @@ var analyze_default = ({ bundler }) => ({
           });
           await (0, import_config2.emitResolvedConfig)(appContext.appDirectory, normalizedConfig);
         });
-        builder.onDevCompileDone(async ({ isFirstCompile }) => {
-          hooks.onAfterDev.call({
-            isFirstCompile
+        builder.onDevCompileDone(async ({ isFirstCompile, stats, environments }) => {
+          hooks.onDevCompileDone.call({
+            isFirstCompile,
+            stats,
+            environments
           });
           if (isFirstCompile) {
             (0, import_printInstructions.printInstructions)(hooks, appContext, normalizedConfig);
@@ -186,6 +188,11 @@ var analyze_default = ({ bundler }) => ({
             compiler
           });
         });
+        builder.onAfterStartDevServer(async ({ port }) => {
+          await hooks.onAfterDev.call({
+            port
+          });
+        });
         builder.addPlugins(resolvedConfig.builderPlugins);
         api.updateAppContext({
           builder

package/dist/esm/commands/dev.js

@@ -134,6 +134,7 @@ var dev = function() {
           }, function() {
             printInstructions(hooks, appContext, normalizedConfig);
           });
+          setServer(server);
           return [
             3,
             12

package/dist/esm/commands/serve.js

@@ -9,7 +9,7 @@ import { loadServerPlugins } from "../utils/loadPlugins";
 import { printInstructions } from "../utils/printInstructions";
 var start = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hooks, distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile, apiOnly, runMode, meta, serverConfigPath, pluginInstances, app;
+    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hooks, distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile, isCrossProjectServer, apiOnly, runMode, meta, serverConfigPath, pluginInstances, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -17,6 +17,7 @@ var start = function() {
           userConfig = api.getNormalizedConfig();
           hooks = api.getHooks();
           distDirectory = appContext.distDirectory, appDirectory = appContext.appDirectory, internalDirectory = appContext.internalDirectory, port = appContext.port, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes, serverConfigFile = appContext.serverConfigFile;
+          isCrossProjectServer = ((userConfig === null || userConfig === void 0 ? void 0 : userConfig.bff) || {}).isCrossProjectServer;
           logger.info("Starting production server...");
           return [
             4,
@@ -55,8 +56,8 @@ var start = function() {
                 appDirectory,
                 internalDirectory,
                 sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
-                apiDirectory: getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
-                lambdaDirectory: getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
+                apiDirectory: isCrossProjectServer ? appContext.apiDirectory : getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
+                lambdaDirectory: isCrossProjectServer ? appContext.lambdaDirectory : getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
               },
               runMode
             })

package/dist/esm/compat/hooks.js

@@ -348,7 +348,7 @@ function getHookRunners(context) {
         return _ts_generator(this, function(_state) {
           return [
             2,
-            hooks.onAfterDev.call(params)
+            hooks.onDevCompileDone.call(params)
           ];
         });
       });

package/dist/esm/compat/utils.js

@@ -31,7 +31,7 @@ function transformHookRunner(hookRunnerName) {
     case "beforeDev":
       return "onBeforeDev";
     case "afterDev":
-      return "onAfterDev";
+      return "onDevCompileDone";
     case "beforeDeploy":
       return "onBeforeDeploy";
     case "afterDeploy":

package/dist/esm/index.js

@@ -1,6 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import path from "path";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import { createAsyncHook, createCollectAsyncHook } from "@modern-js/plugin-v2";
 import { castArray } from "@modern-js/uni-builder";
@@ -194,12 +195,15 @@ var appTools = function() {
       }));
       api.onFileChanged(function() {
         var _ref = _async_to_generator(function(e) {
-          var filename, eventType, isPrivate, closeServer;
+          var filename, eventType, isPrivate, _api_getAppContext, appDirectory, apiDirectory, relativeApiPath, isApiProject, closeServer;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
                 filename = e.filename, eventType = e.eventType, isPrivate = e.isPrivate;
-                if (!(!isPrivate && (eventType === "change" || eventType === "unlink")))
+                _api_getAppContext = api.getAppContext(), appDirectory = _api_getAppContext.appDirectory, apiDirectory = _api_getAppContext.apiDirectory;
+                relativeApiPath = path.relative(appDirectory, apiDirectory);
+                isApiProject = filename.startsWith("".concat(relativeApiPath, "/"));
+                if (!(!isPrivate && (eventType === "change" || eventType === "unlink") && !isApiProject))
                   return [
                     3,
                     4
@@ -245,6 +249,7 @@ var appTools = function() {
 import { defineConfig, defineLegacyConfig } from "./defineConfig";
 import { mergeConfig } from "@modern-js/core";
 import { dev } from "./commands/dev";
+import { generateWatchFiles as generateWatchFiles2 } from "./utils/generateWatchFiles";
 export * from "./types";
 var src_default = appTools;
 export {
@@ -253,6 +258,7 @@ export {
   defineConfig,
   defineLegacyConfig,
   dev,
+  generateWatchFiles2 as generateWatchFiles,
   initAppContext,
   mergeConfig
 };

package/dist/esm/plugins/analyze/index.js

@@ -310,11 +310,13 @@ function analyze_default(param) {
               }());
               builder.onDevCompileDone(function() {
                 var _ref5 = _async_to_generator(function(param2) {
-                  var isFirstCompile;
+                  var isFirstCompile, stats, environments;
                   return _ts_generator(this, function(_state2) {
-                    isFirstCompile = param2.isFirstCompile;
-                    hooks.onAfterDev.call({
-                      isFirstCompile
+                    isFirstCompile = param2.isFirstCompile, stats = param2.stats, environments = param2.environments;
+                    hooks.onDevCompileDone.call({
+                      isFirstCompile,
+                      stats,
+                      environments
                     });
                     if (isFirstCompile) {
                       printInstructions(hooks, appContext, normalizedConfig);
@@ -380,6 +382,31 @@ function analyze_default(param) {
                   return _ref5.apply(this, arguments);
                 };
               }());
+              builder.onAfterStartDevServer(function() {
+                var _ref5 = _async_to_generator(function(param2) {
+                  var port;
+                  return _ts_generator(this, function(_state2) {
+                    switch (_state2.label) {
+                      case 0:
+                        port = param2.port;
+                        return [
+                          4,
+                          hooks.onAfterDev.call({
+                            port
+                          })
+                        ];
+                      case 1:
+                        _state2.sent();
+                        return [
+                          2
+                        ];
+                    }
+                  });
+                });
+                return function(_2) {
+                  return _ref5.apply(this, arguments);
+                };
+              }());
               builder.addPlugins(resolvedConfig.builderPlugins);
               api.updateAppContext({
                 builder

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

@@ -82,6 +82,7 @@ const dev = async (api, options, devServerOptions) => {
     }, () => {
       printInstructions(hooks, appContext, normalizedConfig);
     });
+    setServer(server);
   } else {
     const { server, afterListen } = await createDevServer({
       ...serverOptions,

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

@@ -9,6 +9,7 @@ const start = async (api) => {
   const userConfig = api.getNormalizedConfig();
   const hooks = api.getHooks();
   const { distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile } = appContext;
+  const { isCrossProjectServer } = (userConfig === null || userConfig === void 0 ? void 0 : userConfig.bff) || {};
   logger.info(`Starting production server...`);
   const apiOnly = await isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory);
   let runMode;
@@ -38,8 +39,8 @@ const start = async (api) => {
       appDirectory,
       internalDirectory,
       sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
-      apiDirectory: getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
-      lambdaDirectory: getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
+      apiDirectory: isCrossProjectServer ? appContext.apiDirectory : getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
+      lambdaDirectory: isCrossProjectServer ? appContext.lambdaDirectory : getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
     },
     runMode
   });

package/dist/esm-node/compat/hooks.js

@@ -98,7 +98,7 @@ function getHookRunners(context) {
       return hooks.onBeforeDev.call();
     },
     afterDev: async (params) => {
-      return hooks.onAfterDev.call(params);
+      return hooks.onDevCompileDone.call(params);
     },
     beforeDeploy: async (options) => {
       return hooks.onBeforeDeploy.call(options);

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

@@ -31,7 +31,7 @@ function transformHookRunner(hookRunnerName) {
     case "beforeDev":
       return "onBeforeDev";
     case "afterDev":
-      return "onAfterDev";
+      return "onDevCompileDone";
     case "beforeDeploy":
       return "onBeforeDeploy";
     case "afterDeploy":

package/dist/esm-node/index.js

@@ -1,3 +1,4 @@
+import path from "path";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import { createAsyncHook, createCollectAsyncHook } from "@modern-js/plugin-v2";
 import { castArray } from "@modern-js/uni-builder";
@@ -124,7 +125,10 @@ const appTools = (options = {
     });
     api.onFileChanged(async (e) => {
       const { filename, eventType, isPrivate } = e;
-      if (!isPrivate && (eventType === "change" || eventType === "unlink")) {
+      const { appDirectory, apiDirectory } = api.getAppContext();
+      const relativeApiPath = path.relative(appDirectory, apiDirectory);
+      const isApiProject = filename.startsWith(`${relativeApiPath}/`);
+      if (!isPrivate && (eventType === "change" || eventType === "unlink") && !isApiProject) {
         const { closeServer } = await import("./utils/createServer.js");
         await closeServer();
         await restart(api.getHooks(), filename);
@@ -140,6 +144,7 @@ const appTools = (options = {
 import { defineConfig, defineLegacyConfig } from "./defineConfig";
 import { mergeConfig } from "@modern-js/core";
 import { dev } from "./commands/dev";
+import { generateWatchFiles as generateWatchFiles2 } from "./utils/generateWatchFiles";
 export * from "./types";
 var src_default = appTools;
 export {
@@ -148,6 +153,7 @@ export {
   defineConfig,
   defineLegacyConfig,
   dev,
+  generateWatchFiles2 as generateWatchFiles,
   initAppContext,
   mergeConfig
 };

package/dist/esm-node/plugins/analyze/index.js

@@ -133,9 +133,11 @@ var analyze_default = ({ bundler }) => ({
           });
           await emitResolvedConfig(appContext.appDirectory, normalizedConfig);
         });
-        builder.onDevCompileDone(async ({ isFirstCompile }) => {
-          hooks.onAfterDev.call({
-            isFirstCompile
+        builder.onDevCompileDone(async ({ isFirstCompile, stats, environments }) => {
+          hooks.onDevCompileDone.call({
+            isFirstCompile,
+            stats,
+            environments
           });
           if (isFirstCompile) {
             printInstructions(hooks, appContext, normalizedConfig);
@@ -153,6 +155,11 @@ var analyze_default = ({ bundler }) => ({
             compiler
           });
         });
+        builder.onAfterStartDevServer(async ({ port }) => {
+          await hooks.onAfterDev.call({
+            port
+          });
+        });
         builder.addPlugins(resolvedConfig.builderPlugins);
         api.updateAppContext({
           builder

package/dist/types/index.d.ts

@@ -7,6 +7,7 @@ export { mergeConfig } from '@modern-js/core';
 export type { RuntimeUserConfig } from './types/config';
 export { dev } from './commands/dev';
 export type { DevOptions } from './utils/types';
+export { generateWatchFiles } from './utils/generateWatchFiles';
 export * from './types';
 export { initAppContext };
 export default appTools;

package/dist/types/types/new.d.ts

@@ -152,4 +152,4 @@ export interface AppToolsExtendContext<B extends Bundler = 'webpack'> {
     toolsType?: string;
 }
 export type AppToolsContext<B extends Bundler = 'webpack'> = AppContext<AppTools<B>> & AppToolsExtendContext<B>;
-export type AppToolsHooks<B extends Bundler = 'webpack'> = Hooks<AppToolsUserConfig<B>, AppToolsNormalizedConfig> & AppToolsExtendHooks;
+export type AppToolsHooks<B extends Bundler = 'webpack'> = Hooks<AppToolsUserConfig<B>, AppToolsNormalizedConfig, {}> & AppToolsExtendHooks;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.6",
+  "version": "2.64.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -92,20 +92,20 @@
     "pkg-types": "^1.1.0",
     "ndepe": "0.1.5",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.63.6",
-    "@modern-js/node-bundle-require": "2.63.6",
-    "@modern-js/plugin": "2.63.6",
-    "@modern-js/plugin-data-loader": "2.63.6",
-    "@modern-js/plugin-i18n": "2.63.6",
-    "@modern-js/plugin-v2": "2.63.6",
-    "@modern-js/prod-server": "2.63.6",
-    "@modern-js/rsbuild-plugin-esbuild": "2.63.6",
-    "@modern-js/server": "2.63.6",
-    "@modern-js/server-core": "2.63.6",
-    "@modern-js/server-utils": "2.63.6",
-    "@modern-js/types": "2.63.6",
-    "@modern-js/uni-builder": "2.63.6",
-    "@modern-js/utils": "2.63.6"
+    "@modern-js/core": "2.64.0",
+    "@modern-js/node-bundle-require": "2.64.0",
+    "@modern-js/plugin-data-loader": "2.64.0",
+    "@modern-js/plugin": "2.64.0",
+    "@modern-js/plugin-i18n": "2.64.0",
+    "@modern-js/plugin-v2": "2.64.0",
+    "@modern-js/prod-server": "2.64.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.64.0",
+    "@modern-js/server": "2.64.0",
+    "@modern-js/server-core": "2.64.0",
+    "@modern-js/server-utils": "2.64.0",
+    "@modern-js/types": "2.64.0",
+    "@modern-js/uni-builder": "2.64.0",
+    "@modern-js/utils": "2.64.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.0.9",
@@ -117,8 +117,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.97.1",
-    "@scripts/build": "2.63.6",
-    "@scripts/jest-config": "2.63.6"
+    "@scripts/jest-config": "2.64.0",
+    "@scripts/build": "2.64.0"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",