@baic/yolk-cli 2.1.0-alpha.2 → 2.1.0-alpha.200

package/templates/umi-mobile-native/src/pages/demo/examples/List/mock.ts

@@ -0,0 +1,30 @@
+export default [
+  {
+    id: '1',
+    avatar:
+      'https://images.unsplash.com/photo-1548532928-b34e3be62fc6?ixlib=rb-1.2.1&q=80&fm=jpg&crop=faces&fit=crop&h=200&w=200&ixid=eyJhcHBfaWQiOjE3Nzg0fQ',
+    name: 'Novalee Spicer',
+    description: 'Deserunt dolor ea eaque eos',
+  },
+  {
+    id: '2',
+    avatar:
+      'https://images.unsplash.com/photo-1493666438817-866a91353ca9?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&fit=crop&h=200&w=200&s=b616b2c5b373a80ffc9636ba24f7a4a9',
+    name: 'Sara Koivisto',
+    description: 'Animi eius expedita, explicabo',
+  },
+  {
+    id: '3',
+    avatar:
+      'https://images.unsplash.com/photo-1542624937-8d1e9f53c1b9?ixlib=rb-1.2.1&q=80&fm=jpg&crop=faces&fit=crop&h=200&w=200&ixid=eyJhcHBfaWQiOjE3Nzg0fQ',
+    name: 'Marco Gregg',
+    description: 'Ab animi cumque eveniet ex harum nam odio omnis',
+  },
+  {
+    id: '4',
+    avatar:
+      'https://images.unsplash.com/photo-1546967191-fdfb13ed6b1e?ixlib=rb-1.2.1&q=80&fm=jpg&crop=faces&fit=crop&h=200&w=200&ixid=eyJhcHBfaWQiOjE3Nzg0fQ',
+    name: 'Edith Koenig',
+    description: 'Commodi earum exercitationem id numquam vitae',
+  },
+];

package/templates/{ice-web → umi-mobile-native}/src/pages/demo/examples/Loading.tsx

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

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

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
+
+export default () => {
+  const [form] = useForm();
+  const { createFormItem } = form;
+  return (
+    <Form form={form}>
+      {createFormItem({
+        label: 'default',
+        name: 'NumberInput',
+        rules: 'required',
+      })(<NumberInput />)}
+    </Form>
+  );
+};

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

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
+
+export default () => {
+  const [form] = useForm();
+  const { createFormItem } = form;
+  return (
+    <Form form={form}>
+      {createFormItem({
+        label: 'decimal',
+        name: 'NumberInput',
+        rules: 'required',
+      })(<NumberInput decimal={3} />)}
+    </Form>
+  );
+};

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

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
+
+export default () => {
+  const [form] = useForm();
+  const { createFormItem } = form;
+  return (
+    <Form form={form}>
+      {createFormItem({
+        label: 'zeroStart',
+        name: 'NumberInput',
+        rules: 'required',
+      })(<NumberInput zeroStart />)}
+    </Form>
+  );
+};

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

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { Form, NumberInput, useForm } from '@baic/yolk-mobile';
+
+export default () => {
+  const [form] = useForm();
+  const { createFormItem } = form;
+  return (
+    <Form form={form}>
+      {createFormItem({
+        label: 'negative',
+        name: 'NumberInput',
+        rules: 'required',
+      })(<NumberInput negative />)}
+    </Form>
+  );
+};

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

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

package/templates/{ice-web → umi-mobile-native}/src/pages/demo/examples/QrCode.tsx

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

package/templates/{ice-web → umi-mobile-native}/src/pages/demo/examples/Required.tsx

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

package/templates/{ice-web → umi-mobile-native}/src/pages/demo/examples/TimerButton.tsx

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

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

@@ -0,0 +1,64 @@
+import { useCallback, useState } from 'react';
+
+import { Toast } from 'antd-mobile';
+
+import { useMount } from 'ahooks';
+
+import type { BondedDevice } from '@/common/Xprinter';
+
+import Xprinter from '@/common/Xprinter';
+
+import Util from '@/common/util';
+
+import style from './style.less';
+
+export default () => {
+  const [bondlist, setBondList] = useState<BondedDevice[]>([]);
+  const getOnConnectionHandler = useCallback(
+    ({ deviceId }: plus.Bluetooth.BluetoothDeviceInfo) =>
+      async () => {
+        Util.Loading.start();
+        setBondList([]);
+        /**
+         * 打印机
+         */
+        try {
+          await Xprinter.connect(deviceId); // 成功以后可以执行打印
+          Toast.show({
+            icon: 'success',
+            content: `连接成功：${deviceId}`,
+          });
+        } catch (error) {
+          Toast.show({
+            icon: 'fail',
+            content: `连接失败：${JSON.stringify(error)}`,
+          });
+        } finally {
+          Util.Loading.stop();
+        }
+      },
+    [],
+  );
+  useMount(async () => {
+    setBondList((await Xprinter.getBondedDevices()) || []);
+  });
+  return (
+    <>
+      <div className={style.title}>蓝牙设备</div>
+      <div className={style.list}>
+        {bondlist.map((device) => {
+          const { name, deviceId } = device;
+          return (
+            <div
+              key={deviceId}
+              className={style.item}
+              onClick={getOnConnectionHandler(device)}
+            >
+              {name}[{deviceId}]
+            </div>
+          );
+        })}
+      </div>
+    </>
+  );
+};

package/templates/umi-mobile-native/src/pages/demo/examples/Xprinter/style.less

@@ -0,0 +1,16 @@
+.title {
+  padding: 6px 0;
+  color: #333;
+  font-size: 8px;
+  border: 1px solid #efefef;
+  text-align: center;
+}
+.list {
+  background-color: #fff;
+  .item {
+    padding: 4px 0;
+    font-size: 8px;
+    text-align: center;
+    border: 1px solid #efefef;
+  }
+}

package/templates/{ice-web → umi-mobile-native}/src/pages/demo/examples/usePreload.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { Util } from '@baic/yolk';
-import { usePreload } from '@baic/yolk-web';
+import { usePreload } from '@baic/yolk-mobile';
 export default () => {
   const [wrap] = usePreload(async () => {
     await Util.delay(1000);
   });
-  return wrap(<>页面加载完成显示出来了</>);
+  return wrap(<div>页面加载完成显示出来了</div>);
 };

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

@@ -0,0 +1,90 @@
+import type { FunctionComponent } from 'react';
+import { createElement } from 'react';
+
+import { isFunction, isObject } from 'lodash';
+
+import { Tabs, Collapse } from 'antd-mobile';
+
+import BarCode from './examples/BarCode';
+import Iconfont from './examples/Iconfont';
+import Input from './examples/Input';
+import List_1 from './examples/List/1';
+import List_2 from './examples/List/2';
+import List_3 from './examples/List/3';
+import List_4 from './examples/List/4';
+import Loading from './examples/Loading';
+import NumberInput_1 from './examples/NumberInput/1';
+import NumberInput_2 from './examples/NumberInput/2';
+import NumberInput_3 from './examples/NumberInput/3';
+import NumberInput_4 from './examples/NumberInput/4';
+import PagingList_1 from './examples/PagingList/1';
+import QrCode from './examples/QrCode';
+import Required from './examples/Required';
+import TimerButton from './examples/TimerButton';
+import usePreload from './examples/usePreload';
+import Xprinter from './examples/Xprinter';
+
+const { Tab } = Tabs;
+const { Panel } = Collapse;
+
+const tabs: Record<
+  string,
+  FunctionComponent | Record<string, FunctionComponent>
+> = {
+  BarCode,
+  Iconfont,
+  Input,
+  List: { List_1, List_2, List_3, List_4 },
+  Loading,
+  NumberInput: {
+    NumberInput_1,
+    NumberInput_2,
+    NumberInput_3,
+    NumberInput_4,
+  },
+  PagingList: {
+    PagingList_1,
+  },
+  QrCode,
+  Required,
+  TimerButton,
+  usePreload,
+  Xprinter,
+};
+
+export default () => {
+  const keys = Object.keys(tabs);
+  return (
+    <Tabs defaultActiveKey={keys[0]}>
+      {keys.map((key) => {
+        const tab = tabs[key];
+        if (isFunction(tab)) {
+          return (
+            <Tab key={key} title={key}>
+              {createElement(tab)}
+            </Tab>
+          );
+        }
+        if (isObject(tab)) {
+          const keys2 = Object.keys(tab);
+          return (
+            <Tab key={key} title={key}>
+              <Collapse accordion defaultActiveKey={keys2[0]}>
+                {keys2.map((key2) => {
+                  const tab2 = tab[key2];
+                  return (
+                    <Panel key={key2} title={key2}>
+                      {createElement(tab2)}
+                    </Panel>
+                  );
+                })}
+              </Collapse>
+            </Tab>
+          );
+        }
+      })}
+    </Tabs>
+  );
+};
+
+// export default () => <PagingList_1 />;

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

@@ -0,0 +1,9 @@
+import style from './style.less';
+
+import type { User } from '@/types/user';
+
+export default ({}: User) => (
+  <div>
+    Hello world <div className={style.head}></div>
+  </div>
+);

package/templates/umi-mobile-native/src/pages/style.less

@@ -0,0 +1,6 @@
+.head {
+  width: 100px;
+  height: 100px;
+  background-image: url('@/images/head.png');
+  background-size: cover;
+}

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

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

package/templates/umi-mobile-native/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "./src/.umi/tsconfig.json"
+}

package/templates/umi-mobile-native/typings.d.ts

@@ -0,0 +1 @@
+import '@umijs/max/typings';

package/templates/umi-web/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extends: '@baic/eslint-config-yolk',
+  parserOptions: {
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
+};

package/templates/umi-web/.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-web/.npmrc.tpl

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

package/templates/umi-web/.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-web/.prettierrc.js

@@ -0,0 +1 @@
+module.exports = require('@baic/prettier-config-yolk');

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

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

package/templates/umi-web/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Baic
+Copyright (c) 2024 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

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

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

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

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

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

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

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

@@ -1,8 +1,7 @@
-import * as React from 'react';
-import { Result, Button } from 'antd';
-
 import { history } from 'umi';
 
+import { Button, Result } from 'antd';
+
 export default () => (
   <Result
     status="404"

package/templates/umi-web/src/pages/demo/examples/BankInput.tsx

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

package/templates/umi-web/src/pages/demo/examples/Grid/5.tsx

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

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

@@ -1,7 +1,8 @@
 import * as React from 'react';
-import { Form, Button, Divider } from 'antd';
+import { Button, Divider } from 'antd';
 import { useForm } from '@baic/yolk-web';
 import {
+  Form,
   Config,
   Input,
   NumberInput,

package/templates/umi-web/src/pages/demo/examples/RangeNumber/2.tsx

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

package/templates/umi-web/src/pages/demo/examples/SearchLayout.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Form } from 'antd';
-import { useForm } from '@baic/yolk-web';
 import {
+  Form,
+  useForm,
   SearchLayout,
   Input,
   NumberInput,

package/templates/umi-web/src/pages/demo/examples/Wrapper.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Button, Divider, Radio } from 'antd';
 import { RadioChangeEvent } from 'antd/es/radio/interface';
 import { Wrapper, WrapperInstance } from '@baic/yolk-web';
-import { Mode } from '@baic/yolk-web/lib/wrapper';
+import { Mode } from '@baic/yolk-web/es/wrapper';
 
 export default () => {
   const ref = React.useRef<WrapperInstance>(null);

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

@@ -1,6 +1,7 @@
-import _ from 'lodash';
+import { isFunction, isObject } from 'lodash';
 
-import * as React from 'react';
+import type { FunctionComponent } from 'react';
+import { createElement } from 'react';
 
 import { Tabs } from 'antd';
 
@@ -46,7 +47,7 @@ const { TabPane } = Tabs;
 
 const tabs: Record<
   string,
-  React.FunctionComponent | Record<string, React.FunctionComponent>
+  FunctionComponent | Record<string, FunctionComponent>
 > = {
   BankInput,
   BarCode,
@@ -103,25 +104,25 @@ export default () => {
   const keys = Object.keys(tabs);
   return (
     <Tabs defaultActiveKey={keys[0]}>
-      {keys.map(key => {
+      {keys.map((key) => {
         const tab = tabs[key];
-        if (_.isFunction(tab)) {
+        if (isFunction(tab)) {
           return (
             <TabPane key={key} tab={key}>
-              {React.createElement(tab)}
+              {createElement(tab)}
             </TabPane>
           );
         }
-        if (_.isObject(tab)) {
+        if (isObject(tab)) {
           const keys2 = Object.keys(tab);
           return (
             <TabPane key={key} tab={key}>
               <Tabs defaultActiveKey={keys2[0]}>
-                {keys2.map(key2 => {
+                {keys2.map((key2) => {
                   const tab2 = tab[key2];
                   return (
                     <TabPane key={key2} tab={key2}>
-                      {React.createElement(tab2)}
+                      {createElement(tab2)}
                     </TabPane>
                   );
                 })}
@@ -129,6 +130,7 @@ export default () => {
             </TabPane>
           );
         }
+        return null;
       })}
     </Tabs>
   );

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

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

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

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

package/templates/umi-web-screen/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extends: '@baic/eslint-config-yolk',
+  parserOptions: {
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
+};

package/templates/umi-web-screen/.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-web-screen/.npmrc.tpl

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