create-umi 4.0.0-canary.20220615.1 → 4.0.0-canary.20220624.1

package/dist/index.js

@@ -26,7 +26,8 @@ exports.default = async ({ cwd, args, }) => {
                 message: 'Pick Umi App Template',
                 choices: [
                     { title: 'Simple App', value: 'app' },
-                    { title: 'Enterprise App', value: 'max' },
+                    { title: 'Ant Design Pro', value: 'max' },
+                    { title: 'Vue Simple App', value: 'vue-app' },
                 ],
                 initial: 0,
             },
@@ -95,13 +96,14 @@ exports.default = async ({ cwd, args, }) => {
     ];
     const target = name ? (0, path_1.join)(cwd, name) : cwd;
     const templateName = args.plugin ? 'plugin' : appTemplate;
+    const version = require('../package').version;
     const generator = new utils_1.BaseGenerator({
         path: (0, path_1.join)(__dirname, '..', 'templates', templateName),
         target,
         data: args.default
             ? testData
             : {
-                version: require('../package').version,
+                version: version.includes('-canary.') ? version : `^${version}`,
                 npmClient,
                 registry,
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-umi",
-  "version": "4.0.0-canary.20220615.1",
+  "version": "4.0.0-canary.20220624.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",
@@ -21,11 +21,11 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build -- --watch",
+    "dev": "pnpm build --watch",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/utils": "4.0.0-canary.20220615.1"
+    "@umijs/utils": "4.0.0-canary.20220624.1"
   },
   "publishConfig": {
     "access": "public"

package/templates/app/package.json.tpl

@@ -7,7 +7,7 @@
     "start": "npm run dev"
   },
   "dependencies": {
-    "umi": "^{{{ version }}}"
+    "umi": "{{{ version }}}"
   },
   "devDependencies": {
     "@types/react": "^18.0.0",

package/templates/app/src/layouts/index.tsx.tpl

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link, Outlet } from 'umi';
 import styles from './index.less';
 

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

@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default () => {
   return (
     <div>

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import yayJpg from '../assets/yay.jpg';
 
 export default function HomePage() {

package/templates/max/package.json.tpl

@@ -9,7 +9,7 @@
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-components": "^1.1.3",
-    "@umijs/max": "^{{{ version }}}",
+    "@umijs/max": "{{{ version }}}",
     "antd": "^4.20.7"
   },
   "devDependencies": {

package/templates/max/src/pages/Access/index.tsx

@@ -1,7 +1,6 @@
 import { PageContainer } from '@ant-design/pro-components';
 import { Access, useAccess } from '@umijs/max';
 import { Button } from 'antd';
-import React from 'react';
 
 export default () => {
   const access = useAccess();

package/templates/max/src/pages/Home/index.tsx

@@ -2,7 +2,6 @@ import Guide from '@/components/Guide';
 import { trim } from '@/utils/format';
 import { PageContainer } from '@ant-design/pro-components';
 import { useModel } from '@umijs/max';
-import React from 'react';
 import styles from './index.less';
 
 export default () => {

package/templates/vue-app/.gitignore.tpl

@@ -0,0 +1,11 @@
+/node_modules
+/.env.local
+/.umirc.local.ts
+/config/config.local.ts
+/src/.umi
+/src/.umi-production
+/.umi
+/.umi-production
+/.umi-test
+/dist
+/.mfsu

package/templates/vue-app/.npmrc.tpl

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

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

@@ -0,0 +1,4 @@
+export default {
+  npmClient: '{{{ npmClient }}}',
+  presets: [require.resolve('@umijs/preset-vue')],
+};

package/templates/vue-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": {
+    "vue": "^3.2.36",
+    "umi": "{{{ version }}}"
+  },
+  "devDependencies": {
+    "typescript": "^4.1.2",
+    "@umijs/preset-vue": "{{{ version }}}"
+  }
+}

package/templates/vue-app/src/layouts/index.vue

@@ -0,0 +1,28 @@
+<template>
+  <div class="navs">
+    <ul>
+      <li>
+        <router-link to="/">Home</router-link>
+      </li>
+      <li>
+        <router-link to="/docs">Docs</router-link>
+      </li>
+      <li>
+        <a href="https://github.com/umijs/umi">Github</a>
+      </li>
+    </ul>
+    <router-view></router-view>
+  </div>
+</template>
+<style lang="less">
+  .navs {
+    ul {
+      padding: 0;
+      list-style: none;
+      display: flex;
+    }
+    li {
+      margin-right: 1em;
+    }
+  }
+</style>

package/templates/vue-app/src/pages/docs.vue

@@ -0,0 +1,5 @@
+<template>
+ <div>
+    <p>This is umi docs.</p>
+  </div>
+</template>

package/templates/vue-app/src/pages/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div>
+    <h2>Yay! Welcome to umi ❤️ vue!</h2>
+    <p>
+      <img src="../assets/yay.jpg" width="388" />
+    </p>
+    <p>
+      To get started, edit <code>pages/index.vue</code> and save to reload.
+    </p>
+  </div>
+</template>

package/templates/vue-app/tsconfig.json.tpl

@@ -0,0 +1,6 @@
+{
+  "extends": "./src/.umi/tsconfig.json",
+  "compilerOptions": {
+    "jsx": "preserve"
+  }
+}

package/templates/vue-app/typings.d.ts

@@ -0,0 +1 @@
+import 'umi/typings';