create-umi 4.0.62 → 4.0.64

package/dist/index.d.ts

@@ -1,5 +1,9 @@
 import { yParser } from '@umijs/utils';
-interface IArgs extends yParser.Arguments {
+import { type UmiTemplate } from './template';
+interface ITemplateArgs {
+    template?: UmiTemplate;
+}
+interface IArgs extends yParser.Arguments, ITemplateArgs {
     default?: boolean;
     git?: boolean;
     install?: boolean;

package/dist/index.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(src_exports);
 var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
+var import_template = require("./template");
 var pkg = require("../package");
 var DEFAULT_DATA = {
   pluginName: "umi-plugin-demo",
@@ -32,7 +33,7 @@ var DEFAULT_DATA = {
   author: "umijs",
   version: pkg.version,
   npmClient: "pnpm" /* pnpm */,
-  registry: "https://registry.npmjs.com/" /* npm */,
+  registry: import_template.ERegistry.npm,
   withHusky: false,
   extraNpmrc: "",
   appTemplate: "app" /* app */
@@ -44,19 +45,18 @@ var src_default = async ({
 }) => {
   let [name] = args._;
   let npmClient = "pnpm" /* pnpm */;
-  let registry = "https://registry.npmjs.com/" /* npm */;
+  let registry = import_template.ERegistry.npm;
   let appTemplate = (defaultData == null ? void 0 : defaultData.appTemplate) || "app" /* app */;
   const { username, email } = await (0, import_utils.getGitInfo)();
   const author = email && username ? `${username} <${email}>` : "";
   let pluginName = `umi-plugin-${name || "demo"}`;
+  const target = name ? (0, import_path.join)(cwd, name) : cwd;
   const { isCancel, text, select, intro, outro } = import_utils.clackPrompts;
   const exitPrompt = () => {
     outro(import_utils.chalk.red("Exit create-umi"));
     process.exit(1);
   };
-  const useDefaultData = args.default;
-  if (!useDefaultData) {
-    intro(import_utils.chalk.bgHex("#19BDD2")(" create-umi "));
+  const selectAppTemplate = async () => {
     appTemplate = await select({
       message: "Pick Umi App Template",
       options: [
@@ -75,9 +75,8 @@ var src_default = async ({
       ],
       initialValue: "app" /* app */
     });
-    if (isCancel(appTemplate)) {
-      exitPrompt();
-    }
+  };
+  const selectNpmClient = async () => {
     npmClient = await select({
       message: "Pick Npm Client",
       options: [
@@ -89,24 +88,35 @@ var src_default = async ({
       ],
       initialValue: "pnpm" /* pnpm */
     });
-    if (isCancel(npmClient)) {
-      exitPrompt();
-    }
+  };
+  const selectRegistry = async () => {
     registry = await select({
       message: "Pick Npm Registry",
       options: [
         {
           label: "npm",
-          value: "https://registry.npmjs.com/" /* npm */
+          value: import_template.ERegistry.npm
         },
         {
           label: "taobao",
-          value: "https://registry.npmmirror.com" /* taobao */,
+          value: import_template.ERegistry.taobao,
           hint: "recommended for China"
         }
       ],
-      initialValue: "https://registry.npmjs.com/" /* npm */
+      initialValue: import_template.ERegistry.npm
     });
+  };
+  const internalTemplatePrompts = async () => {
+    intro(import_utils.chalk.bgHex("#19BDD2")(" create-umi "));
+    await selectAppTemplate();
+    if (isCancel(appTemplate)) {
+      exitPrompt();
+    }
+    await selectNpmClient();
+    if (isCancel(npmClient)) {
+      exitPrompt();
+    }
+    await selectRegistry();
     if (isCancel(registry)) {
       exitPrompt();
     }
@@ -126,8 +136,30 @@ var src_default = async ({
       }
     }
     outro(import_utils.chalk.green(`You're all set!`));
+  };
+  const useDefaultData = !!args.default;
+  const useExternalTemplate = !!args.template;
+  switch (true) {
+    case useExternalTemplate:
+      await selectNpmClient();
+      if (isCancel(npmClient)) {
+        exitPrompt();
+      }
+      await selectRegistry();
+      if (isCancel(registry)) {
+        exitPrompt();
+      }
+      await (0, import_template.unpackTemplate)({
+        template: args.template,
+        dest: target,
+        registry
+      });
+      break;
+    default:
+      if (!useDefaultData) {
+        await internalTemplatePrompts();
+      }
   }
-  const target = name ? (0, import_path.join)(cwd, name) : cwd;
   const version = pkg.version;
   const monorepoRoot = await detectMonorepoRoot({ target });
   const inMonorepo = !!monorepoRoot;
@@ -135,25 +167,30 @@ var src_default = async ({
   const shouldInitGit = args.git !== false;
   const withHusky = shouldInitGit && !inMonorepo;
   const isPnpm = npmClient === "pnpm" /* pnpm */;
-  const generator = new import_utils.BaseGenerator({
-    path: (0, import_path.join)(__dirname, "..", "templates", appTemplate),
-    target,
-    slient: true,
-    data: useDefaultData ? defaultData : {
-      version: version.includes("-canary.") ? version : `^${version}`,
-      npmClient,
-      registry,
-      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` : "",
-      pluginName
-    }
-  });
-  await generator.run();
+  const injectInternalTemplateFiles = async () => {
+    const generator = new import_utils.BaseGenerator({
+      path: (0, import_path.join)(__dirname, "..", "templates", appTemplate),
+      target,
+      slient: true,
+      data: useDefaultData ? defaultData : {
+        version: version.includes("-canary.") ? version : `^${version}`,
+        npmClient,
+        registry,
+        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` : "",
+        pluginName
+      }
+    });
+    await generator.run();
+  };
+  if (!useExternalTemplate) {
+    await injectInternalTemplateFiles();
+  }
   const context = {
     inMonorepo,
     target,

package/dist/template.d.ts

@@ -0,0 +1,12 @@
+export declare enum ERegistry {
+    npm = "https://registry.npmjs.com/",
+    taobao = "https://registry.npmmirror.com/"
+}
+export declare type UmiTemplate = `@umijs/${string}-template`;
+interface IUnpackTemplateOpts {
+    template: UmiTemplate;
+    dest: string;
+    registry: ERegistry;
+}
+export declare const unpackTemplate: (opts: IUnpackTemplateOpts) => Promise<string>;
+export {};

package/dist/template.js

@@ -0,0 +1,113 @@
+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 });
+};
+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);
+
+// src/template.ts
+var template_exports = {};
+__export(template_exports, {
+  ERegistry: () => ERegistry,
+  unpackTemplate: () => unpackTemplate
+});
+module.exports = __toCommonJS(template_exports);
+var import_utils = require("@umijs/utils");
+var import_tar = require("@umijs/utils/compiled/tar");
+var ERegistry = /* @__PURE__ */ ((ERegistry2) => {
+  ERegistry2["npm"] = "https://registry.npmjs.com/";
+  ERegistry2["taobao"] = "https://registry.npmmirror.com/";
+  return ERegistry2;
+})(ERegistry || {});
+var unpackTemplate = async (opts) => {
+  const { template, dest, registry } = opts;
+  import_utils.logger.info(
+    `Init a new project with template ${import_utils.chalk.blue(template)} from npm ...`
+  );
+  const tryDownload = async (name) => {
+    const url = await getNpmPkgTarUrl({ registry, name });
+    if (!url) {
+      return;
+    }
+    try {
+      return await downloadTar({ dest, url });
+    } catch (e) {
+      throw new Error(`Download ${name} failed from ${registry}`, { cause: e });
+    }
+  };
+  const nameList = [];
+  const isStartWithUmi = template.startsWith("@umijs/");
+  if (template.endsWith("-template")) {
+    if (isStartWithUmi) {
+      nameList.push(template);
+    } else {
+      nameList.push(`@umijs/${template}`);
+    }
+  } else if (isStartWithUmi) {
+    nameList.push(`${template}-template`);
+  } else {
+    nameList.push(`@umijs/${template}-template`);
+  }
+  for await (const name of nameList) {
+    const success = await tryDownload(name);
+    if (success) {
+      import_utils.logger.ready(`Init ${import_utils.chalk.green(name)} success`);
+      return success;
+    }
+  }
+  throw new Error(
+    `Template ${nameList.map((i) => import_utils.chalk.yellow(i)).join(", ")} not found from ${registry}`
+  );
+};
+async function getNpmPkgTarUrl(opts) {
+  var _a;
+  const { registry, name } = opts;
+  const nameWithoutScope = name.startsWith("@") ? name.split("/")[1] : name;
+  const latestPkgInfoUrl = `${registry}${name}/latest?date=${Date.now()}`;
+  const res = await import_utils.axios.get(latestPkgInfoUrl, { validateStatus: () => true });
+  const latestVersion = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.version;
+  if (!latestVersion) {
+    return;
+  }
+  const latestTarUrl = `${registry}${name}/-/${nameWithoutScope}-${latestVersion}.tgz`;
+  return latestTarUrl;
+}
+async function downloadTar(opts) {
+  const { dest, url } = opts;
+  return new Promise(async (resolve, reject) => {
+    try {
+      const res = await import_utils.axios.get(url, {
+        responseType: "stream"
+      });
+      import_utils.fsExtra.mkdirpSync(dest);
+      res.data.pipe(
+        (0, import_tar.x)({
+          C: dest,
+          strip: 1
+        })
+      );
+      resolve(dest);
+    } catch (e) {
+      if (import_utils.fsExtra.existsSync(dest)) {
+        import_utils.fsExtra.removeSync(dest);
+      }
+      reject(e);
+    }
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ERegistry,
+  unpackTemplate
+});

package/package.json

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