@nocobase/cli 1.9.0-alpha.1 → 1.9.0-alpha.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -5
- package/src/commands/pkg.js +5 -0
- package/src/util.js +6 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/cli",
|
|
3
|
-
"version": "1.9.0-alpha.
|
|
3
|
+
"version": "1.9.0-alpha.10",
|
|
4
4
|
"description": "",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"main": "./src/index.js",
|
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
"nocobase": "./bin/index.js"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@nocobase/app": "1.9.0-alpha.
|
|
12
|
-
"@nocobase/license-kit": "^0.2.
|
|
11
|
+
"@nocobase/app": "1.9.0-alpha.10",
|
|
12
|
+
"@nocobase/license-kit": "^0.2.12",
|
|
13
13
|
"@types/fs-extra": "^11.0.1",
|
|
14
14
|
"@umijs/utils": "3.5.20",
|
|
15
15
|
"chalk": "^4.1.1",
|
|
@@ -27,12 +27,12 @@
|
|
|
27
27
|
"tsx": "^4.19.0"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@nocobase/devtools": "1.9.0-alpha.
|
|
30
|
+
"@nocobase/devtools": "1.9.0-alpha.10"
|
|
31
31
|
},
|
|
32
32
|
"repository": {
|
|
33
33
|
"type": "git",
|
|
34
34
|
"url": "git+https://github.com/nocobase/nocobase.git",
|
|
35
35
|
"directory": "packages/core/cli"
|
|
36
36
|
},
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "3e3aed34a0b93a6525b0f4e905307025e87785bb"
|
|
38
38
|
}
|
package/src/commands/pkg.js
CHANGED
|
@@ -93,6 +93,11 @@ class Package {
|
|
|
93
93
|
if (await fs.exists(file)) {
|
|
94
94
|
return true;
|
|
95
95
|
}
|
|
96
|
+
file = path.resolve(process.cwd(), 'node_modules', this.packageName, 'package.json');
|
|
97
|
+
if (await fs.exists(file)) {
|
|
98
|
+
console.log(chalk.yellowBright(`Skipped: ${this.packageName} is in node_modules`));
|
|
99
|
+
return true;
|
|
100
|
+
}
|
|
96
101
|
return false;
|
|
97
102
|
}
|
|
98
103
|
|
package/src/util.js
CHANGED
|
@@ -495,11 +495,14 @@ async function isEnvMatch(keyData) {
|
|
|
495
495
|
const env = await getEnvAsync();
|
|
496
496
|
if (env?.container?.id && keyData?.instanceData?.container?.id) {
|
|
497
497
|
return (
|
|
498
|
-
JSON.stringify(omit(env, ['timestamp', 'container', 'hostname'])) ===
|
|
499
|
-
JSON.stringify(omit(keyData?.instanceData, ['timestamp', 'container', 'hostname']))
|
|
498
|
+
JSON.stringify(omit(env, ['timestamp', 'container', 'hostname', 'mac'])) ===
|
|
499
|
+
JSON.stringify(omit(keyData?.instanceData, ['timestamp', 'container', 'hostname', 'mac']))
|
|
500
500
|
);
|
|
501
501
|
}
|
|
502
|
-
return
|
|
502
|
+
return (
|
|
503
|
+
JSON.stringify(omit(env, ['timestamp', 'mac'])) ===
|
|
504
|
+
JSON.stringify(omit(keyData?.instanceData, ['timestamp', 'mac']))
|
|
505
|
+
);
|
|
503
506
|
}
|
|
504
507
|
|
|
505
508
|
exports.getAccessKeyPair = async function () {
|