@eggjs/core 7.0.2-beta.10 → 7.0.2-beta.12

package/dist/loader/egg_loader.js

@@ -483,7 +483,7 @@ var EggLoader = class {
 	getPluginPath(plugin) {
 		if (plugin.path && !this.#isBundlePluginPathArtifact(plugin.path)) return plugin.path;
 		if (plugin.package) assert(isValidatePackageName(plugin.package), `plugin ${plugin.name} invalid, use 'path' instead of package: "${plugin.package}"`);
-		if (plugin.path && this.#isBundlePluginPathArtifact(plugin.path)) return this.#resolveBundlePluginPath(plugin);
+		if (this.#isBundleModeForThisApp() && (!plugin.path || this.#isBundlePluginPathArtifact(plugin.path))) return this.#resolveBundlePluginPath(plugin);
 		return this.#resolvePluginPath(plugin);
 	}
 	/**
@@ -492,9 +492,17 @@ var EggLoader = class {
 	* which does not contain the plugin's own files. Detect that case so the plugin is
 	* re-resolved by package name instead.
 	*/
-	#isBundlePluginPathArtifact(pluginPath) {
+	/**
+	* Whether an active bundle store belongs to THIS app. The store is shared via globalThis
+	* across @eggjs/core copies, so one registered for a different app must not reinterpret this
+	* app's plugin paths — mirror `ManifestStore.load()`'s `bundleStore.baseDir === baseDir` gate.
+	*/
+	#isBundleModeForThisApp() {
 		const bundleStore = ManifestStore.getBundleStore();
-		if (!bundleStore || path.resolve(bundleStore.baseDir) !== path.resolve(this.options.baseDir)) return false;
+		return !!bundleStore && path.resolve(bundleStore.baseDir) === path.resolve(this.options.baseDir);
+	}
+	#isBundlePluginPathArtifact(pluginPath) {
+		if (!this.#isBundleModeForThisApp()) return false;
 		return path.resolve(pluginPath) === path.resolve(this.options.baseDir);
 	}
 	/**
@@ -507,11 +515,18 @@ var EggLoader = class {
 		const candidates = plugin.package ? [plugin.package] : plugin.name.includes("/") ? [plugin.name] : [plugin.name, `@eggjs/${plugin.name}`];
 		let lastErr;
 		for (const name$1 of candidates) try {
-			const entry = utils_default.resolvePath(name$1, { paths: [...this.lookupDirs] });
-			const realDir = path.dirname(entry);
+			let realDir;
+			try {
+				realDir = path.dirname(utils_default.resolvePath(name$1, { paths: [...this.lookupDirs] }));
+			} catch {
+				realDir = path.dirname(utils_default.resolvePath(`${name$1}/package.json`, { paths: [...this.lookupDirs] }));
+			}
 			const segments = realDir.split(/[/\\]/);
 			const nmIdx = segments.lastIndexOf("node_modules");
-			if (nmIdx !== -1) return path.join(this.options.baseDir, ...segments.slice(nmIdx));
+			if (nmIdx !== -1) {
+				const rebased = path.join(this.options.baseDir, ...segments.slice(nmIdx));
+				if (fs.existsSync(rebased)) return rebased;
+			}
 			return realDir;
 		} catch (err) {
 			lastErr = err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/core",
-  "version": "7.0.2-beta.10",
+  "version": "7.0.2-beta.12",
   "description": "A core plugin framework based on @eggjs/koa",
   "keywords": [
     "egg",
@@ -42,13 +42,13 @@
     "ready-callback": "^4.0.0",
     "tsconfig-paths": "^4.2.0",
     "utility": "^2.5.0",
-    "@eggjs/koa": "3.1.2-beta.10",
-    "@eggjs/router": "4.0.2-beta.10",
-    "@eggjs/path-matching": "3.0.2-beta.10",
-    "@eggjs/loader-fs": "1.0.0-beta.10",
-    "@eggjs/utils": "5.0.2-beta.10",
-    "@eggjs/typings": "4.1.2-beta.10",
-    "@eggjs/extend2": "5.0.2-beta.10"
+    "@eggjs/extend2": "5.0.2-beta.12",
+    "@eggjs/path-matching": "3.0.2-beta.12",
+    "@eggjs/loader-fs": "1.0.0-beta.12",
+    "@eggjs/router": "4.0.2-beta.12",
+    "@eggjs/typings": "4.1.2-beta.12",
+    "@eggjs/koa": "3.1.2-beta.12",
+    "@eggjs/utils": "5.0.2-beta.12"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
@@ -60,9 +60,9 @@
     "mm": "^4.0.2",
     "typescript": "^5.9.3",
     "urllib": "^4.8.2",
-    "@eggjs/mock": "7.0.2-beta.10",
-    "@eggjs/supertest": "9.0.2-beta.10",
-    "@eggjs/tsconfig": "3.1.2-beta.10"
+    "@eggjs/mock": "7.0.2-beta.12",
+    "@eggjs/tsconfig": "3.1.2-beta.12",
+    "@eggjs/supertest": "9.0.2-beta.12"
   },
   "engines": {
     "node": ">=22.18.0"