@steedos/metadata-core 3.0.0-beta.151 → 3.0.0-beta.152
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 +21 -19
- package/lib/project/index.js.map +1 -1
- package/package.json +3 -3
package/lib/project/index.js
CHANGED
|
@@ -42,22 +42,21 @@ 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
|
-
|
|
60
|
-
nextDir = path.resolve(nowDir, "..");
|
|
58
|
+
while (!fs.existsSync(path.join(nowDir, file)) && !fs.existsSync(path.join(nowDir, file2))) {
|
|
59
|
+
nextDir = path.resolve(nowDir, '..');
|
|
61
60
|
if (nextDir == nowDir) {
|
|
62
61
|
break;
|
|
63
62
|
}
|
|
@@ -67,15 +66,18 @@ function traverseForFileSync(dir, file, file2) {
|
|
|
67
66
|
return foundProjectDir;
|
|
68
67
|
}
|
|
69
68
|
function resolveProjectPathSync(dir = process.cwd()) {
|
|
70
|
-
|
|
69
|
+
let projectPath = traverseForFileSync(dir, STEEDOS_PROJECT_JSON, STEEDOS_PROJECT_JS);
|
|
70
|
+
if (!projectPath) {
|
|
71
|
+
throw new Error('InvalidProjectWorkspace');
|
|
72
|
+
}
|
|
73
|
+
return projectPath;
|
|
71
74
|
}
|
|
72
75
|
function traverseForAppSync(dir, file, file2) {
|
|
73
76
|
let foundAppDir = null;
|
|
74
77
|
let nowDir = dir;
|
|
75
78
|
let nextDir = null;
|
|
76
|
-
while (!fs.existsSync(path.join(nowDir,
|
|
77
|
-
|
|
78
|
-
nextDir = path.resolve(nowDir, "..");
|
|
79
|
+
while (!fs.existsSync(path.join(nowDir, '..', file)) && !fs.existsSync(path.join(nowDir, '..', file2))) {
|
|
80
|
+
nextDir = path.resolve(nowDir, '..');
|
|
79
81
|
if (nextDir == nowDir) {
|
|
80
82
|
break;
|
|
81
83
|
}
|
|
@@ -87,7 +89,7 @@ function traverseForAppSync(dir, file, file2) {
|
|
|
87
89
|
function resolveAppNameSync(dir = process.cwd()) {
|
|
88
90
|
let appPath = traverseForAppSync(dir, STEEDOS_PROJECT_JSON, STEEDOS_PROJECT_JS);
|
|
89
91
|
if (!appPath) {
|
|
90
|
-
throw new Error(
|
|
92
|
+
throw new Error('InvalidAppWorkspace');
|
|
91
93
|
}
|
|
92
94
|
var appName = path.parse(appPath).name;
|
|
93
95
|
return appName;
|
|
@@ -138,7 +140,7 @@ function scanPackages(projectPath) {
|
|
|
138
140
|
if (!memberStat.isDirectory()) {
|
|
139
141
|
continue;
|
|
140
142
|
}
|
|
141
|
-
var minifestPath = path.join(member,
|
|
143
|
+
var minifestPath = path.join(member, 'package.yml');
|
|
142
144
|
if (!fs.existsSync(minifestPath)) {
|
|
143
145
|
continue;
|
|
144
146
|
}
|
|
@@ -160,7 +162,7 @@ async function uncompressPackages(projectPath) {
|
|
|
160
162
|
let appPaths = glob.sync(path.join(packageFolder, "*.package"));
|
|
161
163
|
for (var i = 0; i < appPaths.length; i++) {
|
|
162
164
|
const appPath = appPaths[i];
|
|
163
|
-
var appName = path.basename(appPath,
|
|
165
|
+
var appName = path.basename(appPath, '.package');
|
|
164
166
|
var appFolder = path.join(packageFolder, appName);
|
|
165
167
|
var folderExists = true;
|
|
166
168
|
if (!fs.existsSync(appFolder)) {
|
|
@@ -171,10 +173,10 @@ async function uncompressPackages(projectPath) {
|
|
|
171
173
|
continue;
|
|
172
174
|
}
|
|
173
175
|
await compressing.zip.uncompress(appPath, appFolder);
|
|
174
|
-
var manifestPath = path.join(appFolder,
|
|
176
|
+
var manifestPath = path.join(appFolder, 'package.yml');
|
|
175
177
|
if (!fs.existsSync(manifestPath)) {
|
|
176
178
|
(0, folderUtil_1.deleteFolderRecursive)(appFolder);
|
|
177
|
-
console.error(
|
|
179
|
+
console.error('manifest yml not found in app:' + appName);
|
|
178
180
|
}
|
|
179
181
|
}
|
|
180
182
|
}
|
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.152",
|
|
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.152",
|
|
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": "c8c35d3ad4121ed6b207c43d63d23b18bb504d1f"
|
|
42
42
|
}
|