@baic/yolk-cli 2.1.0-alpha.103 → 2.1.0-alpha.105

package/templates/umi-mobile/src/pages/demo/index.tsx

@@ -1,8 +1,9 @@
-import * as React from 'react';
-
 import _ from 'lodash';
 
-import { Tabs, Collapse } from 'antd-mobile';
+import type { FunctionComponent } from 'react';
+import { createElement } from 'react';
+
+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,
@@ -58,7 +59,7 @@ export default () => {
         if (_.isFunction(tab)) {
           return (
             <Tab key={key} title={key}>
-              {React.createElement(tab)}
+              {createElement(tab)}
             </Tab>
           );
         }
@@ -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/umi-mobile/src/pages/index.tsx

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

package/templates/umi-mobile-h5+app/.umirc.ts.tpl

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

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-web/.umirc.ts.tpl

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

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

@@ -103,7 +103,7 @@ 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)) {
           return (
@@ -117,7 +117,7 @@ export default () => {
           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}>
@@ -129,6 +129,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-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/src/components/resize-container/index.tsx

@@ -1,7 +1,8 @@
 import _ from 'lodash';
 import classnames from 'classnames';
 
-import * as React from 'react';
+import type { ReactNode, RefObject } from 'react';
+import { forwardRef, useImperativeHandle, useMemo, useRef } from 'react';
 
 import { useSize } from 'ahooks';
 
@@ -15,15 +16,15 @@ export type ContainerInstance = {
 };
 
 type ResizeContainerProps = {
-  children?: React.ReactNode | ((e: ContainerInstance) => React.ReactNode);
+  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,
@@ -35,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)
         ? getContainer()
         : () => containerRef.current?.parentElement || null,
     ) || { width: 0, height: 0 };
-    const instance = React.useMemo(() => {
+    const instance = useMemo(() => {
       let res = {
         width,
         height,
@@ -72,8 +73,8 @@ const Component = React.forwardRef<ContainerInstance, ResizeContainerProps>(
       }
       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;

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