@steedos/service-package-registry 2.6.2-beta.9 → 2.6.3

package/main/default/manager/loader.js

@@ -5,7 +5,7 @@ const fs = require("fs");
 const path = require('path');
 const objectql = require('@steedos/objectql');
 const registry = require('./registry');
-const userDir = path.join(process.cwd(), '.steedos');
+const userDir = registry.settings.userDir;
 const packagesFilePath = path.join(userDir, 'steedos-packages.yml'); 
 const metadataApi = require('@steedos/metadata-api');
 const util = require('./util');

package/main/default/manager/login.js

@@ -2,8 +2,10 @@ var ncl = require('./npm_login.js');
 const path = require('path');
 var fs = require('fs');
 const _ = require('lodash');
-const configPath = path.join(process.cwd(), '.steedos', '.npmrc');
-const yarnrcConfigPath = path.join(process.cwd(), '.steedos', '.yarnrc');
+const registry = require('./registry');
+const userDir = registry.settings.userDir;
+const configPath = path.join(userDir, '.npmrc');
+const yarnrcConfigPath = path.join(userDir, '.yarnrc');
 const timeout = 10 * 1000;
 const NPM_TOKENS = {};
 const npmLogin = async function (user, pass, email, registry, scope, quotes, configPath) {

package/main/default/manager/packages.js

@@ -101,7 +101,7 @@ const getAllPackages = async ()=>{
     return packages;
 }
 
-const userDir = path.join(process.cwd(), '.steedos');
+const userDir = registry.settings.userDir;
 const maintainSystemFiles = ()=>{
     if(!fs.existsSync(userDir)){
         fs.mkdirSync(userDir);

package/main/default/manager/registry.js

@@ -19,9 +19,7 @@ const npa = require("npm-package-arg");
 
 log.init({});
 
-const settings = {
-    userDir: path.join(process.cwd(), '.steedos')
-}
+const settings = require('../../../package.service').settings
 
 function checkModulePath(folder) {
     var moduleName;
@@ -352,5 +350,6 @@ module.exports = {
     installModule,
     uninstallModule,
     isPackageUrl,
-    yarnAddPackage
+    yarnAddPackage,
+    settings
 }

package/main/default/pages/steedos_packages_list.page.amis.json

@@ -67,7 +67,7 @@
           "id": "u:2bb7748ac402"
         }
       },
-      "adaptor": "if (payload.data.rows.length) {\n  var unpkgUrl = window.Builder && window.Builder.settings.unpkgUrl || \"\";\n  payload.data.rows.forEach(function (row) {\n    if (!row.icon) {\n      row.icon = \"standard.default\";\n    }\n    if (row.icon) {\n      if (!/^http(s?):\\/\\//.test(row.icon) && !row.icon.endsWith('.jpg') && !row.icon.endsWith('.png')) {\n        var iconCategory = \"standard\";\n        var iconName = row.icon;\n        var tags = row.icon.split(\".\");\n        if (tags.length > 1) {\n          iconCategory = tags[0];\n          iconName = tags[1];\n        }\n        row.iconCategory = iconCategory;\n        row.iconName = iconName.replace(\"_\", \"-\");\n        row.icon = unpkgUrl + \"/@salesforce-ux/design-system@2.22.0/assets/icons/\" + iconCategory + \"/\" + iconName.replace(\"-\", \"_\") + \"_120.png\";\n      }\n    }\n  });\n}\nreturn payload;"
+      "adaptor": "if (payload.data.rows.length) {\n  var unpkgUrl = window.Builder && window.Builder.settings.unpkgUrl || \"\";\n  payload.data.rows.forEach(function (row) {\n    if (!row.icon) {\n      row.icon = \"standard.default\";\n    }\n    if (row.icon) {\n      if (!/^http(s?):\\/\\//.test(row.icon) && !row.icon.endsWith('.jpg') && !row.icon.endsWith('.png')) {\n        var iconCategory = \"standard\";\n        var iconName = row.icon;\n        var tags = row.icon.split(\".\");\n        if (tags.length > 1) {\n          iconCategory = tags[0];\n          iconName = tags[1];\n        }\n        row.iconCategory = iconCategory;\n        row.iconName = iconName.replace(\"_\", \"-\");\n        row.icon = unpkgUrl + \"/@salesforce-ux/design-system@2.22.2/assets/icons/\" + iconCategory + \"/\" + iconName.replace(\"-\", \"_\") + \"_120.png\";\n      }\n    }\n  });\n}\nreturn payload;"
     }
   ],
   "regions": [

package/package.json

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

package/package.service.js

@@ -1,14 +1,15 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-16 15:58:42
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-07-16 16:09:10
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2024-01-08 15:36:18
  * @Description: 
  */
 "use strict";
 const project = require('./package.json');
 const packageName = project.name;
 const packageLoader = require('@steedos/service-package-loader');
+const path = require('path');
 
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
@@ -26,7 +27,8 @@ module.exports = {
 			path: __dirname,
 			name: this.name,
 			isPackage: false
-		}
+		},
+		userDir: process.env.STEEDOS_PACKAGE_STORAGE || path.join(process.cwd(), '.steedos'),
 	},
 
 	/**