@baic/yolk-cli 2.1.0-alpha.24 → 2.1.0-alpha.241

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-mobile-uni-app/.eslintrc.js

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

package/templates/{ice-mobile → umi-mobile-uni-app}/.gitignore.tpl

@@ -1,33 +1,33 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
+# 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
-build/
-dist/
-tmp/
-lib/
+/dist
+/build
 
 # misc
-.idea/
-.happypack
 .DS_Store
-*.swp
-*.dia~
-.ice
 
-*less.d.ts*
-*scss.d.ts*
+# umi
+.umi
+.umi-production
+.umi-test
+.env.local
+coverage
 .eslintcache
 .stylelintcache
+*less.d.ts*
+*scss.d.ts*
+.mfsu*
+
+# ide
+.vscode
 
 # h5+app
 /h5+app/unpackage/cache

package/templates/umi-mobile-uni-app/.prettierignore

@@ -0,0 +1,12 @@
+**/*.md
+**/*.svg
+**/*.ejs
+**/*.html
+package-lock.json
+yarn.lock
+yarn-debug.log
+yarn-error.log
+pnpm-lock.yaml
+.umi
+.umi-production
+.umi-test

package/templates/umi-mobile-uni-app/.prettierrc.js

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

package/templates/umi-mobile-uni-app/.umirc.ts.tpl

@@ -0,0 +1,7 @@
+import { defineConfig } from '@baic/yolk-umi';
+
+export default defineConfig({
+  title: '{{ projectName }}',
+  hd: {},
+  'uni-app': {},
+});

package/templates/umi-mobile-uni-app/LICENSE

@@ -0,0 +1,22 @@
+MIT LICENSE
+
+Copyright (c) 2024 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:
+
+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.

package/templates/{ice-mobile-h5+app → umi-mobile-uni-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-uni-app/biome.json

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

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/package.json.tpl

@@ -6,7 +6,13 @@
     "build": "yolk build"
   },
   "dependencies": {
-    "@baic/preset-yolk-ice-mobile": "~{{ yolkVersion }}"
+    "@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": {

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

@@ -0,0 +1,18 @@
+import { Provider, Style } from '@baic/yolk-mobile';
+
+import request from '@/common/request';
+
+export function rootContainer(container: React.ReactNode) {
+  return (
+    <Provider
+      request={request}
+      iconfontScriptUrl={[
+        '//at.alicdn.com/t/font_1788044_0dwu4guekcwr.js',
+        '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
+      ]}
+    >
+      <Style />
+      {container}
+    </Provider>
+  );
+}

package/templates/umi-mobile-uni-app/src/layouts/index.tsx

@@ -0,0 +1,3 @@
+import { Outlet } from 'umi';
+
+export default () => <Outlet />;

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/404.tsx

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

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/BarCode.tsx

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

package/templates/{ice-web → umi-mobile-uni-app}/src/pages/demo/examples/Iconfont.tsx

@@ -1,5 +1,4 @@
-import * as React from 'react';
-import { Provider, Iconfont } from '@baic/yolk-web';
+import { Iconfont, Provider } from '@baic/yolk-mobile';
 
 export default () => {
   return (

package/templates/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/Input.tsx

@@ -1,6 +1,4 @@
-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/{ice-mobile-native → umi-mobile-uni-app}/src/pages/demo/examples/List/1.tsx

@@ -1,9 +1,8 @@
-import * as React from 'react';
 import { List } from '@baic/yolk-mobile';
 
 export default () => {
   return (
-    <List header='基础用法'>
+    <List header="基础用法">
       <List.Item>1</List.Item>
       <List.Item>2</List.Item>
       <List.Item>3</List.Item>

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/List/2.tsx

@@ -1,5 +1,5 @@
-import * as React from 'react';
 import { Image } from 'antd-mobile';
+
 import { List } from '@baic/yolk-mobile';
 
 import mock from './mock';

package/templates/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/List/3.tsx

@@ -1,5 +1,5 @@
-import * as React from 'react';
 import { Image } from 'antd-mobile';
+
 import { List } from '@baic/yolk-mobile';
 
 import mock from './mock';

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/List/4.tsx

@@ -1,8 +1,10 @@
-import * as React from 'react';
+import { useCallback, useMemo } from 'react';
+
 import { Image } from 'antd-mobile';
-import { List, ListVirtualizedScrollEvent } from '@baic/yolk-mobile';
 
-const rowCount = 100;
+import { List, VirtualListScrollEvent } from '@baic/yolk-mobile';
+
+const rowCount = 100000;
 
 const item = {
   avatar:
@@ -14,22 +16,19 @@ const item = {
 const mock = Array(rowCount).fill(item);
 
 export default () => {
-  const onScrollHandler = React.useCallback(
-    async (e: ListVirtualizedScrollEvent) => {
-      console.log(e);
-    },
-    [],
-  );
-  const virtualizedMemo = React.useMemo(
+  const onScrollHandler = useCallback(async (e: VirtualListScrollEvent) => {
+    console.log(e);
+  }, []);
+  const virtualMemo = 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/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/Loading.tsx

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

package/templates/{ice-mobile-native → umi-mobile-uni-app}/src/pages/demo/examples/NumberInput/1.tsx

@@ -1,6 +1,4 @@
-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/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/NumberInput/2.tsx

@@ -1,6 +1,4 @@
-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/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/NumberInput/3.tsx

@@ -1,6 +1,4 @@
-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/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/NumberInput/4.tsx

@@ -1,6 +1,4 @@
-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/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/PagingList/1.tsx

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

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/QrCode.tsx

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

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

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

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/TimerButton.tsx

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

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

@@ -1,6 +1,6 @@
-import * as React from 'react';
 import { Util } from '@baic/yolk';
 import { usePreload } from '@baic/yolk-mobile';
+
 export default () => {
   const [wrap] = usePreload(async () => {
     await Util.delay(1000);

package/templates/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/index.tsx

@@ -1,8 +1,9 @@
-import * as React from 'react';
+import { isFunction, isObject } from 'lodash';
 
-import _ from 'lodash';
+import type { FunctionComponent } from 'react';
+import { createElement } from 'react';
 
-import { Tabs, Collapse } from 'antd-mobile';
+import { Collapse, Tabs } from 'antd-mobile';
 
 import BarCode from './examples/BarCode';
 import Iconfont from './examples/Iconfont';
@@ -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>
                   );
                 })}
@@ -79,9 +80,8 @@ export default () => {
             </Tab>
           );
         }
+        return null;
       })}
     </Tabs>
   );
 };
-
-// export default () => <PagingList_1 />;

package/templates/{ice-mobile-native → umi-mobile-uni-app}/src/pages/index.tsx

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

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

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

package/templates/umi-mobile-uni-app/tsconfig.json

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

package/templates/umi-mobile-uni-app/typings.d.ts

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

package/templates/umi-mobile-uni-app/uni-app/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" 
+  package="xxx">
+    <application>
+        <!--meta-data-->
+		
+    </application>
+</manifest>

package/templates/umi-mobile-uni-app/uni-app/App.vue

@@ -0,0 +1,28 @@
+<script lang="ts">
+	export default {
+		onLaunch: function () {
+			// #ifndef APP-PLUS
+			console.log('App Launch');
+			// #endif
+		},
+		onShow: function () {
+			// #ifndef APP-PLUS
+			console.log('App Show');
+			// #endif
+		},
+		onHide: function () {
+			// #ifndef APP-PLUS
+			console.log('App Hide');
+			// #endif
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style lang="scss">
+	/*每个页面公共css */
+	// #ifndef APP-PLUS
+
+	// #endif
+</style>

package/templates/umi-mobile-uni-app/uni-app/androidPrivacy.json

@@ -0,0 +1,22 @@
+{
+    "version" : "1.0.0",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "default",
+    "backToExit" : "true",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "进入应用前，你需先同意<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : true,
+        "visitorEntry" : false,
+        "showAlways" : true
+    }
+}

package/templates/umi-mobile-uni-app/uni-app/assets/apple-app-site-association

@@ -0,0 +1,11 @@
+{
+  "applinks": {
+    "apps": [],
+    "details": [
+      {
+        "appID": "",
+        "paths": [""]
+      }
+    ]
+  }
+}

package/templates/umi-mobile-uni-app/uni-app/common/constants.ts

@@ -0,0 +1,5 @@
+export const NAME = 'demo';
+
+export const REQUEST_HOST = 'https://xxx';
+
+export const H5_INDEX = `${REQUEST_HOST}/#/`;