Skip to content

Commit

Permalink
fix: 解决冲突
Browse files Browse the repository at this point in the history
  • Loading branch information
AlbertLin0923 committed Apr 10, 2024
2 parents 815933f + c5363d4 commit d6b6784
Show file tree
Hide file tree
Showing 2 changed files with 2,241 additions and 1,052 deletions.
42 changes: 21 additions & 21 deletions packages/react-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"prepublishOnly": "pnpm run build"
},
"dependencies": {
"@babel/core": "^7.23.7",
"@babel/core": "^7.24.4",
"@mango-scripts/babel-preset-mango": "^0.0.2",
"@mango-scripts/utils": "^2.0.2",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
Expand All @@ -48,22 +48,22 @@
"@rsbuild/plugin-svgr": "^0.5.9",
"@rsbuild/plugin-type-check": "^0.5.9",
"@svgr/webpack": "^8.1.0",
"@swc/core": "^1.3.102",
"@swc/helpers": "^0.5.3",
"address": "^2.0.1",
"@swc/core": "^1.4.12",
"@swc/helpers": "^0.5.8",
"address": "^2.0.2",
"babel-loader": "^9.1.3",
"bfj": "^8.0.0",
"browserslist": "^4.22.1",
"browserslist": "^4.23.0",
"browserslist-to-esbuild": "^1.2.0",
"camelcase": "^8.0.0",
"case-sensitive-paths-webpack-plugin": "^2.4.0",
"css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^5.0.1",
"detect-port": "^1.5.1",
"esbuild": "^0.19.11",
"esbuild-loader": "^4.0.2",
"esbuild": "^0.20.2",
"esbuild-loader": "^4.1.0",
"escape-string-regexp": "^5.0.0",
"eslint-webpack-plugin": "^4.0.1",
"eslint-webpack-plugin": "^4.1.0",
"file-loader": "^6.2.0",
"fork-ts-checker-webpack-plugin": "^9.0.2",
"gzip-size": "^7.0.0",
Expand All @@ -72,39 +72,39 @@
"less": "^4.2.0",
"less-loader": "^11.1.4",
"leven": "^4.0.0",
"lightningcss": "^1.22.1",
"lightningcss": "^1.24.1",
"loader-utils": "^3.2.1",
"lodash-es": "^4.17.21",
"mini-css-extract-plugin": "^2.7.6",
"postcss": "^8.4.31",
"mini-css-extract-plugin": "^2.8.1",
"postcss": "^8.4.38",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-loader": "^7.3.4",
"postcss-normalize": "^10.0.1",
"postcss-preset-env": "^9.3.0",
"postcss-preset-env": "^9.5.4",
"react-refresh": "^0.14.0",
"resolve": "^1.22.8",
"resolve-url-loader": "^5.0.0",
"sass": "^1.69.6",
"sass-loader": "^13.3.3",
"sass": "^1.74.1",
"sass-loader": "^14.1.1",
"source-map-loader": "^4.0.2",
"style-loader": "^3.3.3",
"style-loader": "^3.3.4",
"stylelint-webpack-plugin": "^4.1.1",
"stylus": "^0.62.0",
"stylus": "^0.63.0",
"stylus-loader": "^7.1.3",
"svg-sprite-loader": "^6.0.11",
"svgo-loader": "^4.0.0",
"swc-loader": "^0.2.3",
"tailwindcss": "^3.3.5",
"terser": "^5.24.0",
"swc-loader": "^0.2.6",
"tailwindcss": "^3.4.3",
"terser": "^5.30.3",
"terser-webpack-plugin": "^5.3.10",
"text-table": "^0.2.0",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"uglify-js": "^3.17.4",
"webpack": "^5.89.0",
"webpack": "^5.91.0",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-dev-server": "^4.15.1",
"webpack-manifest-plugin": "^5.0.0",
"webpackbar": "^6.0.0",
"webpackbar": "^6.0.1",
"workbox-webpack-plugin": "^7.0.0"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit d6b6784

Please sign in to comment.