@modern-js/utils 2.9.0 → 2.11.0

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/chainId.d.ts

@@ -55,27 +55,10 @@ export declare const CHAIN_ID: {
   /** Predefined rule groups */
 
   readonly ONE_OF: {
-    readonly JS: "js";
-    readonly TS: "ts";
-    readonly CSS: "css";
-    readonly LESS: "less";
-    readonly SASS: "sass";
-    readonly YAML: "yml";
-    readonly TOML: "toml";
-    readonly FALLBACK: "fallback";
-    readonly MARKDOWN: "markdown";
-    readonly BFF_CLIENT: "bff-client";
-    readonly CSS_MODULES: "css-modules";
-    readonly LESS_MODULES: "less-modules";
-    readonly SASS_MODULES: "sass-modules";
     readonly SVG: "svg";
     readonly SVG_URL: "svg-url";
     readonly SVG_ASSET: "svg-asset";
     readonly SVG_INLINE: "svg-inline";
-    readonly ASSETS: "assets";
-    readonly ASSETS_URL: "assets-url";
-    readonly ASSETS_INLINE: "assets-inline";
-    readonly IMAGE_COMPRESS: "image-compress";
   };
   /** Predefined loaders */
 

package/dist/chainId.js

@@ -60,27 +60,10 @@ const CHAIN_ID = {
   },
   /** Predefined rule groups */
   ONE_OF: {
-    JS: "js",
-    TS: "ts",
-    CSS: "css",
-    LESS: "less",
-    SASS: "sass",
-    YAML: "yml",
-    TOML: "toml",
-    FALLBACK: "fallback",
-    MARKDOWN: "markdown",
-    BFF_CLIENT: "bff-client",
-    CSS_MODULES: "css-modules",
-    LESS_MODULES: "less-modules",
-    SASS_MODULES: "sass-modules",
     SVG: "svg",
     SVG_URL: "svg-url",
     SVG_ASSET: "svg-asset",
-    SVG_INLINE: "svg-inline",
-    ASSETS: "assets",
-    ASSETS_URL: "assets-url",
-    ASSETS_INLINE: "assets-inline",
-    IMAGE_COMPRESS: "image-compress"
+    SVG_INLINE: "svg-inline"
   },
   /** Predefined loaders */
   USE: {

package/dist/commands.d.ts

@@ -1,2 +1,3 @@
+export declare const getArgv: () => string[];
 export declare const getCommand: () => string;
 export declare const isDevCommand: () => boolean;

package/dist/commands.js

@@ -17,12 +17,17 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var commands_exports = {};
 __export(commands_exports, {
+  getArgv: () => getArgv,
   getCommand: () => getCommand,
   isDevCommand: () => isDevCommand
 });
 module.exports = __toCommonJS(commands_exports);
+const getArgv = () => {
+  var _a;
+  return (((_a = process.env.MODERN_ARGV) == null ? void 0 : _a.split(" ")) || process.argv).slice(2);
+};
 const getCommand = () => {
-  const args = process.argv.slice(2);
+  const args = getArgv();
   const command = args[0];
   return command;
 };
@@ -32,6 +37,7 @@ const isDevCommand = () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getArgv,
   getCommand,
   isDevCommand
 });

package/dist/constants.d.ts

@@ -1,9 +1,4 @@
 import { InternalPlugins } from '@modern-js/types';
-/**
- * hmr socket connect path
- */
-
-export declare const HMR_SOCK_PATH = "/webpack-hmr";
 /**
  * route specification file
  */
@@ -71,12 +66,7 @@ export declare const DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
  * Routes manifest filename
  */
 
-export declare const ROUTE_MINIFEST_FILE = "routes-manifest.json";
-/**
- * Property mounted on window that describes route manifest
- */
-
-export declare const ROUTE_MANIFEST = "_MODERNJS_ROUTE_MANIFEST";
+export declare const ROUTE_MANIFEST_FILE = "routes-manifest.json";
 /**
  * directory name for loader routes
  */
@@ -236,4 +226,19 @@ export declare const PLUGIN_SCHEMAS: {
     };
   }[];
   '@modern-js/plugin-nocode': never[];
+};
+/**
+ * The `@babel/preset-typescript` default options.
+ *
+ * for:
+ * - `@modern-js/builder-rspack-provider`
+ * - `@modern-js/babel-preset-base`
+ */
+
+export declare const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS: {
+  allowNamespaces: boolean;
+  allExtensions: boolean;
+  allowDeclareFields: boolean;
+  optimizeConstEnums: boolean;
+  isTSX: boolean;
 };

package/dist/constants.js

@@ -20,10 +20,10 @@ __export(constants_exports, {
   API_DIR: () => API_DIR,
   CONFIG_CACHE_DIR: () => CONFIG_CACHE_DIR,
   CONFIG_FILE_EXTENSIONS: () => CONFIG_FILE_EXTENSIONS,
+  DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS: () => DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS,
   DEFAULT_DEV_HOST: () => DEFAULT_DEV_HOST,
   DEFAULT_SERVER_CONFIG: () => DEFAULT_SERVER_CONFIG,
   ENTRY_NAME_PATTERN: () => ENTRY_NAME_PATTERN,
-  HMR_SOCK_PATH: () => HMR_SOCK_PATH,
   INTERNAL_APP_TOOLS_PLUGINS: () => INTERNAL_APP_TOOLS_PLUGINS,
   INTERNAL_APP_TOOLS_RUNTIME_PLUGINS: () => INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
   INTERNAL_CLI_PLUGINS: () => INTERNAL_CLI_PLUGINS,
@@ -37,8 +37,7 @@ __export(constants_exports, {
   MAIN_ENTRY_NAME: () => MAIN_ENTRY_NAME,
   OUTPUT_CONFIG_FILE: () => OUTPUT_CONFIG_FILE,
   PLUGIN_SCHEMAS: () => PLUGIN_SCHEMAS,
-  ROUTE_MANIFEST: () => ROUTE_MANIFEST,
-  ROUTE_MINIFEST_FILE: () => ROUTE_MINIFEST_FILE,
+  ROUTE_MANIFEST_FILE: () => ROUTE_MANIFEST_FILE,
   ROUTE_SPEC_FILE: () => ROUTE_SPEC_FILE,
   SERVER_BUNDLE_DIRECTORY: () => SERVER_BUNDLE_DIRECTORY,
   SERVER_DIR: () => SERVER_DIR,
@@ -54,7 +53,6 @@ __export(constants_exports, {
   SHARED_DIR: () => SHARED_DIR
 });
 module.exports = __toCommonJS(constants_exports);
-const HMR_SOCK_PATH = "/webpack-hmr";
 const ROUTE_SPEC_FILE = "route.json";
 const MAIN_ENTRY_NAME = "main";
 const LAUNCH_EDITOR_ENDPOINT = "/__open-stack-frame-in-editor";
@@ -70,8 +68,7 @@ const CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
 const CONFIG_FILE_EXTENSIONS = [".js", ".ts", ".mjs"];
 const OUTPUT_CONFIG_FILE = "modern.config.json";
 const DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
-const ROUTE_MINIFEST_FILE = "routes-manifest.json";
-const ROUTE_MANIFEST = `_MODERNJS_ROUTE_MANIFEST`;
+const ROUTE_MANIFEST_FILE = "routes-manifest.json";
 const LOADER_ROUTES_DIR = `loader-routes`;
 const DEFAULT_DEV_HOST = "0.0.0.0";
 const INTERNAL_APP_TOOLS_PLUGINS = {
@@ -275,15 +272,24 @@ const PLUGIN_SCHEMAS = {
   ],
   "@modern-js/plugin-nocode": []
 };
+const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
+  allowNamespaces: true,
+  allExtensions: true,
+  allowDeclareFields: true,
+  // aligns Babel's behavior with TypeScript's default behavior.
+  // https://babeljs.io/docs/en/babel-preset-typescript#optimizeconstenums
+  optimizeConstEnums: true,
+  isTSX: true
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   API_DIR,
   CONFIG_CACHE_DIR,
   CONFIG_FILE_EXTENSIONS,
+  DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS,
   DEFAULT_DEV_HOST,
   DEFAULT_SERVER_CONFIG,
   ENTRY_NAME_PATTERN,
-  HMR_SOCK_PATH,
   INTERNAL_APP_TOOLS_PLUGINS,
   INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
   INTERNAL_CLI_PLUGINS,
@@ -297,8 +303,7 @@ const PLUGIN_SCHEMAS = {
   MAIN_ENTRY_NAME,
   OUTPUT_CONFIG_FILE,
   PLUGIN_SCHEMAS,
-  ROUTE_MANIFEST,
-  ROUTE_MINIFEST_FILE,
+  ROUTE_MANIFEST_FILE,
   ROUTE_SPEC_FILE,
   SERVER_BUNDLE_DIRECTORY,
   SERVER_DIR,

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 export * from './compiled';
 export * from './commands';
-export * from './format';
 export * from './FileSizeReporter';
 export * from './printBuildError';
 export * from './debug';
@@ -32,7 +31,7 @@ export * from './nodeEnv';
 export * from './wait';
 export * from './emptyDir';
 export * from './getServerConfig';
-export * from './tryResolve';
+export * from './resolve';
 export * from './analyzeProject';
 export * from './chainId';
 export * from './version';
@@ -41,4 +40,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

@@ -16,7 +16,6 @@ var src_exports = {};
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./compiled"), module.exports);
 __reExport(src_exports, require("./commands"), module.exports);
-__reExport(src_exports, require("./format"), module.exports);
 __reExport(src_exports, require("./FileSizeReporter"), module.exports);
 __reExport(src_exports, require("./printBuildError"), module.exports);
 __reExport(src_exports, require("./debug"), module.exports);
@@ -48,7 +47,7 @@ __reExport(src_exports, require("./nodeEnv"), module.exports);
 __reExport(src_exports, require("./wait"), module.exports);
 __reExport(src_exports, require("./emptyDir"), module.exports);
 __reExport(src_exports, require("./getServerConfig"), module.exports);
-__reExport(src_exports, require("./tryResolve"), module.exports);
+__reExport(src_exports, require("./resolve"), module.exports);
 __reExport(src_exports, require("./analyzeProject"), module.exports);
 __reExport(src_exports, require("./chainId"), module.exports);
 __reExport(src_exports, require("./version"), module.exports);
@@ -58,3 +57,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/{tryResolve.d.ts → resolve.d.ts}

@@ -9,4 +9,5 @@ export declare const tryResolve: (name: string, resolvePath: string) => string;
  * Try to resolve npm package, return true if package is installed.
  */
 
-export declare const isPackageInstalled: (name: string, resolvePaths: string | string[]) => boolean;
+export declare const isPackageInstalled: (name: string, resolvePaths: string | string[]) => boolean;
+export declare const getAntdMajorVersion: (appDirectory: string) => number | null;

package/dist/{tryResolve.js → resolve.js}

@@ -15,12 +15,13 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var tryResolve_exports = {};
-__export(tryResolve_exports, {
+var resolve_exports = {};
+__export(resolve_exports, {
+  getAntdMajorVersion: () => getAntdMajorVersion,
   isPackageInstalled: () => isPackageInstalled,
   tryResolve: () => tryResolve
 });
-module.exports = __toCommonJS(tryResolve_exports);
+module.exports = __toCommonJS(resolve_exports);
 var import_ensureArray = require("./ensureArray");
 const tryResolve = (name, resolvePath) => {
   let filePath = "";
@@ -43,8 +44,20 @@ const isPackageInstalled = (name, resolvePaths) => {
     return false;
   }
 };
+const getAntdMajorVersion = (appDirectory) => {
+  try {
+    const pkgJsonPath = require.resolve("antd/package.json", {
+      paths: [appDirectory]
+    });
+    const { version } = require(pkgJsonPath);
+    return Number(version.split(".")[0]);
+  } catch (err) {
+    return null;
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getAntdMajorVersion,
   isPackageInstalled,
   tryResolve
 });

package/dist/universal/constants.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Property mounted on window that describes route manifest
+ */
+export declare const ROUTE_MANIFEST = "_MODERNJS_ROUTE_MANIFEST";
+/**
+ * hmr socket connect path
+ */
+
+export declare const HMR_SOCK_PATH = "/webpack-hmr";

package/dist/universal/constants.js

@@ -0,0 +1,30 @@
+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 constants_exports = {};
+__export(constants_exports, {
+  HMR_SOCK_PATH: () => HMR_SOCK_PATH,
+  ROUTE_MANIFEST: () => ROUTE_MANIFEST
+});
+module.exports = __toCommonJS(constants_exports);
+const ROUTE_MANIFEST = `_MODERNJS_ROUTE_MANIFEST`;
+const HMR_SOCK_PATH = "/webpack-hmr";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  HMR_SOCK_PATH,
+  ROUTE_MANIFEST
+});

package/dist/{format.js → universal/formatWebpack.js}

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var format_exports = {};
-__export(format_exports, {
+var formatWebpack_exports = {};
+__export(formatWebpack_exports, {
   formatWebpackMessages: () => formatWebpackMessages
 });
-module.exports = __toCommonJS(format_exports);
+module.exports = __toCommonJS(formatWebpack_exports);
 const friendlySyntaxErrorLabel = "SyntaxError:";
 function isLikelyASyntaxError(message) {
   return message.includes(friendlySyntaxErrorLabel);
@@ -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/{nestedRoutes.d.ts → universal/nestedRoutes.d.ts}

@@ -1,11 +1,8 @@
 /// <reference types="react" />
-
-/**
- * runtime utils for nested routes generating
- */
 import type { NestedRoute } from '@modern-js/types';
 export declare const transformNestedRoutes: (routes: NestedRoute[]) => import("react-router-dom").RouteObject[];
 export declare const renderNestedRoute: (nestedRoute: NestedRoute, options?: {
   parent?: NestedRoute;
   DeferredDataComponent?: () => JSX.Element | null;
+  props?: Record<string, any>;
 }) => JSX.Element;

package/dist/{nestedRoutes.js → universal/nestedRoutes.js}

@@ -50,9 +50,9 @@ 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 { parent, DeferredDataComponent, props = {} } = options;
   const routeProps = {
     caseSensitive: nestedRoute.caseSensitive,
     path: nestedRoute.path,
@@ -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, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, __spreadValues({}, props)),
         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/dist/{remix-router.js → universal/remixRouter.js}

@@ -12,6 +12,6 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var remix_router_exports = {};
-module.exports = __toCommonJS(remix_router_exports);
-__reExport(remix_router_exports, require("@remix-run/router"), module.exports);
+var remixRouter_exports = {};
+module.exports = __toCommonJS(remixRouter_exports);
+__reExport(remixRouter_exports, require("@remix-run/router"), module.exports);