create-umi 4.0.0-rc.2 → 4.0.0-rc.20

package/dist/index.js

@@ -1,13 +1,4 @@
 "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");
@@ -21,13 +12,13 @@ const testData = {
     npmClient: 'pnpm',
     registry: 'https://registry.npmjs.org/',
 };
-exports.default = ({ cwd, args, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const [_, name] = args._;
+exports.default = async ({ cwd, args, }) => {
+    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)([
+        const response = await (0, utils_1.prompts)([
             {
                 type: 'select',
                 name: 'npmClient',
@@ -44,7 +35,7 @@ exports.default = ({ cwd, args, }) => __awaiter(void 0, void 0, void 0, function
             {
                 type: 'select',
                 name: 'registry',
-                message: 'Pick Bpm Registry',
+                message: 'Pick Npm Registry',
                 choices: [
                     {
                         title: 'npm',
@@ -86,9 +77,10 @@ exports.default = ({ cwd, args, }) => __awaiter(void 0, void 0, void 0, function
             message: `Which organization is your plugin stored under github?`,
         },
     ];
+    const target = name ? (0, path_1.join)(cwd, name) : cwd;
     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,
+        target,
         data: args.default
             ? testData
             : {
@@ -98,9 +90,9 @@ exports.default = ({ cwd, args, }) => __awaiter(void 0, void 0, void 0, function
             },
         questions: args.default ? [] : args.plugin ? pluginPrompts : [],
     });
-    yield generator.run();
+    await generator.run();
     if (!args.default) {
         // install
-        (0, utils_1.installWithNpmClient)({ npmClient });
+        (0, utils_1.installWithNpmClient)({ npmClient, cwd: target });
     }
-});
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-umi",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.20",
   "description": "create-umi",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/create-umi#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -20,11 +20,12 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch"
+    "build:deps": "umi-scripts bundleDeps",
+    "dev": "pnpm build -- --watch",
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/utils": "4.0.0-rc.2"
+    "@umijs/utils": "4.0.0-rc.20"
   },
   "publishConfig": {
     "access": "public"

package/templates/app/.gitignore.tpl

@@ -6,5 +6,6 @@
 /src/.umi-production
 /.umi
 /.umi-production
+/.umi-test
 /dist
 /.mfsu

package/templates/app/package.json.tpl

@@ -10,8 +10,8 @@
     "umi": "^{{{ version }}}"
   },
   "devDependencies": {
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
     "typescript": "^4.1.2"
   }
 }

package/templates/app/{pages → src/pages}/index.tsx

@@ -1,11 +1,12 @@
 import React from 'react';
+import yayJpg from '../assets/yay.jpg';
 
 export default function HomePage() {
   return (
     <div>
       <h2>Yay! Welcome to umi!</h2>
       <p>
-        <img src={require('../assets/yay.jpg')} width="388" />
+        <img src={yayJpg} width="388" />
       </p>
       <p>
         To get started, edit <code>pages/index.tsx</code> and save to reload.

package/templates/app/tsconfig.json

@@ -10,8 +10,8 @@
     "baseUrl": ".",
     "strict": true,
     "paths": {
-      "@/*": ["*"],
-      "@@/*": [".umi/*"]
+      "@/*": ["src/*"],
+      "@@/*": ["src/.umi/*"]
     },
     "allowSyntheticDefaultImports": true
   }

package/templates/app/typings.d.ts

@@ -1,3 +1,6 @@
 declare module '*.less';
 declare module '*.css';
+declare module '*.sass';
+declare module '*.scss';
 declare module '*.png';
+declare module '*.jpg';