@qse/edu-scripts 1.12.4 → 1.13.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # 更新日志
 
+## 1.12.5 (2022-11-03)
+
+- feat: 优化 cdn external 规则
+
 ## 1.12.4 (2022-11-03)
 
 - feat: 优化 cdn external 规则

package/docs/debug.md

@@ -0,0 +1,17 @@
+# 代码调试
+
+## 使用 `React Developer Tools` 调试
+
+1. 安装 `React Developer Tools` 插件
+2. 打开控制台(F12)
+3. 切换到 `Component` 标签页
+4. 选中需要查看的组件，可以看到 `state/props/hooks` 等信息
+
+## 使用 vscode 调试代码
+
+1. 打开 `JavaScript Debug Terminal` 终端，输入 `npm run start` 命令启动项目。
+
+![](https://p0.meituan.net/dpplatform/78a65449d74d1fbd61cc47e98c419a011041253.gif)
+
+2. 按住 `ctrl/command` 点击 `http://localhost:port` 打开链接
+3. 代码里打断点，网页点击触发断点

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,7 +34,7 @@ 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'));
 
   function include(pattern) {
@@ -129,26 +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',
       '@qse/common-utils': 'CommonUtils'
-    }, qsbCDN.isUseAxios && {
+    }, 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),
@@ -290,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/lib/deploy.js

@@ -92,22 +92,39 @@ async function normalDeploy(args) {
       // 创建本地临时文件夹，位置在 `opts.localPath` 下的 `__tmp__` 文件夹
       fs.mkdirSync(tmpDir, {
         recursive: true
-      }); // 拉取远程文件到本地
-
-      await sftp.fastGet(remoteFile, tmpFile); // 读取本地文件内容
-
-      let code = await fs.readFile(tmpFile, {
-        encoding: 'utf-8'
       });
-      code = changeDeployVersion(code, {
+      const info = {
         name: pkg.name,
         version: pkg.version,
         grayscale: appConfig.grayscale
-      });
-      await sftp.fastPut(tmpFile, remoteFile + '.bak');
-      await fs.writeFile(tmpFile, code); // 将修改完的内容传回服务器
-
-      await sftp.fastPut(tmpFile, remoteFile);
+      };
+      {
+        // 拉取远程文件到本地
+        await sftp.fastGet(remoteFile, tmpFile); // 读取本地文件内容
+
+        let code = await fs.readFile(tmpFile, {
+          encoding: 'utf-8'
+        });
+        code = changeDeployVersion(code, info);
+        await sftp.fastPut(tmpFile, remoteFile + '.bak');
+        await fs.writeFile(tmpFile, code); // 将修改完的内容传回服务器
+
+        await sftp.fastPut(tmpFile, remoteFile);
+      }
+      {
+        const remoteLogFile = remoteFile + '.log';
+        const tmpLogFile = tmpFile + '.log';
+        let content = '';
+
+        try {
+          await sftp.fastGet(remoteLogFile, tmpLogFile);
+          content = await fs.readFile(tmpLogFile, 'utf-8');
+        } catch (error) {}
+
+        content += `${new Date().toISOString()} ${JSON.stringify(info)}\n`;
+        await fs.writeFile(tmpLogFile, content);
+        await sftp.fastPut(tmpLogFile, remoteLogFile);
+      }
       spinner.succeed('已更新 ver.js 版本配置');
     } catch (e) {
       spinner.fail(`自动修改 ver.js 失败，请手动修改`);

package/package.json

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

package/src/config/webpackConfig.js

@@ -24,7 +24,7 @@ const lessModuleRegex = /\.module\.less$/
 
 const imageInlineSizeLimit = 10 * 1024
 
-const qsbCDN = (() => {
+const qseCDN = (() => {
   const contents = paths.indexHTML.map((url) => fs.readFileSync(url, 'utf-8'))
 
   function include(pattern) {
@@ -127,7 +127,7 @@ module.exports = function getWebpackConfig(args, override) {
     },
     externals: Object.assign(
       {},
-      qsbCDN.isUseCommon && {
+      qseCDN.isUseCommon && {
         react: 'React',
         'react-dom': 'ReactDOM',
         'natty-fetch': 'nattyFetch',
@@ -135,9 +135,9 @@ module.exports = function getWebpackConfig(args, override) {
         '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',
@@ -145,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',
           }
@@ -306,7 +327,7 @@ module.exports = function getWebpackConfig(args, override) {
       ],
     },
     plugins: [
-      qsbCDN.isUseCommon &&
+      qseCDN.isUseCommon &&
         new webpack.DllReferencePlugin({
           manifest: require('../asset/dll/libcommon3-manifest.json'),
         }),

package/src/deploy.js

@@ -69,21 +69,38 @@ async function normalDeploy(args) {
       // 创建本地临时文件夹，位置在 `opts.localPath` 下的 `__tmp__` 文件夹
       fs.mkdirSync(tmpDir, { recursive: true })
 
-      // 拉取远程文件到本地
-      await sftp.fastGet(remoteFile, tmpFile)
-
-      // 读取本地文件内容
-      let code = await fs.readFile(tmpFile, { encoding: 'utf-8' })
-      code = changeDeployVersion(code, {
+      const info = {
         name: pkg.name,
         version: pkg.version,
         grayscale: appConfig.grayscale,
-      })
+      }
+
+      {
+        // 拉取远程文件到本地
+        await sftp.fastGet(remoteFile, tmpFile)
+
+        // 读取本地文件内容
+        let code = await fs.readFile(tmpFile, { encoding: 'utf-8' })
+        code = changeDeployVersion(code, info)
 
-      await sftp.fastPut(tmpFile, remoteFile + '.bak')
-      await fs.writeFile(tmpFile, code)
-      // 将修改完的内容传回服务器
-      await sftp.fastPut(tmpFile, remoteFile)
+        await sftp.fastPut(tmpFile, remoteFile + '.bak')
+        await fs.writeFile(tmpFile, code)
+        // 将修改完的内容传回服务器
+        await sftp.fastPut(tmpFile, remoteFile)
+      }
+
+      {
+        const remoteLogFile = remoteFile + '.log'
+        const tmpLogFile = tmpFile + '.log'
+        let content = ''
+        try {
+          await sftp.fastGet(remoteLogFile, tmpLogFile)
+          content = await fs.readFile(tmpLogFile, 'utf-8')
+        } catch (error) {}
+        content += `${new Date().toISOString()} ${JSON.stringify(info)}\n`
+        await fs.writeFile(tmpLogFile, content)
+        await sftp.fastPut(tmpLogFile, remoteLogFile)
+      }
 
       spinner.succeed('已更新 ver.js 版本配置')
     } catch (e) {