@modern-js/new-action 2.0.0-beta.3 → 2.0.0-beta.4
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/CHANGELOG.md +32 -0
- package/dist/js/modern/index.js +1 -1
- package/dist/js/modern/module.js +107 -47
- package/dist/js/modern/monorepo.js +53 -33
- package/dist/js/modern/mwa.js +117 -45
- package/dist/js/modern/utils/index.js +21 -19
- package/dist/js/node/index.js +20 -49
- package/dist/js/node/module.js +121 -61
- package/dist/js/node/monorepo.js +81 -44
- package/dist/js/node/mwa.js +127 -58
- package/dist/js/node/utils/index.js +46 -30
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,37 @@
|
|
|
1
1
|
# @modern-js/new-action
|
|
2
2
|
|
|
3
|
+
## 2.0.0-beta.4
|
|
4
|
+
|
|
5
|
+
### Major Changes
|
|
6
|
+
|
|
7
|
+
- dda38c9c3e: chore: v2
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [7879e8f]
|
|
12
|
+
- Updated dependencies [6aca875]
|
|
13
|
+
- Updated dependencies [2e6031955e]
|
|
14
|
+
- Updated dependencies [7b7d12c]
|
|
15
|
+
- Updated dependencies [92f0eade39]
|
|
16
|
+
- Updated dependencies [edd1cfb1af]
|
|
17
|
+
- Updated dependencies [cc971eabfc]
|
|
18
|
+
- Updated dependencies [5b9049f2e9]
|
|
19
|
+
- Updated dependencies [92004d1906]
|
|
20
|
+
- Updated dependencies [b8bbe036c7]
|
|
21
|
+
- Updated dependencies [d5a31df781]
|
|
22
|
+
- Updated dependencies [dda38c9c3e]
|
|
23
|
+
- Updated dependencies [3bbea92b2a]
|
|
24
|
+
- Updated dependencies [b710adb843]
|
|
25
|
+
- Updated dependencies [ea7cf06]
|
|
26
|
+
- Updated dependencies [bbe4c4a]
|
|
27
|
+
- Updated dependencies [e4558a0]
|
|
28
|
+
- Updated dependencies [abf3421a75]
|
|
29
|
+
- Updated dependencies [543be9558e]
|
|
30
|
+
- Updated dependencies [14b712da84]
|
|
31
|
+
- @modern-js/utils@2.0.0-beta.4
|
|
32
|
+
- @modern-js/generator-common@3.0.0-beta.4
|
|
33
|
+
- @modern-js/generator-utils@3.0.0-beta.4
|
|
34
|
+
|
|
3
35
|
## 2.0.0-beta.3
|
|
4
36
|
|
|
5
37
|
### Major Changes
|
package/dist/js/modern/index.js
CHANGED
package/dist/js/modern/module.js
CHANGED
|
@@ -1,36 +1,82 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __defProps = Object.defineProperties;
|
|
3
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
4
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
7
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
8
|
+
var __spreadValues = (a, b) => {
|
|
9
|
+
for (var prop in b || (b = {}))
|
|
10
|
+
if (__hasOwnProp.call(b, prop))
|
|
11
|
+
__defNormalProp(a, prop, b[prop]);
|
|
12
|
+
if (__getOwnPropSymbols)
|
|
13
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
14
|
+
if (__propIsEnum.call(b, prop))
|
|
15
|
+
__defNormalProp(a, prop, b[prop]);
|
|
16
|
+
}
|
|
17
|
+
return a;
|
|
18
|
+
};
|
|
19
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
|
+
var __async = (__this, __arguments, generator) => {
|
|
21
|
+
return new Promise((resolve, reject) => {
|
|
22
|
+
var fulfilled = (value) => {
|
|
23
|
+
try {
|
|
24
|
+
step(generator.next(value));
|
|
25
|
+
} catch (e) {
|
|
26
|
+
reject(e);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
var rejected = (value) => {
|
|
30
|
+
try {
|
|
31
|
+
step(generator.throw(value));
|
|
32
|
+
} catch (e) {
|
|
33
|
+
reject(e);
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
37
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
import { merge } from "@modern-js/utils/lodash";
|
|
41
|
+
import { CodeSmith } from "@modern-js/codesmith";
|
|
42
|
+
import { FormilyAPI } from "@modern-js/codesmith-formily";
|
|
43
|
+
import {
|
|
44
|
+
i18n,
|
|
45
|
+
getModuleNewActionSchema,
|
|
46
|
+
ModuleActionFunctions,
|
|
47
|
+
ModuleActionFunctionsDependencies,
|
|
48
|
+
ModuleActionFunctionsDevDependencies,
|
|
49
|
+
ModuleActionFunctionsPeerDependencies,
|
|
50
|
+
ModuleNewActionGenerators,
|
|
51
|
+
Solution
|
|
52
|
+
} from "@modern-js/generator-common";
|
|
53
|
+
import {
|
|
54
|
+
getPackageManager,
|
|
55
|
+
getModernPluginVersion
|
|
56
|
+
} from "@modern-js/generator-utils";
|
|
9
57
|
import { alreadyRepo, getGeneratorPath, hasEnabledFunction } from "./utils";
|
|
10
|
-
|
|
58
|
+
const ModuleNewAction = (options) => __async(void 0, null, function* () {
|
|
11
59
|
const {
|
|
12
|
-
locale =
|
|
13
|
-
distTag =
|
|
60
|
+
locale = "zh",
|
|
61
|
+
distTag = "",
|
|
14
62
|
debug = false,
|
|
15
|
-
registry =
|
|
16
|
-
config =
|
|
63
|
+
registry = "",
|
|
64
|
+
config = "{}",
|
|
17
65
|
cwd = process.cwd()
|
|
18
66
|
} = options;
|
|
19
67
|
let UserConfig = {};
|
|
20
68
|
try {
|
|
21
69
|
UserConfig = JSON.parse(config);
|
|
22
70
|
} catch (e) {
|
|
23
|
-
throw new Error(
|
|
71
|
+
throw new Error("config is not a valid json");
|
|
24
72
|
}
|
|
25
|
-
i18n.changeLanguage({
|
|
26
|
-
locale: UserConfig.locale || locale
|
|
27
|
-
});
|
|
73
|
+
i18n.changeLanguage({ locale: UserConfig.locale || locale });
|
|
28
74
|
const smith = new CodeSmith({
|
|
29
75
|
debug,
|
|
30
76
|
registryUrl: registry
|
|
31
77
|
});
|
|
32
78
|
if (!alreadyRepo(cwd)) {
|
|
33
|
-
smith.logger.warn(
|
|
79
|
+
smith.logger.warn("not valid modern.js repo");
|
|
34
80
|
}
|
|
35
81
|
const formilyAPI = new FormilyAPI({
|
|
36
82
|
materials: {},
|
|
@@ -40,61 +86,75 @@ export const ModuleNewAction = async options => {
|
|
|
40
86
|
});
|
|
41
87
|
let hasOption = false;
|
|
42
88
|
const funcMap = {};
|
|
43
|
-
ModuleActionFunctions.forEach(func => {
|
|
44
|
-
const enable = hasEnabledFunction(
|
|
89
|
+
ModuleActionFunctions.forEach((func) => {
|
|
90
|
+
const enable = hasEnabledFunction(
|
|
91
|
+
func,
|
|
92
|
+
ModuleActionFunctionsDependencies,
|
|
93
|
+
ModuleActionFunctionsDevDependencies,
|
|
94
|
+
ModuleActionFunctionsPeerDependencies,
|
|
95
|
+
cwd
|
|
96
|
+
);
|
|
45
97
|
funcMap[func] = enable;
|
|
46
98
|
if (!enable) {
|
|
47
99
|
hasOption = true;
|
|
48
100
|
}
|
|
49
101
|
});
|
|
50
102
|
if (!hasOption) {
|
|
51
|
-
smith.logger.warn(
|
|
52
|
-
// eslint-disable-next-line no-process-exit
|
|
103
|
+
smith.logger.warn("no option can be enabled");
|
|
53
104
|
process.exit(1);
|
|
54
105
|
}
|
|
55
|
-
const ans =
|
|
106
|
+
const ans = yield formilyAPI.getInputBySchemaFunc(getModuleNewActionSchema, __spreadProps(__spreadValues({}, UserConfig), {
|
|
56
107
|
funcMap
|
|
57
108
|
}));
|
|
58
109
|
const actionType = ans.actionType;
|
|
59
110
|
const action = ans[actionType];
|
|
60
|
-
const generator = getGeneratorPath(
|
|
111
|
+
const generator = getGeneratorPath(
|
|
112
|
+
ModuleNewActionGenerators[actionType][action],
|
|
113
|
+
distTag
|
|
114
|
+
);
|
|
61
115
|
if (!generator) {
|
|
62
116
|
throw new Error(`no valid option`);
|
|
63
117
|
}
|
|
64
118
|
const devDependency = ModuleActionFunctionsDevDependencies[action];
|
|
65
119
|
const dependency = ModuleActionFunctionsDependencies[action];
|
|
66
120
|
const peerDependency = ModuleActionFunctionsPeerDependencies[action];
|
|
67
|
-
const getModulePluginVersion = packageName => {
|
|
121
|
+
const getModulePluginVersion = (packageName) => {
|
|
68
122
|
return getModernPluginVersion(Solution.Module, packageName, {
|
|
69
123
|
registry,
|
|
70
124
|
distTag,
|
|
71
125
|
cwd
|
|
72
126
|
});
|
|
73
127
|
};
|
|
74
|
-
const finalConfig = merge(
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
[
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
128
|
+
const finalConfig = merge(
|
|
129
|
+
UserConfig,
|
|
130
|
+
ans,
|
|
131
|
+
{
|
|
132
|
+
locale: UserConfig.locale || locale,
|
|
133
|
+
packageManager: UserConfig.packageManager || (yield getPackageManager(cwd)),
|
|
134
|
+
distTag
|
|
135
|
+
},
|
|
136
|
+
{
|
|
137
|
+
devDependencies: devDependency ? { [devDependency]: `${yield getModulePluginVersion(devDependency)}` } : {},
|
|
138
|
+
dependencies: dependency ? { [dependency]: `${yield getModulePluginVersion(dependency)}` } : {},
|
|
139
|
+
peerDependencies: peerDependency ? {
|
|
140
|
+
[peerDependency]: `${yield getModulePluginVersion(peerDependency)}`
|
|
141
|
+
} : {}
|
|
142
|
+
}
|
|
143
|
+
);
|
|
144
|
+
const task = [
|
|
145
|
+
{
|
|
146
|
+
name: generator,
|
|
147
|
+
config: finalConfig
|
|
148
|
+
}
|
|
149
|
+
];
|
|
150
|
+
yield smith.forge({
|
|
151
|
+
tasks: task.map((runner) => ({
|
|
95
152
|
generator: runner.name,
|
|
96
153
|
config: runner.config
|
|
97
154
|
})),
|
|
98
155
|
pwd: cwd
|
|
99
156
|
});
|
|
100
|
-
};
|
|
157
|
+
});
|
|
158
|
+
export {
|
|
159
|
+
ModuleNewAction
|
|
160
|
+
};
|
|
@@ -1,17 +1,37 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
var __async = (__this, __arguments, generator) => {
|
|
2
|
+
return new Promise((resolve, reject) => {
|
|
3
|
+
var fulfilled = (value) => {
|
|
4
|
+
try {
|
|
5
|
+
step(generator.next(value));
|
|
6
|
+
} catch (e) {
|
|
7
|
+
reject(e);
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
var rejected = (value) => {
|
|
11
|
+
try {
|
|
12
|
+
step(generator.throw(value));
|
|
13
|
+
} catch (e) {
|
|
14
|
+
reject(e);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
18
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
import path from "path";
|
|
22
|
+
import { merge } from "@modern-js/utils/lodash";
|
|
23
|
+
import { CodeSmith } from "@modern-js/codesmith";
|
|
24
|
+
import { i18n } from "@modern-js/generator-common";
|
|
25
|
+
import { getPackageManager } from "@modern-js/generator-utils";
|
|
6
26
|
import { alreadyRepo } from "./utils";
|
|
7
|
-
const REPO_GENERATOR =
|
|
8
|
-
|
|
27
|
+
const REPO_GENERATOR = "@modern-js/repo-generator";
|
|
28
|
+
const MonorepoNewAction = (options) => __async(void 0, null, function* () {
|
|
9
29
|
const {
|
|
10
|
-
locale =
|
|
11
|
-
distTag =
|
|
30
|
+
locale = "zh",
|
|
31
|
+
distTag = "",
|
|
12
32
|
debug = false,
|
|
13
|
-
registry =
|
|
14
|
-
config =
|
|
33
|
+
registry = "",
|
|
34
|
+
config = "{}",
|
|
15
35
|
plugin = [],
|
|
16
36
|
cwd = process.cwd()
|
|
17
37
|
} = options;
|
|
@@ -19,54 +39,54 @@ export const MonorepoNewAction = async options => {
|
|
|
19
39
|
try {
|
|
20
40
|
UserConfig = JSON.parse(config);
|
|
21
41
|
} catch (e) {
|
|
22
|
-
throw new Error(
|
|
42
|
+
throw new Error("config is not a valid json");
|
|
23
43
|
}
|
|
24
|
-
i18n.changeLanguage({
|
|
25
|
-
locale: UserConfig.locale || locale
|
|
26
|
-
});
|
|
44
|
+
i18n.changeLanguage({ locale: UserConfig.locale || locale });
|
|
27
45
|
const smith = new CodeSmith({
|
|
28
46
|
debug,
|
|
29
47
|
registryUrl: registry
|
|
30
48
|
});
|
|
31
49
|
if (!alreadyRepo(cwd)) {
|
|
32
|
-
smith.logger.warn(
|
|
50
|
+
smith.logger.warn("not valid modern.js repo");
|
|
33
51
|
}
|
|
34
|
-
|
|
35
|
-
// Determine if the plugin is a Monorepo dependency
|
|
36
|
-
const plugins = plugin.map(plugin => {
|
|
52
|
+
const plugins = plugin.map((plugin2) => {
|
|
37
53
|
try {
|
|
38
|
-
return path.join(require.resolve(
|
|
54
|
+
return path.join(require.resolve(plugin2), "../../");
|
|
39
55
|
} catch (e) {
|
|
40
56
|
try {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
return plugin;
|
|
57
|
+
return path.join(require.resolve(plugin2), "../../../../");
|
|
58
|
+
} catch (e2) {
|
|
59
|
+
return plugin2;
|
|
45
60
|
}
|
|
46
61
|
}
|
|
47
62
|
});
|
|
48
63
|
const finalConfig = merge(UserConfig, {
|
|
49
64
|
locale: UserConfig.locale || locale,
|
|
50
|
-
packageManager: UserConfig.packageManager || (
|
|
65
|
+
packageManager: UserConfig.packageManager || (yield getPackageManager(cwd)),
|
|
51
66
|
isMonorepo: true,
|
|
52
67
|
distTag,
|
|
53
68
|
plugins
|
|
54
69
|
});
|
|
55
70
|
let generator = REPO_GENERATOR;
|
|
56
|
-
if (process.env.CODESMITH_ENV ===
|
|
71
|
+
if (process.env.CODESMITH_ENV === "development") {
|
|
57
72
|
generator = require.resolve(generator);
|
|
58
73
|
} else if (distTag) {
|
|
59
74
|
generator = `${generator}@${distTag}`;
|
|
60
75
|
}
|
|
61
|
-
const task = [
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
76
|
+
const task = [
|
|
77
|
+
{
|
|
78
|
+
name: generator,
|
|
79
|
+
config: finalConfig
|
|
80
|
+
}
|
|
81
|
+
];
|
|
82
|
+
yield smith.forge({
|
|
83
|
+
tasks: task.map((runner) => ({
|
|
67
84
|
generator: runner.name,
|
|
68
85
|
config: runner.config
|
|
69
86
|
})),
|
|
70
87
|
pwd: cwd
|
|
71
88
|
});
|
|
72
|
-
};
|
|
89
|
+
});
|
|
90
|
+
export {
|
|
91
|
+
MonorepoNewAction
|
|
92
|
+
};
|
package/dist/js/modern/mwa.js
CHANGED
|
@@ -1,36 +1,85 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __defProps = Object.defineProperties;
|
|
3
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
4
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
7
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
8
|
+
var __spreadValues = (a, b) => {
|
|
9
|
+
for (var prop in b || (b = {}))
|
|
10
|
+
if (__hasOwnProp.call(b, prop))
|
|
11
|
+
__defNormalProp(a, prop, b[prop]);
|
|
12
|
+
if (__getOwnPropSymbols)
|
|
13
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
14
|
+
if (__propIsEnum.call(b, prop))
|
|
15
|
+
__defNormalProp(a, prop, b[prop]);
|
|
16
|
+
}
|
|
17
|
+
return a;
|
|
18
|
+
};
|
|
19
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
|
+
var __async = (__this, __arguments, generator) => {
|
|
21
|
+
return new Promise((resolve, reject) => {
|
|
22
|
+
var fulfilled = (value) => {
|
|
23
|
+
try {
|
|
24
|
+
step(generator.next(value));
|
|
25
|
+
} catch (e) {
|
|
26
|
+
reject(e);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
var rejected = (value) => {
|
|
30
|
+
try {
|
|
31
|
+
step(generator.throw(value));
|
|
32
|
+
} catch (e) {
|
|
33
|
+
reject(e);
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
37
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
import { merge } from "@modern-js/utils/lodash";
|
|
41
|
+
import { CodeSmith } from "@modern-js/codesmith";
|
|
42
|
+
import { FormilyAPI } from "@modern-js/codesmith-formily";
|
|
43
|
+
import {
|
|
44
|
+
getMWANewActionSchema,
|
|
45
|
+
MWAActionFunctions,
|
|
46
|
+
MWAActionReactors,
|
|
47
|
+
MWAActionFunctionsDependencies,
|
|
48
|
+
MWAActionFunctionsAppendTypeContent,
|
|
49
|
+
MWAActionReactorAppendTypeContent,
|
|
50
|
+
MWAActionFunctionsDevDependencies,
|
|
51
|
+
MWANewActionGenerators,
|
|
52
|
+
i18n,
|
|
53
|
+
Solution,
|
|
54
|
+
MWAActionRefactorDependencies
|
|
55
|
+
} from "@modern-js/generator-common";
|
|
56
|
+
import {
|
|
57
|
+
getModernPluginVersion,
|
|
58
|
+
getPackageManager
|
|
59
|
+
} from "@modern-js/generator-utils";
|
|
9
60
|
import { alreadyRepo, getGeneratorPath, hasEnabledFunction } from "./utils";
|
|
10
|
-
|
|
61
|
+
const MWANewAction = (options) => __async(void 0, null, function* () {
|
|
11
62
|
const {
|
|
12
|
-
locale =
|
|
13
|
-
distTag =
|
|
63
|
+
locale = "zh",
|
|
64
|
+
distTag = "",
|
|
14
65
|
debug = false,
|
|
15
|
-
registry =
|
|
16
|
-
config =
|
|
66
|
+
registry = "",
|
|
67
|
+
config = "{}",
|
|
17
68
|
cwd = process.cwd()
|
|
18
69
|
} = options;
|
|
19
70
|
let UserConfig = {};
|
|
20
71
|
try {
|
|
21
72
|
UserConfig = JSON.parse(config);
|
|
22
73
|
} catch (e) {
|
|
23
|
-
throw new Error(
|
|
74
|
+
throw new Error("config is not a valid json");
|
|
24
75
|
}
|
|
25
|
-
i18n.changeLanguage({
|
|
26
|
-
locale: UserConfig.locale || locale
|
|
27
|
-
});
|
|
76
|
+
i18n.changeLanguage({ locale: UserConfig.locale || locale });
|
|
28
77
|
const smith = new CodeSmith({
|
|
29
78
|
debug,
|
|
30
79
|
registryUrl: registry
|
|
31
80
|
});
|
|
32
81
|
if (!alreadyRepo(cwd)) {
|
|
33
|
-
smith.logger.warn(
|
|
82
|
+
smith.logger.warn("not valid modern.js repo");
|
|
34
83
|
}
|
|
35
84
|
const formilyAPI = new FormilyAPI({
|
|
36
85
|
materials: {},
|
|
@@ -39,26 +88,41 @@ export const MWANewAction = async options => {
|
|
|
39
88
|
current: null
|
|
40
89
|
});
|
|
41
90
|
const funcMap = {};
|
|
42
|
-
MWAActionFunctions.forEach(func => {
|
|
43
|
-
const enable = hasEnabledFunction(
|
|
91
|
+
MWAActionFunctions.forEach((func) => {
|
|
92
|
+
const enable = hasEnabledFunction(
|
|
93
|
+
func,
|
|
94
|
+
MWAActionFunctionsDependencies,
|
|
95
|
+
MWAActionFunctionsDevDependencies,
|
|
96
|
+
{},
|
|
97
|
+
cwd
|
|
98
|
+
);
|
|
44
99
|
funcMap[func] = enable;
|
|
45
100
|
});
|
|
46
101
|
const refactorMap = {};
|
|
47
|
-
MWAActionReactors.forEach(refactor => {
|
|
48
|
-
const enable = hasEnabledFunction(
|
|
102
|
+
MWAActionReactors.forEach((refactor) => {
|
|
103
|
+
const enable = hasEnabledFunction(
|
|
104
|
+
refactor,
|
|
105
|
+
MWAActionRefactorDependencies,
|
|
106
|
+
{},
|
|
107
|
+
{},
|
|
108
|
+
cwd
|
|
109
|
+
);
|
|
49
110
|
refactorMap[refactor] = enable;
|
|
50
111
|
});
|
|
51
|
-
const ans =
|
|
112
|
+
const ans = yield formilyAPI.getInputBySchemaFunc(getMWANewActionSchema, __spreadProps(__spreadValues({}, UserConfig), {
|
|
52
113
|
funcMap,
|
|
53
114
|
refactorMap
|
|
54
115
|
}));
|
|
55
116
|
const actionType = ans.actionType;
|
|
56
117
|
const action = ans[actionType];
|
|
57
|
-
const generator = getGeneratorPath(
|
|
118
|
+
const generator = getGeneratorPath(
|
|
119
|
+
MWANewActionGenerators[actionType][action],
|
|
120
|
+
distTag
|
|
121
|
+
);
|
|
58
122
|
if (!generator) {
|
|
59
123
|
throw new Error(`no valid option`);
|
|
60
124
|
}
|
|
61
|
-
const getMwaPluginVersion = packageName => {
|
|
125
|
+
const getMwaPluginVersion = (packageName) => {
|
|
62
126
|
return getModernPluginVersion(Solution.MWA, packageName, {
|
|
63
127
|
registry,
|
|
64
128
|
distTag,
|
|
@@ -67,28 +131,36 @@ export const MWANewAction = async options => {
|
|
|
67
131
|
};
|
|
68
132
|
const devDependency = MWAActionFunctionsDevDependencies[action];
|
|
69
133
|
const dependency = MWAActionFunctionsDependencies[action] || MWAActionRefactorDependencies[action];
|
|
70
|
-
const finalConfig = merge(
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
[
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
134
|
+
const finalConfig = merge(
|
|
135
|
+
UserConfig,
|
|
136
|
+
ans,
|
|
137
|
+
{
|
|
138
|
+
locale: UserConfig.locale || locale,
|
|
139
|
+
packageManager: UserConfig.packageManager || (yield getPackageManager(cwd)),
|
|
140
|
+
distTag
|
|
141
|
+
},
|
|
142
|
+
{
|
|
143
|
+
devDependencies: devDependency ? { [devDependency]: `${yield getMwaPluginVersion(devDependency)}` } : {},
|
|
144
|
+
dependencies: dependency ? {
|
|
145
|
+
[dependency]: `${yield getMwaPluginVersion(dependency)}`
|
|
146
|
+
} : {},
|
|
147
|
+
appendTypeContent: MWAActionFunctionsAppendTypeContent[action] || MWAActionReactorAppendTypeContent[action]
|
|
148
|
+
}
|
|
149
|
+
);
|
|
150
|
+
const task = [
|
|
151
|
+
{
|
|
152
|
+
name: generator,
|
|
153
|
+
config: finalConfig
|
|
154
|
+
}
|
|
155
|
+
];
|
|
156
|
+
yield smith.forge({
|
|
157
|
+
tasks: task.map((runner) => ({
|
|
89
158
|
generator: runner.name,
|
|
90
159
|
config: runner.config
|
|
91
160
|
})),
|
|
92
161
|
pwd: cwd
|
|
93
162
|
});
|
|
94
|
-
};
|
|
163
|
+
});
|
|
164
|
+
export {
|
|
165
|
+
MWANewAction
|
|
166
|
+
};
|
|
@@ -1,51 +1,53 @@
|
|
|
1
|
-
import path from
|
|
2
|
-
import { json5 } from
|
|
3
|
-
import { fs } from
|
|
4
|
-
|
|
1
|
+
import path from "path";
|
|
2
|
+
import { json5 } from "@modern-js/utils";
|
|
3
|
+
import { fs } from "@modern-js/generator-utils";
|
|
4
|
+
function alreadyRepo(cwd = process.cwd()) {
|
|
5
5
|
try {
|
|
6
|
-
return fs.existsSync(path.resolve(cwd,
|
|
6
|
+
return fs.existsSync(path.resolve(cwd, "package.json"));
|
|
7
7
|
} catch (e) {
|
|
8
8
|
return false;
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
|
|
11
|
+
const readJson = (jsonPath) => {
|
|
12
12
|
if (!fs.existsSync(jsonPath)) {
|
|
13
13
|
return {};
|
|
14
14
|
}
|
|
15
|
-
const jsonStr = fs.readFileSync(jsonPath, {
|
|
16
|
-
encoding: 'utf8'
|
|
17
|
-
});
|
|
15
|
+
const jsonStr = fs.readFileSync(jsonPath, { encoding: "utf8" });
|
|
18
16
|
try {
|
|
19
17
|
return json5.parse(jsonStr);
|
|
20
18
|
} catch (error) {
|
|
21
19
|
throw Error(`${jsonPath} is not a valid json, please check and try again.`);
|
|
22
20
|
}
|
|
23
21
|
};
|
|
24
|
-
|
|
22
|
+
function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
|
|
23
|
+
var _a, _b, _c;
|
|
25
24
|
const packageJsonPath = path.normalize(`${cwd}/package.json`);
|
|
26
25
|
const packageJson = readJson(packageJsonPath);
|
|
27
26
|
if (!dependencies[action] && !devDependencies[action]) {
|
|
28
27
|
return false;
|
|
29
28
|
}
|
|
30
29
|
if (dependencies[action]) {
|
|
31
|
-
|
|
32
|
-
return (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[dependencies[action]];
|
|
30
|
+
return (_a = packageJson.dependencies) == null ? void 0 : _a[dependencies[action]];
|
|
33
31
|
}
|
|
34
32
|
if (peerDependencies[action]) {
|
|
35
|
-
|
|
36
|
-
return (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[peerDependencies[action]];
|
|
33
|
+
return (_b = packageJson.peerDependencies) == null ? void 0 : _b[peerDependencies[action]];
|
|
37
34
|
}
|
|
38
35
|
if (!peerDependencies[action] && devDependencies[action]) {
|
|
39
|
-
|
|
40
|
-
return (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[devDependencies[action]];
|
|
36
|
+
return (_c = packageJson.devDependencies) == null ? void 0 : _c[devDependencies[action]];
|
|
41
37
|
}
|
|
42
38
|
return false;
|
|
43
39
|
}
|
|
44
|
-
|
|
45
|
-
if (process.env.CODESMITH_ENV ===
|
|
40
|
+
function getGeneratorPath(generator, distTag) {
|
|
41
|
+
if (process.env.CODESMITH_ENV === "development") {
|
|
46
42
|
return path.dirname(require.resolve(generator));
|
|
47
43
|
} else if (distTag) {
|
|
48
44
|
return `${generator}@${distTag}`;
|
|
49
45
|
}
|
|
50
46
|
return generator;
|
|
51
|
-
}
|
|
47
|
+
}
|
|
48
|
+
export {
|
|
49
|
+
alreadyRepo,
|
|
50
|
+
getGeneratorPath,
|
|
51
|
+
hasEnabledFunction,
|
|
52
|
+
readJson
|
|
53
|
+
};
|