@baic/yolk-cli 2.1.0-alpha.20 → 2.1.0-alpha.201

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,5 @@ import { defineConfig } from '@baic/yolk-umi';
 
 export default defineConfig({
   title: '{{ projectName }}',
-  publicPath: '/',
   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" }
-    }
-  ]
-}

package/templates/ice-mobile/.stylelintrc

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

package/templates/ice-mobile/README.md.tpl

@@ -1,34 +0,0 @@
-# web
-
-## Getting Started
-
-Install dependencies,
-
-{{ #dependenciesInstallType }}
-
-```bash
-$ {{ dependenciesInstallType }} install
-```
-
-{{ /dependenciesInstallType }}
-{{ ^dependenciesInstallType }}
-
-```bash
-$ pnpm install
-```
-
-{{ /dependenciesInstallType }}
-
-Start the dev server,
-
-```bash
-$ npm start
-```
-
-Build,
-
-```bash
-$ npm run build
-```
-
-[查阅文档](https://303394539.github.io/yolk-docs/)

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

@@ -1,16 +0,0 @@
-{
-  "private": true,
-  "name": "{{ projectName }}",
-  "scripts": {
-    "start": "yolk start",
-    "build": "yolk build"
-  },
-  "dependencies": {
-    "@baic/preset-yolk-ice-mobile": "~{{ yolkVersion }}"
-  },
-  "pnpm": {
-    "peerDependencyRules": {
-      "ignoreMissing": "*"
-    }
-  }
-}

package/templates/ice-mobile/public/index.html

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="x-ua-compatible" content="IE=edge,chrome=1" />
-    <meta name="renderer" content="webkit" />
-    <meta name="format-detection" content="telephone=no" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
-    <title></title>
-  </head>
-
-  <body>
-    <div id="yolk-app"></div>
-  </body>
-</html>

package/templates/ice-mobile/src/app.tsx

@@ -1,5 +0,0 @@
-import { runApp } from 'ice';
-
-import '@baic/yolk-mobile/es/style/index.less';
-
-runApp();

package/templates/ice-mobile/src/common/request.ts

@@ -1,3 +0,0 @@
-import { Request } from '@baic/yolk-mobile';
-
-export default new Request();

package/templates/ice-mobile/src/common/util.ts

@@ -1,7 +0,0 @@
-import { Util } from '@baic/yolk-mobile';
-
-const util = {
-  ...Util,
-};
-
-export default util;

package/templates/ice-mobile/src/global.less

@@ -1,3 +0,0 @@
-#yolk-app {
-  height: 100%;
-}

package/templates/ice-mobile/src/layouts/index.tsx

@@ -1,5 +0,0 @@
-import * as React from 'react';
-
-export default ({ children }: { children?: React.ReactNode }) => (
-  <>{children}</>
-);

package/templates/ice-mobile/src/pages/404.tsx

@@ -1,10 +0,0 @@
-import * as React from 'react';
-import { Result } from 'antd-mobile';
-
-export default () => (
-  <Result
-    title="404"
-    description="对不起，您访问的页面不存在。"
-    status="warning"
-  />
-);

package/templates/ice-mobile/src/pages/demo/examples/BarCode.tsx

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

package/templates/ice-mobile/src/pages/demo/examples/Iconfont.tsx

@@ -1,18 +0,0 @@
-import * as React from 'react';
-import { Provider, Iconfont } from '@baic/yolk-mobile';
-
-export default () => {
-  return (
-    <Provider
-      iconfontScriptUrl={[
-        '//at.alicdn.com/t/font_1788044_0dwu4guekcwr.js',
-        '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
-      ]}
-    >
-      <Iconfont type="icon-javascript" />
-      <Iconfont type="icon-java" />
-      <Iconfont type="icon-shoppingcart" />
-      <Iconfont type="icon-python" />
-    </Provider>
-  );
-};

package/templates/ice-mobile/src/pages/demo/examples/Input.tsx

@@ -1,17 +0,0 @@
-import * as React from 'react';
-import { Form } from 'antd-mobile';
-import { Input, useForm } from '@baic/yolk-mobile';
-
-export default () => {
-  const [form] = useForm();
-  const { createFormItem } = form;
-  return (
-    <Form form={form}>
-      {createFormItem({
-        label: 'Input',
-        name: 'Input',
-        rules: 'required',
-      })(<Input maxLength={5} />)}
-    </Form>
-  );
-};

package/templates/ice-mobile/src/pages/demo/examples/List/1.tsx

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

package/templates/ice-mobile/src/pages/demo/examples/List/2.tsx

@@ -1,29 +0,0 @@
-import * as React from 'react';
-import { Image } from 'antd-mobile';
-import { List } from '@baic/yolk-mobile';
-
-import mock from './mock';
-
-export default () => {
-  return (
-    <List header="函数渲染" data={mock}>
-      {({ name, avatar, description }) => (
-        <List.Item
-          key={name}
-          prefix={
-            <Image
-              src={avatar}
-              style={{ borderRadius: 20 }}
-              fit="cover"
-              width={40}
-              height={40}
-            />
-          }
-          description={description}
-        >
-          {name}
-        </List.Item>
-      )}
-    </List>
-  );
-};

package/templates/ice-mobile/src/pages/demo/examples/List/3.tsx

@@ -1,29 +0,0 @@
-import * as React from 'react';
-import { Image } from 'antd-mobile';
-import { List } from '@baic/yolk-mobile';
-
-import mock from './mock';
-
-export default () => {
-  return (
-    <List header="拖拽" drag data={mock}>
-      {({ name, avatar, description }) => (
-        <List.Item
-          key={name}
-          prefix={
-            <Image
-              src={avatar}
-              style={{ borderRadius: 20 }}
-              fit="cover"
-              width={40}
-              height={40}
-            />
-          }
-          description={description}
-        >
-          {name}
-        </List.Item>
-      )}
-    </List>
-  );
-};