@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/dist/js/node/index.js
CHANGED
|
@@ -1,49 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
Object.defineProperty(exports, key, {
|
|
22
|
-
enumerable: true,
|
|
23
|
-
get: function () {
|
|
24
|
-
return _mwa[key];
|
|
25
|
-
}
|
|
26
|
-
});
|
|
27
|
-
});
|
|
28
|
-
var _module = require("./module");
|
|
29
|
-
Object.keys(_module).forEach(function (key) {
|
|
30
|
-
if (key === "default" || key === "__esModule") return;
|
|
31
|
-
if (key in exports && exports[key] === _module[key]) return;
|
|
32
|
-
Object.defineProperty(exports, key, {
|
|
33
|
-
enumerable: true,
|
|
34
|
-
get: function () {
|
|
35
|
-
return _module[key];
|
|
36
|
-
}
|
|
37
|
-
});
|
|
38
|
-
});
|
|
39
|
-
var _monorepo = require("./monorepo");
|
|
40
|
-
Object.keys(_monorepo).forEach(function (key) {
|
|
41
|
-
if (key === "default" || key === "__esModule") return;
|
|
42
|
-
if (key in exports && exports[key] === _monorepo[key]) return;
|
|
43
|
-
Object.defineProperty(exports, key, {
|
|
44
|
-
enumerable: true,
|
|
45
|
-
get: function () {
|
|
46
|
-
return _monorepo[key];
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
});
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __copyProps = (to, from, except, desc) => {
|
|
6
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
7
|
+
for (let key of __getOwnPropNames(from))
|
|
8
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
9
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
10
|
+
}
|
|
11
|
+
return to;
|
|
12
|
+
};
|
|
13
|
+
var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
|
|
14
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
15
|
+
var stdin_exports = {};
|
|
16
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
17
|
+
__reExport(stdin_exports, require("./utils"), module.exports);
|
|
18
|
+
__reExport(stdin_exports, require("./mwa"), module.exports);
|
|
19
|
+
__reExport(stdin_exports, require("./module"), module.exports);
|
|
20
|
+
__reExport(stdin_exports, require("./monorepo"), module.exports);
|
package/dist/js/node/module.js
CHANGED
|
@@ -1,44 +1,94 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
ModuleNewAction: () => ModuleNewAction
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
23
|
+
var import_lodash = require("@modern-js/utils/lodash");
|
|
24
|
+
var import_codesmith = require("@modern-js/codesmith");
|
|
25
|
+
var import_codesmith_formily = require("@modern-js/codesmith-formily");
|
|
26
|
+
var import_generator_common = require("@modern-js/generator-common");
|
|
27
|
+
var import_generator_utils = require("@modern-js/generator-utils");
|
|
28
|
+
var import_utils = require("./utils");
|
|
29
|
+
var __defProp2 = Object.defineProperty;
|
|
30
|
+
var __defProps = Object.defineProperties;
|
|
31
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
32
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
33
|
+
var __hasOwnProp2 = Object.prototype.hasOwnProperty;
|
|
34
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
35
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
36
|
+
var __spreadValues = (a, b) => {
|
|
37
|
+
for (var prop in b || (b = {}))
|
|
38
|
+
if (__hasOwnProp2.call(b, prop))
|
|
39
|
+
__defNormalProp(a, prop, b[prop]);
|
|
40
|
+
if (__getOwnPropSymbols)
|
|
41
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
42
|
+
if (__propIsEnum.call(b, prop))
|
|
43
|
+
__defNormalProp(a, prop, b[prop]);
|
|
44
|
+
}
|
|
45
|
+
return a;
|
|
46
|
+
};
|
|
47
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
48
|
+
var __async = (__this, __arguments, generator) => {
|
|
49
|
+
return new Promise((resolve, reject) => {
|
|
50
|
+
var fulfilled = (value) => {
|
|
51
|
+
try {
|
|
52
|
+
step(generator.next(value));
|
|
53
|
+
} catch (e) {
|
|
54
|
+
reject(e);
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
var rejected = (value) => {
|
|
58
|
+
try {
|
|
59
|
+
step(generator.throw(value));
|
|
60
|
+
} catch (e) {
|
|
61
|
+
reject(e);
|
|
62
|
+
}
|
|
63
|
+
};
|
|
64
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
65
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
66
|
+
});
|
|
67
|
+
};
|
|
68
|
+
const ModuleNewAction = (options) => __async(void 0, null, function* () {
|
|
17
69
|
const {
|
|
18
|
-
locale =
|
|
19
|
-
distTag =
|
|
70
|
+
locale = "zh",
|
|
71
|
+
distTag = "",
|
|
20
72
|
debug = false,
|
|
21
|
-
registry =
|
|
22
|
-
config =
|
|
73
|
+
registry = "",
|
|
74
|
+
config = "{}",
|
|
23
75
|
cwd = process.cwd()
|
|
24
76
|
} = options;
|
|
25
77
|
let UserConfig = {};
|
|
26
78
|
try {
|
|
27
79
|
UserConfig = JSON.parse(config);
|
|
28
80
|
} catch (e) {
|
|
29
|
-
throw new Error(
|
|
81
|
+
throw new Error("config is not a valid json");
|
|
30
82
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
});
|
|
34
|
-
const smith = new _codesmith.CodeSmith({
|
|
83
|
+
import_generator_common.i18n.changeLanguage({ locale: UserConfig.locale || locale });
|
|
84
|
+
const smith = new import_codesmith.CodeSmith({
|
|
35
85
|
debug,
|
|
36
86
|
registryUrl: registry
|
|
37
87
|
});
|
|
38
|
-
if (!(0,
|
|
39
|
-
smith.logger.warn(
|
|
88
|
+
if (!(0, import_utils.alreadyRepo)(cwd)) {
|
|
89
|
+
smith.logger.warn("not valid modern.js repo");
|
|
40
90
|
}
|
|
41
|
-
const formilyAPI = new
|
|
91
|
+
const formilyAPI = new import_codesmith_formily.FormilyAPI({
|
|
42
92
|
materials: {},
|
|
43
93
|
config: {},
|
|
44
94
|
data: {},
|
|
@@ -46,62 +96,72 @@ const ModuleNewAction = async options => {
|
|
|
46
96
|
});
|
|
47
97
|
let hasOption = false;
|
|
48
98
|
const funcMap = {};
|
|
49
|
-
|
|
50
|
-
const enable = (0,
|
|
99
|
+
import_generator_common.ModuleActionFunctions.forEach((func) => {
|
|
100
|
+
const enable = (0, import_utils.hasEnabledFunction)(
|
|
101
|
+
func,
|
|
102
|
+
import_generator_common.ModuleActionFunctionsDependencies,
|
|
103
|
+
import_generator_common.ModuleActionFunctionsDevDependencies,
|
|
104
|
+
import_generator_common.ModuleActionFunctionsPeerDependencies,
|
|
105
|
+
cwd
|
|
106
|
+
);
|
|
51
107
|
funcMap[func] = enable;
|
|
52
108
|
if (!enable) {
|
|
53
109
|
hasOption = true;
|
|
54
110
|
}
|
|
55
111
|
});
|
|
56
112
|
if (!hasOption) {
|
|
57
|
-
smith.logger.warn(
|
|
58
|
-
// eslint-disable-next-line no-process-exit
|
|
113
|
+
smith.logger.warn("no option can be enabled");
|
|
59
114
|
process.exit(1);
|
|
60
115
|
}
|
|
61
|
-
const ans =
|
|
116
|
+
const ans = yield formilyAPI.getInputBySchemaFunc(import_generator_common.getModuleNewActionSchema, __spreadProps(__spreadValues({}, UserConfig), {
|
|
62
117
|
funcMap
|
|
63
118
|
}));
|
|
64
119
|
const actionType = ans.actionType;
|
|
65
120
|
const action = ans[actionType];
|
|
66
|
-
const generator = (0,
|
|
121
|
+
const generator = (0, import_utils.getGeneratorPath)(
|
|
122
|
+
import_generator_common.ModuleNewActionGenerators[actionType][action],
|
|
123
|
+
distTag
|
|
124
|
+
);
|
|
67
125
|
if (!generator) {
|
|
68
126
|
throw new Error(`no valid option`);
|
|
69
127
|
}
|
|
70
|
-
const devDependency =
|
|
71
|
-
const dependency =
|
|
72
|
-
const peerDependency =
|
|
73
|
-
const getModulePluginVersion = packageName => {
|
|
74
|
-
return (0,
|
|
128
|
+
const devDependency = import_generator_common.ModuleActionFunctionsDevDependencies[action];
|
|
129
|
+
const dependency = import_generator_common.ModuleActionFunctionsDependencies[action];
|
|
130
|
+
const peerDependency = import_generator_common.ModuleActionFunctionsPeerDependencies[action];
|
|
131
|
+
const getModulePluginVersion = (packageName) => {
|
|
132
|
+
return (0, import_generator_utils.getModernPluginVersion)(import_generator_common.Solution.Module, packageName, {
|
|
75
133
|
registry,
|
|
76
134
|
distTag,
|
|
77
135
|
cwd
|
|
78
136
|
});
|
|
79
137
|
};
|
|
80
|
-
const finalConfig = (0,
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
[
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
138
|
+
const finalConfig = (0, import_lodash.merge)(
|
|
139
|
+
UserConfig,
|
|
140
|
+
ans,
|
|
141
|
+
{
|
|
142
|
+
locale: UserConfig.locale || locale,
|
|
143
|
+
packageManager: UserConfig.packageManager || (yield (0, import_generator_utils.getPackageManager)(cwd)),
|
|
144
|
+
distTag
|
|
145
|
+
},
|
|
146
|
+
{
|
|
147
|
+
devDependencies: devDependency ? { [devDependency]: `${yield getModulePluginVersion(devDependency)}` } : {},
|
|
148
|
+
dependencies: dependency ? { [dependency]: `${yield getModulePluginVersion(dependency)}` } : {},
|
|
149
|
+
peerDependencies: peerDependency ? {
|
|
150
|
+
[peerDependency]: `${yield getModulePluginVersion(peerDependency)}`
|
|
151
|
+
} : {}
|
|
152
|
+
}
|
|
153
|
+
);
|
|
154
|
+
const task = [
|
|
155
|
+
{
|
|
156
|
+
name: generator,
|
|
157
|
+
config: finalConfig
|
|
158
|
+
}
|
|
159
|
+
];
|
|
160
|
+
yield smith.forge({
|
|
161
|
+
tasks: task.map((runner) => ({
|
|
101
162
|
generator: runner.name,
|
|
102
163
|
config: runner.config
|
|
103
164
|
})),
|
|
104
165
|
pwd: cwd
|
|
105
166
|
});
|
|
106
|
-
};
|
|
107
|
-
exports.ModuleNewAction = ModuleNewAction;
|
|
167
|
+
});
|
package/dist/js/node/monorepo.js
CHANGED
|
@@ -1,24 +1,65 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
6
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
+
var __export = (target, all) => {
|
|
8
|
+
for (var name in all)
|
|
9
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
10
|
+
};
|
|
11
|
+
var __copyProps = (to, from, except, desc) => {
|
|
12
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
13
|
+
for (let key of __getOwnPropNames(from))
|
|
14
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
15
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
16
|
+
}
|
|
17
|
+
return to;
|
|
18
|
+
};
|
|
19
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
20
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
21
|
+
mod
|
|
22
|
+
));
|
|
23
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
+
var stdin_exports = {};
|
|
25
|
+
__export(stdin_exports, {
|
|
26
|
+
MonorepoNewAction: () => MonorepoNewAction
|
|
5
27
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
28
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
29
|
+
var import_path = __toESM(require("path"));
|
|
30
|
+
var import_lodash = require("@modern-js/utils/lodash");
|
|
31
|
+
var import_codesmith = require("@modern-js/codesmith");
|
|
32
|
+
var import_generator_common = require("@modern-js/generator-common");
|
|
33
|
+
var import_generator_utils = require("@modern-js/generator-utils");
|
|
34
|
+
var import_utils = require("./utils");
|
|
35
|
+
var __async = (__this, __arguments, generator) => {
|
|
36
|
+
return new Promise((resolve, reject) => {
|
|
37
|
+
var fulfilled = (value) => {
|
|
38
|
+
try {
|
|
39
|
+
step(generator.next(value));
|
|
40
|
+
} catch (e) {
|
|
41
|
+
reject(e);
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
var rejected = (value) => {
|
|
45
|
+
try {
|
|
46
|
+
step(generator.throw(value));
|
|
47
|
+
} catch (e) {
|
|
48
|
+
reject(e);
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
52
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
53
|
+
});
|
|
54
|
+
};
|
|
55
|
+
const REPO_GENERATOR = "@modern-js/repo-generator";
|
|
56
|
+
const MonorepoNewAction = (options) => __async(void 0, null, function* () {
|
|
16
57
|
const {
|
|
17
|
-
locale =
|
|
18
|
-
distTag =
|
|
58
|
+
locale = "zh",
|
|
59
|
+
distTag = "",
|
|
19
60
|
debug = false,
|
|
20
|
-
registry =
|
|
21
|
-
config =
|
|
61
|
+
registry = "",
|
|
62
|
+
config = "{}",
|
|
22
63
|
plugin = [],
|
|
23
64
|
cwd = process.cwd()
|
|
24
65
|
} = options;
|
|
@@ -26,55 +67,51 @@ const MonorepoNewAction = async options => {
|
|
|
26
67
|
try {
|
|
27
68
|
UserConfig = JSON.parse(config);
|
|
28
69
|
} catch (e) {
|
|
29
|
-
throw new Error(
|
|
70
|
+
throw new Error("config is not a valid json");
|
|
30
71
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
});
|
|
34
|
-
const smith = new _codesmith.CodeSmith({
|
|
72
|
+
import_generator_common.i18n.changeLanguage({ locale: UserConfig.locale || locale });
|
|
73
|
+
const smith = new import_codesmith.CodeSmith({
|
|
35
74
|
debug,
|
|
36
75
|
registryUrl: registry
|
|
37
76
|
});
|
|
38
|
-
if (!(0,
|
|
39
|
-
smith.logger.warn(
|
|
77
|
+
if (!(0, import_utils.alreadyRepo)(cwd)) {
|
|
78
|
+
smith.logger.warn("not valid modern.js repo");
|
|
40
79
|
}
|
|
41
|
-
|
|
42
|
-
// Determine if the plugin is a Monorepo dependency
|
|
43
|
-
const plugins = plugin.map(plugin => {
|
|
80
|
+
const plugins = plugin.map((plugin2) => {
|
|
44
81
|
try {
|
|
45
|
-
return
|
|
82
|
+
return import_path.default.join(require.resolve(plugin2), "../../");
|
|
46
83
|
} catch (e) {
|
|
47
84
|
try {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
return plugin;
|
|
85
|
+
return import_path.default.join(require.resolve(plugin2), "../../../../");
|
|
86
|
+
} catch (e2) {
|
|
87
|
+
return plugin2;
|
|
52
88
|
}
|
|
53
89
|
}
|
|
54
90
|
});
|
|
55
|
-
const finalConfig = (0,
|
|
91
|
+
const finalConfig = (0, import_lodash.merge)(UserConfig, {
|
|
56
92
|
locale: UserConfig.locale || locale,
|
|
57
|
-
packageManager: UserConfig.packageManager || (
|
|
93
|
+
packageManager: UserConfig.packageManager || (yield (0, import_generator_utils.getPackageManager)(cwd)),
|
|
58
94
|
isMonorepo: true,
|
|
59
95
|
distTag,
|
|
60
96
|
plugins
|
|
61
97
|
});
|
|
62
98
|
let generator = REPO_GENERATOR;
|
|
63
|
-
if (process.env.CODESMITH_ENV ===
|
|
99
|
+
if (process.env.CODESMITH_ENV === "development") {
|
|
64
100
|
generator = require.resolve(generator);
|
|
65
101
|
} else if (distTag) {
|
|
66
102
|
generator = `${generator}@${distTag}`;
|
|
67
103
|
}
|
|
68
|
-
const task = [
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
104
|
+
const task = [
|
|
105
|
+
{
|
|
106
|
+
name: generator,
|
|
107
|
+
config: finalConfig
|
|
108
|
+
}
|
|
109
|
+
];
|
|
110
|
+
yield smith.forge({
|
|
111
|
+
tasks: task.map((runner) => ({
|
|
74
112
|
generator: runner.name,
|
|
75
113
|
config: runner.config
|
|
76
114
|
})),
|
|
77
115
|
pwd: cwd
|
|
78
116
|
});
|
|
79
|
-
};
|
|
80
|
-
exports.MonorepoNewAction = MonorepoNewAction;
|
|
117
|
+
});
|