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

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,21 +1,22 @@
-MIT License
+MIT LICENSE
 
-Copyright (c) 2022 Baic
+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:
+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-web/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-web/biome.json

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

package/templates/umi-web/package.json.tpl

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

package/templates/umi-web/src/app.tsx

@@ -1,9 +1,7 @@
-import { Provider } from '@baic/yolk-web';
+import { Provider, Style } from '@baic/yolk-web';
 
 import request from '@/common/request';
 
-import '@baic/yolk-web/es/style/index.less';
-
 export function rootContainer(container: React.ReactNode) {
   return (
     <Provider
@@ -14,6 +12,7 @@ export function rootContainer(container: React.ReactNode) {
         '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
       ]}
     >
+      <Style />
       {container}
     </Provider>
   );

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

@@ -1,8 +1,8 @@
-import path from 'path';
+import path from 'node:path';
 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,21 +1,22 @@
-MIT License
+MIT LICENSE
 
-Copyright (c) 2022 Baic
+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:
+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-web-screen/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-web-screen/biome.json

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

package/templates/umi-web-screen/package.json.tpl

@@ -9,6 +9,12 @@
     "@ant-design/charts": "1.x",
     "@baic/preset-yolk-umi-web": "~{{ yolkVersion }}"
   },
+  "resolutions": {
+    "@types/react": "18.x",
+    "@types/react-dom": "18.x",
+    "react": "18.x",
+    "react-dom": "18.x"
+  },
   "pnpm": {
     "peerDependencyRules": {
       "ignoreMissing": "*"

package/templates/umi-web-screen/src/app.tsx

@@ -1,9 +1,7 @@
-import { Provider } from '@baic/yolk-web';
+import { Provider, Style } from '@baic/yolk-web';
 
 import request from '@/common/request';
 
-import '@baic/yolk-web/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-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"