@baic/yolk-cli 2.1.0-alpha.11 → 2.1.0-alpha.114

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

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

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

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

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

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

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

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

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,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/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/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/index.tsx

@@ -103,7 +103,7 @@ 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)) {
           return (
@@ -117,7 +117,7 @@ export default () => {
           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}>
@@ -129,6 +129,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

@@ -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,7 @@
-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/components/resize-container/index.tsx

@@ -1,30 +1,30 @@
-import * as React from 'react';
-
+import _ from 'lodash';
 import classnames from 'classnames';
 
-import _ from 'lodash';
+import type { ReactNode, RefObject } from 'react';
+import { forwardRef, useImperativeHandle, useMemo, useRef } 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 {
-  children?: React.ReactNode | ((e: ContainerInstance) => React.ReactNode);
+type ResizeContainerProps = {
+  children?: ReactNode | ((e: ContainerInstance) => ReactNode);
   className?: string;
-  getContainer?: () => HTMLElement | React.RefObject<HTMLElement>;
+  getContainer?: () => HTMLElement | RefObject<HTMLElement>;
   onResize?: (e: ContainerInstance) => void;
   containerParentElementZoom?: boolean | number;
   containerZoom?: boolean | number;
-}
+};
 
-const Component = React.forwardRef<ContainerInstance, ResizeContainerProps>(
+const Component = forwardRef<ContainerInstance, ResizeContainerProps>(
   (
     {
       children,
@@ -36,13 +36,13 @@ const Component = React.forwardRef<ContainerInstance, ResizeContainerProps>(
     },
     ref,
   ) => {
-    const containerRef = React.useRef<HTMLDivElement>(null);
+    const containerRef = useRef<HTMLDivElement>(null);
     const { width = 0, height = 0 } = useSize(
       _.isFunction(getContainer)
         ? getContainer()
         : () => containerRef.current?.parentElement || null,
     ) || { width: 0, height: 0 };
-    const instance = React.useMemo(() => {
+    const instance = useMemo(() => {
       let res = {
         width,
         height,
@@ -73,8 +73,8 @@ const Component = React.forwardRef<ContainerInstance, ResizeContainerProps>(
       }
       return res;
     }, [width, height, onResize, containerParentElementZoom, containerZoom]);
-    React.useImperativeHandle(ref, () => instance);
-    const childrenMemo = React.useMemo(() => {
+    useImperativeHandle(ref, () => instance);
+    const childrenMemo = useMemo(() => {
       const { width: containerWidth, height: containerHeight } = instance;
       if (0 === containerWidth || 0 === containerHeight) {
         return null;

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/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-screen/src/pages/template/components/charts/demo-line/index.tsx

@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { Line } from '@ant-design/plots';
 
 import { ResizeContainer } from '@/components';
@@ -8,6 +6,7 @@ const Component = () => (
   <ResizeContainer>
     {({ width, height }) => (
       <Line
+        supportCSSTransform
         width={width}
         height={height}
         xField="date"
@@ -16,7 +15,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;
-}
+};