create-umi 4.0.0-rc.10 → 4.0.0-rc.13

package/dist/index.js

@@ -22,7 +22,7 @@ const testData = {
     registry: 'https://registry.npmjs.org/',
 };
 exports.default = ({ cwd, args, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const [_, name] = args._;
+    const [name] = args._;
     let npmClient = 'pnpm';
     let registry = 'https://registry.npmjs.org/';
     // test ignore prompts
@@ -86,9 +86,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
             : {
@@ -101,6 +102,6 @@ exports.default = ({ cwd, args, }) => __awaiter(void 0, void 0, void 0, function
     yield 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.10",
+  "version": "4.0.0-rc.13",
   "description": "create-umi",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/create-umi#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -25,7 +25,7 @@
     "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@umijs/utils": "4.0.0-rc.10"
+    "@umijs/utils": "4.0.0-rc.13"
   },
   "publishConfig": {
     "access": "public"

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/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';