@modern-js/generator-utils 1.0.0-rc.2 → 1.0.0-rc.3
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 +9 -0
- package/README.md +1 -1
- package/dist/js/modern/index.js +10 -1
- package/dist/js/node/index.js +19 -9
- package/dist/js/node/utils/env.js +1 -1
- package/package.json +12 -7
- package/src/index.ts +8 -0
- package/tests/{index.ts → index.test.ts} +1 -1
package/CHANGELOG.md
ADDED
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
<p align="center">
|
|
3
|
-
<a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs.png" width="300" alt="Modern.js Logo" /></a>
|
|
3
|
+
<a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png" width="300" alt="Modern.js Logo" /></a>
|
|
4
4
|
</p>
|
|
5
5
|
|
|
6
6
|
<p align="center">现代 Web 工程体系</p>
|
package/dist/js/modern/index.js
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import os from 'os';
|
|
3
3
|
import execa from 'execa';
|
|
4
|
+
import ora from 'ora';
|
|
4
5
|
import { fs, getMonorepoPackages } from '@modern-js/utils';
|
|
5
6
|
import { canUseNpm, canUsePnpm, canUseYarn } from "./utils/env";
|
|
6
7
|
import { stripAnsi } from "./utils/strip-ansi";
|
|
7
8
|
import { i18n, localeKeys } from "./locale";
|
|
8
9
|
export * from "./utils";
|
|
9
10
|
export { fs } from '@modern-js/utils';
|
|
10
|
-
export { i18n } from "./locale";
|
|
11
|
+
export { i18n } from "./locale"; // eslint-disable-next-line max-statements
|
|
12
|
+
|
|
11
13
|
export async function getPackageVersion(packageName, registry) {
|
|
14
|
+
const spinner = ora('Loading...').start();
|
|
15
|
+
spinner.color = 'yellow';
|
|
16
|
+
|
|
12
17
|
if (await canUsePnpm()) {
|
|
13
18
|
const args = ['info', packageName, 'version'];
|
|
14
19
|
|
|
@@ -17,6 +22,7 @@ export async function getPackageVersion(packageName, registry) {
|
|
|
17
22
|
}
|
|
18
23
|
|
|
19
24
|
const result = await execa('pnpm', args);
|
|
25
|
+
spinner.stop();
|
|
20
26
|
return stripAnsi(result.stdout);
|
|
21
27
|
}
|
|
22
28
|
|
|
@@ -28,6 +34,7 @@ export async function getPackageVersion(packageName, registry) {
|
|
|
28
34
|
}
|
|
29
35
|
|
|
30
36
|
const result = await execa('yarn', args);
|
|
37
|
+
spinner.stop();
|
|
31
38
|
return stripAnsi(result.stdout);
|
|
32
39
|
}
|
|
33
40
|
|
|
@@ -39,9 +46,11 @@ export async function getPackageVersion(packageName, registry) {
|
|
|
39
46
|
}
|
|
40
47
|
|
|
41
48
|
const result = await execa('npm', args);
|
|
49
|
+
spinner.stop();
|
|
42
50
|
return stripAnsi(result.stdout);
|
|
43
51
|
}
|
|
44
52
|
|
|
53
|
+
spinner.stop();
|
|
45
54
|
throw new Error('not found npm, please install npm before');
|
|
46
55
|
}
|
|
47
56
|
export function getPackageManager(cwd = process.cwd()) {
|
package/dist/js/node/index.js
CHANGED
|
@@ -16,27 +16,27 @@ var _exportNames = {
|
|
|
16
16
|
fs: true,
|
|
17
17
|
i18n: true
|
|
18
18
|
};
|
|
19
|
-
exports.getPackageVersion = getPackageVersion;
|
|
20
|
-
exports.getPackageManager = getPackageManager;
|
|
21
|
-
exports.isTsProject = isTsProject;
|
|
22
|
-
exports.getPackageObj = getPackageObj;
|
|
23
|
-
exports.getAllPackages = getAllPackages;
|
|
24
|
-
exports.validatePackageName = validatePackageName;
|
|
25
|
-
exports.validatePackagePath = validatePackagePath;
|
|
26
|
-
exports.getModuleProjectPath = getModuleProjectPath;
|
|
27
|
-
exports.getMWAProjectPath = getMWAProjectPath;
|
|
28
19
|
Object.defineProperty(exports, "fs", {
|
|
29
20
|
enumerable: true,
|
|
30
21
|
get: function () {
|
|
31
22
|
return _utils.fs;
|
|
32
23
|
}
|
|
33
24
|
});
|
|
25
|
+
exports.getAllPackages = getAllPackages;
|
|
26
|
+
exports.getMWAProjectPath = getMWAProjectPath;
|
|
27
|
+
exports.getModuleProjectPath = getModuleProjectPath;
|
|
28
|
+
exports.getPackageManager = getPackageManager;
|
|
29
|
+
exports.getPackageObj = getPackageObj;
|
|
30
|
+
exports.getPackageVersion = getPackageVersion;
|
|
34
31
|
Object.defineProperty(exports, "i18n", {
|
|
35
32
|
enumerable: true,
|
|
36
33
|
get: function () {
|
|
37
34
|
return _locale.i18n;
|
|
38
35
|
}
|
|
39
36
|
});
|
|
37
|
+
exports.isTsProject = isTsProject;
|
|
38
|
+
exports.validatePackageName = validatePackageName;
|
|
39
|
+
exports.validatePackagePath = validatePackagePath;
|
|
40
40
|
|
|
41
41
|
var _path = _interopRequireDefault(require("path"));
|
|
42
42
|
|
|
@@ -44,6 +44,8 @@ var _os = _interopRequireDefault(require("os"));
|
|
|
44
44
|
|
|
45
45
|
var _execa = _interopRequireDefault(require("execa"));
|
|
46
46
|
|
|
47
|
+
var _ora = _interopRequireDefault(require("ora"));
|
|
48
|
+
|
|
47
49
|
var _utils = require("@modern-js/utils");
|
|
48
50
|
|
|
49
51
|
var _env = require("./utils/env");
|
|
@@ -68,7 +70,11 @@ Object.keys(_utils2).forEach(function (key) {
|
|
|
68
70
|
|
|
69
71
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
70
72
|
|
|
73
|
+
// eslint-disable-next-line max-statements
|
|
71
74
|
async function getPackageVersion(packageName, registry) {
|
|
75
|
+
const spinner = (0, _ora.default)('Loading...').start();
|
|
76
|
+
spinner.color = 'yellow';
|
|
77
|
+
|
|
72
78
|
if (await (0, _env.canUsePnpm)()) {
|
|
73
79
|
const args = ['info', packageName, 'version'];
|
|
74
80
|
|
|
@@ -77,6 +83,7 @@ async function getPackageVersion(packageName, registry) {
|
|
|
77
83
|
}
|
|
78
84
|
|
|
79
85
|
const result = await (0, _execa.default)('pnpm', args);
|
|
86
|
+
spinner.stop();
|
|
80
87
|
return (0, _stripAnsi.stripAnsi)(result.stdout);
|
|
81
88
|
}
|
|
82
89
|
|
|
@@ -88,6 +95,7 @@ async function getPackageVersion(packageName, registry) {
|
|
|
88
95
|
}
|
|
89
96
|
|
|
90
97
|
const result = await (0, _execa.default)('yarn', args);
|
|
98
|
+
spinner.stop();
|
|
91
99
|
return (0, _stripAnsi.stripAnsi)(result.stdout);
|
|
92
100
|
}
|
|
93
101
|
|
|
@@ -99,9 +107,11 @@ async function getPackageVersion(packageName, registry) {
|
|
|
99
107
|
}
|
|
100
108
|
|
|
101
109
|
const result = await (0, _execa.default)('npm', args);
|
|
110
|
+
spinner.stop();
|
|
102
111
|
return (0, _stripAnsi.stripAnsi)(result.stdout);
|
|
103
112
|
}
|
|
104
113
|
|
|
114
|
+
spinner.stop();
|
|
105
115
|
throw new Error('not found npm, please install npm before');
|
|
106
116
|
}
|
|
107
117
|
|
|
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.canUseNpm = canUseNpm;
|
|
7
|
-
exports.canUseYarn = canUseYarn;
|
|
8
7
|
exports.canUsePnpm = canUsePnpm;
|
|
8
|
+
exports.canUseYarn = canUseYarn;
|
|
9
9
|
|
|
10
10
|
var _execa = _interopRequireDefault(require("execa"));
|
|
11
11
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@modern-js/generator-utils",
|
|
3
|
-
"version": "1.0.0-rc.
|
|
3
|
+
"version": "1.0.0-rc.3",
|
|
4
4
|
"jsnext:source": "./src/index.ts",
|
|
5
5
|
"types": "./dist/types/index.d.ts",
|
|
6
6
|
"main": "./dist/js/node/index.js",
|
|
@@ -17,17 +17,18 @@
|
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@babel/runtime": "^7",
|
|
20
|
-
"@modern-js/plugin-i18n": "^1.0.0-rc.
|
|
21
|
-
"@modern-js/utils": "^1.0.0-rc.
|
|
22
|
-
"execa": "^5.1.1"
|
|
20
|
+
"@modern-js/plugin-i18n": "^1.0.0-rc.3",
|
|
21
|
+
"@modern-js/utils": "^1.0.0-rc.3",
|
|
22
|
+
"execa": "^5.1.1",
|
|
23
|
+
"ora": "^5.4.1"
|
|
23
24
|
},
|
|
24
25
|
"devDependencies": {
|
|
25
|
-
"@modern-js/codesmith": "^1.0.0-rc.
|
|
26
|
+
"@modern-js/codesmith": "^1.0.0-rc.10",
|
|
26
27
|
"@types/jest": "^26",
|
|
27
28
|
"@types/node": "^14",
|
|
28
29
|
"typescript": "^4",
|
|
29
|
-
"@modern-js/module-tools": "^1.0.0-rc.
|
|
30
|
-
"@modern-js/plugin-testing": "^1.0.0-rc.
|
|
30
|
+
"@modern-js/module-tools": "^1.0.0-rc.3",
|
|
31
|
+
"@modern-js/plugin-testing": "^1.0.0-rc.3"
|
|
31
32
|
},
|
|
32
33
|
"sideEffects": false,
|
|
33
34
|
"modernConfig": {
|
|
@@ -35,6 +36,10 @@
|
|
|
35
36
|
"packageMode": "node-js"
|
|
36
37
|
}
|
|
37
38
|
},
|
|
39
|
+
"publicCnfig": {
|
|
40
|
+
"registry": "https://registry.npmjs.org/",
|
|
41
|
+
"access": "public"
|
|
42
|
+
},
|
|
38
43
|
"scripts": {
|
|
39
44
|
"new": "modern new",
|
|
40
45
|
"build": "modern build",
|
package/src/index.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import os from 'os';
|
|
3
3
|
import execa from 'execa';
|
|
4
|
+
import ora from 'ora';
|
|
4
5
|
import { GeneratorContext } from '@modern-js/codesmith';
|
|
5
6
|
import { fs, getMonorepoPackages } from '@modern-js/utils';
|
|
6
7
|
import { canUseNpm, canUsePnpm, canUseYarn } from './utils/env';
|
|
@@ -13,16 +14,20 @@ export { fs } from '@modern-js/utils';
|
|
|
13
14
|
|
|
14
15
|
export { i18n } from './locale';
|
|
15
16
|
|
|
17
|
+
// eslint-disable-next-line max-statements
|
|
16
18
|
export async function getPackageVersion(
|
|
17
19
|
packageName: string,
|
|
18
20
|
registry?: string,
|
|
19
21
|
) {
|
|
22
|
+
const spinner = ora('Loading...').start();
|
|
23
|
+
spinner.color = 'yellow';
|
|
20
24
|
if (await canUsePnpm()) {
|
|
21
25
|
const args = ['info', packageName, 'version'];
|
|
22
26
|
if (registry) {
|
|
23
27
|
args.push(`--registry=${registry}`);
|
|
24
28
|
}
|
|
25
29
|
const result = await execa('pnpm', args);
|
|
30
|
+
spinner.stop();
|
|
26
31
|
return stripAnsi(result.stdout);
|
|
27
32
|
}
|
|
28
33
|
if (await canUseYarn()) {
|
|
@@ -31,6 +36,7 @@ export async function getPackageVersion(
|
|
|
31
36
|
args.push(`--registry=${registry}`);
|
|
32
37
|
}
|
|
33
38
|
const result = await execa('yarn', args);
|
|
39
|
+
spinner.stop();
|
|
34
40
|
return stripAnsi(result.stdout);
|
|
35
41
|
}
|
|
36
42
|
if (await canUseNpm()) {
|
|
@@ -39,8 +45,10 @@ export async function getPackageVersion(
|
|
|
39
45
|
args.push(`--registry=${registry}`);
|
|
40
46
|
}
|
|
41
47
|
const result = await execa('npm', args);
|
|
48
|
+
spinner.stop();
|
|
42
49
|
return stripAnsi(result.stdout);
|
|
43
50
|
}
|
|
51
|
+
spinner.stop();
|
|
44
52
|
throw new Error('not found npm, please install npm before');
|
|
45
53
|
}
|
|
46
54
|
|