@qse/edu-scripts 1.13.2 → 1.13.4

package/lib/utils/changeDeployVersion.js

@@ -1,23 +1,18 @@
 "use strict";
 
 const t = require('@babel/types');
-
 const {
   parse
 } = require('@babel/parser');
-
 const generate = require('@babel/generator').default;
-
 const traverse = require('@babel/traverse').default;
-
 const {
   format
-} = require('prettier'); // ver.js 中定义模块的数组
-
+} = require('prettier');
 
+// ver.js 中定义模块的数组
 const TARGET_IDENTIFIER_NAME = 'project_apiArr';
 const MODULE_IDENTIFIER_NAME = 'module';
-
 function changeDeployVersion(code, pkg) {
   const {
     name,
@@ -25,18 +20,16 @@ function changeDeployVersion(code, pkg) {
     grayscale
   } = pkg;
   let ast;
-
   try {
     ast = parse(code);
   } catch (error) {
     throw new Error(`代码解析错误: ${error.message}`);
   }
-
   const keyName = grayscale ? 'grayscale' : 'main';
+
   /**
    * @return {babel.NodePath<t.VariableDeclarator> | undefined}
    */
-
   function findTargetDeclarator(ast) {
     let res;
     traverse(ast, {
@@ -47,16 +40,14 @@ function changeDeployVersion(code, pkg) {
           res = path;
         }
       }
-
     });
     return res;
   }
+
   /**
    * @param {babel.NodePath<t.VariableDeclarator>} path
    * @return {babel.NodePath<t.ObjectExpression> | undefined}
    */
-
-
   function findModuleObject(path) {
     let res;
     path.traverse({
@@ -69,15 +60,13 @@ function changeDeployVersion(code, pkg) {
           res = path;
         }
       }
-
     });
     return res;
   }
+
   /**
    * @param {babel.NodePath<t.ObjectExpression>} path
    */
-
-
   function modifyModuleVersion(path) {
     let hasModify = false;
     path.traverse({
@@ -87,9 +76,7 @@ function changeDeployVersion(code, pkg) {
           hasModify = true;
         }
       }
-
     });
-
     if (!hasModify) {
       path.node.properties.push(t.objectProperty(t.identifier(keyName), t.stringLiteral(version)));
     }
@@ -97,36 +84,29 @@ function changeDeployVersion(code, pkg) {
   /**
    * @param {babel.NodePath<t.ObjectExpression>} path
    */
-
-
   function deleteModuleComments(path) {
     path.traverse({
       ObjectExpression(path) {
         delete path.node.leadingComments;
       }
-
     });
   }
+
   /**
    * @param {babel.NodePath<t.VariableDeclarator>} path
    */
-
-
   function addModuleToTarget(path) {
     const elements = path.node.init.elements;
     elements.splice(elements.length - 2, 0, t.objectExpression([t.objectProperty(t.identifier(MODULE_IDENTIFIER_NAME), t.stringLiteral(name)), t.objectProperty(t.identifier(keyName), t.stringLiteral(version))]));
   }
-
   const targetPath = findTargetDeclarator(ast);
   if (!targetPath) throw new Error(`ver.js 不合规范，未找到参数 ${TARGET_IDENTIFIER_NAME}`);
   const moduleObjPath = findModuleObject(targetPath);
-
   if (moduleObjPath) {
     modifyModuleVersion(moduleObjPath);
   } else {
     addModuleToTarget(targetPath);
   }
-
   deleteModuleComments(targetPath);
   return format(generate(ast, {
     minified: true
@@ -135,5 +115,4 @@ function changeDeployVersion(code, pkg) {
     printWidth: 120
   });
 }
-
 module.exports = changeDeployVersion;

package/lib/utils/defineConfig.d.ts

@@ -1,6 +1,6 @@
 import type { Configuration } from 'webpack';
 import type { Configuration as DevServerConfiguration, ProxyConfigArray } from 'webpack-dev-server';
-export declare type BabelImportPlugin = [
+export type BabelImportPlugin = [
     'import',
     {
         libraryName: string;
@@ -10,11 +10,11 @@ export declare type BabelImportPlugin = [
     },
     string
 ];
-export declare type BabelConfig = {
+export type BabelConfig = {
     presets: any[];
     plugins: (string | BabelImportPlugin | any[])[];
 };
-export declare type Config = {
+export type Config = {
     webpack?: (config: Configuration) => Configuration | undefined;
     devServer?: (config: DevServerConfiguration) => DevServerConfiguration | undefined;
     babel?: (config: BabelConfig, type: 'src' | 'node_modules') => any | undefined;

package/lib/utils/defineConfig.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defineConfig = defineConfig;
-
 function defineConfig(config) {
   return config;
 }

package/lib/utils/exec.js

@@ -1,7 +1,6 @@
 "use strict";
 
 const cp = require('child_process');
-
 const exec = cmd => {
   console.log(`> ${cmd}`);
   return cp.execSync(cmd, {
@@ -9,5 +8,4 @@ const exec = cmd => {
     encoding: 'utf-8'
   });
 };
-
 module.exports = exec;

package/lib/utils/getConfig.js

@@ -1,30 +1,21 @@
 "use strict";
 
 const getWebpackConfig = require('../config/webpackConfig');
-
 const getWebpackDevServerConfig = require('../config/webpackDevServerConfig');
-
 const getOverride = require('./getOverride');
-
 function getConfig(args) {
   const override = getOverride();
   let webpackConfig = getWebpackConfig(args, override);
-
   if (override.webpack) {
     webpackConfig = override.webpack(webpackConfig) || webpackConfig;
   }
-
   if (process.env.NODE_ENV === 'development') {
     let devServerConfig = getWebpackDevServerConfig(args, override);
-
     if (override.devServer) {
       devServerConfig = override.devServer(devServerConfig) || devServerConfig;
     }
-
     webpackConfig.devServer = devServerConfig;
   }
-
   return webpackConfig;
 }
-
 module.exports = getConfig;

package/lib/utils/getOverride.js

@@ -1,11 +1,9 @@
 "use strict";
 
 const fs = require('fs');
-
 const paths = require('../config/paths');
-/** @type {import('./defineConfig').Config} */
-
 
+/** @type {import('./defineConfig').Config} */
 const defaultOverride = {
   transformNodeModules: true,
   minify: 'esbuild',
@@ -13,21 +11,18 @@ const defaultOverride = {
   extraPostCSSPlugins: []
 };
 let override = null;
+
 /**
  * @return {import('./defineConfig').Config}
  */
-
 module.exports = function getOverride() {
   if (override) return override;
   override = Object.assign({}, defaultOverride);
-
   if (fs.existsSync(paths.override)) {
     const userOverride = require(paths.override);
-
     if (typeof userOverride !== 'object') throw new Error('格式错误，请使用 npx edu g override 生成文件');
     Object.assign(override, userOverride);
   }
-
   if (override.minify === true) override.minify = defaultOverride.minify;
   return override;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "1.13.2",
+  "version": "1.13.4",
   "author": "Kinoko",
   "license": "MIT",
   "description": "教育工程化基础框架",
@@ -34,66 +34,66 @@
     "extends": "qsb-react"
   },
   "dependencies": {
-    "@babel/core": "^7.18.2",
-    "@babel/plugin-proposal-decorators": "^7.18.2",
-    "@babel/plugin-transform-runtime": "^7.18.2",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/preset-react": "^7.17.12",
-    "@babel/preset-typescript": "^7.17.12",
-    "@babel/runtime": "^7.18.3",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
+    "@babel/core": "^7.21.4",
+    "@babel/plugin-proposal-decorators": "^7.21.0",
+    "@babel/plugin-transform-runtime": "^7.21.4",
+    "@babel/preset-env": "^7.21.4",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-typescript": "^7.21.4",
+    "@babel/runtime": "^7.21.0",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@qse/ssh-sftp": "^1.0.0",
-    "@svgr/webpack": "^6.2.1",
-    "babel-loader": "^8.2.5",
-    "babel-plugin-import": "^1.13.5",
+    "@svgr/webpack": "^7.0.0",
+    "babel-loader": "^8.3.0",
+    "babel-plugin-import": "^1.13.6",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "chalk": "^4.1.2",
-    "css-loader": "^6.7.1",
-    "cssnano": "^5.1.11",
-    "esbuild-loader": "^2.19.0",
+    "css-loader": "^6.7.3",
+    "cssnano": "^5.1.15",
+    "esbuild-loader": "^2.21.0",
     "file-loader": "^6.2.0",
     "filesize": "^8.0.7",
     "fs-extra": "^10.1.0",
     "globby": "^11.1.0",
     "gzip-size": "^6.0.0",
     "html-webpack-plugin": "^5.5.0",
-    "inquirer": "^8.2.4",
+    "inquirer": "^8.2.5",
     "less": "^3.13.1",
     "less-loader": "^10.2.0",
     "lodash": "^4.17.21",
-    "open": "^8.4.0",
-    "postcss": "^8.4.14",
+    "open": "^8.4.2",
+    "postcss": "^8.4.21",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-loader": "^6.2.1",
     "postcss-momentum-scrolling": "^3.14.22",
     "postcss-normalize": "^8.0.1",
-    "postcss-preset-env": "^7.7.1",
-    "prettier": "^2.6.2",
-    "prettier-plugin-tailwindcss": "^0.1.11",
+    "postcss-preset-env": "^7.8.3",
+    "prettier": "^2.8.7",
+    "prettier-plugin-tailwindcss": "^0.1.13",
     "react-refresh": "^0.13.0",
-    "recursive-readdir": "^2.2.2",
+    "recursive-readdir": "^2.2.3",
     "rimraf": "^3.0.2",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "strip-ansi": "^6.0.1",
-    "style-loader": "^3.3.1",
-    "tailwindcss": "^3.1.2",
-    "terser-webpack-plugin": "^5.3.3",
+    "style-loader": "^3.3.2",
+    "tailwindcss": "^3.3.1",
+    "terser-webpack-plugin": "~5.3.7",
     "tmp": "^0.2.1",
-    "typescript": "^4.7.3",
+    "typescript": "^4.9.5",
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.73.0",
-    "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-dev-server": "^4.9.2",
-    "yargs": "^17.5.1"
+    "webpack": "^5.78.0",
+    "webpack-bundle-analyzer": "^4.8.0",
+    "webpack-dev-server": "^4.13.2",
+    "yargs": "^17.7.1"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^28.1.6",
-    "@types/yargs": "^17.0.10",
-    "dumi": "^1.1.42",
-    "eslint-config-qsb-react": "^1.1.0",
-    "father-build": "^1.22.3",
+    "@types/jest": "^28.1.8",
+    "@types/yargs": "^17.0.24",
+    "dumi": "^1.1.50",
+    "eslint-config-qsb-react": "^1.1.1",
+    "father-build": "^1.22.5",
     "jest": "^28.1.3"
   }
 }

package/src/build.js

@@ -1,6 +1,6 @@
 process.env.NODE_ENV = 'production'
 process.env.BABEL_ENV = 'production'
-process.env.BROWSERSLIST = '>0.25%, not dead, not op_mini all'
+process.env.BROWSERSLIST = '>0.2%, not dead, not op_mini all'
 
 const webpack = require('webpack')
 const chalk = require('chalk')

package/src/config/webpackConfig.js

@@ -380,7 +380,7 @@ module.exports = function getWebpackConfig(args, override) {
             drop: ['debugger'],
             keepNames: false,
             legalComments: 'none',
-            target: 'es5',
+            target: 'es6',
           }),
         // This is only used in production mode
         override.minify === 'terser' &&