@modern-js/utils 2.27.0 → 2.29.0

package/dist/esm-node/runtime-browser/parsed.js

@@ -6,7 +6,8 @@ export const parsedJSONFromElement = (id) => {
   const element = elements[elements.length - 1];
   if (element) {
     try {
-      const parsed = JSON.parse((element === null || element === void 0 ? void 0 : element.textContent) || "");
+      var _element;
+      const parsed = JSON.parse(((_element = element) === null || _element === void 0 ? void 0 : _element.textContent) || "");
       return parsed;
     } catch (e) {
       console.error(`parse ${id} error`, e);

package/dist/esm-node/universal/formatWebpack.js

@@ -42,13 +42,50 @@ ${stats.stack}` : "";
   message = lines.join("\n");
   return message.trim();
 }
-function formatWebpackMessages(json) {
-  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 noop = (message) => message;
+const defaultColor = {
+  gray: noop,
+  cyan: noop,
+  green: noop,
+  yellow: noop,
+  underline: noop
+};
+export 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/builder/en/api/config-source.html#sourceinclude")}`)}
+
+${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, _json_warnings, _json1, _result_errors;
+  const formattedErrors = (_json = json) === null || _json === void 0 ? void 0 : (_json_errors = _json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
+  const formattedWarnings = (_json1 = json) === null || _json1 === void 0 ? void 0 : (_json_warnings = _json1.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
   const result = {
     errors: formattedErrors || [],
-    warnings: formattedWarnings || []
+    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);
@@ -56,6 +93,7 @@ function formatWebpackMessages(json) {
   if (result.errors.length > 1) {
     result.errors.length = 1;
   }
+  result.errors = addErrorTips(result.errors, color);
   return result;
 }
 export { formatWebpackMessages };

package/dist/esm-node/universal/time.js

@@ -0,0 +1,28 @@
+function processHrtime(previousTimestamp) {
+  const now = (/* @__PURE__ */ new Date()).getTime();
+  const clocktime = now * 1e-3;
+  let seconds = Math.floor(clocktime);
+  let nanoseconds = Math.floor(clocktime % 1 * 1e9);
+  if (previousTimestamp) {
+    seconds -= previousTimestamp[0];
+    nanoseconds -= previousTimestamp[1];
+    if (nanoseconds < 0) {
+      seconds--;
+      nanoseconds += 1e9;
+    }
+  }
+  return [
+    seconds,
+    nanoseconds
+  ];
+}
+const getLatency = (hrtime) => {
+  const [s, ns] = processHrtime(hrtime);
+  return s * 1e3 + ns / 1e6;
+};
+export const time = () => {
+  const hrtime = processHrtime();
+  return () => {
+    return getLatency(hrtime);
+  };
+};

package/dist/types/cli/constants/chainId.d.ts

@@ -37,6 +37,8 @@ export declare const CHAIN_ID: {
     readonly YAML: "yaml";
     /** Rule for wasm */
     readonly WASM: "wasm";
+    /** Rule for node */
+    readonly NODE: "node";
     /** Rule for bff */
     readonly JS_BFF_API: "js-bff-api";
   };
@@ -75,6 +77,8 @@ export declare const CHAIN_ID: {
     readonly TOML: "toml";
     /** html-loader */
     readonly HTML: "html";
+    /** node-loader */
+    readonly NODE: "html";
     /** babel-loader */
     readonly BABEL: "babel";
     /** esbuild-loader */
@@ -93,6 +97,8 @@ export declare const CHAIN_ID: {
     readonly CSS_MODULES_TS: "css-modules-typescript";
     /** mini-css-extract-plugin.loader */
     readonly MINI_CSS_EXTRACT: "mini-css-extract";
+    /** resolve-url-loader */
+    readonly RESOLVE_URL_LOADER_FOR_SASS: "resolve-url-loader";
     /** builder-plugin-image-compress.loader */
     readonly IMAGE_COMPRESS: "image-compress";
     /** builder-plugin-image-compress svgo-loader */
@@ -140,6 +146,10 @@ export declare const CHAIN_ID: {
     readonly HTML_NONCE: "html-nonce";
     /** HtmlCrossOriginPlugin */
     readonly HTML_CROSS_ORIGIN: "html-cross-origin";
+    /** htmlPreconnectPlugin */
+    readonly HTML_PRECONNECT: "html-preconnect-plugin";
+    /** htmlDnsPrefetchPlugin */
+    readonly HTML_DNS_PREFETCH: "html-dns-prefetch-plugin";
     /** MiniCssExtractPlugin */
     readonly MINI_CSS_EXTRACT: "mini-css-extract";
     /** VueLoaderPlugin */

package/dist/types/cli/constants/index.d.ts

@@ -40,7 +40,7 @@ export declare const SHARED_DIR = "shared";
 /**
  * Modern.config.ts cached dir
  */
-export declare const CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
+export declare const CONFIG_CACHE_DIR = "./node_modules/.cache/bundle-require";
 export declare const CONFIG_FILE_EXTENSIONS: string[];
 /**
  * Serialized config path

package/dist/types/cli/index.d.ts

@@ -12,7 +12,6 @@ export * from './logger';
 export * from './monorepo';
 export * from './package';
 export * from './path';
-export * from './pathSerializer';
 export * from './port';
 export * from './prettyInstructions';
 export * from './require';

package/dist/types/cli/is/config.d.ts

@@ -24,5 +24,5 @@ export declare const isRouterV5: (config: {
   };
 }) => boolean;
 export declare const isSSGEntry: (config: any, entryName: string, entrypoints: EntryPoint[]) => boolean;
-export declare const isSingleEntry: (entrypoints: EntryPoint[]) => boolean;
+export declare const isSingleEntry: (entrypoints: EntryPoint[], mainEntryName?: string) => boolean;
 export {};

package/dist/types/cli/logger.d.ts

@@ -46,6 +46,7 @@ declare const LOG_TYPES: {
     level: string;
   };
 };
+export declare const isErrorStackMessage: (message: string) => boolean;
 declare class Logger {
   private readonly level;
   private readonly config;

package/dist/types/cli/path.d.ts

@@ -1,17 +1,8 @@
-import { lodash as _ } from '../compiled';
 export declare const isPathString: (test: string) => boolean;
 export declare const isRelativePath: (test: string) => boolean;
 export declare const normalizeOutputPath: (s: string) => string;
 export declare const normalizeToPosixPath: (p: string | undefined) => string;
 export declare const getTemplatePath: (prefix?: string) => string;
-/**
- * Compile path string to RegExp.
- * @note Only support posix path.
- */
-export declare function compilePathMatcherRegExp(match: string | RegExp): RegExp;
-/** @internal @see {@link upwardPaths} */
-export declare const _joinPathParts: (_part: unknown, i: number, parts: _.List<string>) => string;
-export declare function upwardPaths(start: string): string[];
 export declare function getRealTemporaryDirectory(): string | null;
 export declare function splitPathString(str: string): string[];
 export declare const removeLeadingSlash: (s: string) => string;

package/dist/types/universal/formatWebpack.d.ts

@@ -6,7 +6,20 @@
  * https://github.com/facebook/create-react-app/blob/master/LICENSE
  */
 import type { StatsCompilation } from 'webpack';
-declare function formatWebpackMessages(json?: Pick<StatsCompilation, 'errors' | 'warnings'>): {
+export declare function addErrorTips(errors: string[], color?: {
+  gray: (message: string) => string;
+  cyan: (message: string) => string;
+  green: (message: string) => string;
+  yellow: (message: string) => string;
+  underline: (message: string) => string;
+}): string[];
+declare function formatWebpackMessages(json?: Pick<StatsCompilation, 'errors' | 'warnings'>, color?: {
+  gray: (message: string) => string;
+  cyan: (message: string) => string;
+  green: (message: string) => string;
+  yellow: (message: string) => string;
+  underline: (message: string) => string;
+}): {
   errors: string[];
   warnings: string[];
 };

package/dist/types/universal/time.d.ts

@@ -0,0 +1 @@
+export declare const time: () => () => number;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.27.0",
+  "version": "2.29.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -76,6 +76,11 @@
       "import": "./dist/esm/universal/pluginDagSort.js",
       "default": "./dist/cjs/universal/pluginDagSort.js"
     },
+    "./universal/time": {
+      "types": "./dist/types/universal/time.d.ts",
+      "import": "./dist/esm/universal/time.js",
+      "default": "./dist/cjs/universal/time.js"
+    },
     "./ajv": "./dist/compiled/ajv/index.js",
     "./commander": "./dist/compiled/commander/index.js",
     "./ora": "./dist/compiled/ora/index.js",
@@ -138,6 +143,9 @@
       "universal/plugin-dag-sort": [
         "./dist/types/universal/pluginDagSort.d.ts"
       ],
+      "universal/time": [
+        "./dist/types/universal/time.d.ts"
+      ],
       "ajv": [
         "./dist/compiled/ajv/types/ajv.d.ts"
       ],
@@ -235,9 +243,9 @@
     "typescript": "^5",
     "webpack": "^5.88.1",
     "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.27.0",
-    "@scripts/jest-config": "2.27.0",
-    "@scripts/build": "2.27.0"
+    "@modern-js/types": "2.29.0",
+    "@scripts/build": "2.29.0",
+    "@scripts/jest-config": "2.29.0"
   },
   "sideEffects": false,
   "scripts": {

package/dist/cjs/cli/pathSerializer.js

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  matchUpwardPathsAsUnknown: function() {
-    return matchUpwardPathsAsUnknown;
-  },
-  applyPathMatcher: function() {
-    return applyPathMatcher;
-  },
-  applyMatcherReplacement: function() {
-    return applyMatcherReplacement;
-  },
-  createDefaultPathMatchers: function() {
-    return createDefaultPathMatchers;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _os = /* @__PURE__ */ _interop_require_default._(require("os"));
-const _lodash = /* @__PURE__ */ _interop_require_default._(require("../../compiled/lodash"));
-const _path = require("./path");
-const matchUpwardPathsAsUnknown = (p) => (0, _lodash.default)((0, _path.upwardPaths)((0, _path.normalizeToPosixPath)(p))).map((match) => ({
-  match,
-  mark: "unknown"
-})).slice(1, -1).value();
-function applyPathMatcher(matcher, str, options = {}) {
-  const regex = (0, _path.compilePathMatcherRegExp)(matcher.match);
-  const replacer = (substring, ...args) => {
-    if (options.minPartials && (0, _path.splitPathString)(substring).length < options.minPartials) {
-      return substring;
-    }
-    const ret = typeof matcher.mark === "string" ? matcher.mark : matcher.mark(substring, ...args);
-    return `<${_lodash.default.snakeCase(ret).toUpperCase()}>`;
-  };
-  return str.replace(regex, replacer);
-}
-function applyMatcherReplacement(matchers, str, options = {}) {
-  return matchers.reduce((ret, matcher) => {
-    return applyPathMatcher(matcher, ret, options);
-  }, str);
-}
-const createDefaultPathMatchers = (root) => {
-  const ret = [
-    {
-      match: RegExp("(?<=\\/)(\\.pnpm\\/.+?\\/node_modules)(?=\\/)"),
-      mark: "pnpmInner"
-    }
-  ];
-  const tmpdir = (0, _path.getRealTemporaryDirectory)();
-  tmpdir && ret.push({
-    match: tmpdir,
-    mark: "temp"
-  });
-  ret.push({
-    match: _os.default.tmpdir(),
-    mark: "temp"
-  });
-  ret.push({
-    match: _os.default.homedir(),
-    mark: "home"
-  });
-  ret.push(...matchUpwardPathsAsUnknown(root));
-  return ret;
-};

package/dist/esm/cli/pathSerializer.js

@@ -1,60 +0,0 @@
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import os from "os";
-import _ from "../../compiled/lodash";
-import { compilePathMatcherRegExp, normalizeToPosixPath, getRealTemporaryDirectory, splitPathString, upwardPaths } from "./path";
-export var matchUpwardPathsAsUnknown = function(p) {
-  return _(upwardPaths(normalizeToPosixPath(p))).map(function(match) {
-    return {
-      match: match,
-      mark: "unknown"
-    };
-  }).slice(1, -1).value();
-};
-export function applyPathMatcher(matcher, str) {
-  var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-  var regex = compilePathMatcherRegExp(matcher.match);
-  var replacer = function(substring) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
-    }
-    var _matcher;
-    if (options.minPartials && splitPathString(substring).length < options.minPartials) {
-      return substring;
-    }
-    var ret = typeof matcher.mark === "string" ? matcher.mark : (_matcher = matcher).mark.apply(_matcher, [
-      substring
-    ].concat(_to_consumable_array(args)));
-    return "<".concat(_.snakeCase(ret).toUpperCase(), ">");
-  };
-  return str.replace(regex, replacer);
-}
-export function applyMatcherReplacement(matchers, str) {
-  var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-  return matchers.reduce(function(ret, matcher) {
-    return applyPathMatcher(matcher, ret, options);
-  }, str);
-}
-export var createDefaultPathMatchers = function(root) {
-  var _ret;
-  var ret = [
-    {
-      match: RegExp("(?<=\\/)(\\.pnpm\\/.+?\\/node_modules)(?=\\/)"),
-      mark: "pnpmInner"
-    }
-  ];
-  var tmpdir = getRealTemporaryDirectory();
-  tmpdir && ret.push({
-    match: tmpdir,
-    mark: "temp"
-  });
-  ret.push({
-    match: os.tmpdir(),
-    mark: "temp"
-  });
-  ret.push({
-    match: os.homedir(),
-    mark: "home"
-  });
-  (_ret = ret).push.apply(_ret, _to_consumable_array(matchUpwardPathsAsUnknown(root)));
-  return ret;
-};

package/dist/esm-node/cli/pathSerializer.js

@@ -1,46 +0,0 @@
-import os from "os";
-import _ from "../../compiled/lodash";
-import { compilePathMatcherRegExp, normalizeToPosixPath, getRealTemporaryDirectory, splitPathString, upwardPaths } from "./path";
-export const matchUpwardPathsAsUnknown = (p) => _(upwardPaths(normalizeToPosixPath(p))).map((match) => ({
-  match,
-  mark: "unknown"
-})).slice(1, -1).value();
-export function applyPathMatcher(matcher, str, options = {}) {
-  const regex = compilePathMatcherRegExp(matcher.match);
-  const replacer = (substring, ...args) => {
-    if (options.minPartials && splitPathString(substring).length < options.minPartials) {
-      return substring;
-    }
-    const ret = typeof matcher.mark === "string" ? matcher.mark : matcher.mark(substring, ...args);
-    return `<${_.snakeCase(ret).toUpperCase()}>`;
-  };
-  return str.replace(regex, replacer);
-}
-export function applyMatcherReplacement(matchers, str, options = {}) {
-  return matchers.reduce((ret, matcher) => {
-    return applyPathMatcher(matcher, ret, options);
-  }, str);
-}
-export const createDefaultPathMatchers = (root) => {
-  const ret = [
-    {
-      match: RegExp("(?<=\\/)(\\.pnpm\\/.+?\\/node_modules)(?=\\/)"),
-      mark: "pnpmInner"
-    }
-  ];
-  const tmpdir = getRealTemporaryDirectory();
-  tmpdir && ret.push({
-    match: tmpdir,
-    mark: "temp"
-  });
-  ret.push({
-    match: os.tmpdir(),
-    mark: "temp"
-  });
-  ret.push({
-    match: os.homedir(),
-    mark: "home"
-  });
-  ret.push(...matchUpwardPathsAsUnknown(root));
-  return ret;
-};

package/dist/types/cli/pathSerializer.d.ts

@@ -1,16 +0,0 @@
-/** Different from  */
-export type PathMatchExpression = string | RegExp;
-export interface PathMatcher {
-  match: PathMatchExpression;
-  mark: string | ((substring: string, ...args: any[]) => string);
-}
-export declare const matchUpwardPathsAsUnknown: (p: string) => {
-  match: string;
-  mark: string;
-}[];
-export interface ApplyPathMatcherOptions {
-  minPartials?: number;
-}
-export declare function applyPathMatcher(matcher: PathMatcher, str: string, options?: ApplyPathMatcherOptions): string;
-export declare function applyMatcherReplacement(matchers: PathMatcher[], str: string, options?: ApplyPathMatcherOptions): string;
-export declare const createDefaultPathMatchers: (root: string) => PathMatcher[];