@baic/yolk-cli 2.1.0-alpha.9 → 2.1.0-alpha.91

package/templates/miniprogram/.npmrc.tpl

@@ -0,0 +1,2 @@
+strict-peer-dependencies=false
+shamefully-hoist=true

package/templates/miniprogram/.prettierignore

@@ -2,4 +2,8 @@
 **/*.svg
 **/*.ejs
 **/*.html
-package.json
+package-lock.json
+yarn.lock
+yarn-debug.log
+yarn-error.log
+pnpm-lock.yaml

package/templates/miniprogram/.prettierrc.js

@@ -0,0 +1 @@
+module.exports = require('@baic/yolk-cli/lib/.prettierrc');

package/templates/miniprogram/README.md.tpl

@@ -1,4 +1,4 @@
-# {{ projectName }}
+# web
 
 ## Getting Started
 
@@ -14,7 +14,7 @@ $ {{ dependenciesInstallType }} install
 {{ ^dependenciesInstallType }}
 
 ```bash
-$ yarn install
+$ pnpm install
 ```
 
 {{ /dependenciesInstallType }}

package/templates/miniprogram/global.d.ts

@@ -1,33 +1 @@
-declare module '*.png';
-declare module '*.gif';
-declare module '*.jpg';
-declare module '*.jpeg';
-declare module '*.svg' {
-  export function ReactComponent(
-    props: React.SVGProps<SVGSVGElement>,
-  ): React.ReactElement;
-  const url: string;
-  export default url;
-}
-declare module '*.css';
-declare module '*.less';
-declare module '*.scss';
-declare module '*.sass';
-declare module '*.styl';
-
-// @ts-ignore
-declare const process: NodeJS.Process & {
-  env: {
-    TARO_ENV:
-      | 'weapp'
-      | 'swan'
-      | 'alipay'
-      | 'h5'
-      | 'rn'
-      | 'tt'
-      | 'quickapp'
-      | 'qq'
-      | 'jd';
-    [key: string]: any;
-  };
-};
+import "@baic/yolk-taro/typings";

package/templates/miniprogram/package.json.tpl

@@ -16,7 +16,11 @@
     "ios >= 8"
   ],
   "dependencies": {
-    "@baic/preset-yolk-taro-miniprogram": "~{{ yolkVersion }}",
-    "babel-preset-taro": "3.x"
+    "@baic/preset-yolk-taro-miniprogram": "~{{ yolkVersion }}"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": "*"
+    }
   }
 }

package/templates/miniprogram/src/app.tsx

@@ -1,14 +1,12 @@
-import * as React from 'react';
+import './app.scss';
+
+import React, { PropsWithChildren } from 'react';
 
 import { Provider } from '@baic/yolk-miniprogram';
 
 import request from '@/common/request';
 
-import './app.scss';
-
-interface Props {
-  children: React.ReactNode;
-}
+type Props = PropsWithChildren<Record<string, unknown>>;
 
 export default ({ children }: Props) => (
   <Provider request={request} inputMaxLength={40}>

package/templates/miniprogram/src/pages/demo/examples/Input.tsx

@@ -1,3 +1,12 @@
+import { Form, FormItem, Input, useForm } from '@baic/yolk-miniprogram';
 import * as React from 'react';
-import { Input } from '@baic/yolk-miniprogram';
-export default () => <Input />;
+export default () => {
+  const [form] = useForm();
+  return (
+    <Form form={form}>
+      <FormItem name="input" rules="required">
+        <Input />
+      </FormItem>
+    </Form>
+  );
+};

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

@@ -1,5 +1,7 @@
+import * as React from 'react';
+
 import { View } from '@tarojs/components';
 
-import style from './index.module.scss';
+import style from './style.scss';
 
 export default () => <View className={style.page}>Hello world</View>;

package/templates/miniprogram/src/types/user.d.ts

@@ -1,3 +1,5 @@
-export default interface User {
+type User = {
   id?: string;
-}
+};
+
+export default User;

package/templates/umi-mobile/.eslintrc

@@ -1,5 +1,5 @@
 {
-  "extends": "@baic/eslint-config-yolk-mobile",
+  "extends": "@baic/eslint-config-yolk",
   "parserOptions": {
     "project": "./tsconfig.json"
   }

package/templates/umi-mobile/.gitignore.tpl

@@ -1,11 +1,14 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
-/npm-debug.log*
-/yarn-error.log
-/yarn.lock
-/package-lock.json
+node_modules/
+npm-debug.log*
+npm-error.log*
+package-lock.json
+yarn.lock
+yarn-debug.log*
+yarn-error.log*
+pnpm-lock.yaml
 
 # production
 /dist

package/templates/umi-mobile/.npmrc.tpl

@@ -0,0 +1,2 @@
+strict-peer-dependencies=false
+shamefully-hoist=true

package/templates/umi-mobile/.prettierignore

@@ -2,7 +2,11 @@
 **/*.svg
 **/*.ejs
 **/*.html
-package.json
+package-lock.json
+yarn.lock
+yarn-debug.log
+yarn-error.log
+pnpm-lock.yaml
 .umi
 .umi-production
-.umi-test
+.umi-test

package/templates/umi-mobile/.prettierrc.js

@@ -0,0 +1 @@
+module.exports = require('@baic/yolk-cli/lib/.prettierrc');

package/templates/umi-mobile/.umirc.ts.tpl

@@ -1,6 +1,7 @@
-import { defineConfig } from '@baic/yolk-umi-mobile';
+import { defineConfig } from '@baic/yolk-umi';
 
 export default defineConfig({
   title: '{{ projectName }}',
   publicPath: '/',
+  hd: {},
 });

package/templates/umi-mobile/README.md.tpl

@@ -1,4 +1,4 @@
-# mobile
+# web
 
 ## Getting Started
 
@@ -14,7 +14,7 @@ $ {{ dependenciesInstallType }} install
 {{ ^dependenciesInstallType }}
 
 ```bash
-$ yarn install
+$ pnpm install
 ```
 
 {{ /dependenciesInstallType }}

package/templates/umi-mobile/package.json.tpl

@@ -7,5 +7,10 @@
   },
   "dependencies": {
     "@baic/preset-yolk-umi-mobile": "~{{ yolkVersion }}"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": "*"
+    }
   }
 }

package/templates/umi-mobile/src/app.tsx

@@ -2,7 +2,7 @@ import { Provider } from '@baic/yolk-mobile';
 
 import request from '@/common/request';
 
-import '@baic/yolk-mobile/lib/style/index.less';
+import '@baic/yolk-mobile/es/style/index.less';
 
 export function rootContainer(container: React.ReactNode) {
   return (

package/templates/umi-mobile/src/pages/demo/examples/Input.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { Input, useForm } from '@baic/yolk-mobile';
+import { Form, Input, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/umi-mobile/src/pages/demo/examples/List/4.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Image } from 'antd-mobile';
 import { List, ListVirtualizedScrollEvent } from '@baic/yolk-mobile';
 
-const rowCount = 100;
+const rowCount = 100000;
 
 const item = {
   avatar:
@@ -29,7 +29,7 @@ export default () => {
     [onScrollHandler],
   );
   return (
-    <List header="拖拽" virtualized={virtualizedMemo} data={mock}>
+    <List header="虚拟化" virtualized={virtualizedMemo} data={mock}>
       {({ name, avatar, description }, index, e) => {
         return (
           <List.Item

package/templates/umi-mobile/src/pages/demo/examples/NumberInput/1.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { NumberInput, useForm } from '@baic/yolk-mobile';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/umi-mobile/src/pages/demo/examples/NumberInput/2.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { NumberInput, useForm } from '@baic/yolk-mobile';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/umi-mobile/src/pages/demo/examples/NumberInput/3.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { NumberInput, useForm } from '@baic/yolk-mobile';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/umi-mobile/src/pages/demo/examples/NumberInput/4.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { NumberInput, useForm } from '@baic/yolk-mobile';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/umi-mobile/src/types/user.d.ts

@@ -1,3 +1,3 @@
-export interface User {
+export type User = {
   id?: string;
-}
+};

package/templates/{ice-web → umi-mobile-h5+app}/.eslintrc

@@ -1,5 +1,5 @@
 {
-  "extends": "@baic/eslint-config-yolk-web",
+  "extends": "@baic/eslint-config-yolk",
   "parserOptions": {
     "project": "./tsconfig.json"
   }

package/templates/umi-mobile-h5+app/.gitignore.tpl

@@ -0,0 +1,37 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+node_modules/
+npm-debug.log*
+npm-error.log*
+package-lock.json
+yarn.lock
+yarn-debug.log*
+yarn-error.log*
+pnpm-lock.yaml
+
+# production
+/dist
+/build
+
+# misc
+.DS_Store
+
+# umi
+/src/.umi
+/src/.umi-production
+/src/.umi-test
+/.env.local
+coverage
+.eslintcache
+.stylelintcache
+*less.d.ts*
+*scss.d.ts*
+.mfsu*
+
+# ide
+.vscode
+
+# h5+app
+/h5+app/unpackage/cache
+/h5+app/unpackage/release

package/templates/umi-mobile-h5+app/.npmrc.tpl

@@ -0,0 +1,2 @@
+strict-peer-dependencies=false
+shamefully-hoist=true

package/templates/umi-mobile-h5+app/.prettierignore

@@ -0,0 +1,12 @@
+**/*.md
+**/*.svg
+**/*.ejs
+**/*.html
+package-lock.json
+yarn.lock
+yarn-debug.log
+yarn-error.log
+pnpm-lock.yaml
+.umi
+.umi-production
+.umi-test

package/templates/umi-mobile-h5+app/.prettierrc.js

@@ -0,0 +1 @@
+module.exports = require('@baic/yolk-cli/lib/.prettierrc');

package/templates/umi-mobile-h5+app/.umirc.ts.tpl

@@ -0,0 +1,8 @@
+import { defineConfig } from '@baic/yolk-umi';
+
+export default defineConfig({
+  title: '{{ projectName }}',
+  publicPath: '/',
+  hd: {},
+  'h5+app': {},
+});

package/templates/umi-mobile-h5+app/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Baic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/templates/{ice-mobile → umi-mobile-h5+app}/README.md.tpl

@@ -14,7 +14,7 @@ $ {{ dependenciesInstallType }} install
 {{ ^dependenciesInstallType }}
 
 ```bash
-$ yarn install
+$ pnpm install
 ```
 
 {{ /dependenciesInstallType }}

package/templates/umi-mobile-h5+app/h5+app/manifest.json

@@ -0,0 +1,87 @@
+{
+  "@platforms": ["android"],
+  "id": "",
+  "name": "应用名称",
+  "version": {
+    "name": "1.0.0",
+    "code": "100"
+  },
+  "description": "",
+  "icons": {
+    "72": "icon.png"
+  },
+  "launch_path": "",
+  "developer": {
+    "name": "",
+    "email": "",
+    "url": ""
+  },
+  "permissions": {
+    "Webview-x5": {},
+    "Runtime": {
+      "description": "运行环境"
+    },
+    "Webview": {
+      "description": "窗口管理"
+    }
+  },
+  "plus": {
+    "splashscreen": {
+      "autoclose": false,
+      "waiting": true
+    },
+    "popGesture": "none",
+    "runmode": "normal",
+    "cers": {
+      "crash": false
+    },
+    "launchwebview": {
+      "plusrequire": "ahead"
+    },
+    "distribute": {
+      "google": {
+        "packagename": "",
+        "keystore": "",
+        "password": "",
+        "aliasname": "",
+        "permissions": [],
+        "hardwareAccelerated": true
+      },
+      "orientation": [
+        "portrait-primary",
+        "portrait-secondary",
+        "landscape-primary",
+        "landscape-secondary"
+      ],
+      "icons": {
+        "android": {
+          "mdpi": "",
+          "ldpi": "",
+          "hdpi": "",
+          "xhdpi": "",
+          "xxhdpi": "",
+          "xxxhdpi": ""
+        }
+      },
+      "splashscreen": {
+        "android": {
+          "mdpi": "",
+          "ldpi": "",
+          "hdpi": "",
+          "xhdpi": "",
+          "xxhdpi": ""
+        }
+      },
+      "plugins": {},
+      "apple": {
+        "idfa": false
+      }
+    }
+  },
+  "screenOrientation": [
+    "portrait-primary",
+    "portrait-secondary",
+    "landscape-primary",
+    "landscape-secondary"
+  ]
+}

package/templates/{ice-mobile → umi-mobile-h5+app}/package.json.tpl

@@ -6,6 +6,11 @@
     "build": "yolk build"
   },
   "dependencies": {
-    "@baic/preset-yolk-ice-mobile": "~{{ yolkVersion }}"
+    "@baic/preset-yolk-umi-mobile": "~{{ yolkVersion }}"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": "*"
+    }
   }
 }

package/templates/umi-mobile-h5+app/src/app.tsx

@@ -0,0 +1,19 @@
+import { Provider } from '@baic/yolk-mobile';
+
+import request from '@/common/request';
+
+import '@baic/yolk-mobile/es/style/index.less';
+
+export function rootContainer(container: React.ReactNode) {
+  return (
+    <Provider
+      request={request}
+      iconfontScriptUrl={[
+        '//at.alicdn.com/t/font_1788044_0dwu4guekcwr.js',
+        '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
+      ]}
+    >
+      {container}
+    </Provider>
+  );
+}

package/templates/umi-mobile-h5+app/src/layouts/index.tsx

@@ -0,0 +1,3 @@
+import { Outlet } from 'umi';
+
+export default () => <Outlet />;

package/templates/{ice-mobile → umi-mobile-h5+app}/src/pages/demo/examples/Input.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { Input, useForm } from '@baic/yolk-mobile';
+import { Form, Input, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/{ice-mobile → umi-mobile-h5+app}/src/pages/demo/examples/List/4.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Image } from 'antd-mobile';
 import { List, ListVirtualizedScrollEvent } from '@baic/yolk-mobile';
 
-const rowCount = 100;
+const rowCount = 100000;
 
 const item = {
   avatar:
@@ -29,7 +29,7 @@ export default () => {
     [onScrollHandler],
   );
   return (
-    <List header="拖拽" virtualized={virtualizedMemo} data={mock}>
+    <List header="虚拟化" virtualized={virtualizedMemo} data={mock}>
       {({ name, avatar, description }, index, e) => {
         return (
           <List.Item

package/templates/{ice-mobile → umi-mobile-h5+app}/src/pages/demo/examples/NumberInput/1.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { NumberInput, useForm } from '@baic/yolk-mobile';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/{ice-mobile → umi-mobile-h5+app}/src/pages/demo/examples/NumberInput/2.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { NumberInput, useForm } from '@baic/yolk-mobile';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/{ice-mobile → umi-mobile-h5+app}/src/pages/demo/examples/NumberInput/3.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { NumberInput, useForm } from '@baic/yolk-mobile';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/{ice-mobile → umi-mobile-h5+app}/src/pages/demo/examples/NumberInput/4.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { NumberInput, useForm } from '@baic/yolk-mobile';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();