create-umi 4.0.8 → 4.0.11

package/dist/cli.js

@@ -1,4 +1,4 @@
-// cli.ts
+// src/cli.ts
 var import_utils = require("@umijs/utils");
 var args = (0, import_utils.yParser)(process.argv.slice(2), {
   alias: {

package/dist/index.d.ts

@@ -1,6 +1,12 @@
 import { yParser } from '@umijs/utils';
-declare const _default: ({ cwd, args, }: {
+interface IArgs extends yParser.Arguments {
+    default?: boolean;
+    plugin?: boolean;
+    git?: boolean;
+    install?: boolean;
+}
+declare const _default: ({ cwd, args }: {
     cwd: string;
-    args: yParser.Arguments;
+    args: IArgs;
 }) => Promise<void>;
 export default _default;

package/dist/index.js

@@ -16,13 +16,14 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// index.ts
+// src/index.ts
 var src_exports = {};
 __export(src_exports, {
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
 var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
 var import_path = require("path");
 var testData = {
   name: "umi-plugin-demo",
@@ -34,10 +35,7 @@ var testData = {
   npmClient: "pnpm",
   registry: "https://registry.npmjs.org/"
 };
-var src_default = async ({
-  cwd,
-  args
-}) => {
+var src_default = async ({ cwd, args }) => {
   const [name] = args._;
   let npmClient = "pnpm";
   let registry = "https://registry.npmjs.org/";
@@ -123,6 +121,11 @@ var src_default = async ({
   const target = name ? (0, import_path.join)(cwd, name) : cwd;
   const templateName = args.plugin ? "plugin" : appTemplate;
   const version = require("../package").version;
+  const monorepoRoot = await detectMonorepoRoot({ target });
+  const inMonorepo = !!monorepoRoot;
+  const projectRoot = inMonorepo ? monorepoRoot : target;
+  const shouldInitGit = args.git !== false;
+  const withHusky = shouldInitGit && !inMonorepo;
   const generator = new import_utils.BaseGenerator({
     path: (0, import_path.join)(__dirname, "..", "templates", templateName),
     target,
@@ -130,14 +133,76 @@ var src_default = async ({
       version: version.includes("-canary.") ? version : `^${version}`,
       npmClient,
       registry,
-      author
+      author,
+      withHusky,
+      extraNpmrc: npmClient === "pnpm" ? `strict-peer-dependencies=false` : ""
     },
     questions: args.default ? [] : args.plugin ? pluginPrompts : []
   });
   await generator.run();
-  if (!args.default) {
+  const context = {
+    inMonorepo,
+    target,
+    projectRoot
+  };
+  if (!withHusky) {
+    await removeHusky(context);
+  }
+  if (inMonorepo) {
+    await moveNpmrc(context);
+  }
+  if (shouldInitGit) {
+    await initGit(context);
+  } else {
+    import_utils.logger.info(`Skip Git init`);
+  }
+  if (!args.default && args.install !== false) {
     (0, import_utils.installWithNpmClient)({ npmClient, cwd: target });
+  } else {
+    import_utils.logger.info(`Skip install deps`);
   }
 };
+async function detectMonorepoRoot(opts) {
+  const { target } = opts;
+  const rootPkg = await import_utils.pkgUp.pkgUp({ cwd: (0, import_path.dirname)(target) });
+  if (!rootPkg) {
+    return null;
+  }
+  const rootDir = (0, import_path.dirname)(rootPkg);
+  if ((0, import_utils.tryPaths)([
+    (0, import_path.join)(rootDir, "lerna.json"),
+    (0, import_path.join)(rootDir, "pnpm-workspace.yaml")
+  ])) {
+    return rootDir;
+  }
+  return null;
+}
+async function moveNpmrc(opts) {
+  const { target, projectRoot } = opts;
+  const sourceNpmrc = (0, import_path.join)(target, "./.npmrc");
+  const targetNpmrc = (0, import_path.join)(projectRoot, "./.npmrc");
+  if (!(0, import_fs.existsSync)(targetNpmrc)) {
+    await import_utils.fsExtra.copyFile(sourceNpmrc, targetNpmrc);
+  }
+  await import_utils.fsExtra.remove(sourceNpmrc);
+}
+async function initGit(opts) {
+  const { projectRoot } = opts;
+  const isGit = (0, import_fs.existsSync)((0, import_path.join)(projectRoot, ".git"));
+  if (isGit)
+    return;
+  try {
+    await import_utils.execa.execa("git", ["init"], { cwd: projectRoot });
+    import_utils.logger.ready(`Git initialized successfully`);
+  } catch {
+    import_utils.logger.error(`Initial the git repo failed`);
+  }
+}
+async function removeHusky(opts) {
+  const dir = (0, import_path.join)(opts.target, "./.husky");
+  if ((0, import_fs.existsSync)(dir)) {
+    await import_utils.fsExtra.remove(dir);
+  }
+}
 // 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.8",
+  "version": "4.0.11",
   "description": "create-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/create-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -19,13 +19,13 @@
     "templates"
   ],
   "scripts": {
-    "build": "pnpm father build",
+    "build": "umi-scripts father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm father dev",
+    "dev": "umi-scripts father dev",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/utils": "4.0.8"
+    "@umijs/utils": "4.0.11"
   },
   "publishConfig": {
     "access": "public"

package/templates/app/.gitignore.tpl

@@ -4,4 +4,5 @@
 /config/config.local.ts
 /src/.umi
 /src/.umi-production
+/src/.umi-test
 /dist

package/templates/app/.npmrc.tpl

@@ -1 +1,2 @@
 registry={{{ registry }}}
+{{{ extraNpmrc }}}

package/templates/max/.gitignore.tpl

@@ -4,6 +4,7 @@
 /config/config.local.ts
 /src/.umi
 /src/.umi-production
+/src/.umi-test
 /.umi
 /.umi-production
 /.umi-test

package/templates/max/.npmrc.tpl

@@ -1 +1,2 @@
 registry={{{ registry }}}
+{{{ extraNpmrc }}}

package/templates/max/package.json.tpl

@@ -4,8 +4,8 @@
   "scripts": {
     "dev": "max dev",
     "build": "max build",
-    "format": "prettier --cache --write .",
-    "prepare": "husky install",
+    "format": "prettier --cache --write .",{{#withHusky}}
+    "prepare": "husky install",{{/withHusky}}
     "postinstall": "max setup",
     "setup": "max setup",
     "start": "npm run dev"
@@ -18,8 +18,8 @@
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "husky": "^8.0.1",
+    "@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",

package/templates/plugin/.npmrc.tpl

@@ -1 +1,2 @@
 registry={{{ registry }}}
+{{{ extraNpmrc }}}

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

@@ -4,6 +4,7 @@
 /config/config.local.ts
 /src/.umi
 /src/.umi-production
+/src/.umi-test
 /.umi
 /.umi-production
 /.umi-test

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

@@ -1 +1,2 @@
 registry={{{ registry }}}
+{{{ extraNpmrc }}}