@umijs/bundler-webpack 4.0.6 → 4.0.9

package/dist/utils/formatWebpackMessages.js

@@ -1,100 +1,102 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatWebpackMessages = exports.formatMessage = void 0;
-const strip_ansi_1 = __importDefault(require("@umijs/utils/compiled/strip-ansi"));
-const friendlySyntaxErrorLabel = 'Syntax error:';
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// formatWebpackMessages.ts
+var formatWebpackMessages_exports = {};
+__export(formatWebpackMessages_exports, {
+  formatMessage: () => formatMessage,
+  formatWebpackMessages: () => formatWebpackMessages
+});
+module.exports = __toCommonJS(formatWebpackMessages_exports);
+var import_strip_ansi = __toESM(require("@umijs/utils/compiled/strip-ansi"));
+var friendlySyntaxErrorLabel = "Syntax error:";
 function isLikelyASyntaxError(message) {
-    return (0, strip_ansi_1.default)(message).indexOf(friendlySyntaxErrorLabel) !== -1;
+  return (0, import_strip_ansi.default)(message).indexOf(friendlySyntaxErrorLabel) !== -1;
 }
 function formatMessage(message) {
-    let lines = [];
-    if (typeof message === 'string') {
-        lines = message.split('\n');
-    }
-    else if ('message' in message) {
-        lines = message['message'].split('\n');
-    }
-    else if (Array.isArray(message)) {
-        message.forEach((message) => {
-            if ('message' in message) {
-                lines = message['message'].split('\n');
-            }
-        });
-    }
-    // Strip webpack-added headers off errors/warnings
-    // https://github.com/webpack/webpack/blob/master/lib/ModuleError.js
-    lines = lines.filter((line) => !/Module [A-z ]+\(from/.test(line));
-    // Transform parsing error into syntax error
-    // TODO: move this to our ESLint formatter?
-    lines = lines.map((line) => {
-        const parsingError = /Line (\d+):(?:(\d+):)?\s*Parsing error: (.+)$/.exec(line);
-        if (!parsingError) {
-            return line;
-        }
-        const [, errorLine, errorColumn, errorMessage] = parsingError;
-        return `${friendlySyntaxErrorLabel} ${errorMessage} (${errorLine}:${errorColumn})`;
+  let lines = [];
+  if (typeof message === "string") {
+    lines = message.split("\n");
+  } else if ("message" in message) {
+    lines = message["message"].split("\n");
+  } else if (Array.isArray(message)) {
+    message.forEach((message2) => {
+      if ("message" in message2) {
+        lines = message2["message"].split("\n");
+      }
     });
-    message = lines.join('\n');
-    // Smoosh syntax errors (commonly found in CSS)
-    message = message.replace(/SyntaxError\s+\((\d+):(\d+)\)\s*(.+?)\n/g, `${friendlySyntaxErrorLabel} $3 ($1:$2)\n`);
-    // Clean up export errors
-    message = message.replace(/^.*export '(.+?)' was not found in '(.+?)'.*$/gm, `Attempted import error: '$1' is not exported from '$2'.`);
-    message = message.replace(/^.*export 'default' \(imported as '(.+?)'\) was not found in '(.+?)'.*$/gm, `Attempted import error: '$2' does not contain a default export (imported as '$1').`);
-    message = message.replace(/^.*export '(.+?)' \(imported as '(.+?)'\) was not found in '(.+?)'.*$/gm, `Attempted import error: '$1' is not exported from '$3' (imported as '$2').`);
-    lines = message.split('\n');
-    // Remove leading newline
-    if (lines.length > 2 && lines[1].trim() === '') {
-        lines.splice(1, 1);
-    }
-    // Clean up file name
-    lines[0] = lines[0].replace(/^(.*) \d+:\d+-\d+$/, '$1');
-    // Cleans up verbose "module not found" messages for files and packages.
-    if (lines[1] && lines[1].indexOf('Module not found: ') === 0) {
-        lines = [
-            lines[0],
-            lines[1]
-                .replace('Error: ', '')
-                .replace('Module not found: Cannot find file:', 'Cannot find file:'),
-        ];
+  }
+  lines = lines.filter((line) => !/Module [A-z ]+\(from/.test(line));
+  lines = lines.map((line) => {
+    const parsingError = /Line (\d+):(?:(\d+):)?\s*Parsing error: (.+)$/.exec(line);
+    if (!parsingError) {
+      return line;
     }
-    // Add helpful message for users trying to use Sass for the first time
-    if (lines[1] && lines[1].match(/Cannot find module.+sass/)) {
-        lines[1] = 'To import Sass files, you first need to install sass.\n';
-        lines[1] +=
-            'Run `npm install sass` or `yarn add sass` inside your workspace.';
-    }
-    message = lines.join('\n');
-    // Internal stacks are generally useless so we strip them... with the
-    // exception of stacks containing `webpack:` because they're normally
-    // from user code generated by webpack. For more information see
-    // https://github.com/facebook/create-react-app/pull/1050
-    message = message.replace(/^\s*at\s((?!webpack:).)*:\d+:\d+[\s)]*(\n|$)/gm, ''); // at ... ...:x:y
-    message = message.replace(/^\s*at\s<anonymous>(\n|$)/gm, ''); // at <anonymous>
-    lines = message.split('\n');
-    // Remove duplicated newlines
-    lines = lines.filter((line, index, arr) => index === 0 ||
-        line.trim() !== '' ||
-        line.trim() !== arr[index - 1].trim());
-    // Reassemble the message
-    message = lines.join('\n');
-    return message.trim();
+    const [, errorLine, errorColumn, errorMessage] = parsingError;
+    return `${friendlySyntaxErrorLabel} ${errorMessage} (${errorLine}:${errorColumn})`;
+  });
+  message = lines.join("\n");
+  message = message.replace(/SyntaxError\s+\((\d+):(\d+)\)\s*(.+?)\n/g, `${friendlySyntaxErrorLabel} $3 ($1:$2)
+`);
+  message = message.replace(/^.*export '(.+?)' was not found in '(.+?)'.*$/gm, `Attempted import error: '$1' is not exported from '$2'.`);
+  message = message.replace(/^.*export 'default' \(imported as '(.+?)'\) was not found in '(.+?)'.*$/gm, `Attempted import error: '$2' does not contain a default export (imported as '$1').`);
+  message = message.replace(/^.*export '(.+?)' \(imported as '(.+?)'\) was not found in '(.+?)'.*$/gm, `Attempted import error: '$1' is not exported from '$3' (imported as '$2').`);
+  lines = message.split("\n");
+  if (lines.length > 2 && lines[1].trim() === "") {
+    lines.splice(1, 1);
+  }
+  lines[0] = lines[0].replace(/^(.*) \d+:\d+-\d+$/, "$1");
+  if (lines[1] && lines[1].indexOf("Module not found: ") === 0) {
+    lines = [
+      lines[0],
+      lines[1].replace("Error: ", "").replace("Module not found: Cannot find file:", "Cannot find file:")
+    ];
+  }
+  if (lines[1] && lines[1].match(/Cannot find module.+sass/)) {
+    lines[1] = "To import Sass files, you first need to install sass.\n";
+    lines[1] += "Run `npm install sass` or `yarn add sass` inside your workspace.";
+  }
+  message = lines.join("\n");
+  message = message.replace(/^\s*at\s((?!webpack:).)*:\d+:\d+[\s)]*(\n|$)/gm, "");
+  message = message.replace(/^\s*at\s<anonymous>(\n|$)/gm, "");
+  lines = message.split("\n");
+  lines = lines.filter((line, index, arr) => index === 0 || line.trim() !== "" || line.trim() !== arr[index - 1].trim());
+  message = lines.join("\n");
+  return message.trim();
 }
-exports.formatMessage = formatMessage;
 function formatWebpackMessages(json) {
-    const formattedErrors = json.errors.map(function (message) {
-        return formatMessage(message);
-    });
-    const formattedWarnings = json.warnings.map(function (message) {
-        return formatMessage(message);
-    });
-    const result = { errors: formattedErrors, warnings: formattedWarnings };
-    if (result.errors.some(isLikelyASyntaxError)) {
-        // If there are any syntax errors, show just them.
-        result.errors = result.errors.filter(isLikelyASyntaxError);
-    }
-    return result;
+  const formattedErrors = json.errors.map(function(message) {
+    return formatMessage(message);
+  });
+  const formattedWarnings = json.warnings.map(function(message) {
+    return formatMessage(message);
+  });
+  const result = { errors: formattedErrors, warnings: formattedWarnings };
+  if (result.errors.some(isLikelyASyntaxError)) {
+    result.errors = result.errors.filter(isLikelyASyntaxError);
+  }
+  return result;
 }
-exports.formatWebpackMessages = formatWebpackMessages;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatMessage,
+  formatWebpackMessages
+});

package/dist/utils/getEsBuildTarget.js

@@ -1,12 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEsBuildTarget = void 0;
-const constants_1 = require("../constants");
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// getEsBuildTarget.ts
+var getEsBuildTarget_exports = {};
+__export(getEsBuildTarget_exports, {
+  getEsBuildTarget: () => getEsBuildTarget
+});
+module.exports = __toCommonJS(getEsBuildTarget_exports);
+var import_constants = require("../constants");
 function getEsBuildTarget({ targets }) {
-    return Object.keys(targets)
-        .filter((key) => constants_1.DEFAULT_ESBUILD_TARGET_KEYS.includes(key))
-        .map((key) => {
-        return `${key}${targets[key] === true ? '0' : targets[key]}`;
-    });
+  return Object.keys(targets).filter((key) => import_constants.DEFAULT_ESBUILD_TARGET_KEYS.includes(key)).map((key) => {
+    return `${key}${targets[key] === true ? "0" : targets[key]}`;
+  });
 }
-exports.getEsBuildTarget = getEsBuildTarget;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getEsBuildTarget
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.6",
+  "version": "4.0.9",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,10 +21,9 @@
     "dist"
   ],
   "scripts": {
-    "build": "pnpm tsc",
-    "build:client": "pnpm tsc --project ./tsconfig.client.json",
+    "build": "umi-scripts father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build --watch",
+    "dev": "umi-scripts father dev",
     "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs",
     "test": "umi-scripts jest-turbo"
   },
@@ -35,18 +34,21 @@
     "@svgr/plugin-jsx": "^6.2.1",
     "@svgr/plugin-svgo": "^6.2.0",
     "@types/hapi__joi": "17.1.8",
-    "@umijs/babel-preset-umi": "4.0.6",
-    "@umijs/bundler-utils": "4.0.6",
-    "@umijs/mfsu": "4.0.6",
-    "@umijs/utils": "4.0.6",
+    "@umijs/babel-preset-umi": "4.0.9",
+    "@umijs/bundler-utils": "4.0.9",
+    "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
+    "@umijs/mfsu": "4.0.9",
+    "@umijs/utils": "4.0.9",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
+    "fork-ts-checker-webpack-plugin": "7.2.4",
     "jest-worker": "27.5.1",
     "node-libs-browser": "2.2.1",
     "postcss": "^8.4.13",
     "postcss-preset-env": "7.5.0",
-    "react-error-overlay": "6.0.9"
+    "react-error-overlay": "6.0.9",
+    "react-refresh": "0.14.0"
   },
   "devDependencies": {
     "@swc/core": "1.2.165",
@@ -60,14 +62,12 @@
     "copy-webpack-plugin": "10.2.4",
     "css-minimizer-webpack-plugin": "4.0.0",
     "cssnano": "5.1.7",
-    "fork-ts-checker-webpack-plugin": "7.2.4",
     "http-proxy-middleware": "2.0.4",
     "less-loader": "10.2.0",
     "mini-css-extract-plugin": "2.6.0",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-loader": "6.2.1",
     "purgecss-webpack-plugin": "4.1.3",
-    "react-refresh": "0.12.0",
     "sass-loader": "12.6.0",
     "schema-utils": "4.0.0",
     "speed-measure-webpack-plugin": "1.5.0",
@@ -100,7 +100,6 @@
       "cssnano",
       "compression",
       "connect-history-api-fallback",
-      "fork-ts-checker-webpack-plugin",
       "http-proxy-middleware",
       "less-loader",
       "mini-css-extract-plugin",
@@ -121,8 +120,7 @@
       "webpack-manifest-plugin",
       "webpack-sources",
       "ws",
-      "./bundles/webpack/bundle",
-      "./bundles/react-refresh/babel"
+      "./bundles/webpack/bundle"
     ],
     "externals": {
       "@swc/core": "@swc/core",
@@ -169,13 +167,11 @@
       "cssnano",
       "compression",
       "connect-history-api-fallback",
-      "fork-ts-checker-webpack-plugin",
       "less-loader",
       "mini-css-extract-plugin",
       "postcss-flexbugs-fixes",
       "postcss-loader",
       "purgecss-webpack-plugin",
-      "react-refresh",
       "sass-loader",
       "speed-measure-webpack-plugin",
       "style-loader",

package/compiled/fork-ts-checker-webpack-plugin/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 TypeStrong
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.