diff --git a/jjb.config.js b/jjb.config.js index 972d8a1..6d1a393 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -1,3 +1,5 @@ +const path = require("node:path"); + module.exports = { // 应用后端git地址,部署上线需要 javaGit: "", @@ -66,6 +68,17 @@ module.exports = { }, // webpack webpackConfig: { + module: { + rules: [ + { + test: /\.m?js$/, + include: path.resolve(__dirname, "./node_modules/@ant-design/pro-components"), + resolve: { + fullySpecified: false, + }, + }, + ], + }, // 单页面插件 htmlWebpackPluginOption: { // 自动注入编译后的文件到public/index.html中 diff --git a/package.json b/package.json index ad43c59..f4a6fd1 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "license": "MIT", "main": "index.js", "scripts": { - "serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js", - "build": "node node_modules/@cqsjjb/scripts/webpack.build.js", + "serve": "node node_modules/@cqsjjb/scripts/rspack.dev.server.js", + "build": "node node_modules/@cqsjjb/scripts/rspack.build.js", "push": "jjb-cmd push java production", "clean-cache": "rimraf node_modules/.cache/webpack", "serve:development": "cross-env NODE_ENV=development npm run serve", @@ -19,24 +19,24 @@ }, "dependencies": { "@ahooksjs/use-url-state": "^3.5.1", - "@ant-design/icons": "^5.6.1", - "@ant-design/pro-components": "^2.8.10", + "@ant-design/icons": "^6.2.5", + "@ant-design/pro-components": "^3.1.12-0", "@cqsjjb/jjb-common-decorator": "latest", "@cqsjjb/jjb-common-lib": "latest", "@cqsjjb/jjb-dva-runtime": "latest", "@cqsjjb/jjb-react-admin-component": "latest", "ahooks": "^3.9.5", - "antd": "^5.27.6", + "antd": "^6.4.4", "dayjs": "^1.11.7", "lodash-es": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "zy-react-library": "latest" + "zy-react-library": "^2.0.0" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", "@babel/plugin-proposal-decorators": "^7.19.3", - "@cqsjjb/scripts": "2.0.0", + "@cqsjjb/scripts": "latest", "@eslint-react/eslint-plugin": "^2.2.2", "cross-env": "^7.0.3", "eslint": "^9.37.0",