Revert "fix(bundler-webpack): 修复 extraBabelIncludes 不能支持 htmlparser2 …

…特例的问题 (#8480)" This reverts commit 2954d97.
umijs · Jul 14, 2022 · 89a8fdf · 89a8fdf
1 parent 426374e
commit 89a8fdf
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 40 deletions.
diff --git a/packages/bundler-webpack/src/fixtures/extraBabelIncludes/config.ts b/packages/bundler-webpack/src/fixtures/extraBabelIncludes/config.ts
@@ -4,10 +4,5 @@ export default {
   nodeModulesTransform: {
     type: 'none',
   },
-  extraBabelIncludes: [
-    join(__dirname, '../.extraBabelIncludes'),
-    'foo',
-    'bar',
-    'pkg-up-name',
-  ],
+  extraBabelIncludes: [join(__dirname, '../.extraBabelIncludes'), 'foo', 'bar'],
 };
diff --git a/packages/bundler-webpack/src/fixtures/extraBabelIncludes/expect.ts b/packages/bundler-webpack/src/fixtures/extraBabelIncludes/expect.ts
@@ -3,7 +3,6 @@ import { IExpectOpts } from '../types';
 export default ({ indexJS }: IExpectOpts) => {
   expect(indexJS).toContain('var bar = 1;');
   expect(indexJS).toContain('var foo = 1;');
-  expect(indexJS).toContain('var pkg = 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
@@ -2,13 +2,10 @@
 import bar from 'bar/bar';
 // @ts-ignore
 import foo from 'foo/foo';
-// @ts-ignore
-import pun from 'pkg-up-name';
 import hoo from '../.extraBabelIncludes/hoo';
 import too from '../.noExtraBabelIncludes/too';
 
 bar();
 foo();
-pun();
 hoo();
 too();
diff --git a/...ges/bundler-webpack/src/fixtures/extraBabelIncludes/node_modules/pkg-up-name/lib/index.js b/...ges/bundler-webpack/src/fixtures/extraBabelIncludes/node_modules/pkg-up-name/lib/index.js
diff --git a/...bundler-webpack/src/fixtures/extraBabelIncludes/node_modules/pkg-up-name/lib/package.json b/...bundler-webpack/src/fixtures/extraBabelIncludes/node_modules/pkg-up-name/lib/package.json
diff --git a/...ges/bundler-webpack/src/fixtures/extraBabelIncludes/node_modules/pkg-up-name/package.json b/...ges/bundler-webpack/src/fixtures/extraBabelIncludes/node_modules/pkg-up-name/package.json
diff --git a/packages/bundler-webpack/src/getConfig/nodeModulesTransform.ts b/packages/bundler-webpack/src/getConfig/nodeModulesTransform.ts
@@ -1,6 +1,5 @@
-import { semver } from '@umijs/utils';
+import { pkgUp, semver } from '@umijs/utils';
 import { dirname } from 'path';
-import { pkgUpContainName } from './pkgUpContainName';
 
 const pkgPathCache = {};
 const pkgCache = {};
@@ -47,7 +46,7 @@ export function isMatch(opts: { path: string; pkgs: IPkgs }) {
 function getPkgPath(opts: { path: string }) {
   const dir = dirname(opts.path);
   if (dir in pkgPathCache) return pkgPathCache[dir];
-  pkgPathCache[dir] = pkgUpContainName(dir);
+  pkgPathCache[dir] = pkgUp.sync({ cwd: opts.path });
   return pkgPathCache[dir];
 }
 

diff --git a/packages/bundler-webpack/src/getConfig/pkgMatch.ts b/packages/bundler-webpack/src/getConfig/pkgMatch.ts
@@ -1,12 +1,12 @@
+import { pkgUp } from '@umijs/utils';
 import { dirname } from 'path';
-import { pkgUpContainName } from './pkgUpContainName';
 
 const pkgPathCache = {};
 
 export function getPkgPath(filePath: string) {
   const dir = dirname(filePath);
   if (dir in pkgPathCache) return pkgPathCache[dir];
-  pkgPathCache[dir] = pkgUpContainName(dir);
+  pkgPathCache[dir] = pkgUp.sync({ cwd: filePath });
   return pkgPathCache[dir];
 }
 

diff --git a/packages/bundler-webpack/src/getConfig/pkgUpContainName.ts b/packages/bundler-webpack/src/getConfig/pkgUpContainName.ts