fix(utils): routeToChunkName with invalid regular expression (#6156)

* fix(utils): routeToChunkName with invalid regular expression * fix: build watch opts regepx
umijs · Feb 23, 2021 · e80ed23 · e80ed23
1 parent 4052ef6
commit e80ed23
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 3 deletions.
diff --git a/packages/bundler-webpack/src/fixtures/t++/config.ts b/packages/bundler-webpack/src/fixtures/t++/config.ts
@@ -0,0 +1,5 @@
+export default {
+  externals: {
+    react: 'React',
+  }
+}
diff --git a/packages/bundler-webpack/src/fixtures/t++/expect.ts b/packages/bundler-webpack/src/fixtures/t++/expect.ts
@@ -0,0 +1,5 @@
+import { IExpectOpts } from '../types';
+
+export default ({ indexJS }: IExpectOpts) => {
+  expect(indexJS).toContain(`default.a.createElement("div"`);
+}
diff --git a/packages/bundler-webpack/src/fixtures/t++/index.tsx b/packages/bundler-webpack/src/fixtures/t++/index.tsx
@@ -0,0 +1,2 @@
+
+export default () => <div>111</div>;
diff --git a/packages/bundler-webpack/src/index.ts b/packages/bundler-webpack/src/index.ts
@@ -2,7 +2,7 @@ import { IConfig, BundlerConfigType } from '@umijs/types';
 import defaultWebpack from 'webpack';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import { IServerOpts, Server } from '@umijs/server';
-import { winPath } from '@umijs/utils';
+import { winPath, lodash as _ } from '@umijs/utils';
 import { join } from 'path';
 import getConfig, { IOpts as IGetConfigOpts } from './getConfig/getConfig';
 
@@ -60,7 +60,9 @@ class Bundler {
    */
   getIgnoredWatchRegExp = (): defaultWebpack.Options.WatchOptions['ignored'] => {
     const { outputPath } = this.config;
-    const absOutputPath = winPath(join(this.cwd, outputPath as string, '/'));
+    const absOutputPath = _.escapeRegExp(
+      winPath(join(this.cwd, outputPath as string, '/')),
+    );
     // need ${sep} after outputPath
     return process.env.WATCH_IGNORED === 'none'
       ? undefined

diff --git a/packages/utils/src/routes.test.ts b/packages/utils/src/routes.test.ts
@@ -65,3 +65,15 @@ test('routeToChunkName cwd', () => {
     }),
   ).toEqual('p__users__id');
 });
+
+test('routeToChunkName cwd escape char', () => {
+  expect(
+    routeToChunkName({
+      route: {
+        path: '/users/:id',
+        component: '/users/c++/pages/users/[id].jsx',
+      },
+      cwd: '/users/c++',
+    }),
+  ).toEqual('p__users__id');
+});
diff --git a/packages/utils/src/routes.ts b/packages/utils/src/routes.ts
@@ -1,3 +1,4 @@
+import { escapeRegExp } from 'lodash';
 import winPath from './winPath/winPath';
 
 function lastSlash(str: string) {
@@ -19,7 +20,10 @@ export const routeToChunkName: IRouteToChunkName = (
 ) => {
   return typeof route.component === 'string'
     ? route.component
-        .replace(new RegExp(`^${lastSlash(winPath(cwd || '/'))}`), '')
+        .replace(
+          new RegExp(`^${escapeRegExp(lastSlash(winPath(cwd || '/')))}`),
+          '',
+        )
         .replace(/^.(\/|\\)/, '')
         .replace(/(\/|\\)/g, '__')
         .replace(/\.jsx?$/, '')