chore: repair window system execution command failure

vben
1 parent 70fba7ec
Showing 9 changed files with 66 additions and 77 deletions
build/jsc.js → build/jsc.ts
build/script/build.ts
build/script/changelog.ts
build/script/preserve.ts
build/script/preview.ts
build/utils.ts
package.json
src/components/Menu/src/index.less
src/design/var/index.less
 // js调用cli 兼容调用ts
-// const { sh } = require('tasksfile');
+const { sh } = require('tasksfile');
 const { argv } = require('yargs');
-const execa = require('execa');
+// const execa = require('execa');
 let command = ``;
@@ -25,28 +25,28 @@ if (taskList.includes(&#39;build&#39;) || taskList.includes(&#39;report&#39;) || taskList.includ
 }
 if (taskList && Array.isArray(taskList) && taskList.length) {
-  execa(
-    'cross-env',
-    [
-      `NODE_ENV=${NODE_ENV}`,
-      'ts-node',
-      '--project',
-      './build/tsconfig.json',
-      './build/script/cli.ts',
-      taskList.join(' '),
-      command,
-    ],
-    {
-      stdio: 'inherit',
-    }
-  );
-  // sh(
-  //   `cross-env NODE_ENV=${NODE_ENV} ts-node --project  ./build/tsconfig.json ./build/script/cli.ts ${taskList.join(
-  //     ' '
-  //   )} ${command}`,
+  // execa(
+  //   'cross-env',
+  //   [
+  //     `NODE_ENV=${NODE_ENV}`,
+  //     'ts-node',
+  //     '--project',
+  //     './build/tsconfig.json',
+  //     './build/script/cli.ts',
+  //     taskList.join(' '),
+  //     command,
+  //   ],
   //   {
-  //     async: true,
-  //     nopipe: true,
+  //     stdio: 'inherit',
   //   }
   // );
+  sh(
+    `cross-env NODE_ENV=${NODE_ENV} ts-node --files -P  ./build/tsconfig.json ./build/script/cli.ts ${taskList.join(
+      ' '
+    )} ${command}`,
+    {
+      async: true,
+      nopipe: true,
+    }
+  );
 }
 // #!/usr/bin/env node
-// import { sh } from 'tasksfile';
+import { sh } from 'tasksfile';
 import { argv } from 'yargs';
 import { runBuildConfig } from './buildConf';
 import { runUpdateHtml } from './updateHtml';
-import { errorConsole, successConsole, run } from '../utils';
+import { errorConsole, successConsole } from '../utils';
 export const runBuild = async () => {
   try {
     const argvList = argv._;
-    // let cmd = `cross-env NODE_ENV=production vite build`;
-    await run('cross-env', ['NODE_ENV=production', 'vite', 'build']);
-    // await sh(cmd, {
-    //   async: true,
-    //   nopipe: true,
-    // });
+    let cmd = `cross-env NODE_ENV=production vite build`;
+    // await run('cross-env', ['NODE_ENV=production', 'vite', 'build']);
+    await sh(cmd, {
+      async: true,
+      nopipe: true,
+    });
     // Generate configuration file
     if (!argvList.includes('no-conf')) {
 // #!/usr/bin/env node
-// import { sh } from 'tasksfile';
-import { errorConsole, successConsole, run } from '../utils';
+import { sh } from 'tasksfile';
+import { errorConsole, successConsole } from '../utils';
 export const runChangeLog = async () => {
   try {
-    // let cmd = `conventional-changelog -p custom-config -i CHANGELOG.md -s -r 0 `;
-    await run('conventional-changelog', [
-      '-p',
-      'custom-config',
-      '-i',
-      'CHANGELOG.md',
-      '-s',
-      '-r',
-      '-0',
-    ]);
-    // await sh(cmd, {
-    //   async: true,
-    //   nopipe: true,
-    // });
-    await run('prettier', ['--write', '**/CHANGELOG.md']);
-    // await sh('prettier --write **/CHANGELOG.md ', {
-    //   async: true,
-    //   nopipe: true,
-    // });
+    let cmd = `conventional-changelog -p custom-config -i CHANGELOG.md -s -r 0 `;
+
+    await sh(cmd, {
+      async: true,
+      nopipe: true,
+    });
+    await sh('prettier --write **/CHANGELOG.md ', {
+      async: true,
+      nopipe: true,
+    });
     successConsole('CHANGE_LOG.md generated successfully！');
   } catch (error) {
     errorConsole('CHANGE_LOG.md generated error\n' + error);
@@ -3,8 +3,8 @@
 import path from 'path';
 import fs from 'fs-extra';
 import { isEqual } from 'lodash';
-// import { sh } from 'tasksfile';
-import { successConsole, errorConsole, run } from '../utils';
+import { sh } from 'tasksfile';
+import { successConsole, errorConsole } from '../utils';
 const resolve = (dir: string) => {
   return path.resolve(process.cwd(), dir);
@@ -46,11 +46,10 @@ export async function runPreserve() {
       'A dependency change is detected, and the dependency is being installed to ensure that the dependency is consistent! (Tip: The project will be executed for the first time)！'
     );
     try {
-      await run('npm', ['run', 'bootstrap']);
-      // await sh('npm run bootstrap ', {
-      //   async: true,
-      //   nopipe: true,
-      // });
+      await sh('npm run bootstrap ', {
+        async: true,
+        nopipe: true,
+      });
       successConsole('Dependency installation is successful, start running the project！');
 import chalk from 'chalk';
 import Koa from 'koa';
 import inquirer from 'inquirer';
-// import { sh } from 'tasksfile';
+import { sh } from 'tasksfile';
 import staticServer from 'koa-static';
 import portfinder from 'portfinder';
 import { resolve } from 'path';
 import viteConfig from '../../vite.config';
-import { getIPAddress, run } from '../utils';
+import { getIPAddress } from '../utils';
 const BUILD = 1;
 const NO_BUILD = 2;
@@ -53,11 +53,10 @@ export const runPreview = async () =&gt; {
   });
   const { type } = await prompt;
   if (type === BUILD) {
-    await run('npm', ['run', 'build']);
-    // await sh('npm run build', {
-    //   async: true,
-    //   nopipe: true,
-    // });
+    await sh('npm run build', {
+      async: true,
+      nopipe: true,
+    });
   }
   startApp();
 };
@@ -3,7 +3,7 @@ import path from &#39;path&#39;;
 import { networkInterfaces } from 'os';
 import dotenv from 'dotenv';
 import chalk from 'chalk';
-import execa from 'execa';
+// import execa from 'execa';
 export const isFunction = (arg: unknown): arg is (...args: any[]) => any =>
   typeof arg === 'function';
@@ -149,5 +149,5 @@ export function getCwdPath(...dir: string[]) {
   return path.resolve(process.cwd(), ...dir);
 }
-export const run = (bin: string, args: any, opts = {}) =>
-  execa(bin, args, { stdio: 'inherit', ...opts });
+// export const run = (bin: string, args: any, opts = {}) =>
+//   execa(bin, args, { stdio: 'inherit', ...opts });
@@ -3,14 +3,14 @@
   "version": "2.0.0-rc.1",
   "scripts": {
     "bootstrap": "yarn install",
-    "serve": "node ./build/jsc.js preserve && cross-env NODE_ENV=development vite",
-    "build": "node ./build/jsc.js build",
+    "serve": "node ./build/jsc.ts preserve && cross-env NODE_ENV=development vite",
+    "build": "node ./build/jsc.ts build",
     "build:site": "cross-env SITE=true npm run build ",
     "build:no-cache": "yarn  clean:cache && npm run build",
     "report": "cross-env REPORT=true npm run build ",
-    "preview": "node ./build/jsc.js preview",
-    "log": "node ./build/jsc.js log",
-    "gen:gz": "node ./build/jsc.js gzip",
+    "preview": "node ./build/jsc.ts preview",
+    "log": "node ./build/jsc.ts log",
+    "gen:gz": "node ./build/jsc.ts gzip",
     "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite_opt_cache",
     "clean:lib": "npx rimraf node_modules",
     "ls-lint": "npx ls-lint",
@@ -18,7 +18,7 @@
     "lint:prettier": "prettier --write --loglevel warn \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
     "lint:stylelint": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
     "reinstall": "rimraf node_modules && rimraf yarn.lock && rimraf package.lock.json && npm run bootstrap",
-    "postinstall": "node ./build/jsc.js postinstall"
+    "postinstall": "node ./build/jsc.ts postinstall"
   },
   "dependencies": {
     "@iconify/iconify": "^2.0.0-rc.1",
@@ -206,10 +206,10 @@
     }
     .ant-menu-submenu-title {
-      // margin: 0;
       // line-height: @app-menu-item-height;
       display: flex;
       height: @app-menu-item-height;
+      margin: 0;
       align-items: center;
     }
@@ -18,4 +18,4 @@
 // app menu
 // left-menu
-@app-menu-item-height: 48px;
+@app-menu-item-height: 44px;