@umijs/bundler-webpack 3.5.28 → 3.5.29-alpha.0

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)(dir);
   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)(dir);
   return pkgPathCache[dir];
 }
 

package/lib/getConfig/pkgUpContainName.d.ts

@@ -0,0 +1 @@
+export declare const pkgUpContainName: (dir: string) => string | null;

package/lib/getConfig/pkgUpContainName.js

@@ -0,0 +1,55 @@
+"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 }; }
+
+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.dirname(dir));
+  return pkgPath;
+};
+
+exports.pkgUpContainName = pkgUpContainName;

package/lib/index.js

@@ -152,6 +152,8 @@ class Bundler {
               } catch (e) {}
 
               console.error(err);
+
+              _utils().printHelp.feedback();
             }
           });
           resolve({
@@ -169,6 +171,9 @@ class Bundler {
               } catch (e) {}
 
               console.error(err);
+
+              _utils().printHelp.feedback();
+
               return reject(new Error('build failed'));
             } // ref: https://github.com/webpack/webpack/issues/12345#issuecomment-755273757
             // @ts-ignore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "3.5.28",
+  "version": "3.5.29-alpha.0",
   "description": "@umijs/bundler-webpack",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "bugs": "http://github.com/umijs/umi/issues",
-  "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
+  "homepage": "https://github.com/umijs/umi/tree/3.x/packages/bundler-webpack#readme",
   "publishConfig": {
     "access": "public"
   },
@@ -37,10 +37,10 @@
     "strip-ansi": "6.0.0"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "3.5.28",
-    "@umijs/deps": "3.5.28",
-    "@umijs/types": "3.5.28",
-    "@umijs/utils": "3.5.28",
+    "@umijs/bundler-utils": "3.5.29-alpha.0",
+    "@umijs/deps": "3.5.29-alpha.0",
+    "@umijs/types": "3.5.29-alpha.0",
+    "@umijs/utils": "3.5.29-alpha.0",
     "jest-worker": "26.6.2",
     "node-libs-browser": "2.2.1",
     "normalize-url": "1.9.1",