create-packer 1.38.2 → 1.39.1

package/template/web-app/react-vite/pages/home/{home.mock.ts → view.mock.ts}

@@ -1,19 +1,19 @@
-import { faker } from '@faker-js/faker'
-import { defineMock } from '@/mockUtils'
-import { API } from '@/shared/service'
-
-export default defineMock([
-    {
-        url: API.HOME_DATA,
-        body: faker.helpers.multiple(
-            () => ({
-                id: faker.string.uuid(),
-                name: faker.person.fullName(),
-                age: faker.number.int({ max: 110 })
-            }),
-            {
-                count: 10
-            }
-        )
-    }
-])
+import { faker } from '@faker-js/faker'
+import { defineMock } from '@/mockUtils'
+import { API } from '@/shared/service'
+
+export default defineMock([
+    {
+        url: API.HOME_DATA,
+        body: faker.helpers.multiple(
+            () => ({
+                id: faker.string.uuid(),
+                name: faker.person.fullName(),
+                age: faker.number.int({ max: 110 })
+            }),
+            {
+                count: 10
+            }
+        )
+    }
+])

package/template/web-app/{react-webpack/pages/home/home.styled.ts → react-vite/pages/home/view.styled.ts}

@@ -1,7 +1,7 @@
-import styled, { css } from 'styled-components'
-
-export const StyledRoot = styled.div(({ theme }) => {
-    return css`
-        ${theme.tools.flex('center', 'center')};
-    `
-})
+import styled, { css } from 'styled-components'
+
+export const StyledRoot = styled.div(({ theme }) => {
+    return css`
+        ${theme.tools.flex('center', 'center')};
+    `
+})

package/template/web-app/react-vite/pages/home/{home.tsx → view.tsx}

@@ -1,10 +1,10 @@
-import { useHomeQuery } from '@/shared/service'
-import { StyledRoot } from './home.styled'
-
-export default function Home() {
-    const query = useHomeQuery()
-
-    console.log('data', query.data)
-
-    return <StyledRoot>sdfs</StyledRoot>
-}
+import { useHomeQuery } from '@/shared/service'
+import { StyledRoot } from './view.styled'
+
+export default function Home() {
+    const query = useHomeQuery()
+
+    console.log('data', query.data)
+
+    return <StyledRoot>sdfs</StyledRoot>
+}

package/template/web-app/{react-rsbuild/shared/tools → react-vite/shared/components}/componentInstance.tsx

@@ -1,80 +1,80 @@
-import {
-    forwardRef,
-    ForwardRefExoticComponent,
-    FunctionComponent,
-    PropsWithChildren,
-    PropsWithoutRef,
-    RefAttributes,
-    useImperativeHandle,
-    useRef,
-    useState
-} from 'react'
-import { createRoot } from 'react-dom/client'
-
-const instanceMap: Record<string, { pending: Promise<any>; instance: any }> = {}
-
-export interface refsType<P> {
-    $setProps: (newProps: P) => void
-    $updateProps: (newProps: Partial<P>) => void
-}
-
-export function create(Context?: FunctionComponent<PropsWithChildren<any>>) {
-    return async function <P extends Record<string, any>, Refs extends Record<string, any>>(
-        key: string,
-        Component: ForwardRefExoticComponent<PropsWithoutRef<P> & RefAttributes<Refs>>,
-        props?: P
-    ) {
-        let current = instanceMap[key]
-        if (!current) {
-            const div = document.createElement('div')
-            document.body.appendChild(div)
-            const ApiComponent = forwardRef<Refs & refsType<P>>((__, refs) => {
-                const ref = useRef<Refs>(null)
-                const [state, setState] = useState<Partial<P>>(props || {})
-
-                useImperativeHandle(refs, () => {
-                    return {
-                        $setProps: newProps => {
-                            setState(() => newProps)
-                        },
-                        $updateProps: newProps => {
-                            if (newProps) {
-                                setState(state => ({ ...state, ...newProps }))
-                            }
-                        },
-                        ...ref.current
-                    } as Refs & refsType<P>
-                })
-                if (Context) {
-                    return (
-                        <Context>
-                            <Component ref={ref} {...(state as any)} />
-                        </Context>
-                    )
-                }
-                return <Component ref={ref} {...(state as any)} />
-            })
-            current = instanceMap[key] = {
-                instance: void 0,
-                pending: new Promise<void>(resolve => {
-                    createRoot(div).render(
-                        (
-                            <ApiComponent
-                                ref={instance => {
-                                    current.instance = instanceMap[key].instance = instance!
-                                    resolve()
-                                }}
-                            />
-                        ) as never
-                    )
-                })
-            }
-        }
-        await current.pending
-        props && current.instance.$setProps(props)
-        // Delay return to avoid sync issue
-        // ------------------------------------------------------------------------
-        await new Promise(resolve => setTimeout(resolve))
-        return current.instance as Refs & refsType<P>
-    }
-}
+import {
+    forwardRef,
+    ForwardRefExoticComponent,
+    FunctionComponent,
+    PropsWithChildren,
+    PropsWithoutRef,
+    RefAttributes,
+    useImperativeHandle,
+    useRef,
+    useState
+} from 'react'
+import { createRoot } from 'react-dom/client'
+
+const instanceMap: Record<string, { pending: Promise<any>; instance: any }> = {}
+
+export interface refsType<P> {
+    $setProps: (newProps: P) => void
+    $updateProps: (newProps: Partial<P>) => void
+}
+
+export function create(Context?: FunctionComponent<PropsWithChildren<any>>) {
+    return async function <P extends Record<string, any>, Refs extends Record<string, any>>(
+        key: string,
+        Component: ForwardRefExoticComponent<PropsWithoutRef<P> & RefAttributes<Refs>>,
+        props?: P
+    ) {
+        let current = instanceMap[key]
+        if (!current) {
+            const div = document.createElement('div')
+            document.body.appendChild(div)
+            const ApiComponent = forwardRef<Refs & refsType<P>>((__, refs) => {
+                const ref = useRef<Refs>(null)
+                const [state, setState] = useState<Partial<P>>(props || {})
+
+                useImperativeHandle(refs, () => {
+                    return {
+                        $setProps: newProps => {
+                            setState(() => newProps)
+                        },
+                        $updateProps: newProps => {
+                            if (newProps) {
+                                setState(state => ({ ...state, ...newProps }))
+                            }
+                        },
+                        ...ref.current
+                    } as Refs & refsType<P>
+                })
+                if (Context) {
+                    return (
+                        <Context>
+                            <Component ref={ref} {...(state as any)} />
+                        </Context>
+                    )
+                }
+                return <Component ref={ref} {...(state as any)} />
+            })
+            current = instanceMap[key] = {
+                instance: void 0,
+                pending: new Promise<void>(resolve => {
+                    createRoot(div).render(
+                        (
+                            <ApiComponent
+                                ref={instance => {
+                                    current.instance = instanceMap[key].instance = instance!
+                                    resolve()
+                                }}
+                            />
+                        ) as never
+                    )
+                })
+            }
+        }
+        await current.pending
+        current.instance.$setProps(props)
+        // Delay return to avoid sync issue
+        // ------------------------------------------------------------------------
+        await new Promise(resolve => setTimeout(resolve))
+        return current.instance as Refs & refsType<P>
+    }
+}

package/template/web-app/react-vite/shared/components/index.ts

@@ -0,0 +1 @@
+export * as componentInstance from './componentInstance'

package/template/web-app/react-vite/shared/service/home.ts

@@ -1,10 +1,10 @@
-import { useQuery } from '@tanstack/react-query'
-import { request } from './request'
-import { HOME_DATA } from './api'
-
-export function useHomeQuery() {
-    return useQuery({
-        queryKey: ['home_data'],
-        queryFn: () => request.post(HOME_DATA)
-    })
-}
+import { useQuery } from '@tanstack/react-query'
+import { request } from './request'
+import { HOME_DATA } from './api'
+
+export function useHomeQuery() {
+    return useQuery({
+        queryKey: ['home_data'],
+        queryFn: () => request.post(HOME_DATA)
+    })
+}

package/template/web-app/react-vite/shared/theme/theme.styled.ts

@@ -1,56 +1,55 @@
-import { CSSProperties } from 'react'
-import { AnyFunc } from '1k-types'
-import { isString } from 'lodash-es'
-
-export const theme = {
-    tools: {
-        ellipsis: () => ({
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
-            whiteSpace: 'nowrap'
-        }),
-        lineClamp: (n: number) => ({
-            '-webkit-line-clamp': `${n}`,
-            '-webkit-box-orient': 'vertical',
-            overflow: 'hidden',
-            display: '-webkit-box'
-        }),
-        size: (s: string) => ({ width: s, height: s }),
-        py: (s: string) => ({ paddingTop: s, paddingBottom: s }),
-        px: (s: string) => ({ paddingLeft: s, paddingRight: s }),
-        my: (s: string) => ({ marginTop: s, marginBottom: s }),
-        mx: (s: string) => ({ marginLeft: s, marginRight: s }),
-        flex: (
-            align: CSSProperties['alignItems'],
-            justify: CSSProperties['justifyContent'],
-            vertical?: boolean
-        ) => {
-            return {
-                display: 'flex',
-                alignItems: align,
-                justifyContent: justify,
-                flexDirection: vertical ? 'column' : 'row'
-            } satisfies CSSProperties
-        },
-        /** 数字为元素数量，字符串为对应css的值  */
-        grid: {
-            grid: (rows: number | string, cols: number | string, gap?: number) => ({
-                display: 'grid',
-                gridTemplateRows: isString(rows) ? rows : `repeat(${rows}, minmax(0, 1fr))`,
-                gridTemplateColumns: isString(cols) ? cols : `repeat(${cols}, minmax(0, 1fr))`,
-                gap: gap ? `${gap}px` : void 0
-            }),
-            rows: (rows: number | string, gap?: number) => ({
-                display: 'grid',
-                gridTemplateRows: isString(rows) ? rows : `repeat(${rows}, minmax(0, 1fr))`,
-                rowGap: gap ? `${gap}px` : void 0
-            }),
-            cols: (cols: number | string, gap?: number) => ({
-                display: 'grid',
-                gridTemplateColumns: isString(cols) ? cols : `repeat(${cols}, minmax(0, 1fr))`,
-                columnGap: gap ? `${gap}px` : void 0
-            })
-        } satisfies Record<string, AnyFunc<CSSProperties>>
-    }
-}
-export type themeType = typeof theme
+import { CSSProperties } from 'react'
+import { isString } from 'lodash-es'
+
+export const theme = {
+    tools: {
+        ellipsis: () => ({
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap'
+        }),
+        lineClamp: (n: number) => ({
+            '-webkit-line-clamp': `${n}`,
+            '-webkit-box-orient': 'vertical',
+            overflow: 'hidden',
+            display: '-webkit-box'
+        }),
+        size: (s: string) => ({ width: s, height: s }),
+        py: (s: string) => ({ paddingTop: s, paddingBottom: s }),
+        px: (s: string) => ({ paddingLeft: s, paddingRight: s }),
+        my: (s: string) => ({ marginTop: s, marginBottom: s }),
+        mx: (s: string) => ({ marginLeft: s, marginRight: s }),
+        flex: (
+            align: CSSProperties['alignItems'],
+            justify: CSSProperties['justifyContent'],
+            vertical?: boolean
+        ) => {
+            return {
+                display: 'flex',
+                alignItems: align,
+                justifyContent: justify,
+                flexDirection: vertical ? 'column' : 'row'
+            } satisfies CSSProperties
+        },
+        /** 数字为元素数量，字符串为对应css的值  */
+        grid: {
+            grid: (rows: number | string, cols: number | string, gap?: number) => ({
+                display: 'grid',
+                gridTemplateRows: isString(rows) ? rows : `repeat(${rows}, minmax(0, 1fr))`,
+                gridTemplateColumns: isString(cols) ? cols : `repeat(${cols}, minmax(0, 1fr))`,
+                gap: gap ? `${gap}px` : void 0
+            }),
+            rows: (rows: number | string, gap?: number) => ({
+                display: 'grid',
+                gridTemplateRows: isString(rows) ? rows : `repeat(${rows}, minmax(0, 1fr))`,
+                rowGap: gap ? `${gap}px` : void 0
+            }),
+            cols: (cols: number | string, gap?: number) => ({
+                display: 'grid',
+                gridTemplateColumns: isString(cols) ? cols : `repeat(${cols}, minmax(0, 1fr))`,
+                columnGap: gap ? `${gap}px` : void 0
+            })
+        } satisfies Record<string, (...args: any) => CSSProperties>
+    }
+}
+export type themeType = typeof theme

package/template/web-app/react-vite/shared/tools/index.ts

@@ -1 +0,0 @@
-export * as componentInstance from './componentInstance'

package/template/web-app/react-vite/vite.config.ts

@@ -1,76 +1,80 @@
-import { defineConfig, loadEnv } from 'vite'
-import react from '@vitejs/plugin-react'
-import svgr from 'vite-plugin-svgr'
-import mockDevServer from 'vite-plugin-mock-dev-server'
-import stylelint from 'vite-plugin-stylelint'
-import eslint from '@rollup/plugin-eslint'
-import { visualizer } from 'rollup-plugin-visualizer'
-import { includes } from 'lodash-es'
-import { createChunks } from './scripts'
-
-// https://vitejs.dev/config/
-export default defineConfig(({ mode }) => {
-    const env = loadEnv(mode, process.cwd(), '')
-    const proxyBaseUrl = env.VITE_BASE_URL + env.VITE_API_HOST
-    const plugins: any[] = [
-        svgr(),
-        stylelint({ cache: false, include: ['**/*.{css,scss,sass,less,styl,ts,tsx}'] }),
-        eslint({ include: ['**/*.{ts,tsx,js,jsx}'] }),
-        react({
-            babel: {
-                plugins: [
-                    [
-                        'babel-plugin-styled-components',
-                        {
-                            ssr: false,
-                            displayName: false,
-                            fileName: false,
-                            transpileTemplateLiterals: false
-                        }
-                    ]
-                ]
-            }
-        }),
-        mockDevServer({
-            include: ['**/*.mock.{ts,js}']
-        })
-    ]
-
-    if (mode === 'analyse') {
-        plugins.push(visualizer({ open: true, sourcemap: true, brotliSize: true, gzipSize: true }))
-    }
-
-    return {
-        base: env.VITE_BASE_URL,
-        plugins,
-        resolve: {
-            alias: {
-                '@': __dirname
-            }
-        },
-        esbuild: {
-            drop: includes(['production', 'analyse'], mode) ? ['console', 'debugger'] : []
-        },
-        build: {
-            sourcemap: mode === 'analyse',
-            reportCompressedSize: mode === 'analyse',
-            rollupOptions: {
-                output: {
-                    manualChunks: createChunks({
-                        react: ['react', 'react-dom']
-                    })
-                }
-            }
-        },
-        server: {
-            host: '0.0.0.0',
-            proxy: {
-                [proxyBaseUrl]: {
-                    target: 'http://127.0.0.1',
-                    changeOrigin: true,
-                    rewrite: path => path.replace(proxyBaseUrl, '')
-                }
-            }
-        }
-    }
-})
+import { defineConfig, loadEnv } from 'vite'
+import react from '@vitejs/plugin-react'
+import svgr from 'vite-plugin-svgr'
+import mockDevServer from 'vite-plugin-mock-dev-server'
+import checker from 'vite-plugin-checker'
+import stylelint from 'vite-plugin-stylelint'
+import { visualizer } from 'rollup-plugin-visualizer'
+import { includes } from 'lodash-es'
+import { createChunks } from './scripts'
+
+// https://vitejs.dev/config/
+export default defineConfig(({ mode }) => {
+    const env = loadEnv(mode, process.cwd(), '')
+    const proxyBaseUrl = env.VITE_BASE_URL + env.VITE_API_HOST
+    const plugins: any[] = [
+        svgr(),
+        stylelint({ cache: false, include: ['**/*.{css,scss,less,ts,tsx}'] }),
+        checker({
+            enableBuild: false,
+            typescript: true,
+            eslint: { useFlatConfig: true, lintCommand: 'eslint', dev: { logLevel: ['error'] } }
+        }),
+        react({
+            babel: {
+                plugins: [
+                    [
+                        'babel-plugin-styled-components',
+                        {
+                            ssr: false,
+                            displayName: false,
+                            fileName: false,
+                            transpileTemplateLiterals: false
+                        }
+                    ]
+                ]
+            }
+        }),
+        mockDevServer({
+            include: ['**/*.mock.{ts,js}']
+        })
+    ]
+
+    if (mode === 'analyse') {
+        plugins.push(visualizer({ open: true, sourcemap: true, brotliSize: true, gzipSize: true }))
+    }
+
+    return {
+        base: env.VITE_BASE_URL,
+        plugins,
+        resolve: {
+            alias: {
+                '@': __dirname
+            }
+        },
+        esbuild: {
+            drop: includes(['production', 'analyse'], mode) ? ['console', 'debugger'] : []
+        },
+        build: {
+            sourcemap: mode === 'analyse',
+            reportCompressedSize: mode === 'analyse',
+            rollupOptions: {
+                output: {
+                    manualChunks: createChunks({
+                        react: ['react', 'react-dom']
+                    })
+                }
+            }
+        },
+        server: {
+            host: '0.0.0.0',
+            proxy: {
+                [proxyBaseUrl]: {
+                    target: 'http://127.0.0.1',
+                    changeOrigin: true,
+                    rewrite: path => path.replace(proxyBaseUrl, '')
+                }
+            }
+        }
+    }
+})

package/template/web-app/react-webpack/domain/router/components/index.ts

@@ -0,0 +1,2 @@
+export * as SubRouteOutlet from './sub-route-outlet'
+export * as RouteLayout from './route-layout'

package/template/web-app/react-webpack/domain/router/components/route-layout.tsx

@@ -0,0 +1,19 @@
+import { FunctionComponent } from 'react'
+import { Outlet } from 'react-router-dom'
+import { last } from 'lodash-es'
+import { routeType, useMatchRoutes } from '@/domain/router'
+
+export interface propsType {
+    Index: FunctionComponent
+    rootId: routeType['id']
+}
+
+export const Root: FunctionComponent<propsType> = ({ Index, rootId }) => {
+    const matchRoutes = useMatchRoutes()
+
+    if (last(matchRoutes)?.id === rootId) {
+        return <Index />
+    }
+
+    return <Outlet />
+}

package/template/web-app/react-webpack/domain/router/components/sub-route-outlet.tsx

@@ -0,0 +1,22 @@
+import { FunctionComponent } from 'react'
+import { Outlet } from 'react-router-dom'
+import { useMount } from 'react-use'
+import { last } from 'lodash-es'
+import { useMatchRoutes, useRouter, routeType } from '@/domain/router'
+
+export interface propsType {
+    rootId: routeType['id']
+    homeId: routeType['id']
+}
+export const Root: FunctionComponent<propsType> = props => {
+    const matchRoutes = useMatchRoutes()
+    const navigate = useRouter(state => state.navigate)
+
+    useMount(() => {
+        if (last(matchRoutes)?.id === props.rootId) {
+            navigate({ id: props.homeId })
+        }
+    })
+
+    return <Outlet />
+}

package/template/web-app/react-webpack/domain/router/index.ts

@@ -1,3 +1,4 @@
-export { default as routerIds } from './ids'
-export * from './router'
-export * from './router.types'
+export { default as routerIds } from './ids'
+export * from './router'
+export * from './router.types'
+export * from './components'