@modern-js/utils 2.65.3 → 2.65.5

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

@@ -41,7 +41,7 @@ const isWebOnly = async () => {
 const isVersionBeyond17 = (version) => {
   return semver.gte(semver.minVersion(version), "17.0.0");
 };
-const isBeyondReact17 = (cwd) => {
+const getReactVersion = (cwd) => {
   const pkgPath = pkgUp.sync({
     cwd
   });
@@ -56,42 +56,43 @@ const isBeyondReact17 = (cwd) => {
   if (typeof deps.react !== "string") {
     return false;
   }
-  return isVersionBeyond17(deps.react);
-};
-const isSupportAutomaticJsx = (cwd) => {
-  const pkgPath = pkgUp.sync({
-    cwd
-  });
-  if (!pkgPath) {
+  try {
+    const reactPath = require.resolve("react/package.json", {
+      paths: [
+        cwd
+      ]
+    });
+    const reactVersion = JSON.parse(fs.readFileSync(reactPath, "utf8")).version;
+    return reactVersion;
+  } catch (error) {
+    console.error("Failed to resolve React version:", error);
     return false;
   }
-  const pkgInfo = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-  const deps = {
-    ...pkgInfo.devDependencies,
-    ...pkgInfo.dependencies
-  };
-  if (typeof deps.react !== "string") {
+};
+const isBeyondReact17 = (cwd) => {
+  const reactVersion = getReactVersion(cwd);
+  if (!reactVersion) {
     return false;
   }
-  return semver.satisfies(semver.minVersion(deps.react), ">=16.14.0");
+  return isVersionBeyond17(reactVersion);
 };
-const isReact18 = (cwd = process.cwd()) => {
-  const pkgPath = path.join(cwd, "package.json");
-  if (!fs.existsSync(pkgPath)) {
+const isSupportAutomaticJsx = (cwd) => {
+  const reactVersion = getReactVersion(cwd);
+  if (!reactVersion) {
     return false;
   }
-  const pkgInfo = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-  const deps = {
-    ...pkgInfo.devDependencies,
-    ...pkgInfo.dependencies
-  };
-  if (typeof deps.react !== "string") {
+  return semver.satisfies(semver.minVersion(reactVersion), ">=16.14.0");
+};
+const isReact18 = (cwd = process.cwd()) => {
+  const reactVersion = getReactVersion(cwd);
+  if (!reactVersion) {
     return false;
   }
-  return semver.gte(semver.minVersion(deps.react), "18.0.0");
+  return semver.gte(semver.minVersion(reactVersion), "18.0.0");
 };
 const isTypescript = (root) => fs.existsSync(path.resolve(root, "./tsconfig.json"));
 export {
+  getReactVersion,
   isApiOnly,
   isBeyondReact17,
   isDepExists,

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

@@ -23,6 +23,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;
+export declare const getReactVersion: (cwd: string) => string | false;
 /**
  * @deprecated Use {@link isSupportAutomaticJsx} to check if the project supports automatic JSX instead.
  */

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.65.3",
+  "version": "2.65.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -103,8 +103,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "typesVersions": {
     "*": {
@@ -191,9 +190,9 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.98.0",
-    "@modern-js/types": "2.65.3",
-    "@scripts/jest-config": "2.65.3",
-    "@scripts/build": "2.65.3"
+    "@scripts/build": "2.65.5",
+    "@modern-js/types": "2.65.5",
+    "@scripts/jest-config": "2.65.5"
   },
   "sideEffects": false,
   "scripts": {