@steedos/service-package-registry 2.6.2-beta.2 → 2.6.2-beta.20

package/main/default/manager/registry.js

@@ -282,11 +282,13 @@ async function yarnAddPackage(yarnPackage){
         const packagePath = path.dirname(require.resolve(`${parsed.name}/package.json`, {
             paths: [path.join(installDir, 'node_modules')]
         }))
-        steedosPackages.push({
-            name: parsed.name,
-            version: parsed.rawSpec,
-            path: packagePath
-        })
+        if(fs.existsSync(path.join(packagePath, 'package.service.js'))){
+            steedosPackages.push({
+                name: parsed.name,
+                version: parsed.rawSpec,
+                path: packagePath
+            })
+        }
     })
     return steedosPackages;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.6.2-beta.2",
+  "version": "2.6.2-beta.20",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.6.2-beta.2",
-    "@steedos/core": "2.6.2-beta.2",
-    "@steedos/metadata-core": "2.6.2-beta.2",
-    "@steedos/objectql": "2.6.2-beta.2",
-    "@steedos/service-package-loader": "2.6.2-beta.2",
+    "@steedos/auth": "2.6.2-beta.20",
+    "@steedos/core": "2.6.2-beta.20",
+    "@steedos/metadata-core": "2.6.2-beta.20",
+    "@steedos/objectql": "2.6.2-beta.20",
+    "@steedos/service-package-loader": "2.6.2-beta.20",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
+  "gitHead": "3dd1670f6cb23454d8cbd21f9dd3185c2a4c06d4"
 }

package/project.package.service.js

@@ -475,7 +475,11 @@ module.exports = {
 		},
 		getPackageInfo: {
 			handler(packageInfo, packageName){
-				const packageJson = require(`${_path}/package.json`);
+				let packagePath = packageInfo.path || path.dirname(require.resolve(`${packageName}/package.json`));
+				if(!path.isAbsolute(packagePath)){
+					packagePath = path.resolve(process.cwd(), packagePath)
+				}
+				const packageJson = require(`${packagePath}/package.json`);
 				return {
 					version: packageJson.version,
 					description: packageJson.description,
@@ -488,7 +492,7 @@ module.exports = {
 				//注册本地已安装的steedos packages
 				const installPackages = loader.loadPackagesConfig();
 				for (const name in installPackages) {
-					if (Object.hasOwnProperty.call(installPackages, name) && (packageName && packageName === name)) {
+					if (Object.hasOwnProperty.call(installPackages, name) && (packageName && packageName === name || !packageName)) {
 						let _packageInfo = installPackages[name];
 						if(_packageInfo.static){
 							_packageInfo = Object.assign({}, _packageInfo, this.getStaticPackageInfo(_packageInfo, name))