@umijs/bundler-webpack 3.5.35 → 3.5.37

package/lib/getConfig/getConfig.js

@@ -542,13 +542,12 @@ function _getConfig() {
 
     const nodeLibs = require('node-libs-browser');
 
-    if (isWebpack5) {
+    const nodePolyfill = process.env.NODE_POLYFILL !== 'none';
+
+    if (isWebpack5 && nodePolyfill) {
       ret.plugins.push(new bundleImplementor.ProvidePlugin({
-        process: nodeLibs['process']
-      }));
-      ret.plugins.push( // ref: https://github.com/umijs/umi/issues/6914
-      // @ts-ignore
-      new bundleImplementor.ProvidePlugin({
+        process: nodeLibs['process'],
+        // ref: https://github.com/umijs/umi/issues/6914
         Buffer: ['buffer', 'Buffer']
       })); // @ts-ignore
 

package/lib/getConfig/nodeModulesTransform.js

@@ -38,6 +38,8 @@ function _path() {
   return data;
 }
 
+var _pkgUpContainName = require("./pkgUpContainName");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -85,9 +87,7 @@ function isMatch(opts) {
 function getPkgPath(opts) {
   const dir = (0, _path().dirname)(opts.path);
   if (dir in pkgPathCache) return pkgPathCache[dir];
-  pkgPathCache[dir] = _utils().pkgUp.sync({
-    cwd: opts.path
-  });
+  pkgPathCache[dir] = (0, _pkgUpContainName.pkgUpContainName)(opts.path);
   return pkgPathCache[dir];
 }
 

package/lib/getConfig/pkgMatch.js

@@ -16,16 +16,6 @@ function _react() {
   return data;
 }
 
-function _utils() {
-  const data = require("@umijs/utils");
-
-  _utils = function _utils() {
-    return data;
-  };
-
-  return data;
-}
-
 function _path() {
   const data = require("path");
 
@@ -36,6 +26,8 @@ function _path() {
   return data;
 }
 
+var _pkgUpContainName = require("./pkgUpContainName");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const pkgPathCache = {};
@@ -43,9 +35,7 @@ const pkgPathCache = {};
 function getPkgPath(filePath) {
   const dir = (0, _path().dirname)(filePath);
   if (dir in pkgPathCache) return pkgPathCache[dir];
-  pkgPathCache[dir] = _utils().pkgUp.sync({
-    cwd: filePath
-  });
+  pkgPathCache[dir] = (0, _pkgUpContainName.pkgUpContainName)(filePath);
   return pkgPathCache[dir];
 }
 

package/lib/getConfig/pkgUpContainName.d.ts

@@ -0,0 +1,6 @@
+/**
+ * find the closet package.json which contains `name`
+ * why not use pkg-up directly? some package (such as htmlparser2@8) put a `package.json` with
+ * `{ "type": "module" }` to provide pure esm dist, but it is not the npm `package.json` we want
+ */
+export declare const pkgUpContainName: (dir: string) => string | null;

package/lib/getConfig/pkgUpContainName.js

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.pkgUpContainName = void 0;
+
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+
+  _react = function _react() {
+    return data;
+  };
+
+  return data;
+}
+
+function _utils() {
+  const data = require("@umijs/utils");
+
+  _utils = function _utils() {
+    return data;
+  };
+
+  return data;
+}
+
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+
+  _path = function _path() {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * find the closet package.json which contains `name`
+ * why not use pkg-up directly? some package (such as htmlparser2@8) put a `package.json` with
+ * `{ "type": "module" }` to provide pure esm dist, but it is not the npm `package.json` we want
+ */
+const pkgUpContainName = dir => {
+  let pkgPath = _utils().pkgUp.sync({
+    cwd: dir
+  });
+
+  if (!pkgPath) return pkgPath;
+
+  const _require = require(pkgPath),
+        name = _require.name; // invalid package
+
+
+  if (!name) {
+    return pkgUpContainName(_path().default.resolve(dir, '../..'));
+  }
+
+  return pkgPath;
+};
+
+exports.pkgUpContainName = pkgUpContainName;

package/lib/requireHook.js

@@ -29,8 +29,10 @@ function getFileName(filePath) {
 let inited = false;
 
 function init() {
+  const skipRequireHookInit = process.env.INIT_REQUIRE_HOOK === 'none'; // Don't hook webpack when has skip flag
   // Allow run once
-  if (inited) return;
+
+  if (skipRequireHookInit || inited) return;
   inited = true;
   const filesMap = files.map(file => {
     const fileName = getFileName(file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "3.5.35",
+  "version": "3.5.37",
   "description": "@umijs/bundler-webpack",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -37,11 +37,11 @@
     "strip-ansi": "6.0.0"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "3.5.35",
+    "@umijs/bundler-utils": "3.5.37",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/deps": "3.5.35",
-    "@umijs/types": "3.5.35",
-    "@umijs/utils": "3.5.35",
+    "@umijs/deps": "3.5.37",
+    "@umijs/types": "3.5.37",
+    "@umijs/utils": "3.5.37",
     "jest-worker": "26.6.2",
     "node-libs-browser": "2.2.1",
     "normalize-url": "1.9.1",