@steedos/metadata-core 3.0.0-beta.147 → 3.0.0-beta.149
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/lib/project/index.js +19 -21
- package/lib/project/index.js.map +1 -1
- package/package.json +3 -3
package/lib/project/index.js
CHANGED
|
@@ -42,21 +42,22 @@ exports.scanPackages = scanPackages;
|
|
|
42
42
|
exports.uncompressPackages = uncompressPackages;
|
|
43
43
|
exports.getPackages = getPackages;
|
|
44
44
|
const path = __importStar(require("path"));
|
|
45
|
-
const fs = require(
|
|
46
|
-
const glob = require(
|
|
45
|
+
const fs = require("fs");
|
|
46
|
+
const glob = require("glob");
|
|
47
47
|
const compressing = require("compressing");
|
|
48
|
-
const mkdirp = require(
|
|
48
|
+
const mkdirp = require("mkdirp");
|
|
49
49
|
const folderUtil_1 = require("../folderUtil");
|
|
50
|
-
const STEEDOS_PROJECT_JSON =
|
|
51
|
-
const STEEDOS_PROJECT_JS =
|
|
52
|
-
const STEEDOS_PACKAGE_FOLDER_NAME =
|
|
53
|
-
const STEEDOS_SERVICE_FOLDER_NAME =
|
|
50
|
+
const STEEDOS_PROJECT_JSON = "steedos-config.yml";
|
|
51
|
+
const STEEDOS_PROJECT_JS = "steedos.config.js";
|
|
52
|
+
const STEEDOS_PACKAGE_FOLDER_NAME = "steedos-packages";
|
|
53
|
+
const STEEDOS_SERVICE_FOLDER_NAME = "services";
|
|
54
54
|
function traverseForFileSync(dir, file, file2) {
|
|
55
55
|
let foundProjectDir = null;
|
|
56
56
|
let nowDir = dir;
|
|
57
57
|
let nextDir = null;
|
|
58
|
-
while (!fs.existsSync(path.join(nowDir, file)) &&
|
|
59
|
-
|
|
58
|
+
while (!fs.existsSync(path.join(nowDir, file)) &&
|
|
59
|
+
!fs.existsSync(path.join(nowDir, file2))) {
|
|
60
|
+
nextDir = path.resolve(nowDir, "..");
|
|
60
61
|
if (nextDir == nowDir) {
|
|
61
62
|
break;
|
|
62
63
|
}
|
|
@@ -66,18 +67,15 @@ function traverseForFileSync(dir, file, file2) {
|
|
|
66
67
|
return foundProjectDir;
|
|
67
68
|
}
|
|
68
69
|
function resolveProjectPathSync(dir = process.cwd()) {
|
|
69
|
-
|
|
70
|
-
if (!projectPath) {
|
|
71
|
-
throw new Error('InvalidProjectWorkspace');
|
|
72
|
-
}
|
|
73
|
-
return projectPath;
|
|
70
|
+
return dir;
|
|
74
71
|
}
|
|
75
72
|
function traverseForAppSync(dir, file, file2) {
|
|
76
73
|
let foundAppDir = null;
|
|
77
74
|
let nowDir = dir;
|
|
78
75
|
let nextDir = null;
|
|
79
|
-
while (!fs.existsSync(path.join(nowDir,
|
|
80
|
-
|
|
76
|
+
while (!fs.existsSync(path.join(nowDir, "..", file)) &&
|
|
77
|
+
!fs.existsSync(path.join(nowDir, "..", file2))) {
|
|
78
|
+
nextDir = path.resolve(nowDir, "..");
|
|
81
79
|
if (nextDir == nowDir) {
|
|
82
80
|
break;
|
|
83
81
|
}
|
|
@@ -89,7 +87,7 @@ function traverseForAppSync(dir, file, file2) {
|
|
|
89
87
|
function resolveAppNameSync(dir = process.cwd()) {
|
|
90
88
|
let appPath = traverseForAppSync(dir, STEEDOS_PROJECT_JSON, STEEDOS_PROJECT_JS);
|
|
91
89
|
if (!appPath) {
|
|
92
|
-
throw new Error(
|
|
90
|
+
throw new Error("InvalidAppWorkspace");
|
|
93
91
|
}
|
|
94
92
|
var appName = path.parse(appPath).name;
|
|
95
93
|
return appName;
|
|
@@ -140,7 +138,7 @@ function scanPackages(projectPath) {
|
|
|
140
138
|
if (!memberStat.isDirectory()) {
|
|
141
139
|
continue;
|
|
142
140
|
}
|
|
143
|
-
var minifestPath = path.join(member,
|
|
141
|
+
var minifestPath = path.join(member, "package.yml");
|
|
144
142
|
if (!fs.existsSync(minifestPath)) {
|
|
145
143
|
continue;
|
|
146
144
|
}
|
|
@@ -162,7 +160,7 @@ async function uncompressPackages(projectPath) {
|
|
|
162
160
|
let appPaths = glob.sync(path.join(packageFolder, "*.package"));
|
|
163
161
|
for (var i = 0; i < appPaths.length; i++) {
|
|
164
162
|
const appPath = appPaths[i];
|
|
165
|
-
var appName = path.basename(appPath,
|
|
163
|
+
var appName = path.basename(appPath, ".package");
|
|
166
164
|
var appFolder = path.join(packageFolder, appName);
|
|
167
165
|
var folderExists = true;
|
|
168
166
|
if (!fs.existsSync(appFolder)) {
|
|
@@ -173,10 +171,10 @@ async function uncompressPackages(projectPath) {
|
|
|
173
171
|
continue;
|
|
174
172
|
}
|
|
175
173
|
await compressing.zip.uncompress(appPath, appFolder);
|
|
176
|
-
var manifestPath = path.join(appFolder,
|
|
174
|
+
var manifestPath = path.join(appFolder, "package.yml");
|
|
177
175
|
if (!fs.existsSync(manifestPath)) {
|
|
178
176
|
(0, folderUtil_1.deleteFolderRecursive)(appFolder);
|
|
179
|
-
console.error(
|
|
177
|
+
console.error("manifest yml not found in app:" + appName);
|
|
180
178
|
}
|
|
181
179
|
}
|
|
182
180
|
}
|
package/lib/project/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/project/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/metadata-core",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.149",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"build": "rimraf lib && tsc"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@steedos/client": "3.0.0-beta.
|
|
15
|
+
"@steedos/client": "3.0.0-beta.149",
|
|
16
16
|
"archiver": "^5.1.0",
|
|
17
17
|
"chalk": "^4.1.0",
|
|
18
18
|
"clone": "^2.1.2",
|
|
@@ -38,5 +38,5 @@
|
|
|
38
38
|
"publishConfig": {
|
|
39
39
|
"access": "public"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "33fef020c5505c9f122d705ae36d373c716cf822"
|
|
42
42
|
}
|