@modern-js/utils 2.66.0 → 2.67.1

package/dist/cjs/cli/constants.js

@@ -115,6 +115,7 @@ const INTERNAL_CLI_PLUGINS = {
   "@modern-js/module-tools": "@modern-js/module-tools",
   "@modern-js/doc-tools": "@modern-js/doc-tools",
   "@modern-js/runtime": "@modern-js/runtime/cli",
+  "@modern-js/plugin-state": "@modern-js/plugin-state/cli",
   "@modern-js/plugin-proxy": "@modern-js/plugin-proxy/cli",
   "@modern-js/plugin-ssg": "@modern-js/plugin-ssg/cli",
   "@modern-js/plugin-bff": "@modern-js/plugin-bff/cli",

package/dist/cjs/cli/is/config.js

@@ -18,7 +18,6 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var config_exports = {};
 __export(config_exports, {
-  isRouterV5: () => isRouterV5,
   isSSGEntry: () => isSSGEntry,
   isSSR: () => isSSR,
   isServiceWorker: () => isServiceWorker,
@@ -62,10 +61,6 @@ const isServiceWorker = (config) => {
   }
   return false;
 };
-const isRouterV5 = (config) => {
-  var _config_runtime, _config_runtime_router, _config_runtime1;
-  return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (_config_runtime1 = config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
-};
 const isSSGEntry = (config, entryName, entrypoints) => {
   var _config_source;
   const ssgConfig = config.output.ssg;
@@ -75,7 +70,6 @@ const isSSGEntry = (config, entryName, entrypoints) => {
 const isSingleEntry = (entrypoints, mainEntryName = import_constants.MAIN_ENTRY_NAME) => entrypoints.length === 1 && entrypoints[0].entryName === mainEntryName;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  isRouterV5,
   isSSGEntry,
   isSSR,
   isServiceWorker,

package/dist/cjs/cli/prettyInstructions.js

@@ -86,10 +86,10 @@ const getAddressUrls = (protocol = "http", port, host) => {
   }, []);
 };
 const prettyInstructions = (appContext, config) => {
-  var _appContext_builder_context_devServer, _appContext_builder, _config_dev, _config_source, _config_dev1;
+  var _config_dev, _config_tools_devServer, _config_tools, _config_dev1, _config_source, _config_dev2;
   const { entrypoints, serverRoutes, port, apiOnly, checkedEntries } = appContext;
-  const isHttps = (0, import_is.isDev)() && ((_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : (_appContext_builder_context_devServer = _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
-  const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
+  const isHttps = (0, import_is.isDev)() && ((config === null || config === void 0 ? void 0 : (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.https) || (config === null || config === void 0 ? void 0 : (_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : (_config_tools_devServer = _config_tools.devServer) === null || _config_tools_devServer === void 0 ? void 0 : _config_tools_devServer.https));
+  const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev1 = config.dev) === null || _config_dev1 === void 0 ? void 0 : _config_dev1.host);
   const routes = !apiOnly ? serverRoutes.filter((route) => route.entryName) : serverRoutes;
   let message = "\n";
   if ((0, import_is.isSingleEntry)(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) || apiOnly) {
@@ -112,7 +112,7 @@ const prettyInstructions = (appContext, config) => {
     message += import_compiled.chalk.cyanBright("  λ (Server) server-side renders at runtime\n");
     message += import_compiled.chalk.cyanBright("  ○ (Static) client-side renders as static HTML\n");
   }
-  if ((_config_dev1 = config.dev) === null || _config_dev1 === void 0 ? void 0 : _config_dev1.cliShortcuts) {
+  if ((_config_dev2 = config.dev) === null || _config_dev2 === void 0 ? void 0 : _config_dev2.cliShortcuts) {
     message += `  ${import_compiled.chalk.dim("> press")} ${import_compiled.chalk.bold("h + enter")} ${import_compiled.chalk.dim("to show shortcuts")}
 `;
   }

package/dist/cjs/cli/version.js

@@ -20,6 +20,7 @@ var version_exports = {};
 __export(version_exports, {
   isVersionAtLeast18: () => isVersionAtLeast18,
   isVersionAtLeast1819: () => isVersionAtLeast1819,
+  isVersionAtLeast20: () => isVersionAtLeast20,
   isVersionAtLeast22: () => isVersionAtLeast22
 });
 module.exports = __toCommonJS(version_exports);
@@ -38,9 +39,15 @@ function isVersionAtLeast22() {
   const versionArr = nodeVersion.split(".").map(Number);
   return versionArr[0] >= 22;
 }
+function isVersionAtLeast20() {
+  const nodeVersion = process.versions.node;
+  const versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] >= 20;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   isVersionAtLeast18,
   isVersionAtLeast1819,
+  isVersionAtLeast20,
   isVersionAtLeast22
 });

package/dist/esm/cli/constants.js

@@ -62,6 +62,7 @@ var INTERNAL_CLI_PLUGINS = {
   "@modern-js/module-tools": "@modern-js/module-tools",
   "@modern-js/doc-tools": "@modern-js/doc-tools",
   "@modern-js/runtime": "@modern-js/runtime/cli",
+  "@modern-js/plugin-state": "@modern-js/plugin-state/cli",
   "@modern-js/plugin-proxy": "@modern-js/plugin-proxy/cli",
   "@modern-js/plugin-ssg": "@modern-js/plugin-ssg/cli",
   "@modern-js/plugin-bff": "@modern-js/plugin-bff/cli",

package/dist/esm/cli/is/config.js

@@ -50,10 +50,6 @@ var isServiceWorker = function(config) {
   }
   return false;
 };
-var isRouterV5 = function(config) {
-  var _config_runtime, _config_runtime_router, _config_runtime1;
-  return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (_config_runtime1 = config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
-};
 var isSSGEntry = function(config, entryName, entrypoints) {
   var _config_source;
   var ssgConfig = config.output.ssg;
@@ -65,7 +61,6 @@ var isSingleEntry = function(entrypoints) {
   return entrypoints.length === 1 && entrypoints[0].entryName === mainEntryName;
 };
 export {
-  isRouterV5,
   isSSGEntry,
   isSSR,
   isServiceWorker,

package/dist/esm/cli/prettyInstructions.js

@@ -58,10 +58,10 @@ var getAddressUrls = function() {
   }, []);
 };
 var prettyInstructions = function(appContext, config) {
-  var _appContext_builder_context_devServer, _appContext_builder, _config_dev, _config_source, _config_dev1;
+  var _config_dev, _config_tools_devServer, _config_tools, _config_dev1, _config_source, _config_dev2;
   var entrypoints = appContext.entrypoints, serverRoutes = appContext.serverRoutes, port = appContext.port, apiOnly = appContext.apiOnly, checkedEntries = appContext.checkedEntries;
-  var isHttps = isDev() && ((_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : (_appContext_builder_context_devServer = _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
-  var urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
+  var isHttps = isDev() && ((config === null || config === void 0 ? void 0 : (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.https) || (config === null || config === void 0 ? void 0 : (_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : (_config_tools_devServer = _config_tools.devServer) === null || _config_tools_devServer === void 0 ? void 0 : _config_tools_devServer.https));
+  var urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev1 = config.dev) === null || _config_dev1 === void 0 ? void 0 : _config_dev1.host);
   var routes = !apiOnly ? serverRoutes.filter(function(route) {
     return route.entryName;
   }) : serverRoutes;
@@ -91,7 +91,7 @@ var prettyInstructions = function(appContext, config) {
     message += chalk.cyanBright("  λ (Server) server-side renders at runtime\n");
     message += chalk.cyanBright("  ○ (Static) client-side renders as static HTML\n");
   }
-  if ((_config_dev1 = config.dev) === null || _config_dev1 === void 0 ? void 0 : _config_dev1.cliShortcuts) {
+  if ((_config_dev2 = config.dev) === null || _config_dev2 === void 0 ? void 0 : _config_dev2.cliShortcuts) {
     message += "  ".concat(chalk.dim("> press"), " ").concat(chalk.bold("h + enter"), " ").concat(chalk.dim("to show shortcuts"), "\n");
   }
   return message;

package/dist/esm/cli/version.js

@@ -13,8 +13,14 @@ function isVersionAtLeast22() {
   var versionArr = nodeVersion.split(".").map(Number);
   return versionArr[0] >= 22;
 }
+function isVersionAtLeast20() {
+  var nodeVersion = process.versions.node;
+  var versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] >= 20;
+}
 export {
   isVersionAtLeast18,
   isVersionAtLeast1819,
+  isVersionAtLeast20,
   isVersionAtLeast22
 };

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

@@ -62,6 +62,7 @@ const INTERNAL_CLI_PLUGINS = {
   "@modern-js/module-tools": "@modern-js/module-tools",
   "@modern-js/doc-tools": "@modern-js/doc-tools",
   "@modern-js/runtime": "@modern-js/runtime/cli",
+  "@modern-js/plugin-state": "@modern-js/plugin-state/cli",
   "@modern-js/plugin-proxy": "@modern-js/plugin-proxy/cli",
   "@modern-js/plugin-ssg": "@modern-js/plugin-ssg/cli",
   "@modern-js/plugin-bff": "@modern-js/plugin-bff/cli",

package/dist/esm-node/cli/is/config.js

@@ -33,10 +33,6 @@ const isServiceWorker = (config) => {
   }
   return false;
 };
-const isRouterV5 = (config) => {
-  var _config_runtime, _config_runtime_router, _config_runtime1;
-  return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (_config_runtime1 = config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
-};
 const isSSGEntry = (config, entryName, entrypoints) => {
   var _config_source;
   const ssgConfig = config.output.ssg;
@@ -45,7 +41,6 @@ const isSSGEntry = (config, entryName, entrypoints) => {
 };
 const isSingleEntry = (entrypoints, mainEntryName = MAIN_ENTRY_NAME) => entrypoints.length === 1 && entrypoints[0].entryName === mainEntryName;
 export {
-  isRouterV5,
   isSSGEntry,
   isSSR,
   isServiceWorker,

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

@@ -52,10 +52,10 @@ const getAddressUrls = (protocol = "http", port, host) => {
   }, []);
 };
 const prettyInstructions = (appContext, config) => {
-  var _appContext_builder_context_devServer, _appContext_builder, _config_dev, _config_source, _config_dev1;
+  var _config_dev, _config_tools_devServer, _config_tools, _config_dev1, _config_source, _config_dev2;
   const { entrypoints, serverRoutes, port, apiOnly, checkedEntries } = appContext;
-  const isHttps = isDev() && ((_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : (_appContext_builder_context_devServer = _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
-  const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
+  const isHttps = isDev() && ((config === null || config === void 0 ? void 0 : (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.https) || (config === null || config === void 0 ? void 0 : (_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : (_config_tools_devServer = _config_tools.devServer) === null || _config_tools_devServer === void 0 ? void 0 : _config_tools_devServer.https));
+  const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev1 = config.dev) === null || _config_dev1 === void 0 ? void 0 : _config_dev1.host);
   const routes = !apiOnly ? serverRoutes.filter((route) => route.entryName) : serverRoutes;
   let message = "\n";
   if (isSingleEntry(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) || apiOnly) {
@@ -78,7 +78,7 @@ const prettyInstructions = (appContext, config) => {
     message += chalk.cyanBright("  λ (Server) server-side renders at runtime\n");
     message += chalk.cyanBright("  ○ (Static) client-side renders as static HTML\n");
   }
-  if ((_config_dev1 = config.dev) === null || _config_dev1 === void 0 ? void 0 : _config_dev1.cliShortcuts) {
+  if ((_config_dev2 = config.dev) === null || _config_dev2 === void 0 ? void 0 : _config_dev2.cliShortcuts) {
     message += `  ${chalk.dim("> press")} ${chalk.bold("h + enter")} ${chalk.dim("to show shortcuts")}
 `;
   }

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

@@ -13,8 +13,14 @@ function isVersionAtLeast22() {
   const versionArr = nodeVersion.split(".").map(Number);
   return versionArr[0] >= 22;
 }
+function isVersionAtLeast20() {
+  const nodeVersion = process.versions.node;
+  const versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] >= 20;
+}
 export {
   isVersionAtLeast18,
   isVersionAtLeast1819,
+  isVersionAtLeast20,
   isVersionAtLeast22
 };

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

@@ -17,13 +17,6 @@ export declare const isUseRsc: (config: any) => boolean;
  * @returns Whether to use worker deploy.
  */
 export declare const isServiceWorker: (config: any) => boolean;
-export declare const isRouterV5: (config: {
-    runtime?: {
-        router?: {
-            mode?: string;
-        } | boolean;
-    };
-}) => boolean;
 export declare const isSSGEntry: (config: any, entryName: string, entrypoints: EntryPoint[]) => boolean;
 export declare const isSingleEntry: (entrypoints: EntryPoint[], mainEntryName?: string) => boolean;
 export {};

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

@@ -1,3 +1,4 @@
 export declare function isVersionAtLeast1819(): boolean;
 export declare function isVersionAtLeast18(): boolean;
 export declare function isVersionAtLeast22(): boolean;
+export declare function isVersionAtLeast20(): boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.66.0",
+  "version": "2.67.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -190,7 +190,7 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.98.0",
-    "@modern-js/types": "2.66.0",
+    "@modern-js/types": "2.67.1",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },