@modern-js/utils 2.69.4 → 3.0.0-alpha.0

package/package.json

@@ -15,15 +15,16 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.69.4",
+  "version": "3.0.0-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
+  "module": "./dist/esm/index.mjs",
   "_comment": "Provide ESM and CJS exports, ESM is used by runtime package, for treeshaking",
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
+      "import": "./dist/esm-node/index.mjs",
       "default": "./dist/cjs/index.js"
     },
     "./logger": {
@@ -46,22 +47,17 @@
     },
     "./universal": {
       "types": "./dist/types/universal/index.d.ts",
-      "import": "./dist/esm/universal/index.js",
+      "import": "./dist/esm/universal/index.mjs",
       "default": "./dist/cjs/universal/index.js"
     },
     "./universal/constants": {
       "types": "./dist/types/universal/constants.d.ts",
-      "import": "./dist/esm/universal/constants.js",
+      "import": "./dist/esm/universal/constants.mjs",
       "default": "./dist/cjs/universal/constants.js"
     },
-    "./universal/format-webpack": {
-      "types": "./dist/types/universal/formatWebpack.d.ts",
-      "import": "./dist/esm/universal/formatWebpack.js",
-      "default": "./dist/cjs/universal/formatWebpack.js"
-    },
     "./universal/plugin-dag-sort": {
       "types": "./dist/types/universal/pluginDagSort.d.ts",
-      "import": "./dist/esm/universal/pluginDagSort.js",
+      "import": "./dist/esm/universal/pluginDagSort.mjs",
       "default": "./dist/cjs/universal/pluginDagSort.js"
     },
     "./commander": "./dist/compiled/commander/index.js",
@@ -79,37 +75,7 @@
     "./mime-types": "./dist/compiled/mime-types/index.js",
     "./strip-ansi": "./dist/compiled/strip-ansi/index.js",
     "./browserslist": "./dist/compiled/browserslist/index.js",
-    "./webpack-chain": "./dist/compiled/webpack-chain/index.js",
-    "./tsconfig-paths": "./dist/compiled/tsconfig-paths/index.js",
-    "./react-server-dom-webpack": "./dist/compiled/react-server-dom-webpack/index.js",
-    "./react-server-dom-webpack/client": {
-      "workerd": "./dist/compiled/react-server-dom-webpack/client.edge.js",
-      "deno": "./dist/compiled/react-server-dom-webpack/client.edge.js",
-      "worker": "./dist/compiled/react-server-dom-webpack/client.edge.js",
-      "node": {
-        "webpack": "./dist/compiled/react-server-dom-webpack/client.node.js",
-        "default": "./dist/compiled/react-server-dom-webpack/client.node.unbundled.js"
-      },
-      "edge-light": "./dist/compiled/react-server-dom-webpack/client.edge.js",
-      "browser": "./dist/compiled/react-server-dom-webpack/client.browser.js",
-      "default": "./dist/compiled/react-server-dom-webpack/client.browser.js"
-    },
-    "./react-server-dom-webpack/client.browser": "./dist/compiled/react-server-dom-webpack/client.browser.js",
-    "./react-server-dom-webpack/client.edge": "./dist/compiled/react-server-dom-webpack/client.edge.js",
-    "./react-server-dom-webpack/server": {
-      "react-server": {
-        "workerd": "./dist/compiled/react-server-dom-webpack/server.edge.js",
-        "deno": "./dist/compiled/react-server-dom-webpack/server.browser.js",
-        "node": {
-          "webpack": "./dist/compiled/react-server-dom-webpack/server.node.js",
-          "default": "./dist/compiled/react-server-dom-webpack/server.node.unbundled.js"
-        },
-        "edge-light": "./dist/compiled/react-server-dom-webpack/server.edge.js",
-        "browser": "./dist/compiled/react-server-dom-webpack/server.browser.js"
-      },
-      "default": "./dist/compiled/react-server-dom-webpack/server.js"
-    },
-    "./react-server-dom-webpack/server.edge": "./dist/compiled/react-server-dom-webpack/server.edge.js"
+    "./tsconfig-paths": "./dist/compiled/tsconfig-paths/index.js"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -135,9 +101,6 @@
       "universal/constants": [
         "./dist/types/universal/constants.d.ts"
       ],
-      "universal/format-webpack": [
-        "./dist/types/universal/formatWebpack.d.ts"
-      ],
       "universal/plugin-dag-sort": [
         "./dist/types/universal/pluginDagSort.d.ts"
       ],
@@ -180,9 +143,6 @@
       "browserslist": [
         "./dist/compiled/browserslist/index.d.ts"
       ],
-      "webpack-chain": [
-        "./dist/compiled/webpack-chain/types/index.d.ts"
-      ],
       "tsconfig-paths": [
         "./dist/compiled/tsconfig-paths/lib/index.d.ts"
       ],
@@ -198,23 +158,34 @@
     "@swc/helpers": "^0.5.17",
     "caniuse-lite": "^1.0.30001520",
     "lodash": "^4.17.21",
-    "rslog": "^1.1.0"
+    "rslog": "^1.3.2"
   },
   "devDependencies": {
-    "@types/jest": "^29",
-    "@types/node": "^18",
-    "jest": "^29",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^20",
+    "jest": "^29.7.0",
+    "@rslib/core": "0.18.5",
     "typescript": "^5",
-    "webpack": "^5.103.0",
-    "@modern-js/types": "2.69.4",
-    "@scripts/build": "2.66.0",
+    "@modern-js/types": "3.0.0-alpha.0",
+    "@modern-js/rslib": "2.68.10",
     "@scripts/jest-config": "2.66.0"
   },
+  "peerDependencies": {
+    "react": "^19.2.3",
+    "react-dom": "^19.2.3"
+  },
+  "peerDependenciesMeta": {
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    }
+  },
   "sideEffects": false,
   "scripts": {
-    "new": "modern-lib new",
-    "dev": "modern-lib build --watch",
-    "build": "modern-lib build",
+    "dev": "rslib build --watch",
+    "build": "rslib build",
     "test": "jest --passWithNoTests"
   }
 }

package/rslib.config.mts

@@ -0,0 +1,140 @@
+import { rslibConfig } from '@modern-js/rslib';
+import { type RslibConfig, type Rspack, defineConfig } from '@rslib/core';
+
+const dependencies = [
+  // zero dependency
+  'address',
+  'filesize',
+  'minimist',
+  'commander',
+  'import-lazy',
+  'dotenv',
+  'dotenv-expand',
+  'url-join',
+  'slash',
+  'nanoid',
+  'lodash',
+  {
+    name: 'upath',
+  },
+  // a few dependencies
+  'debug',
+  'semver',
+  'js-yaml',
+  'mime-types',
+  'strip-ansi',
+  'gzip-size',
+  'pkg-up',
+  {
+    name: 'json5',
+    externals: {
+      minimist: '../minimist',
+    },
+  },
+  // some dependencies
+  'glob',
+  'chalk',
+  'webpack-chain',
+  {
+    name: 'signale',
+    externals: {
+      chalk: '../chalk',
+    },
+    packageJsonField: ['options'],
+  },
+  'execa',
+  'fs-extra',
+  'browserslist',
+  'chokidar',
+  'fast-glob',
+  {
+    name: 'globby',
+    externals: {
+      'fast-glob': '../fast-glob',
+    },
+  },
+  {
+    name: 'ora',
+    externals: {
+      chalk: '../chalk',
+      'strip-ansi': '../strip-ansi',
+    },
+  },
+  {
+    name: 'inquirer',
+    externals: {
+      ora: '../ora',
+      chalk: '../chalk',
+      'strip-ansi': '../strip-ansi',
+    },
+  },
+  {
+    name: 'tsconfig-paths',
+    externals: {
+      json5: '../json5',
+      minimist: '../minimist',
+    },
+  },
+];
+
+const regexpMap: Record<string, RegExp> = {};
+
+for (const item of dependencies) {
+  const depName = typeof item === 'string' ? item : item.name;
+
+  // Skip dtsOnly dependencies
+  if (typeof item !== 'string' && 'dtsOnly' in item) {
+    continue;
+  }
+
+  regexpMap[depName] = new RegExp(`compiled[\\/]${depName}(?:[\\/]|$)`);
+}
+
+const externals: Rspack.Configuration['externals'] = [
+  // externalize pre-bundled dependencies
+  ({ request }, callback) => {
+    const entries = Object.entries(regexpMap);
+    if (request) {
+      for (const [name, test] of entries) {
+        if (request === name) {
+          throw new Error(
+            `"${name}" is not allowed to be imported, use "../compiled/${name}/index.js" instead.`,
+          );
+        }
+        if (test.test(request)) {
+          return callback(undefined, `node-commonjs ${request}/index.js`);
+        }
+      }
+    }
+    callback();
+  },
+];
+
+const lib: RslibConfig['lib'] = rslibConfig.lib.map((config, index) => {
+  if (config.format === 'esm') {
+    return {
+      ...config,
+      output: {
+        ...config.output,
+        externals,
+      },
+    };
+  }
+  return {
+    ...config,
+    output: {
+      ...config.output,
+      copy: [
+        {
+          from: './compiled',
+          to: '../compiled',
+        },
+      ],
+    },
+  };
+});
+
+export default defineConfig({
+  ...rslibConfig,
+  lib,
+});

package/dist/cjs/cli/action.js

@@ -1,55 +0,0 @@
-"use strict";
-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);
-var action_exports = {};
-__export(action_exports, {
-  newAction: () => newAction,
-  upgradeAction: () => upgradeAction
-});
-module.exports = __toCommonJS(action_exports);
-var import_compiled = require("../compiled");
-const newAction = async (config, solution) => {
-  var _process_env_MODERN_JS_VERSION;
-  await (0, import_compiled.execa)("npx", [
-    "--yes",
-    `@modern-js/new-action@${(_process_env_MODERN_JS_VERSION = process.env.MODERN_JS_VERSION) !== null && _process_env_MODERN_JS_VERSION !== void 0 ? _process_env_MODERN_JS_VERSION : "latest"}`,
-    `--config=${JSON.stringify(config)}`,
-    `--solution=${solution}`
-  ], {
-    stderr: "inherit",
-    stdout: "inherit",
-    stdin: "inherit"
-  });
-};
-const upgradeAction = async () => {
-  var _process_env_MODERN_JS_VERSION;
-  await (0, import_compiled.execa)("npx", [
-    "--yes",
-    `@modern-js/upgrade@${(_process_env_MODERN_JS_VERSION = process.env.MODERN_JS_VERSION) !== null && _process_env_MODERN_JS_VERSION !== void 0 ? _process_env_MODERN_JS_VERSION : "latest"}`,
-    ...process.argv.slice(2)
-  ], {
-    stdin: "inherit",
-    stdout: "inherit",
-    stderr: "inherit"
-  });
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  newAction,
-  upgradeAction
-});

package/dist/cjs/universal/formatWebpack.js

@@ -1,127 +0,0 @@
-"use strict";
-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);
-var formatWebpack_exports = {};
-__export(formatWebpack_exports, {
-  addErrorTips: () => addErrorTips,
-  formatWebpackMessages: () => formatWebpackMessages
-});
-module.exports = __toCommonJS(formatWebpack_exports);
-const friendlySyntaxErrorLabel = "SyntaxError:";
-function isLikelyASyntaxError(message) {
-  return message.includes(friendlySyntaxErrorLabel);
-}
-function formatMessage(stats) {
-  let lines = [];
-  let message;
-  if (typeof stats === "object") {
-    const fileName = stats.moduleName ? `File: ${stats.moduleName}
-` : "";
-    const mainMessage = typeof stats.formatted === "string" ? stats.formatted : stats.message;
-    const details = stats.details ? `
-Details: ${stats.details}
-` : "";
-    const stack = stats.stack ? `
-${stats.stack}` : "";
-    message = `${fileName}${mainMessage}${details}${stack}`;
-  } else {
-    message = stats;
-  }
-  lines = message.split("\n");
-  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})`;
-  });
-  message = lines.join("\n");
-  message = message.replace(/SyntaxError\s+\((\d+):(\d+)\)\s*(.+?)\n/g, `${friendlySyntaxErrorLabel} $3 ($1:$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:") !== -1) {
-    lines[1] = lines[1].replace("Error: ", "");
-  }
-  lines = lines.filter((line, index, arr) => index === 0 || line.trim() !== "" || line.trim() !== arr[index - 1].trim());
-  message = lines.join("\n");
-  return message.trim();
-}
-const noop = (message) => message;
-const defaultColor = {
-  gray: noop,
-  cyan: noop,
-  green: noop,
-  yellow: noop,
-  underline: noop
-};
-function addErrorTips(errors, color = defaultColor) {
-  const errorHelpers = [
-    {
-      validator(message) {
-        return (message.includes("You may need an appropriate loader") || message.includes("You may need an additional loader")) && message.includes(".ts");
-      },
-      formatter(message) {
-        return `${message}
-
-${color.yellow(`If it is a TypeScript file, you can use "source.include" config to compile it. see ${color.underline("https://modernjs.dev/en/configure/app/source/include.html")}`)}
-
-${color.green(`${color.gray("// config file")}
-export default {
-  source: {
-    include: [
-      ${color.gray("// add some include rules")}
-    ]
-  }
-}`)}
-        `;
-      }
-    }
-  ];
-  return errors.map((error) => {
-    const helper = errorHelpers.find((item) => item.validator(error));
-    return helper ? helper.formatter(error) : error;
-  });
-}
-function formatWebpackMessages(json, color = defaultColor) {
-  var _json_errors, _json_warnings, _result_errors;
-  const formattedErrors = json === null || json === void 0 ? void 0 : (_json_errors = json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
-  const formattedWarnings = json === null || json === void 0 ? void 0 : (_json_warnings = json.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
-  const result = {
-    errors: formattedErrors || [],
-    warnings: formattedWarnings || [],
-    errorTips: []
-  };
-  if ((_result_errors = result.errors) === null || _result_errors === void 0 ? void 0 : _result_errors.some(isLikelyASyntaxError)) {
-    result.errors = result.errors.filter(isLikelyASyntaxError);
-  }
-  if (result.errors.length > 1) {
-    result.errors.length = 1;
-  }
-  result.errors = addErrorTips(result.errors, color);
-  return result;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  addErrorTips,
-  formatWebpackMessages
-});

package/dist/compiled/react-server-dom-webpack/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Meta Platforms, Inc. and affiliates.
-
-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.

package/dist/compiled/react-server-dom-webpack/README.md

@@ -1,5 +0,0 @@
-# react-server-dom-webpack
-
-Experimental React Flight bindings for DOM using Webpack.
-
-**Use it at your own risk.**