From 7969e9299521b54e05216b45fdd11bc12c19ab28 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Fri, 12 Nov 2021 17:36:37 +0800 Subject: [PATCH] fix: alias in mode vite (#4890) --- packages/plugin-router/CHANGELOG.md | 4 ++++ packages/plugin-router/package.json | 2 +- packages/plugin-router/src/index.ts | 4 +++- packages/vite-service/CHANGELOG.md | 4 ++++ packages/vite-service/package.json | 2 +- packages/vite-service/src/wp2vite/config.ts | 3 ++- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/plugin-router/CHANGELOG.md b/packages/plugin-router/CHANGELOG.md index bed40def1..8001301b5 100644 --- a/packages/plugin-router/CHANGELOG.md +++ b/packages/plugin-router/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2.0.2 + +- [fix] optimize alias for `react-router-dom` + ## 2.0.1 - [fix] bump version of `@builder/pack` diff --git a/packages/plugin-router/package.json b/packages/plugin-router/package.json index 807cc60ff..7442af744 100644 --- a/packages/plugin-router/package.json +++ b/packages/plugin-router/package.json @@ -1,6 +1,6 @@ { "name": "build-plugin-ice-router", - "version": "2.0.1", + "version": "2.0.2", "description": "build-plugin-ice-router", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/plugin-router/src/index.ts b/packages/plugin-router/src/index.ts index 84e759c4d..27096632d 100644 --- a/packages/plugin-router/src/index.ts +++ b/packages/plugin-router/src/index.ts @@ -57,7 +57,9 @@ const plugin = ({ context, onGetWebpackConfig, modifyUserConfig, getValue, apply // alias for react-router-dom const routerName = 'react-router-dom'; - config.resolve.alias.set(routerName, require.resolve(routerName)); + const packagePath = require.resolve(`${routerName}/package.json`); + // use react-router-dom path while react-router-dom has module field in package.json + config.resolve.alias.set(routerName, path.dirname(packagePath)); // config historyApiFallback for router type browser config.devServer.set('historyApiFallback', true); diff --git a/packages/vite-service/CHANGELOG.md b/packages/vite-service/CHANGELOG.md index e727da53d..9661b0099 100644 --- a/packages/vite-service/CHANGELOG.md +++ b/packages/vite-service/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 1.1.2 + +- [fix] alias path allow with node_modules + ## 1.1.1 - [fix] sourcemap does not work with mode vite diff --git a/packages/vite-service/package.json b/packages/vite-service/package.json index 29e965e0d..a5b71a0e1 100644 --- a/packages/vite-service/package.json +++ b/packages/vite-service/package.json @@ -1,6 +1,6 @@ { "name": "@builder/vite-service", - "version": "1.1.1", + "version": "1.1.2", "description": "vite implementation", "author": "ice-admin@alibaba-inc.com", "homepage": "", diff --git a/packages/vite-service/src/wp2vite/config.ts b/packages/vite-service/src/wp2vite/config.ts index dff1bc790..d9463e415 100644 --- a/packages/vite-service/src/wp2vite/config.ts +++ b/packages/vite-service/src/wp2vite/config.ts @@ -93,7 +93,8 @@ const configMap: ConfigMap = { name: 'resolve.alias', transform: (value, ctx) => { const { rootDir } = ctx; - const blackList = ['webpack/hot', 'node_modules']; + // webpack/hot is not necessary in mode vite + const blackList = ['webpack/hot']; const data: Record = Object.keys(value).reduce( (acc, key) => { if (!blackList.some((word) => value[key]?.includes(word)))