@modern-js/utils 2.64.1 → 2.64.3

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

@@ -23,6 +23,7 @@ __export(config_exports, {
   isSSR: () => isSSR,
   isServiceWorker: () => isServiceWorker,
   isSingleEntry: () => isSingleEntry,
+  isUseRsc: () => isUseRsc,
   isUseSSRBundle: () => isUseSSRBundle
 });
 module.exports = __toCommonJS(config_exports);
@@ -49,6 +50,10 @@ const isUseSSRBundle = (config) => {
   }
   return isSSR(config);
 };
+const isUseRsc = (config) => {
+  var _config_server;
+  return config === null || config === void 0 ? void 0 : (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc;
+};
 const isServiceWorker = (config) => {
   var _deploy_worker;
   const { output, deploy } = config;
@@ -75,5 +80,6 @@ const isSingleEntry = (entrypoints, mainEntryName = import_constants.MAIN_ENTRY_
   isSSR,
   isServiceWorker,
   isSingleEntry,
+  isUseRsc,
   isUseSSRBundle
 });

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

@@ -35,6 +35,7 @@ __export(project_exports, {
   isReact18: () => isReact18,
   isSupportAutomaticJsx: () => isSupportAutomaticJsx,
   isTypescript: () => isTypescript,
+  isVersionBeyond17: () => isVersionBeyond17,
   isWebOnly: () => isWebOnly
 });
 module.exports = __toCommonJS(project_exports);
@@ -78,6 +79,9 @@ const isWebOnly = async () => {
   const options = (0, import_compiled.minimist)((0, import_commands.getArgv)());
   return Boolean(options["web-only"]);
 };
+const isVersionBeyond17 = (version) => {
+  return import_compiled.semver.gte(import_compiled.semver.minVersion(version), "17.0.0");
+};
 const isBeyondReact17 = (cwd) => {
   const pkgPath = import_pkg_up.default.sync({
     cwd
@@ -93,7 +97,7 @@ const isBeyondReact17 = (cwd) => {
   if (typeof deps.react !== "string") {
     return false;
   }
-  return import_compiled.semver.satisfies(import_compiled.semver.minVersion(deps.react), ">=17.0.0");
+  return isVersionBeyond17(deps.react);
 };
 const isSupportAutomaticJsx = (cwd) => {
   const pkgPath = import_pkg_up.default.sync({
@@ -125,7 +129,7 @@ const isReact18 = (cwd = process.cwd()) => {
   if (typeof deps.react !== "string") {
     return false;
   }
-  return import_compiled.semver.satisfies(import_compiled.semver.minVersion(deps.react), ">=18.0.0");
+  return import_compiled.semver.gte(import_compiled.semver.minVersion(deps.react), "18.0.0");
 };
 const isTypescript = (root) => import_compiled.fs.existsSync(import_path.default.resolve(root, "./tsconfig.json"));
 // Annotate the CommonJS export names for ESM import in node:
@@ -137,5 +141,6 @@ const isTypescript = (root) => import_compiled.fs.existsSync(import_path.default
   isReact18,
   isSupportAutomaticJsx,
   isTypescript,
+  isVersionBeyond17,
   isWebOnly
 });

package/dist/cjs/cli/version.js

@@ -18,7 +18,9 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var version_exports = {};
 __export(version_exports, {
-  isVersionAtLeast1819: () => isVersionAtLeast1819
+  isVersionAtLeast18: () => isVersionAtLeast18,
+  isVersionAtLeast1819: () => isVersionAtLeast1819,
+  isVersionAtLeast22: () => isVersionAtLeast22
 });
 module.exports = __toCommonJS(version_exports);
 function isVersionAtLeast1819() {
@@ -26,7 +28,19 @@ function isVersionAtLeast1819() {
   const versionArr = nodeVersion.split(".").map(Number);
   return versionArr[0] > 18 || versionArr[0] === 18 && versionArr[1] >= 19;
 }
+function isVersionAtLeast18() {
+  const nodeVersion = process.versions.node;
+  const versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] >= 18;
+}
+function isVersionAtLeast22() {
+  const nodeVersion = process.versions.node;
+  const versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] >= 22;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  isVersionAtLeast1819
+  isVersionAtLeast18,
+  isVersionAtLeast1819,
+  isVersionAtLeast22
 });

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

@@ -38,6 +38,10 @@ var isUseSSRBundle = function(config) {
   }
   return isSSR(config);
 };
+var isUseRsc = function(config) {
+  var _config_server;
+  return config === null || config === void 0 ? void 0 : (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc;
+};
 var isServiceWorker = function(config) {
   var _deploy_worker;
   var output = config.output, deploy = config.deploy;
@@ -66,5 +70,6 @@ export {
   isSSR,
   isServiceWorker,
   isSingleEntry,
+  isUseRsc,
   isUseSSRBundle
 };

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

@@ -79,6 +79,9 @@ var isWebOnly = function() {
     return _ref.apply(this, arguments);
   };
 }();
+var isVersionBeyond17 = function(version) {
+  return semver.gte(semver.minVersion(version), "17.0.0");
+};
 var isBeyondReact17 = function(cwd) {
   var pkgPath = pkgUp.sync({
     cwd
@@ -91,7 +94,7 @@ var isBeyondReact17 = function(cwd) {
   if (typeof deps.react !== "string") {
     return false;
   }
-  return semver.satisfies(semver.minVersion(deps.react), ">=17.0.0");
+  return isVersionBeyond17(deps.react);
 };
 var isSupportAutomaticJsx = function(cwd) {
   var pkgPath = pkgUp.sync({
@@ -118,7 +121,7 @@ var isReact18 = function() {
   if (typeof deps.react !== "string") {
     return false;
   }
-  return semver.satisfies(semver.minVersion(deps.react), ">=18.0.0");
+  return semver.gte(semver.minVersion(deps.react), "18.0.0");
 };
 var isTypescript = function(root) {
   return fs.existsSync(path.resolve(root, "./tsconfig.json"));
@@ -131,5 +134,6 @@ export {
   isReact18,
   isSupportAutomaticJsx,
   isTypescript,
+  isVersionBeyond17,
   isWebOnly
 };

package/dist/esm/cli/version.js

@@ -3,6 +3,18 @@ function isVersionAtLeast1819() {
   var versionArr = nodeVersion.split(".").map(Number);
   return versionArr[0] > 18 || versionArr[0] === 18 && versionArr[1] >= 19;
 }
+function isVersionAtLeast18() {
+  var nodeVersion = process.versions.node;
+  var versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] >= 18;
+}
+function isVersionAtLeast22() {
+  var nodeVersion = process.versions.node;
+  var versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] >= 22;
+}
 export {
-  isVersionAtLeast1819
+  isVersionAtLeast18,
+  isVersionAtLeast1819,
+  isVersionAtLeast22
 };

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

@@ -21,6 +21,10 @@ const isUseSSRBundle = (config) => {
   }
   return isSSR(config);
 };
+const isUseRsc = (config) => {
+  var _config_server;
+  return config === null || config === void 0 ? void 0 : (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc;
+};
 const isServiceWorker = (config) => {
   var _deploy_worker;
   const { output, deploy } = config;
@@ -46,5 +50,6 @@ export {
   isSSR,
   isServiceWorker,
   isSingleEntry,
+  isUseRsc,
   isUseSSRBundle
 };

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

@@ -38,6 +38,9 @@ const isWebOnly = async () => {
   const options = minimist(getArgv());
   return Boolean(options["web-only"]);
 };
+const isVersionBeyond17 = (version) => {
+  return semver.gte(semver.minVersion(version), "17.0.0");
+};
 const isBeyondReact17 = (cwd) => {
   const pkgPath = pkgUp.sync({
     cwd
@@ -53,7 +56,7 @@ const isBeyondReact17 = (cwd) => {
   if (typeof deps.react !== "string") {
     return false;
   }
-  return semver.satisfies(semver.minVersion(deps.react), ">=17.0.0");
+  return isVersionBeyond17(deps.react);
 };
 const isSupportAutomaticJsx = (cwd) => {
   const pkgPath = pkgUp.sync({
@@ -85,7 +88,7 @@ const isReact18 = (cwd = process.cwd()) => {
   if (typeof deps.react !== "string") {
     return false;
   }
-  return semver.satisfies(semver.minVersion(deps.react), ">=18.0.0");
+  return semver.gte(semver.minVersion(deps.react), "18.0.0");
 };
 const isTypescript = (root) => fs.existsSync(path.resolve(root, "./tsconfig.json"));
 export {
@@ -96,5 +99,6 @@ export {
   isReact18,
   isSupportAutomaticJsx,
   isTypescript,
+  isVersionBeyond17,
   isWebOnly
 };

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

@@ -3,6 +3,18 @@ function isVersionAtLeast1819() {
   const versionArr = nodeVersion.split(".").map(Number);
   return versionArr[0] > 18 || versionArr[0] === 18 && versionArr[1] >= 19;
 }
+function isVersionAtLeast18() {
+  const nodeVersion = process.versions.node;
+  const versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] >= 18;
+}
+function isVersionAtLeast22() {
+  const nodeVersion = process.versions.node;
+  const versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] >= 22;
+}
 export {
-  isVersionAtLeast1819
+  isVersionAtLeast18,
+  isVersionAtLeast1819,
+  isVersionAtLeast22
 };

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

@@ -9,6 +9,7 @@ interface EntryPoint {
  */
 export declare const isSSR: (config: any) => boolean;
 export declare const isUseSSRBundle: (config: any) => boolean;
+export declare const isUseRsc: (config: any) => boolean;
 /**
  * Is Worker project
  *

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

@@ -22,6 +22,7 @@ export declare const isPackageInstalled: (name: string, resolvePaths: string | s
  */
 export declare const isApiOnly: (appDirectory: string, entryDir?: string, apiDir?: string) => Promise<boolean>;
 export declare const isWebOnly: () => Promise<boolean>;
+export declare const isVersionBeyond17: (version: string) => boolean;
 /**
  * @deprecated Use {@link isSupportAutomaticJsx} to check if the project supports automatic JSX instead.
  */

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

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.64.1",
+  "version": "2.64.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -161,10 +161,10 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "webpack": "^5.97.1",
-    "@scripts/build": "2.64.1",
-    "@scripts/jest-config": "2.64.1",
-    "@modern-js/types": "2.64.1"
+    "webpack": "^5.98.0",
+    "@modern-js/types": "2.64.3",
+    "@scripts/build": "2.64.3",
+    "@scripts/jest-config": "2.64.3"
   },
   "sideEffects": false,
   "scripts": {