create-umi 4.1.4 → 4.1.5

package/dist/index.js

@@ -169,8 +169,11 @@ var src_default = async ({
   let pnpmExtraNpmrc = "";
   const isPnpm = npmClient === "pnpm" /* pnpm */;
   let pnpmMajorVersion;
+  let pnpmVersion;
   if (isPnpm) {
-    pnpmMajorVersion = await getPnpmMajorVersion();
+    pnpmVersion = await getPnpmVersion();
+    pnpmMajorVersion = parseInt(pnpmVersion.split(".")[0], 10);
+    import_utils.logger.debug(`pnpm version: ${pnpmVersion}`);
     if (pnpmMajorVersion === 7) {
       pnpmExtraNpmrc = `strict-peer-dependencies=false`;
     }
@@ -213,9 +216,11 @@ var src_default = async ({
     import_utils.logger.info(`Skip Git init`);
   }
   const isPnpm8 = pnpmMajorVersion === 8;
+  const pnpmHighestResolutionMinVersion = "8.7.0";
+  const isPnpmHighestResolution = isPnpm8 && import_utils.semver.gte(pnpmVersion, pnpmHighestResolutionMinVersion);
   if (!useDefaultData && args.install !== false) {
-    if (isPnpm8) {
-      await installWithPnpm8(target);
+    if (isPnpm8 && !isPnpmHighestResolution) {
+      await installAndUpdateWithPnpm(target);
     } else {
       (0, import_utils.installWithNpmClient)({ npmClient, cwd: target });
     }
@@ -278,13 +283,13 @@ async function removeHusky(opts) {
     await import_utils.fsExtra.remove(dir);
   }
 }
-async function installWithPnpm8(cwd) {
+async function installAndUpdateWithPnpm(cwd) {
   await import_utils.execa.execa("pnpm", ["up", "-L"], { cwd, stdio: "inherit" });
 }
-async function getPnpmMajorVersion() {
+async function getPnpmVersion() {
   try {
     const { stdout } = await import_utils.execa.execa("pnpm", ["--version"]);
-    return parseInt(stdout.trim().split(".")[0], 10);
+    return stdout.trim();
   } catch (e) {
     throw new Error("Please install pnpm first", { cause: e });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-umi",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "description": "create-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/create-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -19,7 +19,7 @@
     "templates"
   ],
   "dependencies": {
-    "@umijs/utils": "4.1.4"
+    "@umijs/utils": "4.1.5"
   },
   "publishConfig": {
     "access": "public"

package/templates/max/.husky/commit-msg

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx --no-install max verify-commit $1

package/templates/max/.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx --no-install lint-staged --quiet

package/templates/max/package.json.tpl

@@ -5,7 +5,7 @@
     "dev": "max dev",
     "build": "max build",
     "format": "prettier --cache --write .",{{#withHusky}}
-    "prepare": "husky install",{{/withHusky}}
+    "prepare": "husky",{{/withHusky}}
     "postinstall": "max setup",
     "setup": "max setup",
     "start": "npm run dev"
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@types/react": "^18.0.33",
     "@types/react-dom": "^18.0.11",{{#withHusky}}
-    "husky": "^8.0.3",{{/withHusky}}
+    "husky": "^9",{{/withHusky}}
     "lint-staged": "^13.2.0",
     "prettier": "^2.8.7",
     "prettier-plugin-organize-imports": "^3.2.2",

package/templates/plugin/tsconfig.json

@@ -15,5 +15,6 @@
     "isolatedModules": false,
     "noEmit": false,
     "declaration": true
-  }
+  },
+  "include": ["src"]
 }