@qse/edu-scripts 1.14.2 → 1.14.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 更新日志
 
+## 1.14.4 (2024-05-11)
+
+- feat: 打包时自动压缩图片
+
+## 1.14.3 (2024-01-03)
+
+- fix: 修复 app.d.ts html 文件类型错误
+- feat: override transformNodeModules 默认 true，并且 production 模式下也可生效
+
+## 1.14.2 (2023-10-11)
+
+- fix: 修复声明文件缺失
+
 ## 1.14.1 (2023-10-11)
 
 - fix: esbuild 压缩 target 改成 es5

package/app.d.ts

@@ -16,11 +16,6 @@ declare module '*.bmp' {
   export default src
 }
 
-declare module '*.html' {
-  const src: string
-  export default src
-}
-
 declare module '*.gif' {
   const src: string
   export default src

package/docs/faq.md

@@ -97,3 +97,48 @@ export default (callback) => {
 <!-- 引入 @qsb/antd -->
 <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/qsb-antd.min.js"></script>
 ```
+
+## 钉钉遇到页面打开白屏
+
+这种情况多半是链接中带了 hash，导致页面跳转失败。（复制出来可能是新的链接，但页面其实是老的并未跳转）
+
+将下面两段代码分别加入对应的文件中，必须保证其位置在所有 `script` 最前面
+
+原理： 将 hash 转存至 localStorage，跳转后再取出
+
+```html
+<!-- index.html -->
+<script>
+  ;(function () {
+    var searchString = location.search
+    if (!/(\?|&)S=/.test(searchString)) {
+      var randomHexString = Math.random().toString(32).substring(2)
+      searchString = searchString.substring(1)
+      searchString = '?S=' + randomHexString + (searchString.length > 0 ? '&' + searchString : '')
+    }
+    if (location.hash) {
+      localStorage.setItem('qse:H', location.hash)
+    }
+    var pathnameArr = location.pathname.split('/')
+    var pathname = pathnameArr.slice(0, -1).concat('index1.html').join('/')
+    var __tmp_URL = location.origin + pathname + searchString
+    history.replaceState(null, document.title, __tmp_URL)
+    location.reload()
+  })()
+</script>
+```
+
+```html
+<!-- index1.html -->
+<script>
+  ;(function () {
+    var hash = localStorage.getItem('qse:H')
+    if (hash) {
+      localStorage.removeItem('qse:H')
+      hash = /^#/.test(hash) ? hash : '#' + hash
+      var url = location.origin + location.pathname + location.search + hash
+      history.replaceState(history.state, null, url)
+    }
+  })()
+</script>
+```

package/lib/config/babel.js

@@ -82,9 +82,9 @@ module.exports = function getBabelConfig(opts = {}) {
         }
       ],
       ["@babel/plugin-proposal-decorators", { legacy: true }],
-      ["@babel/plugin-proposal-class-properties", { loose: true }],
-      ["@babel/plugin-proposal-private-methods", { loose: true }],
-      ["@babel/plugin-proposal-private-property-in-object", { loose: true }],
+      ["@babel/plugin-transform-class-properties", { loose: true }],
+      ["@babel/plugin-transform-private-methods", { loose: true }],
+      ["@babel/plugin-transform-private-property-in-object", { loose: true }],
       [
         "import",
         { libraryName: "lodash", libraryDirectory: "", camel2DashComponentName: false },

package/lib/config/webpackConfig.js

@@ -10,6 +10,7 @@ var CaseSensitivePathsPlugin = require("case-sensitive-paths-webpack-plugin");
 var appPkg = require(paths.package);
 var appConfig = require("../utils/appConfig");
 var { ESBuildMinifyPlugin } = require("esbuild-loader");
+var ImageMinimizerPlugin = require("image-minimizer-webpack-plugin");
 var jsMainPath = appConfig.grayscale ? `${appPkg.name}/beta/${appPkg.name}` : `${appPkg.name}/${appPkg.name}`;
 var assetPath = appConfig.grayscale ? `${appPkg.name}/beta/${appPkg.version}` : `${appPkg.name}/${appPkg.version}`;
 var cssRegex = /\.css$/;
@@ -187,7 +188,7 @@ module.exports = function getWebpackConfig(args, override) {
               exclude: /node_modules/,
               options: require("./babel")()
             },
-            (override.transformNodeModules || isProd) && {
+            override.transformNodeModules && {
               test: /\.m?js$/,
               loader: "babel-loader",
               exclude: /@babel(?:\/|\\{1,2})runtime/,
@@ -356,6 +357,17 @@ module.exports = function getWebpackConfig(args, override) {
     optimization: {
       minimize: isProd && override.minify !== false,
       minimizer: [
+        override.minifyImage && new ImageMinimizerPlugin({
+          minimizer: {
+            implementation: ImageMinimizerPlugin.sharpMinify,
+            options: {
+              encodeOptions: {
+                // Your options for `sharp`
+                // https://sharp.pixelplumbing.com/api-output
+              }
+            }
+          }
+        }),
         override.minify === "esbuild" && new ESBuildMinifyPlugin({
           pure: override.pure_funcs ?? ["console.log"],
           drop: ["debugger"],

package/lib/utils/defineConfig.d.ts

@@ -37,7 +37,6 @@ export type Config = {
     /**
      * 编译 node_modules 下文件
      *
-     * 仅在 development 环境下生效。production 一定会编译 node_modules
      * @default true
      */
     transformNodeModules?: boolean;
@@ -47,6 +46,11 @@ export type Config = {
      * @default 'esbuild'
      */
     minify?: boolean | 'terser' | 'esbuild';
+    /**
+     * 打包时压缩图片资源
+     * @default true
+     */
+    minifyImage?: boolean;
     /** 自定义全局参数 */
     define?: Record<string, any>;
     /**

package/lib/utils/getOverride.js

@@ -3,6 +3,7 @@ var fs = require("fs");
 var paths = require("../config/paths");
 var defaultOverride = {
   transformNodeModules: true,
+  minifyImage: true,
   minify: "esbuild",
   proxy: [],
   extraPostCSSPlugins: []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "1.14.2",
+  "version": "1.14.4",
   "author": "Kinoko",
   "license": "MIT",
   "description": "教育工程化基础框架",
@@ -34,19 +34,19 @@
     "extends": "qsb-react"
   },
   "dependencies": {
-    "@babel/core": "~7.18.13",
-    "@babel/plugin-proposal-decorators": "~7.18.10",
-    "@babel/plugin-transform-runtime": "~7.18.10",
-    "@babel/preset-env": "~7.18.10",
-    "@babel/preset-react": "~7.18.6",
-    "@babel/preset-typescript": "~7.18.6",
-    "@babel/register": "~7.18.0",
-    "@babel/runtime": "~7.18.9",
+    "@babel/core": "~7.23.2",
+    "@babel/plugin-proposal-decorators": "~7.23.2",
+    "@babel/plugin-transform-runtime": "~7.23.2",
+    "@babel/preset-env": "~7.23.2",
+    "@babel/preset-react": "~7.23.2",
+    "@babel/preset-typescript": "~7.23.2",
+    "@babel/register": "~7.23.2",
+    "@babel/runtime": "~7.23.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@qse/ssh-sftp": "^1.0.0",
+    "@qse/ssh-sftp": "^1.0.1",
     "@svgr/webpack": "^8.0.1",
-    "babel-loader": "^8.3.0",
-    "babel-plugin-import": "^1.13.6",
+    "babel-loader": "^9.1.3",
+    "babel-plugin-import": "^1.13.8",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -61,6 +61,7 @@
     "globby": "^11.1.0",
     "gzip-size": "^6.0.0",
     "html-webpack-plugin": "^5.5.3",
+    "image-minimizer-webpack-plugin": "^3.0.0",
     "inquirer": "^8.2.5",
     "less": "^3.13.1",
     "less-loader": "^10.2.0",
@@ -80,6 +81,7 @@
     "recursive-readdir": "^2.2.3",
     "rimraf": "^3.0.2",
     "semver": "^7.5.4",
+    "sharp": "^0.32.0",
     "strip-ansi": "^6.0.1",
     "style-loader": "^3.3.3",
     "tailwindcss": "^3.3.3",

package/src/config/babel.js

@@ -67,9 +67,9 @@ module.exports = function getBabelConfig(opts = {}) {
         },
       ],
       ['@babel/plugin-proposal-decorators', { legacy: true }],
-      ['@babel/plugin-proposal-class-properties', { loose: true }],
-      ['@babel/plugin-proposal-private-methods', { loose: true }],
-      ['@babel/plugin-proposal-private-property-in-object', { loose: true }],
+      ['@babel/plugin-transform-class-properties', { loose: true }],
+      ['@babel/plugin-transform-private-methods', { loose: true }],
+      ['@babel/plugin-transform-private-property-in-object', { loose: true }],
       [
         'import',
         { libraryName: 'lodash', libraryDirectory: '', camel2DashComponentName: false },

package/src/config/webpackConfig.js

@@ -9,6 +9,7 @@ const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin')
 const appPkg = require(paths.package)
 const appConfig = require('../utils/appConfig')
 const { ESBuildMinifyPlugin } = require('esbuild-loader')
+const ImageMinimizerPlugin = require("image-minimizer-webpack-plugin");
 
 const jsMainPath = appConfig.grayscale
   ? `${appPkg.name}/beta/${appPkg.name}`
@@ -210,7 +211,7 @@ module.exports = function getWebpackConfig(args, override) {
               exclude: /node_modules/,
               options: require('./babel')(),
             },
-            (override.transformNodeModules || isProd) && {
+            override.transformNodeModules && {
               test: /\.m?js$/,
               loader: 'babel-loader',
               exclude: /@babel(?:\/|\\{1,2})runtime/,
@@ -381,6 +382,17 @@ module.exports = function getWebpackConfig(args, override) {
     optimization: {
       minimize: isProd && override.minify !== false,
       minimizer: [
+        override.minifyImage && new ImageMinimizerPlugin({
+          minimizer: {
+            implementation: ImageMinimizerPlugin.sharpMinify,
+            options: {
+              encodeOptions: {
+                // Your options for `sharp`
+                // https://sharp.pixelplumbing.com/api-output
+              },
+            },
+          },
+        }),
         override.minify === 'esbuild' &&
           new ESBuildMinifyPlugin({
             pure: override.pure_funcs ?? ['console.log'],

package/src/utils/defineConfig.ts

@@ -39,7 +39,6 @@ export type Config = {
   /**
    * 编译 node_modules 下文件
    *
-   * 仅在 development 环境下生效。production 一定会编译 node_modules
    * @default true
    */
   transformNodeModules?: boolean
@@ -49,6 +48,11 @@ export type Config = {
    * @default 'esbuild'
    */
   minify?: boolean | 'terser' | 'esbuild'
+  /**
+   * 打包时压缩图片资源
+   * @default true
+   */
+  minifyImage?:boolean
   /** 自定义全局参数 */
   define?: Record<string, any>
   /**

package/src/utils/getOverride.js

@@ -4,6 +4,7 @@ const paths = require('../config/paths')
 /** @type {import('./defineConfig').Config} */
 const defaultOverride = {
   transformNodeModules: true,
+  minifyImage: true,
   minify: 'esbuild',
   proxy: [],
   extraPostCSSPlugins: [],