@qse/edu-scripts 1.13.1 → 1.13.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 更新日志
 
+## 1.13.3 (2023-04-06)
+
+- fix: 锁定 webpack 版本
+
+## 1.13.2 (2023-02-01)
+
+- fix: 修复部署日志错误 
+
+## 1.13.1 (2023-02-01)
+
+- feat: 优化日志格式
+- feat: 部署时清理 `ver.js` 里杂乱的 `comments`
+
 ## 1.13.0 (2022-11-10)
 
 - feat: 教育集成项目部署增加日志功能

package/docs/override.md

@@ -126,18 +126,24 @@ module.exports = defineConfig({
       if (max) {
         var scale = 1
         var match = metaEl.getAttribute('content').match(/initial\-scale=([\d\.]+)/)
-        var isMobile = /iphone|ipad|ipod|Windows Phone|andriod/i.test(navigator.userAgent)
+        var isMobile = /iphone|ipad|ipod|Windows Phone|android/i.test(navigator.userAgent)
         if (match && isMobile) {
           scale = parseFloat(match[1])
         }
-        var maxFontSize = max / scale
+        maxFontSize = max / scale
       }
 
-      docEl.style.fontSize = Math.min((docEl.clientWidth / designWidth) * base, maxFontSize) + 'px'
+      var clientWidth = docEl.clientWidth ? docEl.clientWidth : docEl.getBoundingClientRect().width
+
+      docEl.style.setProperty(
+        'font-size',
+        Math.min((clientWidth / designWidth) * base, maxFontSize) + 'px',
+        'important'
+      )
     }
     resize()
     window.addEventListener('resize', resize)
-  })(375, 16)
+  })(375, 16, 16)
 </script>
 ```
 

package/docs/static.md

@@ -8,7 +8,7 @@
 <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/antd3.26.20.js"></script>
 
 <!-- 下方资源可能存在版本滞后 -->
-<!-- @qsb/antd @1.5.4 -->
+<!-- @qsb/antd @1.7.2 -->
 <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/qsb-antd.min.js"></script>
 <!-- @qsb/scheme-render @1.2.3  -->
 <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/qsb-scheme-render.min.js"></script>

package/lib/auto-refactor.js

@@ -1,33 +1,23 @@
 "use strict";
 
 const fs = require('fs-extra');
-
 const paths = require('./config/paths');
-
 const path = require('path');
-
 const chalk = require('chalk');
-
 const pkg = require('../package.json');
-
 const glob = require('globby');
-
 const ora = require('ora');
-
 const {
   prompt
 } = require('inquirer');
-
 const open = require('open');
+
 /**
  * @param {string} msg
  * @param {(spinner:ora.Ora) => void | Promise<void>} callback
  */
-
-
 async function step(msg, callback) {
   const spinner = ora(msg).start();
-
   try {
     await callback(spinner);
     spinner.succeed();
@@ -36,16 +26,13 @@ async function step(msg, callback) {
     throw error;
   }
 }
-
 module.exports = async function autoRefactor() {
   if (await fs.pathExists(paths.public)) {
     console.log(chalk.green('已完成改造，不需要重复执行，如果运行报错请查看文档'));
     console.log(`文档: ${chalk.underline(pkg.homepage)}`);
     process.exit(0);
   }
-
   const appPkg = require(paths.package);
-
   const answers = await prompt([{
     type: 'input',
     name: 'name',
@@ -103,7 +90,6 @@ module.exports = async function autoRefactor() {
     const HTMLFiles = await glob('*.html', {
       cwd: paths.src
     });
-
     for (const file of HTMLFiles) {
       await fs.move(path.resolve(paths.src, file), path.resolve(paths.public, file));
     }
@@ -115,7 +101,6 @@ module.exports = async function autoRefactor() {
   });
   await step('删除没用的 babel 和 webpack 配置', async () => {
     const deleteFiles = [...(await glob('{.,*}babel*')), ...(await glob('*webpack*')), ...(await glob('package-lock.json')), paths.nodeModules, paths.sshSftp];
-
     for (const filePath of deleteFiles) {
       await fs.remove(filePath);
     }
@@ -132,14 +117,12 @@ module.exports = async function autoRefactor() {
     scripts.start = 'edu-scripts start';
     scripts.build = 'edu-scripts build';
     scripts.analyze = 'edu-scripts build --analyze';
-
     if (answers.mode !== 'single') {
       scripts.deploy = `edu-scripts deploy ${answers.deploy.join(' ')}`;
     } else {
       scripts.deploy = `edu-scripts deploy`;
       scripts['commit-dist'] = 'edu-scripts commit-dist --rm-local';
     }
-
     scripts['one-key-deploy'] = 'npm version patch';
     scripts.postversion = 'npm run build && npm run deploy';
   });

package/lib/build.js

@@ -3,47 +3,33 @@
 process.env.NODE_ENV = 'production';
 process.env.BABEL_ENV = 'production';
 process.env.BROWSERSLIST = '>0.25%, not dead, not op_mini all';
-
 const webpack = require('webpack');
-
 const chalk = require('chalk');
-
 const getConfig = require('./utils/getConfig');
-
 const {
   measureFileSizesBeforeBuild,
   printFileSizesAfterBuild
 } = require('./utils/FileSizeReporter');
-
 const paths = require('./config/paths');
-
 const fs = require('fs-extra');
-
 const appConfig = require('./utils/appConfig');
-
 const WARN_AFTER_BUNDLE_GZIP_SIZE = appConfig.single ? 1024 * 1024 : 30 * 1024;
 const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
-
 module.exports = async function build(args) {
   if (args.analyze) {
     process.env.ANALYZE = '1';
   }
-
   if (args.outputHtml) {
     process.env.OUTPUT_HTML = '1';
   }
-
   const previousSizeMap = await measureFileSizesBeforeBuild(paths.dist);
   fs.emptyDirSync(paths.dist);
-
   if (appConfig.single) {
     fs.copySync(paths.public, paths.resolveApp('dist'));
   }
-
   if (appConfig.mainProject && fs.existsSync(paths.static)) {
     fs.copySync(paths.static, paths.resolveApp('dist', 'static'));
   }
-
   webpack(getConfig(args), (error, stats) => {
     if (error) {
       console.log(chalk.red('编译失败'));
@@ -51,7 +37,6 @@ module.exports = async function build(args) {
       console.log();
       process.exit(1);
     }
-
     if (stats.compilation.errors.length) {
       console.log(chalk.red('编译失败'));
       console.log(stats.toString({
@@ -61,7 +46,6 @@ module.exports = async function build(args) {
       }));
       process.exit(1);
     }
-
     console.log(stats.toString({
       colors: true,
       preset: 'errors-warnings',
@@ -71,13 +55,11 @@ module.exports = async function build(args) {
     console.log('gzip 后文件大小:\n');
     printFileSizesAfterBuild(stats, previousSizeMap, paths.dist, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
     console.log();
-
     if (appConfig.single) {
       console.log(`打包完成，可以使用 ${chalk.green('@qse/ssh-sftp')} 自动部署代码到 v1`);
     } else {
       console.log(`打包完成，可以运行 ${chalk.green('npx edu-scripts deploy')} 部署代码到 v1`);
     }
-
     console.log();
   });
 };

package/lib/cli.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 "use strict";
 
-const pkg = require('../package.json'); // 检查运行条件
-
-
-require('./utils/beforeStart'); // eslint-disable-next-line no-unused-expressions
+const pkg = require('../package.json');
 
+// 检查运行条件
+require('./utils/beforeStart');
 
+// eslint-disable-next-line no-unused-expressions
 require('yargs').usage(`教育工程化 webpack5 基础框架\n文档: ${pkg.homepage}`).command('start', '开发', yargs => yargs.option('port', {
   alias: 'p',
   desc: '指定端口'

package/lib/commit-dist.js

@@ -1,24 +1,18 @@
 "use strict";
 
 const chalk = require('chalk');
-
 const paths = require('./config/paths');
-
 const fs = require('fs-extra');
-
 const exec = (cmd, opts) => require('child_process').execSync(cmd, {
   encoding: 'utf-8',
   stdio: 'pipe',
   ...opts
 });
-
 const tmp = require('tmp');
-
 function validateSVNRoot(root) {
   const ls = exec(`svn ls ${root}`);
   return ['trunk', 'branches'].every(s => ls.includes(s));
 }
-
 function getWorkingCopyInfo() {
   exec(`svn up`);
   const url = exec(`svn info --show-item url`).trim();
@@ -26,20 +20,16 @@ function getWorkingCopyInfo() {
   const author = exec(`svn info --show-item last-changed-author`).trim();
   let branch = 'trunk';
   let root = url.replace(/\/trunk$/, '');
-
   if (url.includes('/branches/')) {
     branch = url.split('/').pop();
     root = url.replace(/\/branches\/[^/]+$/, '');
   }
-
   let distBranchURL = root + '/branches/dist';
   let distBranchDirURL = distBranchURL + '/' + branch;
-
   if (!validateSVNRoot(root)) {
     console.log(chalk.red('SVN目录不符合规则，必须包含 trunk branches'));
     process.exit(1);
   }
-
   return {
     url,
     branch,
@@ -50,10 +40,8 @@ function getWorkingCopyInfo() {
     root
   };
 }
-
 function copyDistToRepo(info) {
   const tmpdir = tmp.dirSync().name;
-
   try {
     exec(`svn ls ${info.distBranchDirURL} --depth empty`);
   } catch (error) {
@@ -63,15 +51,12 @@ function copyDistToRepo(info) {
       throw error;
     }
   }
-
   exec(`svn co ${info.distBranchDirURL} ${tmpdir}`);
-
   try {
     exec(`svn rm * --force -q`, {
       cwd: tmpdir
     });
   } catch (error) {}
-
   fs.copySync(paths.dist, tmpdir);
   exec(`svn add * --force --auto-props --parents --depth infinity -q`, {
     cwd: tmpdir
@@ -82,32 +67,27 @@ function copyDistToRepo(info) {
   });
   fs.removeSync(tmpdir);
 }
+
 /**
  * svn commit dist folder to dish branches
  *
  * @param {Object} args
  * @param {boolean} args.rmLocal
  */
-
-
 module.exports = async function commitDist(args) {
   if (!fs.existsSync(paths.dist)) {
     console.log(chalk.red('未找到 dist 文件夹，请先 edu-scpirts build'));
     process.exit(1);
   }
-
   if (exec('svn st').trim().length) {
     console.log(chalk.red('似乎存在未提交的代码，请提交后重试。运行 svn st 查看具体信息'));
     process.exit(1);
   }
-
   const info = getWorkingCopyInfo();
   console.log(chalk.green([`分支: ${info.branch}`, `版本: ${info.revision}`, `作者: ${info.author}`, `地址: ${info.distBranchDirURL}`].join('\n')));
   copyDistToRepo(info);
-
   if (args.rmLocal) {
     fs.removeSync(paths.dist);
   }
-
   console.log(chalk.green('提交完成'));
 };

package/lib/config/babel.dependencies.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const getOverride = require('../utils/getOverride');
+
 /**
  * @typedef {Object} Opts
  * @property {string} [modules]
@@ -8,8 +9,6 @@ const getOverride = require('../utils/getOverride');
  * @param {Opts} [opts]
  * @return {*}
  */
-
-
 module.exports = function getBabelConfig(opts = {}) {
   const isDev = process.env.NODE_ENV === 'development';
   let config = {
@@ -35,11 +34,11 @@ module.exports = function getBabelConfig(opts = {}) {
       // explicitly resolving to match the provided helper functions.
       // https://github.com/babel/babel/issues/10261
       version: require('@babel/runtime/package.json').version,
-      regenerator: true // // https://babeljs.io/docs/en/babel-plugin-transform-runtime#useesmodules
+      regenerator: true
+      // // https://babeljs.io/docs/en/babel-plugin-transform-runtime#useesmodules
       // // We should turn this on once the lowest version of Node LTS
       // // supports ES Modules.
       // useESModules: true,
-
     }], ['import', {
       libraryName: 'lodash',
       libraryDirectory: '',
@@ -47,10 +46,8 @@ module.exports = function getBabelConfig(opts = {}) {
     }, 'lodash']].filter(Boolean)
   };
   const override = getOverride();
-
   if (override.babel) {
     config = override.babel(config, 'node_modules') || config;
   }
-
   return config;
 };

package/lib/config/babel.js

@@ -1,22 +1,18 @@
 "use strict";
 
 const fs = require('fs');
-
 const paths = require('./paths');
-
 const appConfig = require('../utils/appConfig');
-
 const getOverride = require('../utils/getOverride');
-
 const hasJsxRuntime = (() => {
   try {
     require.resolve('react/jsx-runtime');
-
     return true && appConfig.single;
   } catch (error) {
     return false;
   }
 })();
+
 /**
  * @typedef {Object} Opts
  * @property {string} [modules]
@@ -24,8 +20,6 @@ const hasJsxRuntime = (() => {
  * @param {Opts} [opts]
  * @return {*}
  */
-
-
 module.exports = function getBabelConfig(opts = {}) {
   const isTypeScriptEnabled = fs.existsSync(paths.tsconfig);
   const isDev = process.env.NODE_ENV === 'development';
@@ -53,11 +47,11 @@ module.exports = function getBabelConfig(opts = {}) {
       // explicitly resolving to match the provided helper functions.
       // https://github.com/babel/babel/issues/10261
       version: require('@babel/runtime/package.json').version,
-      regenerator: true // // https://babeljs.io/docs/en/babel-plugin-transform-runtime#useesmodules
+      regenerator: true
+      // // https://babeljs.io/docs/en/babel-plugin-transform-runtime#useesmodules
       // // We should turn this on once the lowest version of Node LTS
       // // supports ES Modules.
       // useESModules: true,
-
     }], ['@babel/plugin-proposal-decorators', {
       legacy: true
     }], ['@babel/plugin-proposal-class-properties', {
@@ -73,10 +67,8 @@ module.exports = function getBabelConfig(opts = {}) {
     }, 'lodash'], isDev && 'react-refresh/babel'].filter(Boolean)
   };
   const override = getOverride();
-
   if (override.babel) {
     config = override.babel(config, 'src') || config;
   }
-
   return config;
 };

package/lib/config/paths.js

@@ -1,25 +1,19 @@
 "use strict";
 
 const path = require('path');
-
 const fs = require('fs');
-
 const glob = require('globby');
-
 function resolveApp(...filePath) {
   return path.resolve(process.cwd(), ...filePath);
 }
-
 function getExistPath(...paths) {
   for (const path of paths) {
     if (fs.existsSync(path)) {
       return path;
     }
   }
-
   return paths[0];
 }
-
 const paths = {
   resolveApp,
   eduAppEnv: resolveApp('src', 'edu-app-env.d.ts'),

package/lib/config/plugins/postcss-safe-area.js

@@ -2,21 +2,18 @@
 
 const vars = ['safe-area-inset-top', 'safe-area-inset-bottom', 'safe-area-inset-left', 'safe-area-inset-right'];
 const expr = new RegExp(`env\\(\\s*(${vars.join('|')})\\s*,?\\s*([^)]+)?\\s*\\)`, 'g');
-/** @type {import('postcss').PluginCreator} */
 
+/** @type {import('postcss').PluginCreator} */
 module.exports = () => {
   return {
     postcssPlugin: 'postcss-safe-area',
-
     Declaration(decl) {
       const fallback = decl.value.replace(expr, (match, param, defaultValue) => defaultValue || '0');
-
       if (fallback !== decl.value) {
         decl.cloneBefore({
           value: fallback
         });
       }
     }
-
   };
 };

package/lib/config/webpackConfig.js

@@ -1,31 +1,20 @@
 "use strict";
 
 const fs = require('fs');
-
 const webpack = require('webpack');
-
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-
 const {
   BundleAnalyzerPlugin
 } = require('webpack-bundle-analyzer');
-
 const ReactRefreshPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
-
 const paths = require('./paths');
-
 const TerserPlugin = require('terser-webpack-plugin');
-
 const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
-
 const appPkg = require(paths.package);
-
 const appConfig = require('../utils/appConfig');
-
 const {
   ESBuildMinifyPlugin
 } = require('esbuild-loader');
-
 const jsMainPath = appConfig.grayscale ? `${appPkg.name}/beta/${appPkg.name}` : `${appPkg.name}/${appPkg.name}`;
 const assetPath = appConfig.grayscale ? `${appPkg.name}/beta/${appPkg.version}` : `${appPkg.name}/${appPkg.version}`;
 const cssRegex = /\.css$/;
@@ -33,15 +22,12 @@ const cssModuleRegex = /\.module\.css$/;
 const lessRegex = /\.less$/;
 const lessModuleRegex = /\.module\.less$/;
 const imageInlineSizeLimit = 10 * 1024;
-
 const qseCDN = (() => {
   const contents = paths.indexHTML.map(url => fs.readFileSync(url, 'utf-8'));
-
   function include(pattern) {
     const regexp = new RegExp(pattern);
     return contents.some(content => regexp.test(content));
   }
-
   return {
     isUseCommon: include(/react16.14.*_common31?.js|react-dev-preset.js/),
     isUseAxios: include(/react16.14.*_axios0.21.1|react-dev-preset.js/),
@@ -51,18 +37,17 @@ const qseCDN = (() => {
     isUseQsbSchemeRender: include('qsb-scheme-render.min.js')
   };
 })();
+
 /**
  * @param {*} args
  * @param {import('../utils/defineConfig').Config} override
  */
-
-
 module.exports = function getWebpackConfig(args, override) {
   var _override$pure_funcs, _override$pure_funcs2;
-
   const isDev = process.env.NODE_ENV === 'development';
-  const isProd = process.env.NODE_ENV === 'production'; // common function to get style loaders
+  const isProd = process.env.NODE_ENV === 'production';
 
+  // common function to get style loaders
   const getStyleLoaders = (cssOptions, preProcessor) => {
     const loaders = [{
       loader: 'style-loader',
@@ -91,14 +76,13 @@ module.exports = function getWebpackConfig(args, override) {
           }), fs.existsSync(paths.tailwind) && 'tailwindcss', 'postcss-flexbugs-fixes', ['postcss-preset-env', {
             autoprefixer: {
               flexbox: 'no-2009'
-            } // https://preset-env.cssdb.org/features/#stage-2
-
+            }
+            // https://preset-env.cssdb.org/features/#stage-2
           }], isProd && require('./plugins/postcss-safe-area')(), isProd && ['postcss-momentum-scrolling', ['scroll', 'auto']], 'postcss-normalize', ...override.extraPostCSSPlugins].filter(Boolean)
         },
         sourceMap: isDev
       }
     }];
-
     if (preProcessor === 'less-loader') {
       loaders.push({
         loader: 'less-loader',
@@ -111,12 +95,10 @@ module.exports = function getWebpackConfig(args, override) {
         }
       });
     }
-
     return loaders;
   };
-  /** @type {webpack.Configuration} */
-
 
+  /** @type {webpack.Configuration} */
   const config = {
     context: process.cwd(),
     mode: process.env.NODE_ENV,
@@ -151,7 +133,8 @@ module.exports = function getWebpackConfig(args, override) {
     }, qseCDN.isUseQsbSchemeRender && {
       '@qse/scheme-render': 'qsbSchemeRender',
       '@qsb/scheme-render': 'qsbSchemeRender'
-    }), // 教育工程这些一定都需要 external
+    }),
+    // 教育工程这些一定都需要 external
     !appConfig.single && Object.assign({
       react: 'React',
       'react-dom': 'ReactDOM',
@@ -195,7 +178,8 @@ module.exports = function getWebpackConfig(args, override) {
         }
       },
       rules: [{
-        oneOf: [// 两个 babel-loader 是为了处理 pdfjs-dist 与 ofd.js
+        oneOf: [
+        // 两个 babel-loader 是为了处理 pdfjs-dist 与 ofd.js
         {
           test: /\.(j|t)sx?$/,
           loader: 'babel-loader',
@@ -256,7 +240,6 @@ module.exports = function getWebpackConfig(args, override) {
           parser: {
             dataUrlCondition: {
               maxSize: imageInlineSizeLimit // 10kb
-
             }
           }
         }, {
@@ -265,9 +248,9 @@ module.exports = function getWebpackConfig(args, override) {
           parser: {
             dataUrlCondition: {
               maxSize: imageInlineSizeLimit // 10kb
-
             }
           },
+
           issuer: {
             and: [/\.(css|less)$/]
           }
@@ -345,7 +328,8 @@ module.exports = function getWebpackConfig(args, override) {
         keepNames: false,
         legalComments: 'none',
         target: 'es5'
-      }), // This is only used in production mode
+      }),
+      // This is only used in production mode
       override.minify === 'terser' && new TerserPlugin({
         extractComments: false,
         terserOptions: {

package/lib/config/webpackDevServerConfig.js

@@ -1,18 +1,17 @@
 "use strict";
 
 const WebpackDevServer = require('webpack-dev-server');
+
 /**
  * @param {*} args
  * @param {import('../utils/defineConfig').Config} override
  */
-
-
 module.exports = function getWebpackDevServerConfig(args, override) {
   const host = process.env.HOST || '0.0.0.0';
   const sockHost = process.env.WDS_SOCKET_HOST;
   const sockPort = process.env.WDS_SOCKET_PORT;
-  /** @type {WebpackDevServer.Configuration} */
 
+  /** @type {WebpackDevServer.Configuration} */
   const devServer = {
     hot: true,
     allowedHosts: 'all',