@baic/yolk-cli 2.1.0-alpha.13 → 2.1.0-alpha.131

package/templates/miniprogram/.gitignore.tpl

@@ -2,15 +2,13 @@
 
 # dependencies
 /node_modules
-/.pnp
-.pnp.js
-.prettierrc.js
 npm-debug.log*
 npm-error.log*
-/package-lock.json
-/yarn.lock
+package-lock.json
+yarn.lock
 yarn-debug.log*
 yarn-error.log*
+pnpm-lock.yaml
 
 # testing
 /coverage
@@ -27,6 +25,7 @@ dist/
 .env.production.local
 
 # temp
+.swc/
 .temp/
 .rn_temp/
 deploy_versions/
@@ -36,4 +35,7 @@ deploy_versions/
 .eslintcache
 .stylelintcache
 .vscode
-project.private.config.json
+project.private.config.json
+
+# ide
+.vscode

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

@@ -17,5 +17,10 @@
   ],
   "dependencies": {
     "@baic/preset-yolk-taro-miniprogram": "~{{ yolkVersion }}"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": "*"
+    }
   }
 }

package/templates/miniprogram/project.config.json.tpl

@@ -5,7 +5,7 @@
   "appid": "touristappid",
   "setting": {
     "urlCheck": true,
-    "es6": true,
+    "es6": false,
     "enhance": false,
     "postcss": true,
     "preloadBackgroundData": false,
@@ -42,12 +42,14 @@
     "showES6CompileOption": false,
     "disableUseStrict": false,
     "useCompilerPlugins": false,
-    "minifyWXML": true
+    "minifyWXML": true,
+    "condition": false,
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
-  "libVersion": "2.13.0",
+  "libVersion": "2.30.0",
   "condition": {},
   "srcMiniprogramRoot": "dist/",
   "packOptions": {

package/templates/miniprogram/src/app.scss

@@ -1,2 +1 @@
-@import "./theme.scss";
 @import "~taro-ui/dist/style/index.scss";

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/demo/examples/Textarea.tsx

@@ -1,3 +1,14 @@
 import * as React from 'react';
-import { Textarea } from '@baic/yolk-miniprogram';
-export default () => <Textarea />;
+
+import { Form, FormItem, Textarea, useForm } from '@baic/yolk-miniprogram';
+
+export default () => {
+  const [form] = useForm();
+  return (
+    <Form form={form}>
+      <FormItem name="textarea" rules="required">
+        <Textarea />
+      </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

@@ -4,10 +4,11 @@
 node_modules/
 npm-debug.log*
 npm-error.log*
-/package-lock.json
-/yarn.lock
+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,6 @@
-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

@@ -1,9 +1,9 @@
+import '@baic/yolk-mobile/es/style/index.less';
+
 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

package/templates/umi-mobile/src/pages/404.tsx

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Result } from 'antd-mobile';
 
 export default () => (

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

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { BarCode } from '@baic/yolk-mobile';
 
 export default () => <BarCode value="https://www.baidu.com" />;

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

@@ -1,5 +1,4 @@
-import * as React from 'react';
-import { Provider, Iconfont } from '@baic/yolk-mobile';
+import { Iconfont, Provider } from '@baic/yolk-mobile';
 
 export default () => {
   return (

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

@@ -1,6 +1,4 @@
-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/1.tsx

@@ -1,9 +1,8 @@
-import * as React from 'react';
 import { List } from '@baic/yolk-mobile';
 
 export default () => {
   return (
-    <List header='基础用法'>
+    <List header="基础用法">
       <List.Item>1</List.Item>
       <List.Item>2</List.Item>
       <List.Item>3</List.Item>

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

@@ -1,5 +1,5 @@
-import * as React from 'react';
 import { Image } from 'antd-mobile';
+
 import { List } from '@baic/yolk-mobile';
 
 import mock from './mock';

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

@@ -1,5 +1,5 @@
-import * as React from 'react';
 import { Image } from 'antd-mobile';
+
 import { List } from '@baic/yolk-mobile';
 
 import mock from './mock';

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

@@ -1,8 +1,10 @@
-import * as React from 'react';
+import { useCallback, useMemo } from 'react';
+
 import { Image } from 'antd-mobile';
+
 import { List, ListVirtualizedScrollEvent } from '@baic/yolk-mobile';
 
-const rowCount = 100;
+const rowCount = 100000;
 
 const item = {
   avatar:
@@ -14,13 +16,10 @@ const item = {
 const mock = Array(rowCount).fill(item);
 
 export default () => {
-  const onScrollHandler = React.useCallback(
-    async (e: ListVirtualizedScrollEvent) => {
-      console.log(e);
-    },
-    [],
-  );
-  const virtualizedMemo = React.useMemo(
+  const onScrollHandler = useCallback(async (e: ListVirtualizedScrollEvent) => {
+    console.log(e);
+  }, []);
+  const virtualizedMemo = useMemo(
     () => ({
       height: 500,
       rowHeight: 60,
@@ -29,7 +28,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/Loading.tsx

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Loading } from '@baic/yolk-mobile';
 
 export default () => (

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

@@ -1,6 +1,4 @@
-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,4 @@
-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,4 @@
-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,4 @@
-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/PagingList/1.tsx

@@ -1,6 +1,5 @@
-import * as React from 'react';
 import { PagingList } from '@baic/yolk-mobile';
 
 export default () => {
-  return <PagingList url=""/>;
+  return <PagingList url="" />;
 };

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

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { QrCode } from '@baic/yolk-mobile';
 
 export default () => <QrCode value="https://www.baidu.com" />;

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

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Required } from '@baic/yolk-mobile';
 
 export default () => <Required>必填</Required>;

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

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { TimerButton } from '@baic/yolk-mobile';
 
 export default () => <TimerButton>验证码</TimerButton>;

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

@@ -1,6 +1,6 @@
-import * as React from 'react';
 import { Util } from '@baic/yolk';
 import { usePreload } from '@baic/yolk-mobile';
+
 export default () => {
   const [wrap] = usePreload(async () => {
     await Util.delay(1000);

package/templates/umi-mobile/src/pages/demo/index.tsx

@@ -1,8 +1,9 @@
-import * as React from 'react';
-
 import _ from 'lodash';
 
-import { Tabs, Collapse } from 'antd-mobile';
+import type { FunctionComponent } from 'react';
+import { createElement } from 'react';
+
+import { Collapse, Tabs } from 'antd-mobile';
 
 import BarCode from './examples/BarCode';
 import Iconfont from './examples/Iconfont';
@@ -27,7 +28,7 @@ const { Panel } = Collapse;
 
 const tabs: Record<
   string,
-  React.FunctionComponent | Record<string, React.FunctionComponent>
+  FunctionComponent | Record<string, FunctionComponent>
 > = {
   BarCode,
   Iconfont,
@@ -58,7 +59,7 @@ export default () => {
         if (_.isFunction(tab)) {
           return (
             <Tab key={key} title={key}>
-              {React.createElement(tab)}
+              {createElement(tab)}
             </Tab>
           );
         }
@@ -71,7 +72,7 @@ export default () => {
                   const tab2 = tab[key2];
                   return (
                     <Panel key={key2} title={key2}>
-                      {React.createElement(tab2)}
+                      {createElement(tab2)}
                     </Panel>
                   );
                 })}
@@ -79,9 +80,8 @@ export default () => {
             </Tab>
           );
         }
+        return null;
       })}
     </Tabs>
   );
 };
-
-// export default () => <PagingList_1 />;

package/templates/umi-mobile/src/pages/index.tsx

@@ -1,3 +1 @@
-import * as React from 'react';
-
 export default () => <div>Hello world</div>;

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

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

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

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

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

@@ -4,10 +4,11 @@
 node_modules/
 npm-debug.log*
 npm-error.log*
-/package-lock.json
-/yarn.lock
+package-lock.json
+yarn.lock
 yarn-debug.log*
 yarn-error.log*
+pnpm-lock.yaml
 
 # production
 /dist

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

@@ -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-h5+app/.prettierrc.js

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

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

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

package/templates/umi-mobile-h5+app/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-h5+app/package.json.tpl

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

package/templates/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();