@xfe-repo/web-app 1.5.1 → 1.6.0

package/config/webpack/webpack.config.js

@@ -178,7 +178,7 @@ module.exports = function (webpackEnv) {
               javascriptEnabled: true,
             },
           },
-        }
+        },
       )
     }
     return loaders
@@ -281,7 +281,7 @@ module.exports = function (webpackEnv) {
       // We placed these paths second because we want `node_modules` to "win"
       // if there are any conflicts. This matches Node resolution mechanism.
       // https://github.com/facebook/create-react-app/issues/253
-      modules: ['node_modules', paths.appNodeModules].concat(modules.additionalModulePaths || []),
+      modules: [paths.appNodeModules, 'node_modules'].concat(modules.additionalModulePaths || []),
       // These are the reasonable defaults supported by the Node ecosystem.
       // We also include JSX as a common component filename extension to support
       // some tools, although we do not recommend using it, see:
@@ -299,7 +299,7 @@ module.exports = function (webpackEnv) {
           'scheduler/tracing': 'scheduler/tracing-profiling',
         }),
         ...(modules.webpackAliases || {}),
-        react: path.resolve('./node_modules/react')
+        react: path.resolve('./node_modules/react'),
       },
       plugins: [
         // Prevents users from importing files from outside of src/ (or node_modules/).
@@ -403,7 +403,7 @@ module.exports = function (webpackEnv) {
                 plugins: [
                   isEnvDevelopment && shouldUseReactRefresh && require.resolve('react-refresh/babel'),
                   // modify 异步按需加载
-                  ['@loadable/babel-plugin'],
+                  require.resolve('@loadable/babel-plugin'),
                 ].filter(Boolean),
                 // This is a feature of `babel-loader` for webpack (not Babel itself).
                 // It enables caching results in ./node_modules/.cache/babel-loader/
@@ -487,7 +487,7 @@ module.exports = function (webpackEnv) {
                     mode: 'icss',
                   },
                 },
-                'less-loader'
+                'less-loader',
               ),
               // Don't consider CSS imports dead code even if the
               // containing package claims to have no side effects.
@@ -509,7 +509,7 @@ module.exports = function (webpackEnv) {
                     getLocalIdent: getCSSModuleLocalIdent,
                   },
                 },
-                'less-loader'
+                'less-loader',
               ),
             },
             // "file" loader makes sure those assets get served by WebpackDevServer.
@@ -555,8 +555,8 @@ module.exports = function (webpackEnv) {
                   minifyURLs: true,
                 },
               }
-            : undefined
-        )
+            : undefined,
+        ),
       ),
       // Inlines the webpack runtime script. This script is too small to warrant
       // a network request.
@@ -594,6 +594,7 @@ module.exports = function (webpackEnv) {
           // both options are optional
           filename: 'static/css/[name].[contenthash:8].css',
           chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
+          ignoreOrder: true,
         }),
       // Generate an asset manifest file with the following content:
       // - "files" key: Mapping of all asset filenames to their corresponding

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-app",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "bin": {
     "xfe-web": "./bin/index.js"
   },
@@ -79,8 +79,8 @@
     "webpack-manifest-plugin": "^4.0.2",
     "workbox-webpack-plugin": "^7.0.0",
     "yaml": "^2.3.4",
-    "@xfe-repo/typescript-config": "1.5.1",
-    "@xfe-repo/eslint-config": "1.5.1"
+    "@xfe-repo/eslint-config": "1.6.0",
+    "@xfe-repo/typescript-config": "1.6.0"
   },
   "peerDependencies": {
     "react": "18.2.0",
@@ -93,6 +93,6 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "lint": "eslint \"src/**/*.ts*\" --fix",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
+    "clean": "rm -rf .turbo coverage dist node_modules"
   }
 }

package/scripts/dev.js

@@ -19,6 +19,14 @@ const chalk = require("react-dev-utils/chalk");
 const webpack = require("webpack");
 const WebpackDevServer = require("webpack-dev-server");
 const clearConsole = require("react-dev-utils/clearConsole");
+// modify 覆写 关闭 CRA/webpack 开发脚本的默认清屏逻辑，避免 turbo 并行任务日志被擦掉
+const shouldClearConsole = process.env.XFE_WEB_CLEAR_CONSOLE === 'true'
+if (shouldClearConsole) {
+  const clearConsolePath = require.resolve('react-dev-utils/clearConsole')
+  if (require.cache[clearConsolePath]) {
+    require.cache[clearConsolePath].exports = () => {}
+  }
+}
 const checkRequiredFiles = require("react-dev-utils/checkRequiredFiles");
 const {
   choosePort,