cmyr-template-cli 1.10.2 → 1.12.0

package/dist/index.js

@@ -13,7 +13,7 @@ var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
 const program = new commander.Command('ct')
     .description('草梅项目创建器');
-program.version("1.10.1" , '-v, --version');
+program.version("1.11.0" , '-v, --version');
 const args = process.argv.slice(2);
 if (args.length === 0) {
     args.push('create');

package/dist/plopfile.js

@@ -11,6 +11,7 @@ var child_process = require('child_process');
 var colors = require('colors');
 var ejs = require('ejs');
 var core = require('@lint-md/core');
+var JSON5 = require('json5');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -39,6 +40,7 @@ var download__default = /*#__PURE__*/_interopDefaultLegacy(download);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var colors__default = /*#__PURE__*/_interopDefaultLegacy(colors);
 var ejs__default = /*#__PURE__*/_interopDefaultLegacy(ejs);
+var JSON5__default = /*#__PURE__*/_interopDefaultLegacy(JSON5);
 
 process.env;
 const PACKAGE_MANAGER = 'pnpm';
@@ -50,7 +52,10 @@ if (!Promise.any) {
     });
 }
 const GITHUB_API_URL = 'https://api.github.com';
-const NODEJS_URL = 'https://nodejs.org/zh-cn/download/';
+const NODEJS_URLS = [
+    'https://nodejs.org/zh-cn/download/',
+    'http://nodejs.cn/download/',
+];
 const REMOTES = [
     'https://github.com',
     'https://hub.fastgit.xyz',
@@ -159,6 +164,7 @@ async function init(projectPath, answers) {
         await sortProjectJson(projectPath);
         await initDependabot(projectPath, answers);
         await initYarn(projectPath, answers);
+        await initTsconfig(projectPath);
         await asyncExec('git add .', {
             cwd: projectPath,
         });
@@ -170,6 +176,7 @@ async function init(projectPath, answers) {
             loading.succeed('依赖安装成功！');
         }
         catch (error) {
+            console.error(error);
             loading.fail('依赖安装失败！');
             process.exit(1);
         }
@@ -228,6 +235,30 @@ async function initYarn(projectPath, answers) {
         console.error(error);
     }
 }
+async function initTsconfig(projectPath) {
+    var _a;
+    try {
+        const tsconfigPath = path__default["default"].join(projectPath, 'tsconfig.json');
+        if (await fs__default["default"].pathExists(tsconfigPath)) {
+            const tsconfigStr = await fs__default["default"].readFile(tsconfigPath, 'utf8');
+            const tsconfig = JSON5__default["default"].parse(tsconfigStr);
+            if ((_a = tsconfig === null || tsconfig === void 0 ? void 0 : tsconfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.importHelpers) {
+                const pkg = await getProjectJson(projectPath);
+                const pkgData = {
+                    dependencies: {
+                        ...pkg.dependencies,
+                        tslib: `^${await getNpmPackageVersion('tslib')}`,
+                    },
+                };
+                const newPkg = Object.assign({}, pkg, pkgData);
+                await saveProjectJson(projectPath, newPkg);
+            }
+        }
+    }
+    catch (error) {
+        console.error(error);
+    }
+}
 async function initProjectJson(projectPath, answers) {
     const loading = ora__default["default"]('正在初始化 package.json ……').start();
     try {
@@ -663,10 +694,31 @@ async function getAuthorWebsiteFromGithubAPI(githubUsername) {
         return '';
     }
 }
+async function getFastNodeUrl() {
+    const loading = ora__default["default"]('正在选择 Node.js 网址');
+    loading.start();
+    try {
+        const fast = await Promise.any(NODEJS_URLS.map((url) => axios__default["default"]({
+            url,
+            method: 'HEAD',
+            timeout: 15 * 1000,
+        })));
+        loading.succeed(`成功选择了 Node.js 网址 - ${fast.config.url}`);
+        return fast.config.url;
+    }
+    catch (error) {
+        console.error(error);
+        loading.fail('选择 Node.js 网址失败！');
+    }
+}
 async function getLtsNodeVersion() {
     var _a, _b;
     try {
-        const html = (await axios__default["default"].get(NODEJS_URL)).data;
+        const url = await getFastNodeUrl();
+        if (!url) {
+            return;
+        }
+        const html = (await axios__default["default"].get(url)).data;
         const version = (_a = html.match(/<strong>(.*)<\/strong>/)) === null || _a === void 0 ? void 0 : _a[1];
         return (_b = version.split('.')) === null || _b === void 0 ? void 0 : _b[0];
     }
@@ -756,6 +808,7 @@ module.exports = function (plop) {
                             'electron-vue',
                             'nuxt',
                             'uni',
+                            'uni-vite2',
                             'react',
                             'react16',
                             'ts',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.10.2",
+  "version": "1.12.0",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -32,7 +32,7 @@
     "build:prod": "npm run build && rimraf temp && cross-env NODE_ENV=production ct create"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^21.0.0",
+    "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.5",
     "@rollup/plugin-replace": "^4.0.0",
@@ -56,26 +56,27 @@
     "debug": "^4.3.1",
     "eslint": "^7.14.0",
     "eslint-config-cmyr": "^1.1.14",
-    "husky": "^7.0.2",
+    "husky": "^8.0.1",
     "lint-staged": "^12.0.2",
     "rimraf": "^3.0.2",
     "rollup": "^2.33.3",
     "rollup-plugin-terser": "^7.0.2",
     "semantic-release": "^19.0.2",
     "ts-node": "^10.2.1",
-    "ts-node-dev": "^1.0.0",
+    "ts-node-dev": "^2.0.0",
     "typescript": "^4.1.2",
     "validate-commit-msg": "^2.14.0"
   },
   "dependencies": {
     "@lint-md/core": "^0.2.1",
-    "axios": "^0.26.0",
+    "axios": "^0.27.1",
     "colors": "^1.4.0",
     "commander": "^9.0.0",
     "dayjs": "^1.9.6",
     "download-git-repo": "^3.0.2",
     "ejs": "^3.1.6",
     "fs-extra": "^10.0.0",
+    "json5": "^2.2.1",
     "lodash": "^4.17.20",
     "minimist": "^1.2.5",
     "ora": "^5.4.1",