create-umi 4.0.64 → 4.0.66

package/dist/index.js

@@ -166,7 +166,15 @@ var src_default = async ({
   const projectRoot = inMonorepo ? monorepoRoot : target;
   const shouldInitGit = args.git !== false;
   const withHusky = shouldInitGit && !inMonorepo;
+  let pnpmExtraNpmrc = "";
   const isPnpm = npmClient === "pnpm" /* pnpm */;
+  let pnpmMajorVersion;
+  if (isPnpm) {
+    pnpmMajorVersion = await getPnpmMajorVersion();
+    if (pnpmMajorVersion === 7) {
+      pnpmExtraNpmrc = `strict-peer-dependencies=false`;
+    }
+  }
   const injectInternalTemplateFiles = async () => {
     const generator = new import_utils.BaseGenerator({
       path: (0, import_path.join)(__dirname, "..", "templates", appTemplate),
@@ -179,10 +187,7 @@ var src_default = async ({
         author,
         email,
         withHusky,
-        // suppress pnpm v7 warning
-        // No need when `pnpm` > v7.13.5 , but we are forward compatible
-        // https://pnpm.io/npmrc#strict-peer-dependencies
-        extraNpmrc: isPnpm ? `strict-peer-dependencies=false` : "",
+        extraNpmrc: isPnpm ? pnpmExtraNpmrc : "",
         pluginName
       }
     });
@@ -207,10 +212,29 @@ var src_default = async ({
   } else {
     import_utils.logger.info(`Skip Git init`);
   }
+  const isPnpm8 = pnpmMajorVersion === 8;
   if (!useDefaultData && args.install !== false) {
-    (0, import_utils.installWithNpmClient)({ npmClient, cwd: target });
+    if (isPnpm8) {
+      await installWithPnpm8(target);
+    } else {
+      (0, import_utils.installWithNpmClient)({ npmClient, cwd: target });
+    }
   } else {
     import_utils.logger.info(`Skip install deps`);
+    if (isPnpm8) {
+      import_utils.logger.warn(
+        import_utils.chalk.yellow(
+          `You current using pnpm v8, it will install minimal version of dependencies`
+        )
+      );
+      import_utils.logger.warn(
+        import_utils.chalk.green(
+          `Recommended that you run ${import_utils.chalk.bold.cyan(
+            "pnpm up -L"
+          )} to install latest version of dependencies`
+        )
+      );
+    }
   }
 };
 async function detectMonorepoRoot(opts) {
@@ -254,5 +278,16 @@ async function removeHusky(opts) {
     await import_utils.fsExtra.remove(dir);
   }
 }
+async function installWithPnpm8(cwd) {
+  await import_utils.execa.execa("pnpm", ["up", "-L"], { cwd, stdio: "inherit" });
+}
+async function getPnpmMajorVersion() {
+  try {
+    const { stdout } = await import_utils.execa.execa("pnpm", ["--version"]);
+    return parseInt(stdout.trim().split(".")[0], 10);
+  } catch (e) {
+    throw new Error("Please install pnpm first", { cause: e });
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-umi",
-  "version": "4.0.64",
+  "version": "4.0.66",
   "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.0.64"
+    "@umijs/utils": "4.0.66"
   },
   "publishConfig": {
     "access": "public"

package/templates/app/package.json.tpl

@@ -12,8 +12,8 @@
     "umi": "{{{ version }}}"
   },
   "devDependencies": {
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "typescript": "^5.0.0"
+    "@types/react": "^18.0.33",
+    "@types/react-dom": "^18.0.11",
+    "typescript": "^5.0.3"
   }
 }

package/templates/max/.umirc.ts.tpl

@@ -25,9 +25,9 @@ export default defineConfig({
       component: './Access',
     },
     {
-        name: ' CRUD 示例',
-        path: '/table',
-        component: './Table',
+      name: ' CRUD 示例',
+      path: '/table',
+      component: './Table',
     },
   ],
   npmClient: '{{{ npmClient }}}',

package/templates/max/package.json.tpl

@@ -11,19 +11,19 @@
     "start": "npm run dev"
   },
   "dependencies": {
-    "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-components": "^2.0.1",
+    "@ant-design/icons": "^5.0.1",
+    "@ant-design/pro-components": "^2.4.4",
     "@umijs/max": "{{{ version }}}",
-    "antd": "^5.0.0"
+    "antd": "^5.4.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",{{#withHusky}}
-    "husky": "^8.0.1",{{/withHusky}}
-    "lint-staged": "^13.0.3",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^2",
-    "prettier-plugin-packagejson": "^2",
-    "typescript": "^5.0.0"
+    "@types/react": "^18.0.33",
+    "@types/react-dom": "^18.0.11",{{#withHusky}}
+    "husky": "^8.0.3",{{/withHusky}}
+    "lint-staged": "^13.2.0",
+    "prettier": "^2.8.7",
+    "prettier-plugin-organize-imports": "^3.2.2",
+    "prettier-plugin-packagejson": "^2.4.3",
+    "typescript": "^5.0.3"
   }
 }

package/templates/plugin/package.json.tpl

@@ -18,9 +18,9 @@
     "dist"
   ],
   "devDependencies": {
-    "father": "^4.0.0",
+    "father": "^4.1.8",
     "umi": "{{{ version }}}",
-    "@types/node": "^18.0.0",
-    "typescript": "^5.0.0"
+    "@types/node": "^18.15.11",
+    "typescript": "^5.0.3"
   }
 }

package/templates/vue-app/package.json.tpl

@@ -8,11 +8,11 @@
     "start": "npm run dev"
   },
   "dependencies": {
-    "vue": "^3.2.36",
+    "vue": "^3.2.47",
     "umi": "{{{ version }}}"
   },
   "devDependencies": {
-    "typescript": "^5.0.0",
+    "typescript": "^5.0.3",
     "@umijs/preset-vue": "{{{ version }}}"
   }
 }