@baic/yolk-cli 2.1.0-alpha.22 → 2.1.0-alpha.221

package/templates/umi-mobile-uni-app/uni-app/pages/webview/index.vue

@@ -0,0 +1,19 @@
+<style scoped lang="scss">
+</style>
+<template>
+	<webview ref="webview" :url="url" />
+</template>
+
+<script lang="ts">
+	export default {
+		data() : {
+			url ?: string;
+		} {
+			return {
+			};
+		},
+		async onLoad({ url }) {
+			this.url = decodeURIComponent(url || '');
+		},
+	}
+</script>

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

@@ -0,0 +1,22 @@
+{
+	"pages": [
+		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index"
+		},
+		{
+			"path": "pages/webview/index"
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "white",
+		"navigationBarTitleText": "xxx",
+		"backgroundColor": "#FFFFFF",
+		"dynamicRpx": true,
+		"app-plus": {
+			"scrollIndicator": "none",
+			"background": "#FFFFFF",
+			"softinputNavBar": "auto"
+		}
+	}
+}

package/templates/umi-mobile-uni-app/uni-app/uni.promisify.adaptor.js

@@ -0,0 +1,16 @@
+uni.addInterceptor({
+  returnValue(res) {
+    if (
+      !(
+        !!res &&
+        (typeof res === 'object' || typeof res === 'function') &&
+        typeof res.then === 'function'
+      )
+    ) {
+      return res;
+    }
+    return new Promise((resolve, reject) => {
+      res.then((res) => (res[0] ? reject(res[0]) : resolve(res[1])));
+    });
+  },
+});

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

@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color: #333; //基本色
+$uni-text-color-inverse: #fff; //反色
+$uni-text-color-grey: #999; //辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable: #c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color: #fff;
+$uni-bg-color-grey: #f8f8f8;
+$uni-bg-color-hover: #f1f1f1; //点击状态颜色
+$uni-bg-color-mask: rgba(0, 0, 0, 40%); //遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color: #c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm: 12px;
+$uni-font-size-base: 14px;
+$uni-font-size-lg: 16;
+
+/* 图片尺寸 */
+$uni-img-size-sm: 20px;
+$uni-img-size-base: 26px;
+$uni-img-size-lg: 40px;
+
+/* Border Radius */
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2c405a; // 文章标题颜色
+$uni-font-size-title: 20px;
+$uni-color-subtitle: #555; // 二级标题颜色
+$uni-font-size-subtitle: 26px;
+$uni-color-paragraph: #3f536e; // 文章段落颜色
+$uni-font-size-paragraph: 15px;

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/prettier-config-yolk');

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

@@ -2,5 +2,5 @@ import { defineConfig } from '@baic/yolk-umi';
 
 export default defineConfig({
   title: '{{ projectName }}',
-  publicPath: '/',
+  antd: {},
 });

package/templates/umi-web/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Baic
+Copyright (c) 2024 Baic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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/prettier-config-yolk');

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

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

package/templates/umi-web-screen/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Baic
+Copyright (c) 2024 Baic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

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

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

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;
-}
+};

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,34 +0,0 @@
-# See https://help.github.com/ignore-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/
-
-# misc
-.idea/
-.happypack
-.DS_Store
-*.swp
-*.dia~
-.ice
-
-*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';
-
-export default defineConfig({ hd: {} });

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

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

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" }
-    }
-  ]
-}