create-umi 4.0.0-canary.20220620.1 → 4.0.0-canary.20220628.2

package/dist/index.js

@@ -26,8 +26,8 @@ exports.default = async ({ cwd, args, }) => {
                 message: 'Pick Umi App Template',
                 choices: [
                     { title: 'Simple App', value: 'app' },
+                    { title: 'Ant Design Pro', value: 'max' },
                     { title: 'Vue Simple App', value: 'vue-app' },
-                    { title: 'Enterprise App', value: 'max' },
                 ],
                 initial: 0,
             },
@@ -96,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,12 +1,12 @@
 {
   "name": "create-umi",
-  "version": "4.0.0-canary.20220620.1",
+  "version": "4.0.0-canary.20220628.2",
   "description": "create-umi",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/create-umi#readme",
-  "bugs": "https://github.com/umijs/umi-next/issues",
+  "homepage": "https://github.com/umijs/umi/tree/master/packages/create-umi#readme",
+  "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+    "url": "https://github.com/umijs/umi"
   },
   "license": "MIT",
   "main": "dist/index.js",
@@ -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.20220620.1"
+    "@umijs/utils": "4.0.0-canary.20220628.2"
   },
   "publishConfig": {
     "access": "public"

package/templates/app/package.json.tpl

@@ -4,10 +4,11 @@
     "dev": "umi dev",
     "build": "umi build",
     "postinstall": "umi setup",
+    "setup": "umi setup",
     "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,9 +1,9 @@
-import React from 'react';
-
-export default () => {
+const DocsPage = () => {
   return (
     <div>
       <p>This is umi docs.</p>
     </div>
   );
 };
+
+export default DocsPage;

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

@@ -4,12 +4,13 @@
     "dev": "max dev",
     "build": "max build",
     "postinstall": "max setup",
+    "setup": "max setup",
     "start": "npm run dev"
   },
   "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,9 +1,8 @@
 import { PageContainer } from '@ant-design/pro-components';
 import { Access, useAccess } from '@umijs/max';
 import { Button } from 'antd';
-import React from 'react';
 
-export default () => {
+const AccessPage: React.FC = () => {
   const access = useAccess();
   return (
     <PageContainer
@@ -18,3 +17,5 @@ export default () => {
     </PageContainer>
   );
 };
+
+export default AccessPage;

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

@@ -2,10 +2,9 @@ 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 () => {
+const HomePage: React.FC = () => {
   const { name } = useModel('global');
   return (
     <PageContainer ghost>
@@ -15,3 +14,5 @@ export default () => {
     </PageContainer>
   );
 };
+
+export default HomePage;

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

@@ -8,10 +8,10 @@
   },
   "dependencies": {
     "vue": "^3.2.36",
-    "umi": "^{{{ version }}}"
+    "umi": "{{{ version }}}"
   },
   "devDependencies": {
     "typescript": "^4.1.2",
-    "@umijs/preset-vue": "^{{{ version }}}"
+    "@umijs/preset-vue": "{{{ version }}}"
   }
 }