@qse/edu-scripts 1.12.3 → 1.12.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # 更新日志
 
+## 1.12.5 (2022-11-03)
+
+- feat: 优化 cdn external 规则
+
+## 1.12.4 (2022-11-03)
+
+- feat: 优化 cdn external 规则
+
 ## 1.12.3 (2022-11-01)
 
 - fix: 修复 commit-dist 错误

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/docs/refactor.md

@@ -24,10 +24,19 @@
 <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/react-dev-preset.js"></script>
 <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/moment2.29.1.js"></script>
 <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/antd3.26.20.js"></script>
+
+<!-- 如果用到 @qse/antd -->
+<script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/qsb-antd.min.js"></script>
+<!-- 如果用到 @qse/scheme-render -->
+<script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/qsb-scheme-render.min.js"></script>
 <% } else { %>
 <script src="//static.qsepay.net/lib/react16.14_fastclick1.0.6_natty-storage2.0.2-fetch2.4.2_axios0.21.1_common31.js"></script>
 <script src="//static.qsepay.net/lib/moment2.29.1.js"></script>
 <script src="//static.qsepay.net/lib/antd3.26.20.js"></script>
+
+<!-- 如果你是主工程，需要下面这两个文件 -->
+<script src="static/lib/qsb-antd.min.js"></script>
+<script src="static/lib/qsb-scheme-render.min.js"></script>
 <% } %>
 ```
 

package/lib/config/webpackConfig.js

@@ -34,23 +34,21 @@ const lessRegex = /\.less$/;
 const lessModuleRegex = /\.module\.less$/;
 const imageInlineSizeLimit = 10 * 1024;
 
-const qsbCDN = (() => {
+const qseCDN = (() => {
   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')
   };
 })();
 /**
@@ -131,25 +129,41 @@ module.exports = function getWebpackConfig(args, override) {
       uniqueName: appPkg.name,
       publicPath: ''
     },
-    externals: Object.assign({}, qsbCDN.isUseCommon && {
+    externals: Object.assign({}, qseCDN.isUseCommon && {
       react: 'React',
       'react-dom': 'ReactDOM',
       'natty-fetch': 'nattyFetch',
       'natty-storage': 'nattyStorage',
-      'common-utils': 'CommonUtils'
-    }, qsbCDN.isUseAxios && {
+      'common-utils': 'CommonUtils',
+      '@qse/common-utils': 'CommonUtils'
+    }, qseCDN.isUseAxios && {
       axios: 'axios'
-    }, qsbCDN.isUseMoment && {
+    }, qseCDN.isUseMoment && {
       moment: 'moment'
-    }, qsbCDN.isUseAntd && Object.assign({
+    }, qseCDN.isUseAntd && Object.assign({
       react: 'React',
       'react-dom': 'ReactDOM',
       moment: 'moment',
       antd: 'antd'
-    }, qsbCDN.isUseQsbAntd && {
+    }, qseCDN.isUseQsbAntd && {
       '@qse/antd': 'qsbAntd',
       '@qsb/antd': 'qsbAntd'
-    }, qsbCDN.isUseQsbSchemeRender && {
+    }, qseCDN.isUseQsbSchemeRender && {
+      '@qse/scheme-render': 'qsbSchemeRender',
+      '@qsb/scheme-render': 'qsbSchemeRender'
+    }), // 教育工程这些一定都需要 external
+    !appConfig.single && Object.assign({
+      react: 'React',
+      'react-dom': 'ReactDOM',
+      'natty-fetch': 'nattyFetch',
+      'natty-storage': 'nattyStorage',
+      'common-utils': 'CommonUtils',
+      '@qse/common-utils': 'CommonUtils',
+      moment: 'moment',
+      antd: 'antd'
+    }, isProd && {
+      '@qse/antd': 'qsbAntd',
+      '@qsb/antd': 'qsbAntd',
       '@qse/scheme-render': 'qsbSchemeRender',
       '@qsb/scheme-render': 'qsbSchemeRender'
     }), override.externals),
@@ -291,7 +305,7 @@ module.exports = function getWebpackConfig(args, override) {
         }].filter(Boolean)
       }]
     },
-    plugins: [qsbCDN.isUseCommon && new webpack.DllReferencePlugin({
+    plugins: [qseCDN.isUseCommon && new webpack.DllReferencePlugin({
       manifest: require('../asset/dll/libcommon3-manifest.json')
     }), new webpack.IgnorePlugin({
       resourceRegExp: /^\.\/locale$/,

package/package.json

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

package/src/config/webpackConfig.js

@@ -24,27 +24,21 @@ const lessModuleRegex = /\.module\.less$/
 
 const imageInlineSizeLimit = 10 * 1024
 
-const qsbCDN = (() => {
+const qseCDN = (() => {
   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'),
   }
 })()
 
@@ -133,16 +127,17 @@ module.exports = function getWebpackConfig(args, override) {
     },
     externals: Object.assign(
       {},
-      qsbCDN.isUseCommon && {
+      qseCDN.isUseCommon && {
         react: 'React',
         'react-dom': 'ReactDOM',
         'natty-fetch': 'nattyFetch',
         'natty-storage': 'nattyStorage',
         'common-utils': 'CommonUtils',
+        '@qse/common-utils': 'CommonUtils',
       },
-      qsbCDN.isUseAxios && { axios: 'axios' },
-      qsbCDN.isUseMoment && { moment: 'moment' },
-      qsbCDN.isUseAntd &&
+      qseCDN.isUseAxios && { axios: 'axios' },
+      qseCDN.isUseMoment && { moment: 'moment' },
+      qseCDN.isUseAntd &&
         Object.assign(
           {
             react: 'React',
@@ -150,11 +145,32 @@ module.exports = function getWebpackConfig(args, override) {
             moment: 'moment',
             antd: 'antd',
           },
-          qsbCDN.isUseQsbAntd && {
+          qseCDN.isUseQsbAntd && {
             '@qse/antd': 'qsbAntd',
             '@qsb/antd': 'qsbAntd',
           },
-          qsbCDN.isUseQsbSchemeRender && {
+          qseCDN.isUseQsbSchemeRender && {
+            '@qse/scheme-render': 'qsbSchemeRender',
+            '@qsb/scheme-render': 'qsbSchemeRender',
+          }
+        ),
+
+      // 教育工程这些一定都需要 external
+      !appConfig.single &&
+        Object.assign(
+          {
+            react: 'React',
+            'react-dom': 'ReactDOM',
+            'natty-fetch': 'nattyFetch',
+            'natty-storage': 'nattyStorage',
+            'common-utils': 'CommonUtils',
+            '@qse/common-utils': 'CommonUtils',
+            moment: 'moment',
+            antd: 'antd',
+          },
+          isProd && {
+            '@qse/antd': 'qsbAntd',
+            '@qsb/antd': 'qsbAntd',
             '@qse/scheme-render': 'qsbSchemeRender',
             '@qsb/scheme-render': 'qsbSchemeRender',
           }
@@ -311,7 +327,7 @@ module.exports = function getWebpackConfig(args, override) {
       ],
     },
     plugins: [
-      qsbCDN.isUseCommon &&
+      qseCDN.isUseCommon &&
         new webpack.DllReferencePlugin({
           manifest: require('../asset/dll/libcommon3-manifest.json'),
         }),