@teams-max/mwsp 2.0.5 → 2.0.6
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/es/cli/build.js +1 -1
- package/lib/cli/build.js +1 -1
- package/lib/utils/index.js +10 -15
- package/package.json +1 -1
package/es/cli/build.js
CHANGED
package/lib/cli/build.js
CHANGED
package/lib/utils/index.js
CHANGED
|
@@ -24,13 +24,15 @@ function printErrorAndExit(...args) {
|
|
|
24
24
|
}
|
|
25
25
|
function pickDependencies(dependencies, isDev) {
|
|
26
26
|
const pkgs = require(join(cwd, "package.json"));
|
|
27
|
-
const dependenciesList = Object.entries(dependencies || {}).filter(
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
const dependenciesList = Object.entries(dependencies || {}).filter(
|
|
28
|
+
([key]) => {
|
|
29
|
+
if (isDev) {
|
|
30
|
+
return !pkgs.devDependencies[key];
|
|
31
|
+
} else {
|
|
32
|
+
return !pkgs.dependencies[key];
|
|
33
|
+
}
|
|
32
34
|
}
|
|
33
|
-
|
|
35
|
+
);
|
|
34
36
|
return dependenciesList.map(([key, value]) => `${key}@${value}`);
|
|
35
37
|
}
|
|
36
38
|
async function addAsgDependencies(cfg) {
|
|
@@ -38,11 +40,7 @@ async function addAsgDependencies(cfg) {
|
|
|
38
40
|
let dependencies = {};
|
|
39
41
|
let devDependencies = {};
|
|
40
42
|
try {
|
|
41
|
-
asgDependencies = require(join(
|
|
42
|
-
ASG_DIR,
|
|
43
|
-
"base",
|
|
44
|
-
"dependencies.js"
|
|
45
|
-
)) || {};
|
|
43
|
+
asgDependencies = require(join(ASG_DIR, "base", "dependencies.js")) || {};
|
|
46
44
|
dependencies = asgDependencies.dependencies || {};
|
|
47
45
|
devDependencies = asgDependencies.devDependencies || {};
|
|
48
46
|
} catch (error) {
|
|
@@ -53,10 +51,7 @@ async function addAsgDependencies(cfg) {
|
|
|
53
51
|
return;
|
|
54
52
|
}
|
|
55
53
|
const asgDeps = pickDependencies(dependencies);
|
|
56
|
-
const asgDevDeps = pickDependencies(
|
|
57
|
-
devDependencies,
|
|
58
|
-
true
|
|
59
|
-
);
|
|
54
|
+
const asgDevDeps = pickDependencies(devDependencies, true);
|
|
60
55
|
if ((infra == null ? void 0 : infra.arch) === "PRO") {
|
|
61
56
|
!!asgDeps.length && await exec("yarn", ["add", ...asgDeps]);
|
|
62
57
|
!!asgDevDeps.length && await exec("yarn", ["add", ...asgDevDeps, "-D"]);
|