@modern-js/generator-utils 3.0.0-beta.3 → 3.0.0-beta.5
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 +65 -0
- package/dist/js/modern/index.js +180 -108
- package/dist/js/modern/locale/en.js +7 -8
- package/dist/js/modern/locale/index.js +6 -6
- package/dist/js/modern/locale/zh.js +7 -8
- package/dist/js/modern/utils/fs-exist.js +37 -0
- package/dist/js/modern/utils/index.js +1 -1
- package/dist/js/modern/utils/package.js +73 -55
- package/dist/js/modern/utils/strip-ansi.js +13 -9
- package/dist/js/node/index.js +208 -219
- package/dist/js/node/locale/en.js +27 -12
- package/dist/js/node/locale/index.js +31 -14
- package/dist/js/node/locale/zh.js +27 -12
- package/dist/js/node/utils/fs-exist.js +60 -0
- package/dist/js/node/utils/index.js +18 -27
- package/dist/js/node/utils/package.js +99 -63
- package/dist/js/node/utils/strip-ansi.js +34 -13
- package/dist/types/index.d.ts +2 -1
- package/dist/types/utils/fs-exist.d.ts +1 -0
- package/dist/types/utils/package.d.ts +1 -0
- package/package.json +7 -7
|
@@ -1,27 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
if (key === "default" || key === "__esModule") return;
|
|
20
|
-
if (key in exports && exports[key] === _package[key]) return;
|
|
21
|
-
Object.defineProperty(exports, key, {
|
|
22
|
-
enumerable: true,
|
|
23
|
-
get: function () {
|
|
24
|
-
return _package[key];
|
|
25
|
-
}
|
|
26
|
-
});
|
|
27
|
-
});
|
|
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 utils_exports = {};
|
|
16
|
+
module.exports = __toCommonJS(utils_exports);
|
|
17
|
+
__reExport(utils_exports, require("./strip-ansi"), module.exports);
|
|
18
|
+
__reExport(utils_exports, require("./package"), module.exports);
|
|
@@ -1,44 +1,77 @@
|
|
|
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 __async = (__this, __arguments, generator) => {
|
|
19
|
+
return new Promise((resolve, reject) => {
|
|
20
|
+
var fulfilled = (value) => {
|
|
21
|
+
try {
|
|
22
|
+
step(generator.next(value));
|
|
23
|
+
} catch (e) {
|
|
24
|
+
reject(e);
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
var rejected = (value) => {
|
|
28
|
+
try {
|
|
29
|
+
step(generator.throw(value));
|
|
30
|
+
} catch (e) {
|
|
31
|
+
reject(e);
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
35
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
36
|
+
});
|
|
37
|
+
};
|
|
38
|
+
var package_exports = {};
|
|
39
|
+
__export(package_exports, {
|
|
40
|
+
getAvailableVersion: () => getAvailableVersion,
|
|
41
|
+
isPackageDeprecated: () => isPackageDeprecated,
|
|
42
|
+
isPackageExist: () => isPackageExist,
|
|
43
|
+
semverDecrease: () => semverDecrease
|
|
5
44
|
});
|
|
6
|
-
exports
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
45
|
+
module.exports = __toCommonJS(package_exports);
|
|
46
|
+
var import_utils = require("@modern-js/utils");
|
|
47
|
+
function isPackageExist(packageName, registry) {
|
|
48
|
+
return __async(this, null, function* () {
|
|
49
|
+
if (yield (0, import_utils.canUseNpm)()) {
|
|
50
|
+
const args = ["view", packageName, "version"];
|
|
51
|
+
if (registry) {
|
|
52
|
+
args.push(`--registry=${registry}`);
|
|
53
|
+
}
|
|
54
|
+
const result = yield (0, import_utils.execa)("npm", args);
|
|
55
|
+
return (0, import_utils.stripAnsi)(result.stdout);
|
|
17
56
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
21
|
-
throw new Error('not found npm, please install npm before');
|
|
57
|
+
throw new Error("not found npm, please install npm before");
|
|
58
|
+
});
|
|
22
59
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
60
|
+
function isPackageDeprecated(packageName, registry) {
|
|
61
|
+
return __async(this, null, function* () {
|
|
62
|
+
if (yield (0, import_utils.canUseNpm)()) {
|
|
63
|
+
const args = ["view", packageName, "deprecated"];
|
|
64
|
+
if (registry) {
|
|
65
|
+
args.push(`--registry=${registry}`);
|
|
66
|
+
}
|
|
67
|
+
const result = yield (0, import_utils.execa)("npm", args);
|
|
68
|
+
return (0, import_utils.stripAnsi)(result.stdout);
|
|
30
69
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
34
|
-
throw new Error('not found npm, please install npm before');
|
|
70
|
+
throw new Error("not found npm, please install npm before");
|
|
71
|
+
});
|
|
35
72
|
}
|
|
36
|
-
|
|
37
|
-
// 降低包小版本号
|
|
38
73
|
function semverDecrease(version) {
|
|
39
|
-
const versionObj =
|
|
40
|
-
loose: true
|
|
41
|
-
});
|
|
74
|
+
const versionObj = import_utils.semver.parse(version, { loose: true });
|
|
42
75
|
if (!versionObj) {
|
|
43
76
|
throw new Error(`Version ${version} is not valid semver`);
|
|
44
77
|
}
|
|
@@ -46,37 +79,40 @@ function semverDecrease(version) {
|
|
|
46
79
|
versionObj.prerelease = [];
|
|
47
80
|
versionObj.patch--;
|
|
48
81
|
const result = versionObj.format();
|
|
49
|
-
if (!
|
|
50
|
-
|
|
82
|
+
if (!import_utils.semver.valid(result)) {
|
|
83
|
+
import_utils.logger.debug(`Version ${result} is not valid semver`);
|
|
51
84
|
return version;
|
|
52
85
|
}
|
|
53
86
|
return result;
|
|
54
87
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
version = _utils.semver.inc(version, 'patch');
|
|
67
|
-
times--;
|
|
68
|
-
continue;
|
|
88
|
+
function getAvailableVersion(packageName, currentVersion, registry) {
|
|
89
|
+
return __async(this, null, function* () {
|
|
90
|
+
let times = 5;
|
|
91
|
+
let version = currentVersion;
|
|
92
|
+
while (times) {
|
|
93
|
+
if (!(yield isPackageExist(`${packageName}@${version}`, registry)) || (yield isPackageDeprecated(`${packageName}@${version}`, registry))) {
|
|
94
|
+
version = import_utils.semver.inc(version, "patch");
|
|
95
|
+
times--;
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
return version;
|
|
69
99
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
100
|
+
times = 5;
|
|
101
|
+
while (times) {
|
|
102
|
+
version = semverDecrease(version);
|
|
103
|
+
if (!(yield isPackageExist(`${packageName}@${version}`, registry)) || (yield isPackageDeprecated(`${packageName}@${version}`, registry))) {
|
|
104
|
+
times--;
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
return version;
|
|
78
108
|
}
|
|
79
|
-
return
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
|
|
109
|
+
return currentVersion;
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
113
|
+
0 && (module.exports = {
|
|
114
|
+
getAvailableVersion,
|
|
115
|
+
isPackageDeprecated,
|
|
116
|
+
isPackageExist,
|
|
117
|
+
semverDecrease
|
|
118
|
+
});
|
|
@@ -1,18 +1,39 @@
|
|
|
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 strip_ansi_exports = {};
|
|
19
|
+
__export(strip_ansi_exports, {
|
|
20
|
+
stripAnsi: () => stripAnsi
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
function ansiRegex({
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
22
|
+
module.exports = __toCommonJS(strip_ansi_exports);
|
|
23
|
+
function ansiRegex({ onlyFirst = false } = {}) {
|
|
24
|
+
const pattern = [
|
|
25
|
+
"[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
|
|
26
|
+
"(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"
|
|
27
|
+
].join("|");
|
|
28
|
+
return new RegExp(pattern, onlyFirst ? void 0 : "g");
|
|
12
29
|
}
|
|
13
30
|
function stripAnsi(string) {
|
|
14
|
-
if (typeof string !==
|
|
31
|
+
if (typeof string !== "string") {
|
|
15
32
|
throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
|
|
16
33
|
}
|
|
17
|
-
return string.replace(ansiRegex(),
|
|
18
|
-
}
|
|
34
|
+
return string.replace(ansiRegex(), "");
|
|
35
|
+
}
|
|
36
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
37
|
+
0 && (module.exports = {
|
|
38
|
+
stripAnsi
|
|
39
|
+
});
|
package/dist/types/index.d.ts
CHANGED
|
@@ -35,4 +35,5 @@ export declare function validatePackagePath(value: string, projectDir: string, o
|
|
|
35
35
|
error?: undefined;
|
|
36
36
|
};
|
|
37
37
|
export declare function getModuleProjectPath(packagePath: string, isMonorepoSubProject: boolean, isPublic: boolean, isLocalPackages: boolean): string;
|
|
38
|
-
export declare function getMWAProjectPath(packagePath: string, isMonorepoSubProject: boolean, isTest?: boolean): string;
|
|
38
|
+
export declare function getMWAProjectPath(packagePath: string, isMonorepoSubProject: boolean, isTest?: boolean): string;
|
|
39
|
+
export declare function getModernConfigFile(appDir: string): Promise<"modern.config.ts" | "modern.config.js">;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function fileExist(filePath: string): Promise<boolean>;
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"modern",
|
|
12
12
|
"modern.js"
|
|
13
13
|
],
|
|
14
|
-
"version": "3.0.0-beta.
|
|
14
|
+
"version": "3.0.0-beta.5",
|
|
15
15
|
"jsnext:source": "./src/index.ts",
|
|
16
16
|
"types": "./dist/types/index.d.ts",
|
|
17
17
|
"main": "./dist/js/node/index.js",
|
|
@@ -28,18 +28,18 @@
|
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@babel/runtime": "^7.18.0",
|
|
31
|
-
"@modern-js/plugin-i18n": "2.0.0-beta.
|
|
32
|
-
"@modern-js/generator-common": "3.0.0-beta.
|
|
33
|
-
"@modern-js/utils": "2.0.0-beta.
|
|
31
|
+
"@modern-js/plugin-i18n": "2.0.0-beta.6",
|
|
32
|
+
"@modern-js/generator-common": "3.0.0-beta.5",
|
|
33
|
+
"@modern-js/utils": "2.0.0-beta.6"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@modern-js/codesmith": "2.0.
|
|
36
|
+
"@modern-js/codesmith": "2.0.3",
|
|
37
37
|
"@types/jest": "^27",
|
|
38
38
|
"@types/node": "^14",
|
|
39
39
|
"jest": "^27",
|
|
40
40
|
"typescript": "^4",
|
|
41
|
-
"@scripts/build": "2.0.0-beta.
|
|
42
|
-
"@scripts/jest-config": "2.0.0-beta.
|
|
41
|
+
"@scripts/build": "2.0.0-beta.6",
|
|
42
|
+
"@scripts/jest-config": "2.0.0-beta.6"
|
|
43
43
|
},
|
|
44
44
|
"sideEffects": false,
|
|
45
45
|
"modernConfig": {
|