rigjs 2.1.6 → 2.1.9
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/built/index.js +23 -23
- package/demo/package.rig.json5 +1 -1
- package/lib/build/index.ts +2 -2
- package/lib/classes/cicd/Endpoint.ts +1 -0
- package/lib/deploy/index.ts +2 -2
- package/lib/preinstall/index.js +2 -2
- package/package.json +1 -1
- package/tsconfig.json +1 -0
package/demo/package.rig.json5
CHANGED
package/lib/build/index.ts
CHANGED
|
@@ -64,13 +64,13 @@ export default async (cmd: any) => {
|
|
|
64
64
|
}
|
|
65
65
|
if (!ep.extra_env) ep.extra_env = {};
|
|
66
66
|
ep.extra_env['PUBLIC_PATH'] = ep.publicPath;
|
|
67
|
-
ep.extra_env['OUTPUT_DIR'] = path.join(cicd.source.root_path, ep.
|
|
67
|
+
ep.extra_env['OUTPUT_DIR'] = path.join(cicd.source.root_path, ep.deployDir);
|
|
68
68
|
|
|
69
69
|
switch (frameworktype) {
|
|
70
70
|
case FrameworkType.vue: {
|
|
71
71
|
vueEnv.useEnv(ep.vue_env!, ep.extra_env);
|
|
72
72
|
//推测vue脚本
|
|
73
|
-
if (!ep.build) ep.build =
|
|
73
|
+
if (!ep.build) ep.build = `npx vue-cli-service build --mode rig --dest ${ep.extra_env['OUTPUT_DIR']}`;
|
|
74
74
|
}
|
|
75
75
|
break;
|
|
76
76
|
default:
|
|
@@ -42,6 +42,7 @@ class Endpoint {
|
|
|
42
42
|
|
|
43
43
|
static createEndpointArr(cicdConfig: CICDConfig, schema: DirLevel[]) {
|
|
44
44
|
const endpointDict = cicdConfig.endpoints;
|
|
45
|
+
if (!endpointDict) throw new Error('No endpoints found');
|
|
45
46
|
return Object.keys(endpointDict).map((dir) => {
|
|
46
47
|
const info = endpointDict[dir];
|
|
47
48
|
return new Endpoint(dir, info, schema);
|
package/lib/deploy/index.ts
CHANGED
|
@@ -41,13 +41,13 @@ export default async (cmd: any) => {
|
|
|
41
41
|
const distPath = path.join(
|
|
42
42
|
process.cwd(),
|
|
43
43
|
cicd.source.root_path,
|
|
44
|
-
cicdCmd.endpoints[i].
|
|
44
|
+
cicdCmd.endpoints[i].deployDir
|
|
45
45
|
);
|
|
46
46
|
traverseFolder(distPath);
|
|
47
47
|
await aliOss.putStreamFiles(
|
|
48
48
|
filesList,
|
|
49
49
|
cicdCmd.endpoints[i].deployDir.replace(/\\/g, '/'),
|
|
50
|
-
cicdCmd.endpoints[i].
|
|
50
|
+
cicdCmd.endpoints[i].deployDir,
|
|
51
51
|
cicd.source.root_path
|
|
52
52
|
);
|
|
53
53
|
filesList = [];
|
package/lib/preinstall/index.js
CHANGED
|
@@ -78,6 +78,7 @@ const clone = (target, dep) => {
|
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
const checkDepsValid = (rigJson5) => {
|
|
81
|
+
print.info(`checkDepsValid`);
|
|
81
82
|
let valid = true;
|
|
82
83
|
for (let rig of rigJson5) {
|
|
83
84
|
try {
|
|
@@ -113,8 +114,8 @@ const checkDepsValid = (rigJson5) => {
|
|
|
113
114
|
|
|
114
115
|
//从rigJson5获取该依赖的版本号
|
|
115
116
|
const dep = rigJson5.find(r => r.name === key);
|
|
117
|
+
print.info(`checking: ${key}[${min},${max}]`);
|
|
116
118
|
if (dep) {
|
|
117
|
-
console.log(min,max,dep);
|
|
118
119
|
if (min) {
|
|
119
120
|
valid = compareVersions(dep.version, min) >= 0
|
|
120
121
|
}
|
|
@@ -132,7 +133,6 @@ const checkDepsValid = (rigJson5) => {
|
|
|
132
133
|
}
|
|
133
134
|
} catch (e) {
|
|
134
135
|
print.error(`checkDepsValid failed:${e.message}`);
|
|
135
|
-
|
|
136
136
|
valid = false;
|
|
137
137
|
}
|
|
138
138
|
return valid;
|
package/package.json
CHANGED