fix: config extraBabelIncludes is absolute, nodeModules all transform (…

…#6632) * fix: config extraBabelIncludes is absolute, nodeModules all transform * chore: add jest test * fix: JavaScript heap out of memory * chore: code style * fix: windows set NODE_OPTIONS * fix: window set NODE_OPTIONS * fix: ci JavaScript heap out of memory * chore: add github ci NODE_OPTIONS * fix: github ci env * fix: ci
umijs · May 26, 2021 · da26563 · da26563
1 parent 3e4c380
commit da26563
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,3 +43,4 @@ jobs:
           HEADLESS: false
           PROGRESS: none
           NODE_ENV: test
+          NODE_OPTIONS: --max_old_space_size=4071
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -35,7 +35,7 @@ jobs:
         displayName: install
       - script: yarn build
         displayName: build
-      - script: yarn test --forceExit --detectOpenHandles --maxWorkers=4
+      - script: set NODE_OPTIONS='--max-old-space-size=4071' && yarn test --forceExit --detectOpenHandles --maxWorkers=2
         env:
           PROGRESS: none
           CI: true
@@ -66,7 +66,7 @@ jobs:
       - script: yarn --frozen-lockfile
       - script: yarn build
         displayName: build
-      - script: yarn test --forceExit --detectOpenHandles --maxWorkers=4
+      - script: NODE_OPTIONS='--max-old-space-size=4071' yarn test --forceExit --detectOpenHandles --maxWorkers=4
         env:
           PROGRESS: none
           CI: true
@@ -97,7 +97,7 @@ jobs:
       - script: yarn --frozen-lockfile
       - script: yarn build
         displayName: build
-      - script: yarn test --forceExit --detectOpenHandles --maxWorkers=4
+      - script: NODE_OPTIONS='--max-old-space-size=4071' yarn test --forceExit --detectOpenHandles --maxWorkers=4
         env:
           PROGRESS: none
           CI: true

diff --git a/packages/bundler-webpack/src/fixtures/.noExtraBabelIncludes/too.js b/packages/bundler-webpack/src/fixtures/.noExtraBabelIncludes/too.js
@@ -0,0 +1,6 @@
+
+export default () => {
+  let too = 1;
+  too += 1;
+  return too;
+}
diff --git a/packages/bundler-webpack/src/fixtures/extraBabelIncludes/expect.ts b/packages/bundler-webpack/src/fixtures/extraBabelIncludes/expect.ts
@@ -4,4 +4,6 @@ export default ({ indexJS }: IExpectOpts) => {
   expect(indexJS).toContain('var bar = 1;');
   expect(indexJS).toContain('var foo = 1;');
   expect(indexJS).toContain('var hoo = 1;');
+  expect(indexJS).toContain('let too = 1;');
+  expect(indexJS).not.toContain('var too = 1;');
 };
diff --git a/packages/bundler-webpack/src/fixtures/extraBabelIncludes/index.ts b/packages/bundler-webpack/src/fixtures/extraBabelIncludes/index.ts
@@ -3,7 +3,9 @@ import bar from 'bar/bar';
 // @ts-ignore
 import foo from 'foo/foo';
 import hoo from '../.extraBabelIncludes/hoo';
+import too from '../.noExtraBabelIncludes/too';
 
 bar();
 foo();
 hoo();
+too();
diff --git a/packages/bundler-webpack/src/getConfig/getConfig.ts b/packages/bundler-webpack/src/getConfig/getConfig.ts
@@ -217,7 +217,7 @@ export default async function getConfig(
             .add((a: any) => {
               // 支持绝对路径匹配
               if (isAbsolute(include)) {
-                return isAbsolute(include);
+                return a.includes(include);
               }
 
               // 支持 node_modules 下的 npm 包