chore: 合并冲突

umijs · Sep 14, 2023 · f929530 · f929530
2 parents 1620ed9 + f69d375
commit f929530
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 12 deletions.
diff --git a/packages/bundler-webpack/package.json b/packages/bundler-webpack/package.json
@@ -28,7 +28,6 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
     "@svgr/core": "6.5.1",
     "@svgr/plugin-jsx": "^6.5.1",
     "@svgr/plugin-svgo": "^6.5.1",
@@ -37,6 +36,7 @@
     "@umijs/bundler-utils": "workspace:*",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
     "@umijs/mfsu": "workspace:*",
+    "@umijs/react-refresh-webpack-plugin": "0.5.11",
     "@umijs/utils": "workspace:*",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",

diff --git a/packages/bundler-webpack/src/config/fastRefreshPlugin.ts b/packages/bundler-webpack/src/config/fastRefreshPlugin.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
-import FastRefreshPlugin from '@pmmmwh/react-refresh-webpack-plugin/lib';
 import Config from '@umijs/bundler-webpack/compiled/webpack-5-chain';
+// @ts-ignore
+import FastRefreshPlugin from '@umijs/react-refresh-webpack-plugin/lib';
 import { MFSU_NAME } from '../constants';
 import { Env, IConfig } from '../types';
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml