Skip to content

Commit ceda5bf

Browse files
authored
Merge pull request #134 from codingapi/dev
Dev
2 parents b0194e1 + a2dc784 commit ceda5bf

File tree

8 files changed

+32
-187
lines changed

8 files changed

+32
-187
lines changed

admin-ui/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Admin-ui with Antd For Micro Frontends
22

3-
This is a simple React App with Webpack5 & Typescript.
3+
This is a simple React App with RsBuild & Typescript.
44

55
## Features
6-
1. Support Webpack 5 ModuleFederationPlugin for Micro Frontends
6+
1. Support RsBuild ModuleFederationPlugin for Micro Frontends
77
2. Support Dynamic zip component loading
88
3. Support Dynamic Routing & Dynamic Menu
99
4. Support Axios for API calls

admin-ui/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
"dependencies": {
66
"@ant-design/icons": "^5.4.0",
77
"@ant-design/pro-components": "^2.8.7",
8-
"@babel/standalone": "^7.25.6",
9-
"@codingapi/flow-pc": "^0.0.43",
10-
"@codingapi/form-pc": "^0.0.43",
11-
"@codingapi/ui-framework": "^0.0.43",
8+
"@codingapi/flow-pc": "^0.0.44",
9+
"@codingapi/form-pc": "^0.0.44",
10+
"@codingapi/ui-framework": "^0.0.44",
1211
"@dnd-kit/core": "^6.2.0",
1312
"@dnd-kit/sortable": "^9.0.0",
1413
"@handsontable/react-wrapper": "^15.0.0",
@@ -29,7 +28,6 @@
2928
"react-router": "^6.26.2",
3029
"react-router-dom": "^6.26.2",
3130
"remark-gfm": "^4.0.1",
32-
"typescript": "^5.6.2",
3331
"web-vitals": "^2.1.4"
3432
},
3533
"scripts": {
@@ -58,25 +56,26 @@
5856
]
5957
},
6058
"devDependencies": {
59+
"@babel/preset-env": "^7.26.0",
60+
"@babel/preset-react": "^7.26.3",
61+
"@babel/preset-typescript": "^7.26.0",
62+
"@babel/standalone": "^7.25.6",
6163
"@module-federation/enhanced": "^0.17.0",
6264
"@module-federation/rsbuild-plugin": "^0.17.0",
6365
"@rsbuild/core": "^1.4.7",
6466
"@rsbuild/plugin-react": "^1.3.4",
6567
"@rsbuild/plugin-sass": "^1.3.3",
66-
"@types/babel__standalone": "^7.1.7",
67-
"@types/node": "^16.18.108",
68-
"@types/react": "^18.3.5",
69-
"@types/react-dom": "^18.3.0",
70-
"@babel/preset-env": "^7.26.0",
71-
"@babel/preset-react": "^7.26.3",
72-
"@babel/preset-typescript": "^7.26.0",
7368
"@testing-library/dom": "^10.4.0",
7469
"@testing-library/jest-dom": "^6.6.3",
7570
"@testing-library/react": "^16.3.0",
71+
"@types/babel__standalone": "^7.1.7",
7672
"@types/jest": "^29.5.14",
7773
"@types/lodash": "^4.17.7",
7874
"@types/lodash-es": "^4.17.12",
7975
"@types/mockjs": "^1.0.10",
76+
"@types/node": "^16.18.108",
77+
"@types/react": "^18.3.5",
78+
"@types/react-dom": "^18.3.0",
8079
"babel-jest": "^29.7.0",
8180
"css-loader": "^7.1.2",
8281
"express": "^4.21.0",
@@ -85,11 +84,12 @@
8584
"jest-environment-jsdom": "^29.7.0",
8685
"mockjs": "^1.1.0",
8786
"monaco-editor-webpack-plugin": "^7.1.0",
88-
"sass": "^1.78.0",
87+
"sass": "^1.89.2",
8988
"sass-loader": "^16.0.1",
9089
"style-loader": "^4.0.0",
9190
"ts-jest": "^29.3.2",
9291
"ts-loader": "^9.5.1",
93-
"ts-node": "^10.9.2"
92+
"ts-node": "^10.9.2",
93+
"typescript": "^5.6.2"
9494
}
9595
}

admin-ui/webpack.common.js

Lines changed: 0 additions & 96 deletions
This file was deleted.

admin-ui/webpack.config.dev.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

admin-ui/webpack.config.mock.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

admin-ui/webpack.config.prod.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

mobile-ui/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@babel/standalone": "^7.25.6",
7-
"@codingapi/flow-mobile": "^0.0.43",
8-
"@codingapi/form-mobile": "^0.0.43",
9-
"@codingapi/ui-framework": "^0.0.43",
6+
"@codingapi/flow-mobile": "^0.0.44",
7+
"@codingapi/form-mobile": "^0.0.44",
8+
"@codingapi/ui-framework": "^0.0.44",
109
"@logicflow/core": "^2.0.10",
1110
"@logicflow/extension": "^2.0.14",
1211
"@reduxjs/toolkit": "^2.2.7",
@@ -24,7 +23,6 @@
2423
"react-resizable": "^3.0.5",
2524
"react-router": "^6.26.2",
2625
"react-router-dom": "^6.26.2",
27-
"typescript": "^5.6.2",
2826
"web-vitals": "^2.1.4"
2927
},
3028
"scripts": {
@@ -53,34 +51,36 @@
5351
]
5452
},
5553
"devDependencies": {
54+
"@babel/standalone": "^7.25.6",
5655
"@module-federation/enhanced": "^0.17.0",
5756
"@module-federation/rsbuild-plugin": "^0.17.0",
5857
"@rsbuild/core": "^1.4.7",
5958
"@rsbuild/plugin-react": "^1.3.4",
6059
"@rsbuild/plugin-sass": "^1.3.3",
61-
"@types/babel__standalone": "^7.1.7",
62-
"@types/node": "^16.18.108",
63-
"@types/react": "^18.3.5",
64-
"@types/react-dom": "^18.3.0",
65-
"@types/lodash": "^4.17.7",
66-
"@types/lodash-es": "^4.17.12",
67-
"@types/react-resizable": "^3.0.8",
6860
"@testing-library/dom": "^10.4.0",
6961
"@testing-library/jest-dom": "^6.6.3",
7062
"@testing-library/react": "^16.3.0",
63+
"@types/babel__standalone": "^7.1.7",
7164
"@types/jest": "^29.5.14",
65+
"@types/lodash": "^4.17.7",
66+
"@types/lodash-es": "^4.17.12",
7267
"@types/mockjs": "^1.0.10",
68+
"@types/node": "^16.18.108",
69+
"@types/react": "^18.3.5",
70+
"@types/react-dom": "^18.3.0",
71+
"@types/react-resizable": "^3.0.8",
7372
"babel-jest": "^29.7.0",
7473
"css-loader": "^7.1.2",
7574
"express": "^4.21.0",
7675
"identity-obj-proxy": "^3.0.0",
7776
"jest": "^29.7.0",
7877
"jest-environment-jsdom": "^29.7.0",
7978
"mockjs": "^1.1.0",
80-
"sass": "^1.78.0",
79+
"sass": "^1.89.2",
8180
"sass-loader": "^16.0.1",
8281
"style-loader": "^4.0.0",
8382
"ts-jest": "^29.3.2",
84-
"ts-loader": "^9.5.1"
83+
"ts-loader": "^9.5.1",
84+
"typescript": "^5.6.2"
8585
}
8686
}

mobile-ui/readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Mobile-ui with Antd For Micro Frontends
22

3-
This is a Simple React App with Webpack5 & Typescript.
3+
This is a Simple React App with RsBuild & Typescript.
44

55
## Features
6-
1. Support Webpack 5 ModuleFederationPlugin for Micro Frontends
6+
1. Support RsBuild ModuleFederationPlugin for Micro Frontends
77
2. Support Dynamic zip component loading
88
3. Support Dynamic Routing & Dynamic Menu
99
4. Support Axios for API calls

0 commit comments

Comments
 (0)