@baic/yolk-cli 2.1.0-alpha.18 → 2.1.0-alpha.182

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/android/app/build.gradle

@@ -7,13 +7,13 @@ android {
 
   defaultConfig {
     applicationId "plus.H5ECA1DEE"
-    minSdk 21
-    targetSdk 25
+    minSdkVersion 21
+    targetSdkVersion 25
     versionCode 100
     versionName '1.0.0'
     multiDexEnabled true
     ndk {
-      abiFilters 'armeabi-v7a'
+      abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
     }
   }
 
@@ -51,16 +51,31 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  packagingOptions {
+    exclude 'resources.arsc'
+    exclude 'AndroidManifest.xml'
+  }
+
+  aaptOptions {
+    additionalParameters '--auto-add-overlay'
+    ignoreAssetsPattern "!.svn:!.git:.*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
+  }
+
+  lint {
+    checkReleaseBuilds false
+  }
 }
 
 dependencies {
   // base
   implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
-  implementation 'androidx.appcompat:appcompat:1.3.0'
+  implementation 'androidx.appcompat:appcompat:1.4.1'
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
   implementation 'androidx.recyclerview:recyclerview:1.2.1'
   implementation 'com.facebook.fresco:fresco:2.6.0'
   implementation 'com.facebook.fresco:animated-gif:2.6.0'
   implementation 'com.github.bumptech.glide:glide:4.13.1'
   implementation 'com.alibaba:fastjson:1.1.46.android'
+  implementation 'androidx.webkit:webkit:1.4.0'
 }

package/templates/umi-mobile-native/android/gradle.properties

@@ -15,8 +15,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+android.enableJetifier=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.useNewApkCreator=false

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

@@ -1,17 +1,17 @@
-import _ from 'lodash';
+import { isFunction, unionBy } from 'lodash';
 
 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 = {
@@ -112,7 +112,7 @@ class Bluetooth {
           content: '蓝牙设备断开',
         });
       }
-      if (_.isFunction(e)) {
+      if (isFunction(e)) {
         e({ connected, deviceId });
       }
     });
@@ -123,7 +123,7 @@ class Bluetooth {
   ) {
     const { bluetooth } = window.plus || {};
     bluetooth.onBluetoothDeviceFound(({ devices = [] }) => {
-      this.devices = _.unionBy(
+      this.devices = unionBy(
         this.devices.concat(
           devices.filter(
             ({ name }: plus.Bluetooth.BluetoothDeviceInfo) =>
@@ -132,7 +132,7 @@ class Bluetooth {
         ),
         'deviceId',
       );
-      if (_.isFunction(e)) {
+      if (isFunction(e)) {
         e({ devices: this.devices });
       }
     });
@@ -142,7 +142,7 @@ class Bluetooth {
     const { bluetooth } = window.plus || {};
     const { notifyInterval = 200 } = this.options;
     bluetooth.onBLECharacteristicValueChange(({ value }) => {
-      if (_.isFunction(onChange)) {
+      if (isFunction(onChange)) {
         if (notifyInterval > 0) {
           if (!this.isNotifyInterval) {
             onChange(value);
@@ -222,7 +222,7 @@ class Bluetooth {
       deviceId,
       serviceId,
       characteristicId,
-      value: _.isFunction(onWriteValue) ? onWriteValue() : new ArrayBuffer(0),
+      value: isFunction(onWriteValue) ? onWriteValue() : new ArrayBuffer(0),
     });
     if (writeInterval > 0) {
       this.writeTimeoutId = setTimeout(

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

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isFunction } from 'lodash';
 
 type Result<T = object> = {
   code: number;
@@ -17,24 +17,24 @@ const bridge = {
   ) {
     return new Promise<T | undefined>((resolve, reject) => {
       const successCallback = (event: Result<T>) => {
-        if (_.isFunction(complete)) {
+        if (isFunction(complete)) {
           complete(event);
         }
         if (event) {
           const { code, data } = event;
           if (0 === code) {
-            if (_.isFunction(success)) {
+            if (isFunction(success)) {
               success(data);
             }
             resolve(data);
           } else {
-            if (_.isFunction(fail)) {
+            if (isFunction(fail)) {
               fail(event);
             }
             reject(event);
           }
         } else {
-          if (_.isFunction(fail)) {
+          if (isFunction(fail)) {
             fail({
               code: -1,
             });
@@ -45,7 +45,7 @@ const bridge = {
         }
       };
       const failCallback = (event?: Result<T>) => {
-        if (_.isFunction(fail)) {
+        if (isFunction(fail)) {
           fail(event);
         }
         reject(event);

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

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

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

@@ -1,6 +1,7 @@
-import * as React from 'react';
+import type { FunctionComponent } from 'react';
+import { createElement } from 'react';
 
-import _ from 'lodash';
+import { isFunction, isObject } from 'lodash';
 
 import { Tabs, Collapse } from 'antd-mobile';
 
@@ -28,7 +29,7 @@ const { Panel } = Collapse;
 
 const tabs: Record<
   string,
-  React.FunctionComponent | Record<string, React.FunctionComponent>
+  FunctionComponent | Record<string, FunctionComponent>
 > = {
   BarCode,
   Iconfont,
@@ -57,14 +58,14 @@ export default () => {
     <Tabs defaultActiveKey={keys[0]}>
       {keys.map((key) => {
         const tab = tabs[key];
-        if (_.isFunction(tab)) {
+        if (isFunction(tab)) {
           return (
             <Tab key={key} title={key}>
-              {React.createElement(tab)}
+              {createElement(tab)}
             </Tab>
           );
         }
-        if (_.isObject(tab)) {
+        if (isObject(tab)) {
           const keys2 = Object.keys(tab);
           return (
             <Tab key={key} title={key}>
@@ -73,7 +74,7 @@ export default () => {
                   const tab2 = tab[key2];
                   return (
                     <Panel key={key2} title={key2}>
-                      {React.createElement(tab2)}
+                      {createElement(tab2)}
                     </Panel>
                   );
                 })}

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.js

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

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/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

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

package/templates/umi-web-screen/src/components/resize-container/index.tsx

@@ -1,30 +1,30 @@
-import * as React from 'react';
-
+import { isFunction, isNumber } 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)
+      isFunction(getContainer)
         ? getContainer()
         : () => containerRef.current?.parentElement || null,
     ) || { width: 0, height: 0 };
-    const instance = React.useMemo(() => {
+    const instance = useMemo(() => {
       let res = {
         width,
         height,
@@ -50,7 +50,7 @@ const Component = React.forwardRef<ContainerInstance, ResizeContainerProps>(
         container: containerRef.current,
       };
       if (containerRef.current) {
-        const $zoom = _.isNumber(containerParentElementZoom)
+        const $zoom = isNumber(containerParentElementZoom)
           ? containerParentElementZoom
           : containerParentElementZoom
           ? Number(document.body.getAttribute('data-zoom') || 1)
@@ -68,18 +68,18 @@ const Component = React.forwardRef<ContainerInstance, ResizeContainerProps>(
           containerRef.current.style.zoom = 1 / $zoom;
         }
       }
-      if (_.isFunction(onResize)) {
+      if (isFunction(onResize)) {
         onResize(res);
       }
       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;
       }
-      return _.isFunction(children) ? children(instance) : children;
+      return isFunction(children) ? children(instance) : children;
     }, [children, instance]);
     return (
       <div