create-umi 4.0.6 → 4.0.9

package/bin/create-umi.js

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
 
+process.env.FS_LOGGER = 'none';
 require('../dist/cli');

package/dist/cli.js

@@ -1,27 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@umijs/utils");
-const args = (0, utils_1.yParser)(process.argv.slice(2), {
-    alias: {
-        version: ['v'],
-        help: ['h'],
-    },
-    boolean: ['version'],
+// cli.ts
+var import_utils = require("@umijs/utils");
+var args = (0, import_utils.yParser)(process.argv.slice(2), {
+  alias: {
+    version: ["v"],
+    help: ["h"]
+  },
+  boolean: ["version"]
 });
 if (args.version && !args._[0]) {
-    args._[0] = 'version';
-    const local = (0, utils_1.isLocalDev)() ? utils_1.chalk.cyan('@local') : '';
-    const { name, version } = require('../package.json');
-    console.log(`${name}@${version}${local}`);
-}
-else {
-    require('./')
-        .default({
-        cwd: process.cwd(),
-        args,
-    })
-        .catch((err) => {
-        console.error(`Create failed, ${err.message}`);
-        console.error(err);
-    });
+  args._[0] = "version";
+  const local = (0, import_utils.isLocalDev)() ? import_utils.chalk.cyan("@local") : "";
+  const { name, version } = require("../package.json");
+  console.log(`${name}@${version}${local}`);
+} else {
+  require("./").default({
+    cwd: process.cwd(),
+    args
+  }).catch((err) => {
+    console.error(`Create failed, ${err.message}`);
+    console.error(err);
+  });
 }

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

@@ -1,120 +1,208 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@umijs/utils");
-const path_1 = require("path");
-const testData = {
-    name: 'umi-plugin-demo',
-    description: 'nothing',
-    mail: 'xiaohuoni@gmail.com',
-    author: 'xiaohuoni',
-    org: 'umijs',
-    version: require('../package').version,
-    npmClient: 'pnpm',
-    registry: 'https://registry.npmjs.org/',
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-exports.default = async ({ cwd, args, }) => {
-    const [name] = args._;
-    let npmClient = 'pnpm';
-    let registry = 'https://registry.npmjs.org/';
-    let appTemplate = 'app';
-    const { username, email } = await (0, utils_1.getGitInfo)();
-    let author = email && username ? `${username} <${email}>` : '';
-    // test ignore prompts
-    if (!args.default) {
-        const response = await (0, utils_1.prompts)([
-            {
-                type: 'select',
-                name: 'appTemplate',
-                message: 'Pick Umi App Template',
-                choices: [
-                    { title: 'Simple App', value: 'app' },
-                    { title: 'Ant Design Pro', value: 'max' },
-                    { title: 'Vue Simple App', value: 'vue-app' },
-                ],
-                initial: 0,
-            },
-            {
-                type: 'select',
-                name: 'npmClient',
-                message: 'Pick Npm Client',
-                choices: [
-                    { title: 'npm', value: 'npm' },
-                    { title: 'cnpm', value: 'cnpm' },
-                    { title: 'tnpm', value: 'tnpm' },
-                    { title: 'yarn', value: 'yarn' },
-                    { title: 'pnpm', value: 'pnpm' },
-                ],
-                initial: 4,
-            },
-            {
-                type: 'select',
-                name: 'registry',
-                message: 'Pick Npm Registry',
-                choices: [
-                    {
-                        title: 'npm',
-                        value: 'https://registry.npmjs.org/',
-                        selected: true,
-                    },
-                    { title: 'taobao', value: 'https://registry.npmmirror.com' },
-                ],
-            },
-        ], {
-            onCancel() {
-                process.exit(1);
-            },
-        });
-        npmClient = response.npmClient;
-        registry = response.registry;
-        appTemplate = response.appTemplate;
-    }
-    const pluginPrompts = [
-        {
-            name: 'name',
-            type: 'text',
-            message: `What's the plugin name?`,
-            default: name,
-        },
-        {
-            name: 'description',
-            type: 'text',
-            message: `What's your plugin used for?`,
-        },
-        {
-            name: 'mail',
-            type: 'text',
-            message: `What's your email?`,
-        },
-        {
-            name: 'author',
-            type: 'text',
-            message: `What's your name?`,
-        },
-        {
-            name: 'org',
-            type: 'text',
-            message: `Which organization is your plugin stored under github?`,
-        },
-    ];
-    const target = name ? (0, path_1.join)(cwd, name) : cwd;
-    const templateName = args.plugin ? 'plugin' : appTemplate;
-    const version = require('../package').version;
-    const generator = new utils_1.BaseGenerator({
-        path: (0, path_1.join)(__dirname, '..', 'templates', templateName),
-        target,
-        data: args.default
-            ? testData
-            : {
-                version: version.includes('-canary.') ? version : `^${version}`,
-                npmClient,
-                registry,
-                author,
-            },
-        questions: args.default ? [] : args.plugin ? pluginPrompts : [],
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// 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",
+  description: "nothing",
+  mail: "xiaohuoni@gmail.com",
+  author: "xiaohuoni",
+  org: "umijs",
+  version: require("../package").version,
+  npmClient: "pnpm",
+  registry: "https://registry.npmjs.org/"
+};
+var src_default = async ({ cwd, args }) => {
+  const [name] = args._;
+  let npmClient = "pnpm";
+  let registry = "https://registry.npmjs.org/";
+  let appTemplate = "app";
+  const { username, email } = await (0, import_utils.getGitInfo)();
+  let author = email && username ? `${username} <${email}>` : "";
+  if (!args.default) {
+    const response = await (0, import_utils.prompts)([
+      {
+        type: "select",
+        name: "appTemplate",
+        message: "Pick Umi App Template",
+        choices: [
+          { title: "Simple App", value: "app" },
+          { title: "Ant Design Pro", value: "max" },
+          { title: "Vue Simple App", value: "vue-app" }
+        ],
+        initial: 0
+      },
+      {
+        type: "select",
+        name: "npmClient",
+        message: "Pick Npm Client",
+        choices: [
+          { title: "npm", value: "npm" },
+          { title: "cnpm", value: "cnpm" },
+          { title: "tnpm", value: "tnpm" },
+          { title: "yarn", value: "yarn" },
+          { title: "pnpm", value: "pnpm" }
+        ],
+        initial: 4
+      },
+      {
+        type: "select",
+        name: "registry",
+        message: "Pick Npm Registry",
+        choices: [
+          {
+            title: "npm",
+            value: "https://registry.npmjs.org/",
+            selected: true
+          },
+          { title: "taobao", value: "https://registry.npmmirror.com" }
+        ]
+      }
+    ], {
+      onCancel() {
+        process.exit(1);
+      }
     });
-    await generator.run();
-    if (!args.default) {
-        // install
-        (0, utils_1.installWithNpmClient)({ npmClient, cwd: target });
+    npmClient = response.npmClient;
+    registry = response.registry;
+    appTemplate = response.appTemplate;
+  }
+  const pluginPrompts = [
+    {
+      name: "name",
+      type: "text",
+      message: `What's the plugin name?`,
+      default: name
+    },
+    {
+      name: "description",
+      type: "text",
+      message: `What's your plugin used for?`
+    },
+    {
+      name: "mail",
+      type: "text",
+      message: `What's your email?`
+    },
+    {
+      name: "author",
+      type: "text",
+      message: `What's your name?`
+    },
+    {
+      name: "org",
+      type: "text",
+      message: `Which organization is your plugin stored under github?`
     }
+  ];
+  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,
+    data: args.default ? testData : {
+      version: version.includes("-canary.") ? version : `^${version}`,
+      npmClient,
+      registry,
+      author,
+      withHusky,
+      extraNpmrc: npmClient === "pnpm" ? `strict-peer-dependencies=false` : ""
+    },
+    questions: args.default ? [] : args.plugin ? pluginPrompts : []
+  });
+  await generator.run();
+  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.6",
+  "version": "4.0.9",
   "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 tsc",
+    "build": "umi-scripts father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build --watch",
+    "dev": "umi-scripts father dev",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/utils": "4.0.6"
+    "@umijs/utils": "4.0.9"
   },
   "publishConfig": {
     "access": "public"

package/templates/app/.npmrc.tpl

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

package/templates/max/.lintstagedrc.tpl

@@ -1,17 +1,17 @@
 {
   "*.{md,json}": [
-    "prettier --write"
+    "prettier --cache --write"
   ],
   "*.{js,jsx}": [
     "max lint --fix --eslint-only",
-    "prettier --write"
+    "prettier --cache --write"
   ],
   "*.{css,less}": [
     "max lint --fix --stylelint-only",
-    "prettier --write"
+    "prettier --cache --write"
   ],
   "*.ts?(x)": [
     "max lint --fix --eslint-only",
-    "prettier --parser=typescript --write"
+    "prettier --cache --parser=typescript --write"
   ]
 }

package/templates/max/.npmrc.tpl

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

package/templates/max/package.json.tpl

@@ -4,7 +4,8 @@
   "scripts": {
     "dev": "max dev",
     "build": "max build",
-    "prepare": "husky install",
+    "format": "prettier --cache --write .",{{#withHusky}}
+    "prepare": "husky install",{{/withHusky}}
     "postinstall": "max setup",
     "setup": "max setup",
     "start": "npm run dev"
@@ -17,10 +18,10 @@
   },
   "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",
+    "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^2",
     "prettier-plugin-packagejson": "^2",
     "typescript": "^4.1.2"

package/templates/plugin/.npmrc.tpl

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

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

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

package/templates/vue-app/src/layouts/index.vue

@@ -15,14 +15,14 @@
   </div>
 </template>
 <style lang="less">
-  .navs {
-    ul {
-      padding: 0;
-      list-style: none;
-      display: flex;
-    }
-    li {
-      margin-right: 1em;
-    }
+.navs {
+  ul {
+    padding: 0;
+    list-style: none;
+    display: flex;
   }
+  li {
+    margin-right: 1em;
+  }
+}
 </style>

package/templates/vue-app/src/pages/docs.vue

@@ -1,5 +1,5 @@
 <template>
- <div>
+  <div>
     <p>This is umi docs.</p>
   </div>
 </template>

package/templates/vue-app/src/pages/index.vue

@@ -4,8 +4,6 @@
     <p>
       <img src="../assets/yay.jpg" width="388" />
     </p>
-    <p>
-      To get started, edit <code>pages/index.vue</code> and save to reload.
-    </p>
+    <p>To get started, edit <code>pages/index.vue</code> and save to reload.</p>
   </div>
 </template>

package/dist/index.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/index.test.js

@@ -1,44 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@umijs/utils");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const index_1 = __importDefault(require("./index"));
-const fixtures = (0, path_1.join)(__dirname, '..', 'fixtures');
-let oldCwd = process.cwd();
-beforeEach(() => {
-    oldCwd = process.cwd();
-});
-afterEach(() => {
-    process.chdir(oldCwd);
-});
-test('generate app', async () => {
-    const cwd = (0, path_1.join)(fixtures, 'app');
-    await (0, index_1.default)({
-        cwd,
-        args: {
-            _: [],
-            $0: '',
-            default: true,
-        },
-    });
-    expect((0, fs_1.existsSync)((0, path_1.join)(cwd, 'src', 'pages', 'index.tsx'))).toEqual(true);
-    utils_1.rimraf.sync(cwd);
-});
-test('generate plugin', async () => {
-    const cwd = (0, path_1.join)(fixtures, 'plugin');
-    await (0, index_1.default)({
-        cwd,
-        args: {
-            plugin: true,
-            _: [],
-            $0: '',
-            default: true,
-        },
-    });
-    expect((0, fs_1.existsSync)((0, path_1.join)(cwd, 'src', 'index.ts'))).toEqual(true);
-    utils_1.rimraf.sync(cwd);
-});