@qse/edu-scripts 1.12.2 → 1.12.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # 更新日志
 
+## 1.12.4 (2022-11-03)
+
+- feat: 优化 cdn external 规则
+
+## 1.12.3 (2022-11-01)
+
+- fix: 修复 commit-dist 错误
+
 ## 1.12.2 (2022-09-29)
 
 - feat: 校验 version 字段

package/docs/override.md

@@ -59,8 +59,8 @@ const path = require('path')
 
 module.exports = defineConfig({
   alias: {
-    config: path.resolve(__dirname,'src/config')
-  }
+    config: path.resolve(__dirname, 'src/config'),
+  },
 })
 ```
 
@@ -70,7 +70,7 @@ module.exports = defineConfig({
 const { defineConfig } = require('@qse/edu-scripts')
 
 module.exports = defineConfig({
-  pure_funcs: []
+  pure_funcs: [],
 })
 ```
 
@@ -98,7 +98,7 @@ module.exports = defineConfig({
 
 适用范围：antd-mobile@2, antd-mobile@5
 
-安装公司内专用的 pxtorem 插件，比原版增加了 include 与 CSS变量 编译。并且修改默认值 `1rem === 10px`
+安装公司内专用的 pxtorem 插件，比原版增加了 include 与 CSS 变量 编译。并且修改默认值 `1rem === 10px`
 
 ```bash
 npm i @qse/postcss-pxtorem
@@ -106,14 +106,10 @@ npm i @qse/postcss-pxtorem
 
 ```js
 const { defineConfig } = require('@qse/edu-scripts')
-const pxtorem = require('@qse/postcss-pxtorem') 
+const pxtorem = require('@qse/postcss-pxtorem')
 
 module.exports = defineConfig({
-  extraPostCSSPlugins: [
-    pxtorem({
-      include: ['antd-mobile']
-    })
-  ]
+  extraPostCSSPlugins: [pxtorem({ include: ['antd-mobile'] })],
 })
 ```
 
@@ -137,8 +133,7 @@ module.exports = defineConfig({
         var maxFontSize = max / scale
       }
 
-      docEl.style.fontSize =
-        Math.min((docEl.clientWidth / designWidth) * base, maxFontSize) + 'px'
+      docEl.style.fontSize = Math.min((docEl.clientWidth / designWidth) * base, maxFontSize) + 'px'
     }
     resize()
     window.addEventListener('resize', resize)
@@ -154,12 +149,32 @@ module.exports = defineConfig({
 const { defineConfig } = require('@qse/edu-scripts')
 
 module.exports = defineConfig({
-  babel(config){
-    config.plugins.push([
-      'import',
-      { libraryName: 'antd-mobile', libraryDirectory: 'es', style: true },
-      'antd-mobile',
-    ])
-  }
+  babel(config) {
+    config.plugins.push(['import', { libraryName: 'antd-mobile', style: true }, 'antd-mobile'])
+  },
+})
+```
+
+### 兼容 antd-mobile@1
+
+安装 `svg-sprite-loader` 模块，复制下面的代码
+
+```shell
+npm i svg-sprite-loader
+```
+
+```js
+const { defineConfig } = require('@qse/edu-scripts')
+module.exports = defineConfig({
+  webpack(config) {
+    config.module.rules[0].oneOf.unshift({
+      test: /\.svg$/,
+      loader: 'svg-sprite-loader',
+      options: {
+        esModule: false,
+        runtimeCompat: true,
+      },
+    })
+  },
 })
 ```

package/lib/build.js

@@ -59,10 +59,6 @@ module.exports = async function build(args) {
         errors: true,
         colors: true
       }));
-    } // Fail the build if running in a CI server
-
-
-    if (error || stats.compilation.errors.length) {
       process.exit(1);
     }
 

package/lib/commit-dist.js

@@ -14,8 +14,6 @@ const exec = (cmd, opts) => require('child_process').execSync(cmd, {
 
 const tmp = require('tmp');
 
-const glob = require('globby');
-
 function validateSVNRoot(root) {
   const ls = exec(`svn ls ${root}`);
   return ['trunk', 'branches'].every(s => ls.includes(s));
@@ -67,17 +65,15 @@ function copyDistToRepo(info) {
   }
 
   exec(`svn co ${info.distBranchDirURL} ${tmpdir}`);
-  let files = glob.sync('**/*', {
-    cwd: tmpdir
-  });
-  exec(`svn rm "${files.join('" "')}"`, {
-    cwd: tmpdir
-  });
+
+  try {
+    exec(`svn rm * --force -q`, {
+      cwd: tmpdir
+    });
+  } catch (error) {}
+
   fs.copySync(paths.dist, tmpdir);
-  files = glob.sync('**/*', {
-    cwd: tmpdir
-  });
-  exec(`svn add "${files.join('" "')}"`, {
+  exec(`svn add * --force --auto-props --parents --depth infinity -q`, {
     cwd: tmpdir
   });
   const msg = `[edu-scripts] commit ${info.branch} dist #${info.revision} @${info.author}`;

package/lib/config/webpackConfig.js

@@ -36,21 +36,19 @@ const imageInlineSizeLimit = 10 * 1024;
 
 const qsbCDN = (() => {
   const contents = paths.indexHTML.map(url => fs.readFileSync(url, 'utf-8'));
-  const isUseCommon = contents.some(content => /react16.14.*_common31?.js/.test(content));
-  const isUseAxios = contents.some(content => /react16.14.*_axios0.21.1/.test(content));
-  const isUseMoment = contents.some(content => content.includes('moment2.29.1.js'));
-  const isUseAntd = contents.some(content => content.includes('antd3.26.20.js'));
-  const isUseQsbAntd = contents.some(content => content.includes('qsb-antd.min.js'));
-  const isUseQsbSchemeRender = contents.some(content => content.includes('qsb-scheme-render.min.js'));
-  const isUse = isUseAntd || isUseCommon || isUseMoment || isUseAxios || isUseQsbAntd || isUseQsbSchemeRender;
+
+  function include(pattern) {
+    const regexp = new RegExp(pattern);
+    return contents.some(content => regexp.test(content));
+  }
+
   return {
-    isUse,
-    isUseAntd,
-    isUseCommon,
-    isUseMoment,
-    isUseAxios,
-    isUseQsbAntd,
-    isUseQsbSchemeRender
+    isUseCommon: include(/react16.14.*_common31?.js|react-dev-preset.js/),
+    isUseAxios: include(/react16.14.*_axios0.21.1|react-dev-preset.js/),
+    isUseMoment: include('moment2.29.1.js'),
+    isUseAntd: include('antd3.26.20.js'),
+    isUseQsbAntd: include('qsb-antd.min.js'),
+    isUseQsbSchemeRender: include('qsb-scheme-render.min.js')
   };
 })();
 /**
@@ -136,7 +134,8 @@ module.exports = function getWebpackConfig(args, override) {
       'react-dom': 'ReactDOM',
       'natty-fetch': 'nattyFetch',
       'natty-storage': 'nattyStorage',
-      'common-utils': 'CommonUtils'
+      'common-utils': 'CommonUtils',
+      '@qse/common-utils': 'CommonUtils'
     }, qsbCDN.isUseAxios && {
       axios: 'axios'
     }, qsbCDN.isUseMoment && {
@@ -275,7 +274,6 @@ module.exports = function getWebpackConfig(args, override) {
           }, {
             loader: 'url-loader',
             options: {
-              name: `images/${assetPath}/[name].[hash:6].[ext]`,
               limit: imageInlineSizeLimit
             }
           }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "1.12.2",
+  "version": "1.12.4",
   "author": "Kinoko",
   "license": "MIT",
   "description": "教育工程化基础框架",

package/src/build.js

@@ -44,10 +44,6 @@ module.exports = async function build(args) {
     if (stats.compilation.errors.length) {
       console.log(chalk.red('编译失败'))
       console.log(stats.toString({ all: false, errors: true, colors: true }))
-    }
-
-    // Fail the build if running in a CI server
-    if (error || stats.compilation.errors.length) {
       process.exit(1)
     }
 

package/src/commit-dist.js

@@ -4,7 +4,6 @@ const fs = require('fs-extra')
 const exec = (cmd, opts) =>
   require('child_process').execSync(cmd, { encoding: 'utf-8', stdio: 'pipe', ...opts })
 const tmp = require('tmp')
-const glob = require('globby')
 
 function validateSVNRoot(root) {
   const ls = exec(`svn ls ${root}`)
@@ -49,13 +48,13 @@ function copyDistToRepo(info) {
   }
   exec(`svn co ${info.distBranchDirURL} ${tmpdir}`)
 
-  let files = glob.sync('**/*', { cwd: tmpdir })
-  exec(`svn rm "${files.join('" "')}"`, { cwd: tmpdir })
+  try {
+    exec(`svn rm * --force -q`, { cwd: tmpdir })
+  } catch (error) {}
 
   fs.copySync(paths.dist, tmpdir)
 
-  files = glob.sync('**/*', { cwd: tmpdir })
-  exec(`svn add "${files.join('" "')}"`, { cwd: tmpdir })
+  exec(`svn add * --force --auto-props --parents --depth infinity -q`, { cwd: tmpdir })
 
   const msg = `[edu-scripts] commit ${info.branch} dist #${info.revision} @${info.author}`
   exec(`svn ci -m "${msg}"`, { cwd: tmpdir })

package/src/config/webpackConfig.js

@@ -26,25 +26,19 @@ const imageInlineSizeLimit = 10 * 1024
 
 const qsbCDN = (() => {
   const contents = paths.indexHTML.map((url) => fs.readFileSync(url, 'utf-8'))
-  const isUseCommon = contents.some((content) => /react16.14.*_common31?.js/.test(content))
-  const isUseAxios = contents.some((content) => /react16.14.*_axios0.21.1/.test(content))
-  const isUseMoment = contents.some((content) => content.includes('moment2.29.1.js'))
-  const isUseAntd = contents.some((content) => content.includes('antd3.26.20.js'))
-  const isUseQsbAntd = contents.some((content) => content.includes('qsb-antd.min.js'))
-  const isUseQsbSchemeRender = contents.some((content) =>
-    content.includes('qsb-scheme-render.min.js')
-  )
 
-  const isUse =
-    isUseAntd || isUseCommon || isUseMoment || isUseAxios || isUseQsbAntd || isUseQsbSchemeRender
+  function include(pattern) {
+    const regexp = new RegExp(pattern)
+    return contents.some((content) => regexp.test(content))
+  }
+
   return {
-    isUse,
-    isUseAntd,
-    isUseCommon,
-    isUseMoment,
-    isUseAxios,
-    isUseQsbAntd,
-    isUseQsbSchemeRender,
+    isUseCommon: include(/react16.14.*_common31?.js|react-dev-preset.js/),
+    isUseAxios: include(/react16.14.*_axios0.21.1|react-dev-preset.js/),
+    isUseMoment: include('moment2.29.1.js'),
+    isUseAntd: include('antd3.26.20.js'),
+    isUseQsbAntd: include('qsb-antd.min.js'),
+    isUseQsbSchemeRender: include('qsb-scheme-render.min.js'),
   }
 })()
 
@@ -139,6 +133,7 @@ module.exports = function getWebpackConfig(args, override) {
         'natty-fetch': 'nattyFetch',
         'natty-storage': 'nattyStorage',
         'common-utils': 'CommonUtils',
+        '@qse/common-utils': 'CommonUtils',
       },
       qsbCDN.isUseAxios && { axios: 'axios' },
       qsbCDN.isUseMoment && { moment: 'moment' },
@@ -290,7 +285,6 @@ module.exports = function getWebpackConfig(args, override) {
                 {
                   loader: 'url-loader',
                   options: {
-                    name: `images/${assetPath}/[name].[hash:6].[ext]`,
                     limit: imageInlineSizeLimit,
                   },
                 },