@modern-js/app-tools 2.54.2-alpha.3 → 2.54.3-alpha.4

package/dist/cjs/commands/build.js

@@ -35,7 +35,7 @@ const build = async (api, options) => {
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  await (0, import_loadPlugins.loadServerPlugins)(api, appContext.appDirectory);
+  await (0, import_loadPlugins.loadServerPlugins)(api, appContext.appDirectory, appContext.metaName);
   await (0, import_register.registerCompiler)(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias);
   const { apiOnly } = appContext;
   if (apiOnly) {

package/dist/cjs/commands/deploy.js

@@ -24,7 +24,8 @@ module.exports = __toCommonJS(deploy_exports);
 var import_loadPlugins = require("../utils/loadPlugins");
 const deploy = async (api, options) => {
   const hookRunners = api.useHookRunners();
-  await (0, import_loadPlugins.getServerPlugins)(api);
+  const { metaName } = api.useAppContext();
+  await (0, import_loadPlugins.getServerPlugins)(api, metaName);
   await hookRunners.beforeDeploy(options);
   await hookRunners.deploy(options);
   await hookRunners.afterDeploy(options);

package/dist/cjs/commands/dev.js

@@ -70,7 +70,7 @@ const dev = async (api, options, devServerOptions = {}) => {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
   await (0, import_routes.generateRoutes)(appContext);
-  const pluginInstances = await (0, import_loadPlugins.loadServerPlugins)(api, appDirectory);
+  const pluginInstances = await (0, import_loadPlugins.loadServerPlugins)(api, appDirectory, metaName);
   const serverOptions = {
     metaName,
     dev: {

package/dist/cjs/commands/serve.js

@@ -50,7 +50,7 @@ const start = async (api) => {
   }
   const meta = (0, import_utils.getMeta)(metaName);
   const serverConfigPath = import_path.default.resolve(distDirectory, import_utils.SERVER_DIR, `${meta}.server`);
-  const pluginInstances = await (0, import_loadPlugins.loadServerPlugins)(api, appDirectory);
+  const pluginInstances = await (0, import_loadPlugins.loadServerPlugins)(api, appDirectory, metaName);
   const app = await (0, import_prod_server.createProdServer)({
     metaName,
     pwd: distDirectory,

package/dist/cjs/plugins/deploy/dependencies/index.js

@@ -136,7 +136,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
     tracedFile.pkgName = pkgName;
     tracedFile.pkgVersion = pkgJSON.version;
     const shouldCopyWholePackage = copyWholePackage === null || copyWholePackage === void 0 ? void 0 : copyWholePackage(pkgName);
-    if (tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.path === tracedFile.pkgPath) {
+    if (tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.pkgJSON.version === tracedFile.pkgVersion) {
       if (shouldCopyWholePackage) {
         const allFiles = await (0, import_utils2.readDirRecursive)(tracedFile.pkgPath);
         tracedPackageVersion.files.push(...allFiles);

package/dist/cjs/plugins/deploy/dependencies/utils.js

@@ -141,8 +141,7 @@ const findPackageParents = (pkg, version, tracedFiles) => {
 const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   return await (0, import_nft.nodeFileTrace)(entryFiles, {
     base,
-    processCwd: serverRootDir,
-    cache: /* @__PURE__ */ Object.create(null)
+    processCwd: serverRootDir
   });
 };
 const resolveTracedPath = async (base, p) => import_utils.fs.realpath(import_path.default.resolve(base, p));

package/dist/cjs/utils/loadPlugins.js

@@ -23,19 +23,20 @@ __export(loadPlugins_exports, {
 });
 module.exports = __toCommonJS(loadPlugins_exports);
 var import_prod_server = require("@modern-js/prod-server");
-async function getServerPlugins(api) {
+async function getServerPlugins(api, metaName = "modern-js") {
   const runner = api.useHookRunners();
   const { plugins } = await runner._internalServerPlugins({
     plugins: []
   });
+  const filtedPlugins = plugins.filter((plugin) => plugin.name.includes(metaName));
   api.setAppContext({
     ...api.useAppContext(),
-    serverPlugins: plugins
+    serverPlugins: filtedPlugins
   });
-  return plugins;
+  return filtedPlugins;
 }
-async function loadServerPlugins(api, appDirectory) {
-  const plugins = await getServerPlugins(api);
+async function loadServerPlugins(api, appDirectory, metaName) {
+  const plugins = await getServerPlugins(api, metaName);
   const instances = (0, import_prod_server.loadServerPlugins)(plugins, appDirectory);
   return instances;
 }

package/dist/esm/commands/build.js

@@ -22,7 +22,7 @@ var build = function() {
           hookRunners = api.useHookRunners();
           return [
             4,
-            loadServerPlugins(api, appContext.appDirectory)
+            loadServerPlugins(api, appContext.appDirectory, appContext.metaName)
           ];
         case 1:
           _state.sent();

package/dist/esm/commands/deploy.js

@@ -3,14 +3,15 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { getServerPlugins } from "../utils/loadPlugins";
 var deploy = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var hookRunners;
+    var hookRunners, metaName;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           hookRunners = api.useHookRunners();
+          metaName = api.useAppContext().metaName;
           return [
             4,
-            getServerPlugins(api)
+            getServerPlugins(api, metaName)
           ];
         case 1:
           _state.sent();

package/dist/esm/commands/dev.js

@@ -68,7 +68,7 @@ var dev = function() {
           _state.sent();
           return [
             4,
-            loadServerPlugins(api, appDirectory)
+            loadServerPlugins(api, appDirectory, metaName)
           ];
         case 5:
           pluginInstances = _state.sent();

package/dist/esm/commands/serve.js

@@ -31,7 +31,7 @@ var start = function() {
           serverConfigPath = path.resolve(distDirectory, SERVER_DIR, "".concat(meta, ".server"));
           return [
             4,
-            loadServerPlugins(api, appDirectory)
+            loadServerPlugins(api, appDirectory, metaName)
           ];
         case 2:
           pluginInstances = _state.sent();

package/dist/esm/plugins/deploy/dependencies/index.js

@@ -224,7 +224,7 @@ var handleDependencies = function() {
           tracedFile.pkgName = pkgName;
           tracedFile.pkgVersion = pkgJSON.version;
           shouldCopyWholePackage = copyWholePackage === null || copyWholePackage === void 0 ? void 0 : copyWholePackage(pkgName);
-          if (!(tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.path === tracedFile.pkgPath))
+          if (!(tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.pkgJSON.version === tracedFile.pkgVersion))
             return [
               3,
               9

package/dist/esm/plugins/deploy/dependencies/utils.js

@@ -346,8 +346,7 @@ var traceFiles = function() {
             4,
             nodeFileTrace(entryFiles, {
               base,
-              processCwd: serverRootDir,
-              cache: /* @__PURE__ */ Object.create(null)
+              processCwd: serverRootDir
             })
           ];
         case 1:

package/dist/esm/utils/loadPlugins.js

@@ -8,10 +8,12 @@ function getServerPlugins(api) {
 }
 function _getServerPlugins() {
   _getServerPlugins = _async_to_generator(function(api) {
-    var runner, plugins;
+    var metaName, runner, plugins, filtedPlugins;
+    var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
+          metaName = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : "modern-js";
           runner = api.useHookRunners();
           return [
             4,
@@ -21,30 +23,33 @@ function _getServerPlugins() {
           ];
         case 1:
           plugins = _state.sent().plugins;
+          filtedPlugins = plugins.filter(function(plugin) {
+            return plugin.name.includes(metaName);
+          });
           api.setAppContext(_object_spread_props(_object_spread({}, api.useAppContext()), {
-            serverPlugins: plugins
+            serverPlugins: filtedPlugins
           }));
           return [
             2,
-            plugins
+            filtedPlugins
           ];
       }
     });
   });
   return _getServerPlugins.apply(this, arguments);
 }
-function loadServerPlugins(api, appDirectory) {
+function loadServerPlugins(api, appDirectory, metaName) {
   return _loadServerPlugins.apply(this, arguments);
 }
 function _loadServerPlugins() {
-  _loadServerPlugins = _async_to_generator(function(api, appDirectory) {
+  _loadServerPlugins = _async_to_generator(function(api, appDirectory, metaName) {
     var plugins, instances;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           return [
             4,
-            getServerPlugins(api)
+            getServerPlugins(api, metaName)
           ];
         case 1:
           plugins = _state.sent();

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

@@ -12,7 +12,7 @@ const build = async (api, options) => {
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  await loadServerPlugins(api, appContext.appDirectory);
+  await loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
   await registerCompiler(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias);
   const { apiOnly } = appContext;
   if (apiOnly) {

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

@@ -1,7 +1,8 @@
 import { getServerPlugins } from "../utils/loadPlugins";
 const deploy = async (api, options) => {
   const hookRunners = api.useHookRunners();
-  await getServerPlugins(api);
+  const { metaName } = api.useAppContext();
+  await getServerPlugins(api, metaName);
   await hookRunners.beforeDeploy(options);
   await hookRunners.deploy(options);
   await hookRunners.afterDeploy(options);

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

@@ -37,7 +37,7 @@ const dev = async (api, options, devServerOptions = {}) => {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
   await generateRoutes(appContext);
-  const pluginInstances = await loadServerPlugins(api, appDirectory);
+  const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
   const serverOptions = {
     metaName,
     dev: {

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

@@ -17,7 +17,7 @@ const start = async (api) => {
   }
   const meta = getMeta(metaName);
   const serverConfigPath = path.resolve(distDirectory, SERVER_DIR, `${meta}.server`);
-  const pluginInstances = await loadServerPlugins(api, appDirectory);
+  const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
   const app = await createProdServer({
     metaName,
     pwd: distDirectory,

package/dist/esm-node/plugins/deploy/dependencies/index.js

@@ -103,7 +103,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
     tracedFile.pkgName = pkgName;
     tracedFile.pkgVersion = pkgJSON.version;
     const shouldCopyWholePackage = copyWholePackage === null || copyWholePackage === void 0 ? void 0 : copyWholePackage(pkgName);
-    if (tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.path === tracedFile.pkgPath) {
+    if (tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.pkgJSON.version === tracedFile.pkgVersion) {
       if (shouldCopyWholePackage) {
         const allFiles = await readDirRecursive(tracedFile.pkgPath);
         tracedPackageVersion.files.push(...allFiles);

package/dist/esm-node/plugins/deploy/dependencies/utils.js

@@ -101,8 +101,7 @@ const findPackageParents = (pkg, version, tracedFiles) => {
 const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   return await nodeFileTrace(entryFiles, {
     base,
-    processCwd: serverRootDir,
-    cache: /* @__PURE__ */ Object.create(null)
+    processCwd: serverRootDir
   });
 };
 const resolveTracedPath = async (base, p) => fse.realpath(path.resolve(base, p));

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

@@ -1,17 +1,18 @@
 import { loadServerPlugins as loadServerPluginInstances } from "@modern-js/prod-server";
-async function getServerPlugins(api) {
+async function getServerPlugins(api, metaName = "modern-js") {
   const runner = api.useHookRunners();
   const { plugins } = await runner._internalServerPlugins({
     plugins: []
   });
+  const filtedPlugins = plugins.filter((plugin) => plugin.name.includes(metaName));
   api.setAppContext({
     ...api.useAppContext(),
-    serverPlugins: plugins
+    serverPlugins: filtedPlugins
   });
-  return plugins;
+  return filtedPlugins;
 }
-async function loadServerPlugins(api, appDirectory) {
-  const plugins = await getServerPlugins(api);
+async function loadServerPlugins(api, appDirectory, metaName) {
+  const plugins = await getServerPlugins(api, metaName);
   const instances = loadServerPluginInstances(plugins, appDirectory);
   return instances;
 }

package/dist/types/utils/loadPlugins.d.ts

@@ -1,5 +1,5 @@
 import { ServerPlugin as ServerPluginInstance } from '@modern-js/server-core';
 import { ServerPlugin } from '@modern-js/types';
 import { AppTools, PluginAPI } from '../types';
-export declare function getServerPlugins(api: PluginAPI<AppTools<'shared'>>): Promise<ServerPlugin[]>;
-export declare function loadServerPlugins(api: PluginAPI<AppTools<'shared'>>, appDirectory: string): Promise<ServerPluginInstance[]>;
+export declare function getServerPlugins(api: PluginAPI<AppTools<'shared'>>, metaName?: string): Promise<ServerPlugin[]>;
+export declare function loadServerPlugins(api: PluginAPI<AppTools<'shared'>>, appDirectory: string, metaName: string): Promise<ServerPluginInstance[]>;

package/package.json

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