create-umi 4.0.0-beta.16 → 4.0.0-canary.202200505.1

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',
@@ -37,13 +28,14 @@ exports.default = ({ cwd, args, }) => __awaiter(void 0, void 0, void 0, function
                     { title: 'cnpm', value: 'cnpm' },
                     { title: 'tnpm', value: 'tnpm' },
                     { title: 'yarn', value: 'yarn' },
-                    { title: 'pnpm', value: 'pnpm', selected: true },
+                    { title: 'pnpm', value: 'pnpm' },
                 ],
+                initial: 4,
             },
             {
                 type: 'select',
                 name: 'registry',
-                message: 'Pick Bpm Registry',
+                message: 'Pick Npm Registry',
                 choices: [
                     {
                         title: 'npm',
@@ -85,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
             : {
@@ -97,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-beta.16",
+  "version": "4.0.0-canary.202200505.1",
   "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-beta.16"
+    "@umijs/utils": "4.0.0-canary.202200505.1"
   },
   "publishConfig": {
     "access": "public"

package/templates/app/.gitignore.tpl

@@ -1,8 +1,10 @@
 /node_modules
 /.env.local
 /.umirc.local.ts
-/.umirc.local.js
 /config/config.local.ts
-/config/config.local.js
 /src/.umi
+/src/.umi-production
 /.umi
+/.umi-production
+/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/src/layouts/index.less

@@ -0,0 +1,10 @@
+.navs {
+  ul {
+    padding: 0;
+    list-style: none;
+    display: flex;
+  }
+  li {
+    margin-right: 1em;
+  }
+}

package/templates/app/{layouts/index.tsx → src/layouts/index.tsx.tpl}

@@ -1,20 +1,19 @@
 import React from 'react';
-// @ts-ignore
 import { Link, Outlet } from 'umi';
+import styles from './index.less';
 
 export default function Layout() {
   return (
-    <div>
-      <h2>global layout</h2>
+    <div className={styles.navs}>
       <ul>
         <li>
           <Link to="/">Home</Link>
         </li>
         <li>
-          <Link to="/users">/users</Link>
+          <Link to="/docs">Docs</Link>
         </li>
         <li>
-          <Link to="/users/foo">/users/foo</Link>
+          <a href="https://github.com/umijs/umi">Github</a>
         </li>
       </ul>
       <Outlet />

package/templates/app/{pages/users.tsx → src/pages/docs.tsx}

@@ -3,7 +3,7 @@ import React from 'react';
 export default () => {
   return (
     <div>
-      <h2>users layout</h2>
+      <p>This is umi docs.</p>
     </div>
   );
 };

package/templates/app/src/pages/index.tsx

@@ -0,0 +1,16 @@
+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={yayJpg} width="388" />
+      </p>
+      <p>
+        To get started, edit <code>pages/index.tsx</code> and save to reload.
+      </p>
+    </div>
+  );
+}

package/templates/app/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "jsx": "react",
+    "esModuleInterop": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "strict": true,
+    "paths": {
+      "@/*": ["src/*"],
+      "@@/*": ["src/.umi/*"]
+    },
+    "allowSyntheticDefaultImports": true
+  }
+}

package/templates/app/typings.d.ts

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

package/templates/app/pages/index.tsx

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

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

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