@modern-js/utils 2.19.1 → 2.21.0

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

@@ -4,56 +4,39 @@ export declare const CHAIN_ID: {
     /** Rule for .mjs */
     readonly MJS: "mjs";
     /** Rule for predefined loaders */
-
     readonly LOADERS: "loaders";
     /** Rule for fonts */
-
     readonly FONT: "font";
     /** Rule for images */
-
     readonly IMAGE: "image";
     /** Rule for media */
-
     readonly MEDIA: "media";
     /** Rule for js */
-
     readonly JS: "js";
     /** Rule for data uri encoded javascript */
-
     readonly JS_DATA_URI: "js-data-uri";
     /** Rule for ts */
-
     readonly TS: "ts";
     /** Rule for css */
-
     readonly CSS: "css";
     /** Rule for less */
-
     readonly LESS: "less";
     /** Rule for sass */
-
     readonly SASS: "sass";
     /** Rule for stylus */
-
     readonly STYLUS: "stylus";
     /** Rule for svg */
-
     readonly SVG: "svg";
     /** Rule for pug */
-
     readonly PUG: "pug";
     /** Rule for toml */
-
     readonly TOML: "toml";
     /** Rule for yaml */
-
     readonly YAML: "yaml";
     /** Rule for bff */
-
     readonly JS_BFF_API: "js-bff-api";
   };
   /** Predefined rule groups */
-
   readonly ONE_OF: {
     readonly SVG: "svg";
     readonly SVG_URL: "svg-url";
@@ -61,183 +44,129 @@ export declare const CHAIN_ID: {
     readonly SVG_INLINE: "svg-inline";
   };
   /** Predefined loaders */
-
   readonly USE: {
     /** ts-loader */
     readonly TS: "ts";
     /** css-loader */
-
     readonly CSS: "css";
     /** sass-loader */
-
     readonly SASS: "sass";
     /** less-loader */
-
     readonly LESS: "less";
     /** stylus-loader */
-
     readonly STYLUS: "stylus";
     /** url-loader */
-
     readonly URL: "url";
     /** pug-loader */
-
     readonly PUG: "pug";
     /** file-loader */
-
     readonly FILE: "file";
     /** @svgr/webpack */
-
     readonly SVGR: "svgr";
     /** yaml-loader */
-
     readonly YAML: "yaml";
     /** toml-loader */
-
     readonly TOML: "toml";
     /** html-loader */
-
     readonly HTML: "html";
     /** babel-loader */
-
     readonly BABEL: "babel";
     /** esbuild-loader */
-
     readonly ESBUILD: "esbuild";
     /** swc-loader */
-
     readonly SWC: "swc";
     /** style-loader */
-
     readonly STYLE: "style-loader";
     /** postcss-loader */
-
     readonly POSTCSS: "postcss";
     /** markdown-loader */
-
     readonly MARKDOWN: "markdown";
     /** ignore-css-loader */
-
     readonly IGNORE_CSS: "ignore-css";
     /** css-modules-typescript-loader */
-
     readonly CSS_MODULES_TS: "css-modules-typescript";
     /** mini-css-extract-plugin.loader */
-
     readonly MINI_CSS_EXTRACT: "mini-css-extract";
     /** builder-plugin-image-compress.loader */
-
     readonly IMAGE_COMPRESS: "image-compress";
     /** builder-plugin-image-compress svgo-loader */
-
     readonly SVGO: "svgo";
     /** builder-plugin-imagex */
-
     readonly IMAGEX: "imagex";
   };
   /** Predefined plugins */
-
   readonly PLUGIN: {
     /** HotModuleReplacementPlugin */
     readonly HMR: "hmr";
     /** CopyWebpackPlugin */
-
     readonly COPY: "copy";
     /** HtmlWebpackPlugin */
-
     readonly HTML: "html";
     /** DefinePlugin */
-
     readonly DEFINE: "define";
     /** IgnorePlugin */
-
     readonly IGNORE: "ignore";
     /** BannerPlugin */
-
     readonly BANNER: "banner";
     /** Webpackbar */
-
     readonly PROGRESS: "progress";
     /** Inspector */
-
     readonly INSPECTOR: "inspector";
     /** AppIconPlugin */
-
     readonly APP_ICON: "app-icon";
     /** FaviconUrlPlugin */
-
     readonly FAVICON_URL: "favicon-url";
     /** LoadableWebpackPlugin */
-
     readonly LOADABLE: "loadable";
     /** WebpackManifestPlugin */
-
     readonly MANIFEST: "webpack-manifest";
     /** ForkTsCheckerWebpackPlugin */
-
     readonly TS_CHECKER: "ts-checker";
     /** InlineChunkHtmlPlugin */
-
     readonly INLINE_HTML: "inline-html";
     /** WebpackBundleAnalyzer */
-
     readonly BUNDLE_ANALYZER: "bundle-analyze";
     /** BottomTemplatePlugin */
-
     readonly BOTTOM_TEMPLATE: "bottom-template";
     /** HtmlCrossOriginPlugin */
-
     readonly HTML_CROSS_ORIGIN: "html-cross-origin";
+    /** HtmlNoncePlugin */
+    readonly HTML_NONCE: "html-nonce";
     /** MiniCssExtractPlugin */
-
     readonly MINI_CSS_EXTRACT: "mini-css-extract";
     /** ReactFastRefreshPlugin */
-
     readonly REACT_FAST_REFRESH: "react-fast-refresh";
     /** ProvidePlugin for node polyfill */
-
     readonly NODE_POLYFILL_PROVIDE: "node-polyfill-provide";
     /** WebpackSRIPlugin */
-
     readonly SUBRESOURCE_INTEGRITY: "subresource-integrity";
     /** WebpackAssetsRetryPlugin */
-
     readonly ASSETS_RETRY: "ASSETS_RETRY";
     /** AutoSetRootFontSizePlugin */
-
     readonly AUTO_SET_ROOT_SIZE: "auto-set-root-size";
     /** HtmlAsyncChunkPlugin */
-
     readonly HTML_ASYNC_CHUNK: "html-async-chunk";
     /** SWC_POLYFILL_CHECKER */
-
     readonly SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin";
     /** HtmlTagsPlugin */
-
     readonly HTML_TAGS: "html-tags";
   };
   /** Predefined minimizers */
-
   readonly MINIMIZER: {
     /** TerserWebpackPlugin */
     readonly JS: "js";
     /** CssMinimizerWebpackPlugin */
-
     readonly CSS: "css";
     /** ESBuildPlugin */
-
     readonly ESBUILD: "js-css";
     /** SWCPlugin */
-
     readonly SWC: "swc";
   };
   /** Predefined resolve plugins */
-
   readonly RESOLVE_PLUGIN: {
     /** ModuleScopePlugin */
     readonly MODULE_SCOPE: "module-scope";
     /** TsConfigPathsPlugin */
-
     readonly TS_CONFIG_PATHS: "ts-config-paths";
   };
 };

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

@@ -2,101 +2,82 @@ import { InternalPlugins } from '@modern-js/types';
 /**
  * route specification file
  */
-
 export declare const ROUTE_SPEC_FILE = "route.json";
 /**
  * main entry name
  */
-
 export declare const MAIN_ENTRY_NAME = "main";
 /**
  * server side bundles directory, which relative to dist.
  */
-
 export declare const SERVER_BUNDLE_DIRECTORY = "bundles";
 /**
  * server side bundles directory, which relative to dist.
  */
-
 export declare const SERVER_WORKER_BUNDLE_DIRECTORY = "worker";
 /**
  * entry name pattern used for ajv pattern properties.
  */
-
 export declare const ENTRY_NAME_PATTERN = "^[a-zA-Z0-9_-]+$";
 /**
  * SSR server render function name
  */
-
 export declare const SERVER_RENDER_FUNCTION_NAME = "serverRender";
 /**
  * loadbale manifest json file
  */
-
 export declare const LOADABLE_STATS_FILE = "loadable-stats.json";
 /**
  * internal specified folder
  */
-
 export declare const API_DIR = "api";
 export declare const SERVER_DIR = "server";
 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_FILE_EXTENSIONS: string[];
 /**
  * Serialized config path
  */
-
 export declare const OUTPUT_CONFIG_FILE = "modern.config.json";
 /**
  * Default server config basename
  */
-
 export declare const DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
 /**
  * Routes manifest filename
  */
-
 export declare const ROUTE_MANIFEST_FILE = "routes-manifest.json";
 /**
  * directory name for loader routes
  */
-
 export declare const LOADER_ROUTES_DIR = "loader-routes";
 /**
  * default host for dev
  */
-
 export declare const DEFAULT_DEV_HOST = "0.0.0.0";
 /**
  * Internal app-tools plugins that work as soon as they are installed.
  */
-
 export declare const INTERNAL_APP_TOOLS_PLUGINS: InternalPlugins;
 export declare const INTERNAL_APP_TOOLS_RUNTIME_PLUGINS: InternalPlugins;
 /**
  * Internal module-tools plugins that work as soon as they are installed.
  */
-
 export declare const INTERNAL_MODULE_TOOLS_PLUGINS: InternalPlugins;
 /**
  * Internal monorepo-tools plugins that work as soon as they are installed.
  */
-
 export declare const INTERNAL_MONOREPO_TOOLS_PLUGINS: InternalPlugins;
 /**
  * Internal doc-tools plugins that work as soon as they are installed.
  */
-
 export declare const INTERNAL_DOC_TOOLS_PLUGINS: InternalPlugins;
 /**
  * Internal plugins that work as soon as they are installed.
  */
-
 export declare const INTERNAL_CLI_PLUGINS: InternalPlugins;
 export declare const SERVER_PLUGIN_BFF = "@modern-js/plugin-bff";
 export declare const SERVER_PLUGIN_EXPRESS = "@modern-js/plugin-express";
@@ -107,7 +88,6 @@ export declare const INTERNAL_SERVER_PLUGINS: InternalPlugins;
 /**
  * The schema registered in the plugin.
  */
-
 export declare const PLUGIN_SCHEMAS: {
   '@modern-js/runtime': ({
     target: string;
@@ -233,7 +213,6 @@ export declare const PLUGIN_SCHEMAS: {
  * - `@modern-js/builder-rspack-provider`
  * - `@modern-js/babel-preset-base`
  */
-
 export declare const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS: {
   allowNamespaces: boolean;
   allExtensions: boolean;

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

@@ -8,7 +8,6 @@ export * from './commands';
 export * from './common';
 export * from './ensure';
 export * from './fs';
-export * from './generateMetaTags';
 export * from './logger';
 export * from './monorepo';
 export * from './package';

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

@@ -7,7 +7,6 @@ interface EntryPoint {
  * @param config - User config.
  * @returns Whether to use server side render.
  */
-
 export declare const isSSR: (config: any) => boolean;
 export declare const isUseSSRBundle: (config: any) => boolean;
 /**
@@ -16,7 +15,6 @@ export declare const isUseSSRBundle: (config: any) => boolean;
  * @param config - User config.
  * @returns Whether to use worker deploy.
  */
-
 export declare const isServiceWorker: (config: any) => boolean;
 export declare const isRouterV5: (config: {
   runtime?: {

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

@@ -9,7 +9,6 @@ export declare const isDepExists: (appDirectory: string, name: string) => boolea
 /**
  * Try to resolve npm package, return true if package is installed.
  */
-
 export declare const isPackageInstalled: (name: string, resolvePaths: string | string[]) => boolean;
 export declare const isApiOnly: (appDirectory: string, entryDir?: string) => Promise<boolean>;
 export declare const isWebOnly: () => Promise<boolean>;
@@ -21,5 +20,4 @@ export declare const isReact18: (cwd: string) => boolean;
  * @param root - App directory.
  * @returns Whether to use typescript.
  */
-
 export declare const isTypescript: (root: string) => boolean;

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

@@ -12,5 +12,4 @@ export declare function isRegExp(obj: any): obj is RegExp;
  * @param o - Any object.
  * @returns Whether it is empty object.
  */
-
 export declare const isEmpty: (o: Record<string, unknown>) => boolean;

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

@@ -46,7 +46,6 @@ declare const LOG_TYPES: {
     level: string;
   };
 };
-
 declare class Logger {
   private readonly level;
   private readonly config;
@@ -57,7 +56,6 @@ declare class Logger {
   private _log;
   private getLongestLabel;
 }
-
 type LoggerInterface = { [key in keyof typeof LOG_TYPES]: LoggerFunction };
 declare const logger: Logger & LoggerInterface;
 export { Logger };

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

@@ -8,10 +8,8 @@ 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;

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

@@ -17,5 +17,4 @@ export declare function deleteRequireCache(path: string): void;
  * @param resolvePath - Path to resolve dependencies.
  * @returns Resolved file path.
  */
-
 export declare const tryResolve: (name: string, resolvePath: string) => string;

package/dist/types/compiled.d.ts

@@ -37,7 +37,6 @@ export type { default as WebpackChain } from '../compiled/webpack-chain';
  * Lazy import some expensive modules that will slow down startup speed.
  * Notice that `csmith-tools build` can not bundle lazy imported modules.
  */
-
 export declare const mime: typeof import('../compiled/mime-types');
 export declare const chokidar: typeof import('../compiled/chokidar');
 export declare const inquirer: typeof import('../compiled/inquirer');

package/dist/types/runtime/router.d.ts

@@ -1,2 +1 @@
-export * from './nestedRoutes';
-export * from './remixRouter';
+export * from 'react-router-dom';

package/dist/types/runtime-node/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-
 /**
  * ssr helpers
  */

package/dist/types/runtime-node/router.d.ts

@@ -0,0 +1 @@
+export * from 'react-router-dom/server';

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

@@ -5,5 +5,4 @@ export declare const ROUTE_MANIFEST = "_MODERNJS_ROUTE_MANIFEST";
 /**
  * hmr socket connect path
  */
-
 export declare const HMR_SOCK_PATH = "/webpack-hmr";

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.19.1",
+  "version": "2.21.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -38,6 +38,14 @@
       "types": "./dist/types/runtime/router.d.ts",
       "default": "./dist/esm/runtime/router.js"
     },
+    "./runtime/remix-router": {
+      "types": "./dist/types/runtime/remixRouter.d.ts",
+      "default": "./dist/esm/runtime/remixRouter.js"
+    },
+    "./runtime/nested-routes": {
+      "types": "./dist/types/runtime/nestedRoutes.d.ts",
+      "default": "./dist/esm/runtime/nestedRoutes.js"
+    },
     "./runtime-browser": {
       "jsnext:source": "./src/runtime-browser/index.d.ts",
       "default": "./dist/esm/runtime-browser/index.js"
@@ -46,6 +54,10 @@
       "types": "./dist/types/runtime-node/index.d.ts",
       "default": "./dist/esm/runtime-node/index.js"
     },
+    "./runtime-node/router": {
+      "types": "./dist/types/runtime-node/router.d.ts",
+      "default": "./dist/esm/runtime-node/router.js"
+    },
     "./universal/constants": {
       "types": "./dist/types/universal/constants.d.ts",
       "import": "./dist/esm/universal/constants.js",
@@ -62,6 +74,8 @@
       "default": "./dist/cjs/universal/pluginDagSort.js"
     },
     "./ajv": "./dist/compiled/ajv/index.js",
+    "./commander": "./compiled/commander/index.js",
+    "./ora": "./compiled/ora/index.js",
     "./glob": "./dist/compiled/glob/index.js",
     "./chalk": "./dist/compiled/chalk/index.js",
     "./execa": "./dist/compiled/execa/index.js",
@@ -96,12 +110,21 @@
       "runtime/router": [
         "./dist/types/runtime/router.d.ts"
       ],
+      "runtime/remix-router": [
+        "./dist/types/runtime/remixRouter.d.ts"
+      ],
+      "runtime/nested-routes": [
+        "./dist/types/runtime/nestedRoutes.d.ts"
+      ],
       "runtime-browser": [
         "./dist/types/runtime-browser/index.d.ts"
       ],
       "runtime-node": [
         "./dist/types/runtime-node/index.d.ts"
       ],
+      "runtime-node/router": [
+        "./dist/types/runtime-node/router.d.ts"
+      ],
       "universal/constants": [
         "./dist/types/universal/constants.d.ts"
       ],
@@ -170,6 +193,12 @@
       ],
       "webpack-dev-middleware": [
         "./dist/compiled/webpack-dev-middleware/types/index.d.ts"
+      ],
+      "commander": [
+        "./dist/compiled/commander/typings/index.d.ts"
+      ],
+      "ora": [
+        "./dist/compiled/ora/index.d.ts"
       ]
     }
   },
@@ -177,12 +206,13 @@
     "caniuse-lite": "^1.0.30001451",
     "lodash": "^4.17.21",
     "serialize-javascript": "^6.0.0",
-    "@remix-run/router": "^1.3.2"
+    "react-router-dom": "6.11.2",
+    "@remix-run/router": "1.6.2",
+    "@swc/helpers": "0.5.1"
   },
   "peerDependencies": {
     "react": ">=17.0.0",
-    "react-dom": ">=17.0.0",
-    "react-router-dom": "^6.8.1"
+    "react-dom": ">=17.0.0"
   },
   "peerDependenciesMeta": {
     "react": {
@@ -190,24 +220,20 @@
     },
     "react-dom": {
       "optional": true
-    },
-    "react-router-dom": {
-      "optional": true
     }
   },
   "devDependencies": {
     "react": ">=17.0.0",
     "react-dom": ">=17.0.0",
-    "react-router-dom": "^6.8.1",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
-    "typescript": "^4",
+    "typescript": "^5",
     "webpack": "^5.82.1",
     "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.19.1",
-    "@scripts/build": "2.19.1",
-    "@scripts/jest-config": "2.19.1"
+    "@modern-js/types": "2.21.0",
+    "@scripts/jest-config": "2.21.0",
+    "@scripts/build": "2.21.0"
   },
   "sideEffects": false,
   "scripts": {

package/dist/cjs/cli/generateMetaTags.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "generateMetaTags", {
-  enumerable: true,
-  get: () => generateMetaTags
-});
-const tagObjectToString = (tagDefinition) => {
-  const attributes = Object.keys(tagDefinition.attributes || {}).filter((attributeName) => tagDefinition.attributes[attributeName] !== false).map((attributeName) => {
-    if (tagDefinition.attributes[attributeName] === true) {
-      return attributeName;
-    }
-    return `${attributeName}="${tagDefinition.attributes[attributeName]}"`;
-  });
-  return `<${[
-    tagDefinition.tagName
-  ].concat(attributes).join(" ")}>${tagDefinition.innerHTML || ""}${tagDefinition.voidTag ? "" : `</${tagDefinition.tagName}>`}`;
-};
-const generateMetaTags = (metaOptions) => {
-  if (!metaOptions) {
-    return "";
-  }
-  const metaTagAttributeObjects = Object.keys(metaOptions).map((metaName) => {
-    const metaTagContent = metaOptions[metaName];
-    return typeof metaTagContent === "string" ? {
-      name: metaName,
-      content: metaTagContent
-    } : metaTagContent;
-  }).filter((attribute) => attribute !== false);
-  return metaTagAttributeObjects.map((metaTagAttributes) => {
-    if (metaTagAttributes === false) {
-      throw new Error("Invalid meta tag");
-    }
-    return {
-      tagName: "meta",
-      voidTag: true,
-      attributes: metaTagAttributes
-    };
-  }).reduce((memo, tagObject) => `${memo}
-${tagObjectToString(tagObject)}`, "");
-};

package/dist/esm/cli/generateMetaTags.js

@@ -1,34 +0,0 @@
-const tagObjectToString = (tagDefinition) => {
-  const attributes = Object.keys(tagDefinition.attributes || {}).filter((attributeName) => tagDefinition.attributes[attributeName] !== false).map((attributeName) => {
-    if (tagDefinition.attributes[attributeName] === true) {
-      return attributeName;
-    }
-    return `${attributeName}="${tagDefinition.attributes[attributeName]}"`;
-  });
-  return `<${[
-    tagDefinition.tagName
-  ].concat(attributes).join(" ")}>${tagDefinition.innerHTML || ""}${tagDefinition.voidTag ? "" : `</${tagDefinition.tagName}>`}`;
-};
-export const generateMetaTags = (metaOptions) => {
-  if (!metaOptions) {
-    return "";
-  }
-  const metaTagAttributeObjects = Object.keys(metaOptions).map((metaName) => {
-    const metaTagContent = metaOptions[metaName];
-    return typeof metaTagContent === "string" ? {
-      name: metaName,
-      content: metaTagContent
-    } : metaTagContent;
-  }).filter((attribute) => attribute !== false);
-  return metaTagAttributeObjects.map((metaTagAttributes) => {
-    if (metaTagAttributes === false) {
-      throw new Error("Invalid meta tag");
-    }
-    return {
-      tagName: "meta",
-      voidTag: true,
-      attributes: metaTagAttributes
-    };
-  }).reduce((memo, tagObject) => `${memo}
-${tagObjectToString(tagObject)}`, "");
-};