create-umi 0.25.1 → 4.0.0-beta.12

package/README.md

@@ -1,98 +1,3 @@
-# create-umi
+# @umijs/create-umi
 
-Creates a UmiJS application/plugin/block/library using the command line.
-
-[![codecov](https://codecov.io/gh/umijs/create-umi/branch/master/graph/badge.svg)](https://codecov.io/gh/umijs/create-umi)
-[![NPM version](https://img.shields.io/npm/v/create-umi.svg?style=flat)](https://npmjs.org/package/create-umi)
-[![CircleCI](https://circleci.com/gh/umijs/create-umi/tree/master.svg?style=svg)](https://circleci.com/gh/umijs/create-umi/tree/master)
-[![NPM downloads](http://img.shields.io/npm/dm/create-umi.svg?style=flat)](https://npmjs.org/package/create-umi)
-[![GitHub Actions status](https://github.com/umijs/create-umi/workflows/Node%20CI/badge.svg)](https://github.com/umijs/create-umi)
-
-## Usage
-
-```bash
-$ yarn create umi [appName]
-```
-
-## Boilerplates
-
-* `ant-design-pro` - Create project with a layout-only ant-design-pro boilerplate, use together with umi block.
-* `app ` - Create project with a simple boilerplate, support typescript.
-* `block ` - Create a umi block.
-* `library ` - Create a library with umi.
-* `plugin ` - Create a umi plugin.
-
-## Usage Example
-
-```bash
-$ yarn create umi
-
-? Select the boilerplate type (Use arrow keys)
-  ant-design-pro  - Create project with a layout-only ant-design-pro boilerplate, use together with umi block.
-❯ app             - Create project with a simple boilerplate, support typescript.
-  block           - Create a umi block.
-  library         - Create a library with umi.
-  plugin          - Create a umi plugin.
-
-? Do you want to use typescript? (y/N)
-
-? What functionality do you want to enable? (Press <space> to select, <a> to toggle all, <i> to invert selection)
-❯◯ antd
- ◯ dva
- ◯ code splitting
- ◯ dll
-
-  create abc/package.json
-  create abc/.gitignore
-  create abc/.editorconfig
-  create abc/.env
-  create abc/.eslintrc
-  create abc/.prettierignore
-  create abc/.prettierrc
-  create abc/.umirc.js
-  create abc/mock/.gitkeep
-  create abc/src/assets/yay.jpg
-  create abc/src/global.css
-  create abc/src/layouts/index.css
-  create abc/src/layouts/index.tsx
-  create abc/src/pages/index.css
-  create abc/src/pages/index.tsx
-  create abc/tsconfig.json
-  create abc/typings.d.ts
- 📋  Copied to clipboard, just use Ctrl+V
- ✨  File Generate Done
-```
-
-## FAQ
-
-### `yarn create umi` command failed
-
-这个问题基本上都是因为没有添加 yarn global module 的路径到 PATH 环境变量引起的。
-
-先执行 `yarn global bin` 拿到路径，然后添加到 PATH 环境变量里。
-
-```bash
-$ yarn global bin
-/usr/local/bin
-```
-
-你也可以尝试用 npm，
-
-```bash
-$ npm create umi
-```
-
-或者手动安装 create-umi，并执行他，
-
-```bash
-$ npm install create-umi -g
-$ create-umi
-```
-
-## Questions & Suggestions
-
-Please open an issue [here](https://github.com/umijs/umi/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc).
-
-## LICENSE
-
-MIT
+See our website [umijs](https://umijs.org) for more information.

package/bin/create-umi.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../dist/cli');

package/dist/cli.d.ts

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

package/dist/cli.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@umijs/utils");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const args = (0, utils_1.yParser)(process.argv.slice(2), {
+    alias: {
+        version: ['v'],
+        help: ['h'],
+    },
+    boolean: ['version'],
+});
+if (args.version && !args._[0]) {
+    args._[0] = 'version';
+    const local = (0, fs_1.existsSync)((0, path_1.join)(__dirname, '../.local'))
+        ? 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);
+    });
+}

package/dist/index.d.ts

@@ -0,0 +1,6 @@
+import { yParser } from '@umijs/utils';
+declare const _default: ({ cwd, args, }: {
+    cwd: string;
+    args: yParser.Arguments;
+}) => Promise<void>;
+export default _default;

package/dist/index.js

@@ -0,0 +1,105 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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/',
+};
+exports.default = ({ cwd, args, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const [_, name] = args._;
+    let npmClient = 'pnpm';
+    let registry = 'https://registry.npmjs.org/';
+    // test ignore prompts
+    if (!args.default) {
+        const response = yield (0, utils_1.prompts)([
+            {
+                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', selected: true },
+                ],
+            },
+            {
+                type: 'select',
+                name: 'registry',
+                message: 'Pick Bpm Registry',
+                choices: [
+                    {
+                        title: 'npm',
+                        value: 'https://registry.npmjs.org/',
+                        selected: true,
+                    },
+                    { title: 'taobao', value: 'https://registry.npmmirror.com' },
+                ],
+            },
+        ]);
+        npmClient = response.npmClient;
+        registry = response.registry;
+    }
+    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 generator = new utils_1.BaseGenerator({
+        path: (0, path_1.join)(__dirname, '..', 'templates', args.plugin ? 'plugin' : 'app'),
+        target: name ? (0, path_1.join)(cwd, name) : cwd,
+        data: args.default
+            ? testData
+            : {
+                version: require('../package').version,
+                npmClient,
+                registry,
+            },
+        questions: args.default ? [] : args.plugin ? pluginPrompts : [],
+    });
+    yield generator.run();
+    if (!args.default) {
+        // install
+        (0, utils_1.installWithNpmClient)({ npmClient });
+    }
+});

package/package.json

@@ -1,55 +1,33 @@
 {
   "name": "create-umi",
-  "version": "0.25.1",
-  "description": "Creates a UmiJS application using the command line.",
-  "homepage": "https://github.com/umijs/create-umi",
-  "bugs": {
-    "url": "https://github.com/umijs/create-umi/issues"
-  },
+  "version": "4.0.0-beta.12",
+  "description": "create-umi",
+  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/create-umi#readme",
+  "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/create-umi"
+    "url": "https://github.com/umijs/umi-next"
   },
   "license": "MIT",
-  "files": [
-    "cli.js",
-    "index.js",
-    "lib"
-  ],
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "bin": {
-    "create-umi": "cli.js"
+    "create-umi": "bin/create-umi.js"
   },
+  "files": [
+    "dist",
+    "templates"
+  ],
   "scripts": {
-    "prepublishOnly": "np --no-cleanup --yolo --no-publish",
-    "test": "umi-test test/index.test.js",
-    "cov": "umi-test test/index.test.js --coverage",
-    "prettier": "prettier -c --write '**/*'"
+    "build": "pnpm tsc",
+    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "chalk": "4.0.0",
-    "clipboardy": "^2.1.0",
-    "debug": "^4.1.1",
-    "execa": "^1.0.0",
-    "fs-extra": "^8.0.1",
-    "glob": "^7.1.4",
-    "inquirer": "^6.4.1",
-    "mkdirp": "^0.5.1",
-    "prettier": "^1.17.0",
-    "semver": "^6.1.0",
-    "sort-package-json": "^1.22.1",
-    "sylvanas": "^0.6.1",
-    "typescript": "^3.8.3",
-    "umi-utils": "^1.5.2",
-    "yargs-parser": "^13.1.1",
-    "yeoman-environment": "^2.8.0",
-    "yeoman-generator": "^4.0.1"
+    "@umijs/utils": "4.0.0-beta.12"
   },
-  "devDependencies": {
-    "@types/jest": "^24.0.19",
-    "coffee": "^5.2.1",
-    "mm": "^2.5.0",
-    "np": "^5.0.1",
-    "umi-test": "^1.8.2"
+  "publishConfig": {
+    "access": "public"
   },
   "authors": [
     "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"

package/templates/app/.gitignore.tpl

@@ -0,0 +1,8 @@
+/node_modules
+/.env.local
+/.umirc.local.ts
+/.umirc.local.js
+/config/config.local.ts
+/config/config.local.js
+/src/.umi
+/.umi

package/templates/app/.npmrc.tpl

@@ -0,0 +1 @@
+registry={{{ registry }}}

package/templates/app/.umirc.ts.tpl

@@ -0,0 +1,3 @@
+export default {
+  npmClient: '{{{ npmClient }}}'
+};

package/templates/app/layouts/index.tsx

@@ -0,0 +1,22 @@
+import React from 'react';
+import { Link, Outlet } from 'umi';
+
+export default function Layout() {
+  return (
+    <div>
+      <h2>global layout</h2>
+      <ul>
+        <li>
+          <Link to="/">Home</Link>
+        </li>
+        <li>
+          <Link to="/users">/users</Link>
+        </li>
+        <li>
+          <Link to="/users/foo">/users/foo</Link>
+        </li>
+      </ul>
+      <Outlet />
+    </div>
+  );
+}

package/templates/app/package.json.tpl

@@ -0,0 +1,17 @@
+{
+  "private": true,
+  "scripts": {
+    "dev": "umi dev",
+    "build": "umi build",
+    "postinstall": "umi setup",
+    "start": "npm run dev"
+  },
+  "dependencies": {
+    "umi": "^{{{ version }}}"
+  },
+  "devDependencies": {
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
+    "typescript": "^4.1.2"
+  }
+}

package/templates/app/pages/index.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+export default function HomePage() {
+  return <div>HomePage</div>;
+}

package/templates/app/pages/users/foo.tsx

@@ -0,0 +1,3 @@
+import React from 'react';
+
+export default () => <h2>user: Foo</h2>;

package/templates/app/pages/users.tsx

@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default () => {
+  return (
+    <div>
+      <h2>users layout</h2>
+    </div>
+  );
+};

package/templates/plugin/.fatherrc.ts

@@ -0,0 +1,5 @@
+export default {
+  target: 'node',
+  cjs: { type: 'babel', lazy: true },
+  disableTypeCheck: true,
+};

package/templates/plugin/.gitignore.tpl

@@ -0,0 +1,2 @@
+node_modules
+lib

package/templates/plugin/.npmrc.tpl

@@ -0,0 +1 @@
+registry={{{ registry }}}

package/templates/plugin/README.md.tpl

@@ -0,0 +1,38 @@
+# {{{ name }}}
+
+[![NPM version](https://img.shields.io/npm/v/{{{ name }}}.svg?style=flat)](https://npmjs.org/package/{{{ name }}})
+[![NPM downloads](http://img.shields.io/npm/dm/{{{ name }}}.svg?style=flat)](https://npmjs.org/package/{{{ name }}})
+
+{{{ description }}}
+
+## Install
+
+```bash
+# or yarn
+$ npm install
+```
+
+```bash
+$ npm run build --watch
+$ npm run start
+```
+
+## Usage
+
+Configure in `.umirc.js`,
+
+```js
+export default {
+  plugins: [
+    ['{{{ name }}}'],
+  ],
+}
+```
+
+## Options
+
+TODO
+
+## LICENSE
+
+MIT

package/templates/plugin/package.json.tpl

@@ -0,0 +1,24 @@
+{
+  "name": "{{{ name }}}",
+  "version": "0.0.1",
+  "description": "{{{ description }}}",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "scripts": {
+    "build": "father-build"
+  },
+  "keywords": [],
+  "repository": "{{{ org }}}/{{{ name }}}",
+  "authors": {
+    "name": "{{{ author }}}",
+    "email": "{{{ mail }}}"
+  },
+  "license": "MIT",
+  "files": [
+    "lib"
+  ],
+  "devDependencies": {
+    "@umijs/types": "{{{ version }}}",
+    "father-build": "^1.20.0"
+  }
+}

package/templates/plugin/src/index.ts.tpl

@@ -0,0 +1,5 @@
+import type { IApi } from '@umijs/types';
+
+export default (api: IApi) => {
+  // TODO: https://umijs.org/plugins/api
+};

package/CHANGELOG.md

@@ -1,44 +0,0 @@
-
-## The new CHNAGELOG will be updated on the [Release page](https://github.com/umijs/create-umi/releases).
-
-0.9.5 / 2019-01-14
-==================
-
- * enhance: add tests files (#32)
-
-0.9.4 / 2019-01-14
-==================
-
- * fix: create with typescript (#31)
- * fix: 少了一个分号 (#30)
-
-0.9.3 / 2019-01-13
-==================
-
- * yarn create umi时报错 (#29)
-
-0.9.2 / 2019-01-12
-==================
-
- * fix: create-umi not found, Close #26, Close #27
- * fix: create-umi -v
-
-0.9.1 / 2019-01-12
-==================
-
- * enable treeShaking by default
-
-0.9.0 / 2019-01-12
-==================
-
- * refact: improve create-umi (#25)
-   * 重构一遍，结构清晰一些
-   * app 支持 TypeScript，Close #22, Close #17
-   * app 添加 ESLint 校验、treeShaking 配置
-   * 优化 ant-design-pro 仓库 clone 时间问题，Close #20
-   * 优化选择界面的提示文案，Close #24
-
-0.8.1 / 2019-01-05
-==================
-
- * fix: update umi-plugin-library to ^1.0.1-0

package/cli.js

@@ -1,37 +0,0 @@
-#!/usr/bin/env node
-
-const yParser = require('yargs-parser');
-const semver = require('semver');
-const { existsSync } = require('fs');
-const { join } = require('path');
-const chalk = require('chalk');
-const run = require('./lib/run');
-
-// print version and @local
-const args = yParser(process.argv.slice(2));
-
-if (args.v || args.version) {
-  console.log(require('./package').version);
-  if (existsSync(join(__dirname, '.local'))) {
-    console.log(chalk.cyan('@local'));
-  }
-  process.exit(0);
-}
-
-if (!semver.satisfies(process.version, '>= 8.0.0')) {
-  console.error(chalk.red('✘ The generator will only work with Node v8.0.0 and up!'));
-  process.exit(1);
-}
-
-const name = args._[0] || '';
-const { type } = args;
-delete args.type;
-
-(async () => {
-  await run({
-    name,
-    type,
-    args,
-  });
-  process.exit(0);
-})();

package/index.js

@@ -1,3 +0,0 @@
-const run = require('./lib/run');
-
-module.exports.run = run;

package/lib/BasicGenerator.js

@@ -1,70 +0,0 @@
-const Generator = require('yeoman-generator');
-const glob = require('glob');
-const { statSync } = require('fs');
-const { basename } = require('path');
-const debug = require('debug')('create-umi:BasicGenerator');
-
-function noop() {
-  return true;
-}
-
-class BasicGenerator extends Generator {
-  constructor(opts) {
-    super(opts);
-    this.opts = opts;
-    this.name = basename(opts.env.cwd);
-  }
-
-  isTsFile(f) {
-    return f.endsWith('.ts') || f.endsWith('.tsx') || !!/(tsconfig\.json)/g.test(f);
-  }
-
-  writeFiles({ context, filterFiles = noop }) {
-    // We have multiple welcome file, random this
-    const welcomeImages = glob
-      .sync('**/assets/welcomeImgs/*', {
-        cwd: this.templatePath(),
-        dot: true,
-      })
-      .filter(filterFiles);
-
-    if (welcomeImages.length) {
-      const welcomeImg = welcomeImages[Math.floor(Math.random() * welcomeImages.length)];
-      debug(`copy ${welcomeImg}`);
-
-      this.fs.copyTpl(
-        this.templatePath(welcomeImg),
-        this.destinationPath(welcomeImg.replace(/welcomeImgs.*$/, 'yay.jpg')),
-        context,
-      );
-    }
-
-    debug(`context: ${JSON.stringify(context)}`);
-    glob
-      .sync('**/*', {
-        cwd: this.templatePath(),
-        dot: true,
-      })
-      .filter(filterFiles)
-      .filter(file => !file.includes('welcomeImgs'))
-      .forEach(file => {
-        debug(`copy ${file}`);
-        const filePath = this.templatePath(file);
-        if (statSync(filePath).isFile()) {
-          this.fs.copyTpl(
-            this.templatePath(filePath),
-            this.destinationPath(file.replace(/^_/, '.')),
-            context,
-          );
-        }
-      });
-  }
-
-  prompt(questions) {
-    process.send && process.send({ type: 'prompt' });
-    process.emit('message', { type: 'prompt' });
-    return super.prompt(questions);
-  }
-}
-
-module.exports = BasicGenerator;

package/lib/generators/ant-design-pro/.babelrc

@@ -1,10 +0,0 @@
-{
-  "plugins": [
-    [
-      "@babel/plugin-transform-typescript",
-      {
-        "isTSX": true
-      }
-    ]
-  ]
-}