@baic/yolk-cli 2.1.0-alpha.25 → 2.1.0-alpha.250

package/templates/umi-mobile-h5+app/LICENSE

@@ -1,21 +1,22 @@
-MIT License
+MIT LICENSE
 
-Copyright (c) 2020 Baic
+Copyright (c) 2025 Baic<303394539@qq.com>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/templates/umi-mobile-h5+app/README.md.tpl

@@ -4,20 +4,20 @@
 
 Install dependencies,
 
-{{ #dependenciesInstallType }}
+{{ #packageManager }}
 
 ```bash
-$ {{ dependenciesInstallType }} install
+$ {{ packageManager }} install
 ```
 
-{{ /dependenciesInstallType }}
-{{ ^dependenciesInstallType }}
+{{ /packageManager }}
+{{ ^packageManager }}
 
 ```bash
 $ pnpm install
 ```
 
-{{ /dependenciesInstallType }}
+{{ /packageManager }}
 
 Start the dev server,
 

package/templates/umi-mobile-h5+app/biome.json

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

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

@@ -8,6 +8,12 @@
   "dependencies": {
     "@baic/preset-yolk-umi-mobile": "~{{ yolkVersion }}"
   },
+  "resolutions": {
+    "@types/react": "18.x",
+    "@types/react-dom": "18.x",
+    "react": "18.x",
+    "react-dom": "18.x"
+  },
   "pnpm": {
     "peerDependencyRules": {
       "ignoreMissing": "*"

package/templates/umi-mobile-h5+app/src/app.tsx

@@ -1,9 +1,7 @@
-import { Provider } from '@baic/yolk-mobile';
+import { Provider, Style } 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
@@ -13,6 +11,7 @@ export function rootContainer(container: React.ReactNode) {
         '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
       ]}
     >
+      <Style />
       {container}
     </Provider>
   );

package/templates/umi-mobile-h5+app/src/pages/404.tsx

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

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();

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

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { Image } from 'antd-mobile';
-import { List, ListVirtualizedScrollEvent } from '@baic/yolk-mobile';
+import { List, VirtualListScrollEvent } from '@baic/yolk-mobile';
 
-const rowCount = 100;
+const rowCount = 100000;
 
 const item = {
   avatar:
@@ -15,21 +15,21 @@ const mock = Array(rowCount).fill(item);
 
 export default () => {
   const onScrollHandler = React.useCallback(
-    async (e: ListVirtualizedScrollEvent) => {
+    async (e: VirtualListScrollEvent) => {
       console.log(e);
     },
     [],
   );
-  const virtualizedMemo = React.useMemo(
+  const virtualMemo = React.useMemo(
     () => ({
       height: 500,
-      rowHeight: 60,
-      onScroll: onScrollHandler,
+      itemHeight: 60,
+      onVirtualScroll: onScrollHandler,
     }),
     [onScrollHandler],
   );
   return (
-    <List header="拖拽" virtualized={virtualizedMemo} data={mock}>
+    <List header="虚拟化" virtual={virtualMemo} data={mock}>
       {({ name, avatar, description }, index, e) => {
         return (
           <List.Item

package/templates/umi-mobile-h5+app/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-h5+app/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-h5+app/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-h5+app/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-h5+app/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';
 
@@ -27,7 +28,7 @@ const { Panel } = Collapse;
 
 const tabs: Record<
   string,
-  React.FunctionComponent | Record<string, React.FunctionComponent>
+  FunctionComponent | Record<string, FunctionComponent>
 > = {
   BarCode,
   Iconfont,
@@ -55,14 +56,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}>
@@ -71,7 +72,7 @@ export default () => {
                   const tab2 = tab[key2];
                   return (
                     <Panel key={key2} title={key2}>
-                      {React.createElement(tab2)}
+                      {createElement(tab2)}
                     </Panel>
                   );
                 })}

package/templates/umi-mobile-h5+app/src/pages/index.tsx

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

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

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

package/templates/umi-mobile-h5+app/tsconfig.json

@@ -1,3 +1,6 @@
 {
-  "extends": "./src/.umi/tsconfig.json"
+  "extends": "./src/.umi/tsconfig.json",
+  "compilerOptions": {
+    "verbatimModuleSyntax": true
+  }
 }

package/templates/umi-mobile-native/.eslintignore

@@ -0,0 +1,6 @@
+.umi
+.umi-production
+node_modules/
+/public/
+/build/
+/dist/

package/templates/umi-mobile-native/.eslintrc.js

@@ -0,0 +1,8 @@
+/** @type {import('eslint').Linter.BaseConfig} */
+module.exports = {
+  extends: '@baic/eslint-config-yolk',
+  parserOptions: {
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
+};

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

@@ -4,11 +4,8 @@
 node_modules/
 npm-debug.log*
 npm-error.log*
-package-lock.json
-yarn.lock
 yarn-debug.log*
 yarn-error.log*
-pnpm-lock.yaml
 
 # production
 /dist
@@ -18,10 +15,10 @@ pnpm-lock.yaml
 .DS_Store
 
 # umi
-/src/.umi
-/src/.umi-production
-/src/.umi-test
-/.env.local
+.umi
+.umi-production
+.umi-test
+.env.local
 coverage
 .eslintcache
 .stylelintcache

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,2 @@
+/** @type {import('prettier').Config} */
+module.exports = require('@baic/prettier-config-yolk');

package/templates/umi-mobile-native/.stylelintignore

@@ -0,0 +1,6 @@
+.umi
+.umi-production
+node_modules/
+/public/
+/build/
+/dist/

package/templates/umi-mobile-native/.stylelintrc.js

@@ -0,0 +1,4 @@
+/** @type {import('stylelint').Config} */
+module.exports = {
+  extends: '@baic/stylelint-config-yolk',
+};

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

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

package/templates/umi-mobile-native/LICENSE

@@ -1,21 +1,22 @@
-MIT License
+MIT LICENSE
 
-Copyright (c) 2020 Baic
+Copyright (c) 2025 Baic<303394539@qq.com>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/templates/umi-mobile-native/README.md.tpl

@@ -4,20 +4,20 @@
 
 Install dependencies,
 
-{{ #dependenciesInstallType }}
+{{ #packageManager }}
 
 ```bash
-$ {{ dependenciesInstallType }} install
+$ {{ packageManager }} install
 ```
 
-{{ /dependenciesInstallType }}
-{{ ^dependenciesInstallType }}
+{{ /packageManager }}
+{{ ^packageManager }}
 
 ```bash
 $ pnpm install
 ```
 
-{{ /dependenciesInstallType }}
+{{ /packageManager }}
 
 Start the dev server,
 

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/biome.json

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

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

@@ -8,6 +8,12 @@
   "dependencies": {
     "@baic/preset-yolk-umi-mobile": "~{{ yolkVersion }}"
   },
+  "resolutions": {
+    "@types/react": "18.x",
+    "@types/react-dom": "18.x",
+    "react": "18.x",
+    "react-dom": "18.x"
+  },
   "pnpm": {
     "peerDependencyRules": {
       "ignoreMissing": "*"

package/templates/umi-mobile-native/src/app.tsx

@@ -1,9 +1,7 @@
-import { Provider } from '@baic/yolk-mobile';
+import { Provider, Style } 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
@@ -13,6 +11,7 @@ export function rootContainer(container: React.ReactNode) {
         '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
       ]}
     >
+      <Style />
       {container}
     </Provider>
   );

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 = {
@@ -26,11 +26,11 @@ class Bluetooth {
 
   // private connectedDeviceId: string = '';
 
-  private listenServicesTimeoutId?: NodeJS.Timeout;
+  private listenServicesTimeoutId?: any;
 
-  private writeTimeoutId?: NodeJS.Timeout;
+  private writeTimeoutId?: any;
 
-  private readTimeoutId?: NodeJS.Timeout;
+  private readTimeoutId?: any;
 
   private isNotifyInterval?: boolean;
 
@@ -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(
@@ -322,15 +322,15 @@ class Bluetooth {
     const { bluetooth } = window.plus || {};
     if (this.listenServicesTimeoutId) {
       clearTimeout(this.listenServicesTimeoutId);
-      this.listenServicesTimeoutId = undefined;
+      this.listenServicesTimeoutId = void 0;
     }
     if (this.writeTimeoutId) {
       clearTimeout(this.writeTimeoutId);
-      this.writeTimeoutId = undefined;
+      this.writeTimeoutId = void 0;
     }
     if (this.readTimeoutId) {
       clearTimeout(this.readTimeoutId);
-      this.readTimeoutId = undefined;
+      this.readTimeoutId = void 0;
     }
     try {
       const discovering = await this.isAvailableAdapter();