@baic/yolk-cli 2.1.0-alpha.10 → 2.1.0-alpha.100

package/templates/umi-mobile-native/src/common/Xprinter.ts

@@ -1,9 +1,9 @@
 import bridge from './bridge';
 
-interface Options {
+type Options = {
   deviceId?: string;
   commands?: PrintCommand[];
-}
+};
 type FunctionName = 'connect' | 'disconnect' | 'print' | 'getBondedDevices';
 
 export type PrintCommand = Record<
@@ -25,13 +25,13 @@ export type PrintCommand = Record<
   url?: string;
 };
 
-export interface BondedDevice {
+export type BondedDevice = {
   name: string;
   deviceId: string;
   bondState: number;
   type: number;
   alias?: string;
-}
+};
 
 const Xprinter = {
   exec<T = object>(functionName: FunctionName, options?: Options) {

package/templates/umi-mobile-native/src/common/bluetooth.ts

@@ -4,14 +4,14 @@ import { Toast } from 'antd-mobile';
 
 import Util from '@/common/util';
 
-export interface BluetoothOptions {
+export type BluetoothOptions = {
   autoReconnection?: boolean;
   onWriteValue?: () => ArrayBuffer;
   writeInterval?: number;
   readInterval?: number;
   reconnectInterval?: number;
   notifyInterval?: number;
-}
+};
 
 class Bluetooth {
   private options: BluetoothOptions = {

package/templates/umi-mobile-native/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-native/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-native/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-native/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-native/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-native/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-native/src/types/user.d.ts

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

package/templates/umi-web/.eslintrc

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

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/yolk-cli/lib/.prettierrc');

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

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

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/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/types/user.d.ts

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

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

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

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

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

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

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

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

@@ -1,6 +1,8 @@
-import { defineConfig } from '@baic/yolk-umi-web';
+import path from 'path';
+import { defineConfig } from '@baic/yolk-umi';
 
 export default defineConfig({
   title: '{{ projectName }}',
   publicPath: '/',
+  lessVarsResources: [path.resolve('src/styles/vars.less')],
 });

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

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

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

@@ -8,5 +8,10 @@
   "dependencies": {
     "@ant-design/charts": "1.x",
     "@baic/preset-yolk-umi-web": "~{{ yolkVersion }}"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": "*"
+    }
   }
 }

package/templates/umi-web-screen/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-screen/src/components/resize-container/index.tsx

@@ -1,28 +1,27 @@
-import * as React from 'react';
-
+import _ from 'lodash';
 import classnames from 'classnames';
 
-import _ from 'lodash';
+import * as React from 'react';
 
 import { useSize } from 'ahooks';
 
 import style from './style.less';
 
-export interface ContainerInstance {
+export type ContainerInstance = {
   zoom: number;
   width: number;
   height: number;
   container?: HTMLDivElement | null;
-}
+};
 
-interface ResizeContainerProps {
+type ResizeContainerProps = {
   children?: React.ReactNode | ((e: ContainerInstance) => React.ReactNode);
   className?: string;
   getContainer?: () => HTMLElement | React.RefObject<HTMLElement>;
   onResize?: (e: ContainerInstance) => void;
   containerParentElementZoom?: boolean | number;
   containerZoom?: boolean | number;
-}
+};
 
 const Component = React.forwardRef<ContainerInstance, ResizeContainerProps>(
   (

package/templates/umi-web-screen/src/layouts/controller/index.tsx

@@ -1,18 +1,16 @@
-import type { ReactNode } from 'react';
-
+import type { PropsWithChildren } from 'react';
 import { createContext, useEffect, useRef, useState } from 'react';
 
-import useSize from '@/hooks/use-size';
-
 import { RootWinWidth } from '@/constants';
+import useSize from '@/hooks/use-size';
 
-export interface Value {
+export type Value = {
   layout: {
     16_9: {
       type: 1;
     };
   };
-}
+};
 
 export const context = createContext<Value>({
   layout: {
@@ -22,9 +20,7 @@ export const context = createContext<Value>({
   },
 });
 
-interface Props {
-  children?: ReactNode;
-}
+type Props = PropsWithChildren<Record<string, unknown>>;
 
 const { Provider } = context;
 

package/templates/umi-web-screen/src/pages/template/components/charts/demo-line/index.tsx

@@ -16,7 +16,7 @@ const Component = () => (
           label: {
             // 数值格式化为千分位
             formatter: (v) =>
-              `${v}`.replace(/\d{1,3}(?=(\d{3})+$)/gu, (s) => `${s},`),
+              `${v}`.replace(/\d{1,3}(?=(\d{3})+$)/g, (s) => `${s},`),
           },
         }}
         seriesField="type"

package/templates/umi-web-screen/src/pages/template/controller/index.tsx

@@ -1,25 +1,24 @@
-import * as React from 'react';
+import type { PropsWithChildren } from 'react';
+import { createContext, useCallback, useEffect,useRef, useState } from 'react';
 
 import { useMount, useUnmount } from 'ahooks';
 
 import useSize from '@/hooks/use-size';
 
-interface Props {
-  children?: React.ReactNode;
-}
+type Props = PropsWithChildren<Record<string, unknown>>;
 
 export type Data = Record<string, any>;
 
-export interface Value {
+export type Value = {
   data: Data;
   layout: {
     16_9: {
       type: 1;
     };
   };
-}
+};
 
-export const context = React.createContext<Value>({
+export const context = createContext<Value>({
   data: {},
   layout: {
     16_9: {
@@ -34,11 +33,11 @@ const Component = ({ children }: Props) => {
   const [size] = useSize();
 
   // ref
-  const timeoutID = React.useRef<NodeJS.Timeout>();
+  const timeoutID = useRef<NodeJS.Timeout>();
 
   // data
-  const [data, setData] = React.useState<Data>({});
-  const initDataHandler = React.useCallback(async () => {
+  const [data, setData] = useState<Data>({});
+  const initDataHandler = useCallback(async () => {
     await Promise.all([]);
     const $data: Data = {};
     setData({
@@ -49,7 +48,7 @@ const Component = ({ children }: Props) => {
   }, [data]);
 
   // layout
-  const [layout, setLayout] = React.useState<Value['layout']>({
+  const [layout, setLayout] = useState<Value['layout']>({
     16_9: {
       type: 1,
     },
@@ -62,7 +61,7 @@ const Component = ({ children }: Props) => {
     }
   });
 
-  React.useEffect(() => {
+  useEffect(() => {
     setLayout({
       16_9: {
         type: 1,

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

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

package/templates/ice-mobile/.eslintrc

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

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

@@ -1,30 +0,0 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-# dependencies
-node_modules/
-
-# production
-build/
-dist/
-tmp/
-lib/
-
-# misc
-.idea/
-.happypack
-.DS_Store
-*.swp
-*.dia~
-.ice
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-*less.d.ts*
-*scss.d.ts*
-.eslintcache
-.stylelintcache
-
-# h5+app
-/h5+app/unpackage/cache
-/h5+app/unpackage/release

package/templates/ice-mobile/.icerc.ts

@@ -1,3 +0,0 @@
-import { defineConfig } from '@baic/yolk-ice-mobile';
-
-export default defineConfig({});

package/templates/ice-mobile/.prettierignore

@@ -1,9 +0,0 @@
-build/
-tests/
-demo/
-.ice/
-coverage/
-**/*-min.js
-**/*.min.js
-package-lock.json
-yarn.lock

package/templates/ice-mobile/.prettierrc

@@ -1,11 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "printWidth": 80,
-  "overrides": [
-    {
-      "files": ".prettierrc",
-      "options": { "parser": "json" }
-    }
-  ]
-}

package/templates/ice-mobile/.stylelintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "@baic/stylelint-config-yolk"
-}

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

@@ -1,34 +0,0 @@
-# web
-
-## Getting Started
-
-Install dependencies,
-
-{{ #dependenciesInstallType }}
-
-```bash
-$ {{ dependenciesInstallType }} install
-```
-
-{{ /dependenciesInstallType }}
-{{ ^dependenciesInstallType }}
-
-```bash
-$ yarn install
-```
-
-{{ /dependenciesInstallType }}
-
-Start the dev server,
-
-```bash
-$ npm start
-```
-
-Build,
-
-```bash
-$ npm run build
-```
-
-[查阅文档](https://303394539.github.io/yolk-docs/)

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

@@ -1,11 +0,0 @@
-{
-  "private": true,
-  "name": "{{ projectName }}",
-  "scripts": {
-    "start": "yolk start",
-    "build": "yolk build"
-  },
-  "dependencies": {
-    "@baic/preset-yolk-ice-mobile": "~{{ yolkVersion }}"
-  }
-}

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

@@ -1,5 +0,0 @@
-import { runApp } from 'ice';
-
-import '@baic/yolk-mobile/lib/style/index.less';
-
-runApp();

package/templates/ice-mobile/src/common/request.ts

@@ -1,3 +0,0 @@
-import { Request } from '@baic/yolk-mobile';
-
-export default new Request();