@modern-js/utils 1.9.0 → 1.15.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/utils
 
+## 1.15.0
+
+### Patch Changes
+
+- 8658a78: chore: remove `@modern-js/plugin-docsite`
+
+  chore: 移除 `@modern-js/plugin-docsite`
+
+- 05d4a4f: chore(utils): add fs-extra to exports fields
+
+  chore(utils): 通过 exports 导出 fs-extra 子路径
+
+- ad05af9: fix: bff.proxy and devServer.proxy types
+
+  fix: 修复 bff.proxy 和 devServer.proxy 类型定义不完整的问题
+
+- 5d53d1c: fix(webpack): failed to format error message in some cases
+
+  fix(webpack): 修复格式化 webpack 错误信息时报错的问题
+
+- 37cd159: feat(webpack): log more detailed error messages
+
 ## 1.9.0
 
 ### Minor Changes

package/dist/chainId.d.ts

@@ -13,6 +13,12 @@ export declare const CHAIN_ID: {
         readonly JS: "js";
         /** Rule for ts */
         readonly TS: "ts";
+        /** Rule for css */
+        readonly CSS: "css";
+        /** Rule for less */
+        readonly LESS: "less";
+        /** Rule for sass */
+        readonly SASS: "sass";
     };
     /** Predefined rule groups */
     readonly ONE_OF: {
@@ -42,6 +48,10 @@ export declare const CHAIN_ID: {
         readonly TS: "ts";
         /** css-loader */
         readonly CSS: "css";
+        /** sass-loader */
+        readonly SASS: "sass";
+        /** less-loader */
+        readonly LESS: "less";
         /** url-loader */
         readonly URL: "url";
         /** file-loader */

package/dist/chainId.js

@@ -16,6 +16,12 @@ exports.CHAIN_ID = {
         JS: 'js',
         /** Rule for ts */
         TS: 'ts',
+        /** Rule for css */
+        CSS: 'css',
+        /** Rule for less */
+        LESS: 'less',
+        /** Rule for sass */
+        SASS: 'sass',
     },
     /** Predefined rule groups */
     ONE_OF: {
@@ -45,6 +51,10 @@ exports.CHAIN_ID = {
         TS: 'ts',
         /** css-loader */
         CSS: 'css',
+        /** sass-loader */
+        SASS: 'sass',
+        /** less-loader */
+        LESS: 'less',
         /** url-loader */
         URL: 'url',
         /** file-loader */

package/dist/constants.js

@@ -72,7 +72,6 @@ exports.INTERNAL_PLUGINS = {
     '@modern-js/plugin-electron': { cli: '@modern-js/plugin-electron/cli' },
     '@modern-js/plugin-testing': { cli: '@modern-js/plugin-testing/cli' },
     '@modern-js/plugin-storybook': { cli: '@modern-js/plugin-storybook/cli' },
-    '@modern-js/plugin-docsite': { cli: '@modern-js/plugin-docsite/cli' },
     '@modern-js/plugin-express': {
         cli: '@modern-js/plugin-express/cli',
         server: '@modern-js/plugin-express',

package/dist/format.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file at
  * https://github.com/facebook/create-react-app/blob/master/LICENSE
  */
-import { StatsCompilation } from 'webpack';
+import type { StatsCompilation } from 'webpack';
 import type { ProxyDetail, BffProxyOptions } from '@modern-js/types';
 declare function formatWebpackMessages(json: StatsCompilation): {
     errors: string[];

package/dist/format.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable no-param-reassign */
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
  *
@@ -9,22 +8,26 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatProxyOptions = exports.formatWebpackMessages = void 0;
-const friendlySyntaxErrorLabel = 'Syntax error:';
+const friendlySyntaxErrorLabel = 'SyntaxError:';
 function isLikelyASyntaxError(message) {
     return message.includes(friendlySyntaxErrorLabel);
 }
 // Cleans up webpack error messages.
-function formatMessage(message) {
-    var _a;
+function formatMessage(stats) {
     let lines = [];
+    let message;
     // webpack 5 stats error object
-    if (typeof message === 'object') {
-        message = `${(message.moduleName && `${message.moduleName}\n`)}${message.details || message.stack || message.message}`;
+    if (typeof stats === 'object') {
+        const fileName = stats.moduleName ? `File: ${stats.moduleName}\n` : '';
+        const mainMessage = stats.message;
+        const details = stats.details ? `\nDetails: ${stats.details}\n` : '';
+        const stack = stats.stack ? `\n${stats.stack}` : '';
+        message = `${fileName}${mainMessage}${details}${stack}`;
+    }
+    else {
+        message = stats;
     }
     lines = 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
     lines = lines.map(line => {
         const parsingError = /Line (\d+):(?:(\d+):)?\s*Parsing error: (.+)$/.exec(line);
@@ -45,15 +48,8 @@ function formatMessage(message) {
     // 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 ((_a = lines[1]) === null || _a === void 0 ? void 0 : _a.startsWith('Module not found: ')) {
-        lines = [
-            lines[0],
-            lines[1]
-                .replace('Error: ', '')
-                .replace('Module not found: Cannot find file:', 'Cannot find file:')
-                .replace('[CaseSensitivePathsPlugin] ', '')
-                .replace("Cannot resolve 'file' or 'directory' ", ''),
-        ];
+    if (lines[1] && lines[1].indexOf('Module not found:') !== -1) {
+        lines[1] = lines[1].replace('Error: ', '');
     }
     message = lines.join('\n');
     // Internal stacks are generally useless so we strip them... with the
@@ -90,7 +86,6 @@ function formatWebpackMessages(json) {
     return result;
 }
 exports.formatWebpackMessages = formatWebpackMessages;
-/* eslint-enable no-param-reassign */
 function formatProxyOptions(proxyOptions) {
     const formattedProxy = [];
     if (!Array.isArray(proxyOptions)) {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.9.0",
+  "version": "1.15.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -30,6 +30,7 @@
     "./semver": "./compiled/semver/index.js",
     "./lodash": "./compiled/lodash/index.js",
     "./globby": "./compiled/globby/index.js",
+    "./fs-extra": "./compiled/fs-extra/index.js",
     "./fast-glob": "./compiled/fast-glob/index.js",
     "./gzip-size": "./compiled/gzip-size/index.js",
     "./mime-types": "./compiled/mime-types/index.js",
@@ -38,7 +39,8 @@
     "./browserslist": "./compiled/browserslist/index.js",
     "./webpack-chain": "./compiled/webpack-chain/index.js",
     "./tsconfig-paths": "./compiled/tsconfig-paths/index.js",
-    "./better-ajv-errors": "./compiled/better-ajv-errors/index.js"
+    "./better-ajv-errors": "./compiled/better-ajv-errors/index.js",
+    "./chain-id": "./dist/chainId.js"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -79,6 +81,9 @@
       "globby": [
         "./compiled/globby/index.d.ts"
       ],
+      "fs-extra": [
+        "./compiled/fs-extra/index.d.ts"
+      ],
       "fast-glob": [
         "./compiled/fast-glob/index.d.ts"
       ],
@@ -105,6 +110,9 @@
       ],
       "better-ajv-errors": [
         "./compiled/better-ajv-errors/index.d.ts"
+      ],
+      "chain-id": [
+        "./dist/chainId.d.ts"
       ]
     }
   },
@@ -113,9 +121,9 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@modern-js/types": "1.6.2",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0",
+    "@modern-js/types": "1.15.0",
+    "@scripts/build": "1.15.0",
+    "@scripts/jest-config": "1.15.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "typescript": "^4",