@modern-js/utils 2.9.0 → 2.10.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @modern-js/utils
 
+## 2.10.0
+
+### Patch Changes
+
+- 0da32d0: chore: upgrade jest and puppeteer
+  chore: 升级 jest 和 puppeteer 到 latest
+- fbefa7e: chore(deps): bump webpack from 5.75.0 to 5.76.2
+
+  chore(deps): 将 webpack 从 5.75.0 升级至 5.76.2
+
+- 4d54233: chore(builder): update rspack & show rspack format error
+
+  chore(builder): 更新 rspack 版本 & 优化 rspack 错误日志输出
+
+- 6db4864: feat: add output.splitRouteChunks
+  feat: 添加 output.splitRouteChunks 配置
+
 ## 2.9.0
 
 ## 2.8.0

package/dist/babel.d.ts

@@ -0,0 +1,3 @@
+import { BabelConfig, BabelConfigUtils, BabelTransformOptions } from '@modern-js/types';
+export declare const getBabelUtils: (config: BabelTransformOptions) => BabelConfigUtils;
+export declare const applyUserBabelConfig: (defaultOptions: BabelTransformOptions, userBabelConfig?: BabelConfig | BabelConfig[], extraBabelUtils?: Partial<BabelConfigUtils>) => BabelTransformOptions;

package/dist/babel.js

@@ -0,0 +1,136 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+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 babel_exports = {};
+__export(babel_exports, {
+  applyUserBabelConfig: () => applyUserBabelConfig,
+  getBabelUtils: () => getBabelUtils
+});
+module.exports = __toCommonJS(babel_exports);
+var import_path = require("path");
+var import_applyOptionsChain = require("./applyOptionsChain");
+var import_ensureArray = require("./ensureArray");
+var import_path2 = require("./path");
+const formatPath = (originPath) => {
+  if ((0, import_path.isAbsolute)(originPath)) {
+    return originPath.split(import_path.sep).join("/");
+  }
+  return originPath;
+};
+const getPluginItemName = (item) => {
+  if (typeof item === "string") {
+    return formatPath(item);
+  }
+  if (Array.isArray(item) && typeof item[0] === "string") {
+    return formatPath(item[0]);
+  }
+  return null;
+};
+const addPlugins = (plugins, config) => {
+  if (config.plugins) {
+    config.plugins.push(...plugins);
+  } else {
+    config.plugins = plugins;
+  }
+};
+const addPresets = (presets, config) => {
+  if (config.presets) {
+    config.presets.push(...presets);
+  } else {
+    config.presets = presets;
+  }
+};
+const removePlugins = (plugins, config) => {
+  if (!config.plugins) {
+    return;
+  }
+  const removeList = (0, import_ensureArray.ensureArray)(plugins);
+  config.plugins = config.plugins.filter((item) => {
+    const name = getPluginItemName(item);
+    if (name) {
+      return !removeList.find((removeItem) => name.includes(removeItem));
+    }
+    return true;
+  });
+};
+const removePresets = (presets, config) => {
+  if (!config.presets) {
+    return;
+  }
+  const removeList = (0, import_ensureArray.ensureArray)(presets);
+  config.presets = config.presets.filter((item) => {
+    const name = getPluginItemName(item);
+    if (name) {
+      return !removeList.find((removeItem) => name.includes(removeItem));
+    }
+    return true;
+  });
+};
+const modifyPresetOptions = (presetName, options, presets = []) => {
+  presets.forEach((preset, index) => {
+    if (Array.isArray(preset)) {
+      if (typeof preset[0] === "string" && (0, import_path2.normalizeToPosixPath)(preset[0]).includes(presetName)) {
+        preset[1] = __spreadValues(__spreadValues({}, preset[1] || {}), options);
+      }
+    } else if (typeof preset === "string" && (0, import_path2.normalizeToPosixPath)(preset).includes(presetName)) {
+      presets[index] = [preset, options];
+    }
+  });
+};
+const getBabelUtils = (config) => {
+  const noop = () => {
+  };
+  return {
+    addPlugins: (plugins) => addPlugins(plugins, config),
+    addPresets: (presets) => addPresets(presets, config),
+    removePlugins: (plugins) => removePlugins(plugins, config),
+    removePresets: (presets) => removePresets(presets, config),
+    // `addIncludes` and `addExcludes` are noop functions by default,
+    // It can be overridden by `extraBabelUtils`.
+    addIncludes: noop,
+    addExcludes: noop,
+    // Compat `presetEnvOptions` and `presetReactOptions` in Eden.
+    modifyPresetEnvOptions: (options) => modifyPresetOptions("@babel/preset-env", options, config.presets || []),
+    modifyPresetReactOptions: (options) => modifyPresetOptions("@babel/preset-react", options, config.presets || [])
+  };
+};
+const applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils) => {
+  if (userBabelConfig) {
+    const babelUtils = __spreadValues(__spreadValues({}, getBabelUtils(defaultOptions)), extraBabelUtils);
+    return (0, import_applyOptionsChain.applyOptionsChain)(defaultOptions, userBabelConfig || {}, babelUtils);
+  }
+  return defaultOptions;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyUserBabelConfig,
+  getBabelUtils
+});

package/dist/format.js

@@ -30,7 +30,7 @@ function formatMessage(stats) {
   if (typeof stats === "object") {
     const fileName = stats.moduleName ? `File: ${stats.moduleName}
 ` : "";
-    const mainMessage = stats.message;
+    const mainMessage = typeof stats.formatted === "string" ? stats.formatted : stats.message;
     const details = stats.details ? `
 Details: ${stats.details}
 ` : "";

package/dist/index.d.ts

@@ -41,4 +41,5 @@ export * from './routes';
 export * from './testUtils';
 export * from './getCoreJsVersion';
 export * from './react';
-export * from './getTargetDir';
+export * from './getTargetDir';
+export * from './babel';

package/dist/index.js

@@ -58,3 +58,4 @@ __reExport(src_exports, require("./testUtils"), module.exports);
 __reExport(src_exports, require("./getCoreJsVersion"), module.exports);
 __reExport(src_exports, require("./react"), module.exports);
 __reExport(src_exports, require("./getTargetDir"), module.exports);
+__reExport(src_exports, require("./babel"), module.exports);

package/dist/nestedRoutes.js

@@ -50,7 +50,7 @@ const transformNestedRoutes = (routes) => {
   return (0, import_react_router_dom.createRoutesFromElements)(routeElements);
 };
 const renderNestedRoute = (nestedRoute, options = {}) => {
-  const { children, index, id, component, isRoot } = nestedRoute;
+  const { children, index, id, component, isRoot, lazyImport } = nestedRoute;
   const Component = component;
   const { parent, DeferredDataComponent } = options;
   const routeProps = {
@@ -72,22 +72,24 @@ const renderNestedRoute = (nestedRoute, options = {}) => {
   }
   let element;
   if (Component) {
-    if (parent == null ? void 0 : parent.loading) {
+    if ((parent == null ? void 0 : parent.loading) && lazyImport) {
       const Loading = parent.loading;
       if (isLoadableComponent(Component)) {
         element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {}) });
       } else {
         element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, { fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {}), children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {}) });
       }
-    } else if (isLoadableComponent(Component)) {
+    } else if (isLoadableComponent(Component) && lazyImport) {
       element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {});
     } else if (isRoot) {
       element = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {}),
         typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DeferredDataComponent, {})
       ] });
-    } else {
+    } else if (lazyImport) {
       element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, { fallback: null, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {}) });
+    } else {
+      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {});
     }
   } else {
     nestedRoute.loading = parent == null ? void 0 : parent.loading;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.9.0",
+  "version": "2.10.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -26,6 +26,7 @@
     "./serialize": "./dist/serialize.js",
     "./nestedRoutes": "./dist/nestedRoutes.js",
     "./remix-router": "./dist/remix-router.js",
+    "./babel": "./dist/babel.js",
     "./ajv": "./compiled/ajv/index.js",
     "./glob": "./compiled/glob/index.js",
     "./chalk": "./compiled/chalk/index.js",
@@ -70,6 +71,9 @@
       "nestedRoutes": [
         "./dist/nestedRoutes.d.ts"
       ],
+      "babel": [
+        "./dist/babel.d.ts"
+      ],
       "ajv": [
         "./compiled/ajv/types/ajv.d.ts"
       ],
@@ -161,15 +165,15 @@
     "react": ">=17.0.0",
     "react-dom": ">=17.0.0",
     "react-router-dom": "^6.8.1",
-    "@types/jest": "^27",
+    "@types/jest": "^29",
     "@types/node": "^14",
-    "jest": "^27",
+    "jest": "^29",
     "typescript": "^4",
-    "webpack": "^5.75.0",
+    "webpack": "^5.76.2",
     "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.9.0",
-    "@scripts/jest-config": "2.9.0",
-    "@scripts/build": "2.9.0"
+    "@modern-js/types": "2.10.0",
+    "@scripts/jest-config": "2.10.0",
+    "@scripts/build": "2.10.0"
   },
   "sideEffects": false,
   "scripts": {