create-packer 1.43.13 → 1.43.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-packer",
-  "version": "1.43.13",
+  "version": "1.43.14",
   "main": "index.js",
   "repository": "https://github.com/kevily/create-packer",
   "author": "1k <bug_zero@163.com>",

package/template/lib/workspace/packages/ts/package.json

@@ -16,7 +16,7 @@
     ],
     "license": "ISC",
     "devDependencies": {
-        "@vitest/coverage-v8": "2.0.5",
+        "@vitest/coverage-v8": "3.1.2",
         "eslint": "9.17.0",
         "eslint-import-resolver-typescript": "3.7.0",
         "eslint-plugin-import": "2.31.0",
@@ -25,6 +25,6 @@
         "stylelint-config-standard-scss": "13.0.0",
         "typescript": "5.8.2",
         "typescript-eslint": "8.15.0",
-        "vitest": "2.0.5"
+        "vitest": "3.1.2"
     }
 }

package/template/web-app/react-rsbuild/domain/app/components/app-context.tsx

@@ -1,10 +1,28 @@
 import { FunctionComponent, ReactNode } from 'react'
-import { ThemeProvider } from 'styled-components'
-import { theme } from '@/shared/theme'
+import { ThemeProvider } from '@emotion/react'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { request } from '@/shared/service'
+import { theme } from '@/shared/styles'
 
+const queryClient = new QueryClient({
+    defaultOptions: {
+        queries: {
+            queryFn: async ({ queryKey }) => {
+                const { data } = await request.get(queryKey[0] as string, {
+                    params: queryKey[1]
+                })
+                return data
+            }
+        }
+    }
+})
 export interface propsType {
     children: ReactNode
 }
 export const Root: FunctionComponent<propsType> = props => {
-    return <ThemeProvider theme={theme}>{props.children}</ThemeProvider>
+    return (
+        <QueryClientProvider client={queryClient}>
+            <ThemeProvider theme={theme}>{props.children}</ThemeProvider>
+        </QueryClientProvider>
+    )
 }

package/template/web-app/react-rsbuild/domain/app/components/app.tsx

@@ -1,8 +1,8 @@
-import { useLayoutEffect } from 'react'
+import { useLayoutEffect, Suspense } from 'react'
 import { RouterProvider } from 'react-router/dom'
 import { request } from '@/shared/service'
 import { routerInstance } from '@/domain/router'
-import { GlobalStyle } from '../app.styled'
+import { GlobalStyle } from '@/shared/styles'
 import * as AppContext from './app-context'
 
 export const Root = () => {
@@ -18,7 +18,9 @@ export const Root = () => {
     return (
         <AppContext.Root>
             <GlobalStyle />
-            <RouterProvider router={routerInstance} />
+            <Suspense fallback={<>loading...</>}>
+                <RouterProvider router={routerInstance} />
+            </Suspense>
         </AppContext.Root>
     )
 }

package/template/web-app/react-rsbuild/domain/app/startApp.tsx

@@ -1,6 +1,6 @@
-import { createRoot } from 'react-dom/client'
-import { App } from '@/domain/app'
-
-export default function () {
-    createRoot(document.getElementById('root') as HTMLElement).render(<App.Root />)
-}
+import { createRoot } from 'react-dom/client'
+import { App } from '@/domain/app'
+
+export default function () {
+    createRoot(document.getElementById('root') as HTMLElement).render(<App.Root />)
+}

package/template/web-app/react-rsbuild/domain/router/router.tsx

@@ -9,7 +9,6 @@ const routes: routeType[] = [
         path: '/',
         id: ids.root,
         Component: lazy(() => import('@/pages')),
-        hydrateFallbackElement: <>loading...</>,
         children: [
             ...home.routes,
             {

package/template/web-app/react-rsbuild/env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="@rsbuild/core/types" />
-import 'styled-components'
-import { themeType } from './shared/theme'
+import '@emotion/react'
+import { themeType } from './shared/styles'
 
 declare module 'styled-components' {
     export interface DefaultTheme extends themeType {}
@@ -26,3 +26,7 @@ declare global {
         export default ReactComponent
     }
 }
+
+declare module '@emotion/react' {
+    export interface Theme extends themeType {}
+}

package/template/web-app/react-rsbuild/main.tsx

@@ -1,3 +1,3 @@
-import { startApp } from '@/domain/app'
-
-startApp()
+import { startApp } from '@/domain/app'
+
+startApp()

package/template/web-app/react-rsbuild/package.json

@@ -19,6 +19,9 @@
         "commit": "git add . && npm run cz"
     },
     "dependencies": {
+        "@emotion/react": "11.14.0",
+        "@emotion/styled": "11.14.0",
+        "@tanstack/react-query": "5.51.15",
         "axios": "1.7.9",
         "define-zustand": "3.2.1",
         "immer": "10.0.1",
@@ -28,7 +31,6 @@
         "react-dom": "18.3.1",
         "react-router": "7.5.0",
         "react-use": "17.5.0",
-        "styled-components": "6.1.11",
         "type-fest": "4.33.0",
         "zustand": "5.0.3"
     },
@@ -40,10 +42,10 @@
         "@rsbuild/core": "1.2.19",
         "@rsbuild/plugin-eslint": "1.1.1",
         "@rsbuild/plugin-react": "1.1.1",
-        "@rsbuild/plugin-styled-components": "1.2.1",
         "@rsbuild/plugin-svgr": "1.0.7",
         "@rsbuild/plugin-type-check": "1.2.1",
         "@rsdoctor/rspack-plugin": "0.4.13",
+        "@swc/plugin-emotion": "9.0.3",
         "@types/lodash-es": "4.17.12",
         "@types/node": "18.16.0",
         "@types/qs": "6.9.7",

package/template/web-app/react-rsbuild/pages/home/view.styled.ts

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

package/template/web-app/react-rsbuild/pages/home/view.tsx

@@ -1,11 +1,10 @@
-import { useAsync } from 'react-use'
-import { fetchHomeData } from '@/shared/service'
-import { StyledRoot } from './view.styled'
-
-export default function Home() {
-    const homeData = useAsync(fetchHomeData)
-
-    console.log('data', homeData.value)
-
-    return <StyledRoot>sdfs</StyledRoot>
-}
+import { useHomeData } from '@/shared/service'
+import { StyledRoot } from './view.styled'
+
+export default function Home() {
+    const { data } = useHomeData()
+
+    console.log('data', data)
+
+    return <StyledRoot>sdfs</StyledRoot>
+}

package/template/web-app/react-rsbuild/postcss.config.cjs

@@ -1,7 +1,7 @@
-module.exports = {
-    plugins: {
-        'postcss-import': {},
-        autoprefixer: {},
-        ...(process.env.NODE_ENV === 'production' ? { cssnano: {} } : {})
-    }
-}
+module.exports = {
+    plugins: {
+        'postcss-import': {},
+        autoprefixer: {},
+        ...(process.env.NODE_ENV === 'production' ? { cssnano: {} } : {})
+    }
+}

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

@@ -1,6 +1,5 @@
 import { defineConfig, loadEnv } from '@rsbuild/core'
 import { pluginReact } from '@rsbuild/plugin-react'
-import { pluginStyledComponents } from '@rsbuild/plugin-styled-components'
 import { pluginEslint } from '@rsbuild/plugin-eslint'
 import StylelintWebpackPlugin from 'stylelint-webpack-plugin'
 import { pluginTypeCheck } from '@rsbuild/plugin-type-check'
@@ -10,11 +9,12 @@ import { createChunks } from './scripts'
 
 export default defineConfig(({ envMode, command }) => {
     const { parsed: env } = loadEnv()
+
     return {
         html: {
             template: './index.html',
             title: 'Rsbuild + React + TS',
-            favicon: './shared/assets/react.ico'
+            favicon: './shared/assets/react.svg'
         },
         source: {
             entry: {
@@ -41,6 +41,13 @@ export default defineConfig(({ envMode, command }) => {
                     new StylelintWebpackPlugin(),
                     process.env.RSDOCTOR && new RsdoctorRspackPlugin()
                 ]
+            },
+            swc: {
+                jsc: {
+                    experimental: {
+                        plugins: [['@swc/plugin-emotion', {}]]
+                    }
+                }
             }
         },
         plugins: [
@@ -51,14 +58,12 @@ export default defineConfig(({ envMode, command }) => {
                         configType: 'flat'
                     }
                 }),
-            pluginStyledComponents({
-                ssr: false,
-                displayName: false,
-                fileName: false,
-                transpileTemplateLiterals: false
-            }),
             pluginSvgr(),
-            pluginReact()
+            pluginReact({
+                swcReactOptions: {
+                    importSource: '@emotion/react'
+                }
+            })
         ],
         performance: {
             removeConsole: command === 'build' ? ['log'] : false,

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

@@ -1,7 +1,9 @@
-import { request } from './request'
+import { useQuery, UndefinedInitialDataOptions } from '@tanstack/react-query'
 import { HOME_DATA } from './api'
 
-export async function fetchHomeData() {
-    const { data } = await request(HOME_DATA)
-    return data
+export const useHomeData = (options?: UndefinedInitialDataOptions) => {
+    return useQuery({
+        ...options,
+        queryKey: [HOME_DATA, ...(options?.queryKey || [])]
+    })
 }

package/template/web-app/react-rsbuild/shared/styles/global-style.tsx

@@ -0,0 +1,14 @@
+import { FunctionComponent } from 'react'
+import { css, Global } from '@emotion/react'
+
+export const GlobalStyle: FunctionComponent<{ nameSpace?: string }> = props => {
+    return (
+        <Global
+            styles={css`
+                ${props.nameSpace ? '.' + props.nameSpace : 'body'} {
+                    margin: 0;
+                }
+            `}
+        />
+    )
+}

package/template/web-app/react-rsbuild/shared/styles/index.ts

@@ -0,0 +1,2 @@
+export * from './theme.styled'
+export * from './global-style'

package/template/web-app/react-rsbuild/tsconfig.node.json

@@ -2,7 +2,7 @@
     "compilerOptions": {
         "composite": true,
         "module": "ESNext",
-        "moduleResolution": "bundler",
+        "moduleResolution": "node",
         "allowSyntheticDefaultImports": true,
         "resolveJsonModule": true
     },

package/template/web-app/react-vite/domain/app/components/app-context.tsx

@@ -1,10 +1,28 @@
 import { FunctionComponent, ReactNode } from 'react'
-import { ThemeProvider } from 'styled-components'
-import { theme } from '@/shared/theme'
+import { ThemeProvider } from '@emotion/react'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { request } from '@/shared/service'
+import { theme } from '@/shared/styles'
 
+const queryClient = new QueryClient({
+    defaultOptions: {
+        queries: {
+            queryFn: async ({ queryKey }) => {
+                const { data } = await request.get(queryKey[0] as string, {
+                    params: queryKey[1]
+                })
+                return data
+            }
+        }
+    }
+})
 export interface propsType {
     children: ReactNode
 }
 export const Root: FunctionComponent<propsType> = props => {
-    return <ThemeProvider theme={theme}>{props.children}</ThemeProvider>
+    return (
+        <QueryClientProvider client={queryClient}>
+            <ThemeProvider theme={theme}>{props.children}</ThemeProvider>
+        </QueryClientProvider>
+    )
 }

package/template/web-app/react-vite/domain/app/components/app.tsx

@@ -1,8 +1,8 @@
-import { useLayoutEffect } from 'react'
+import { useLayoutEffect, Suspense } from 'react'
 import { RouterProvider } from 'react-router/dom'
 import { request } from '@/shared/service'
 import { routerInstance } from '@/domain/router'
-import { GlobalStyle } from '../app.styled'
+import { GlobalStyle } from '@/shared/styles'
 import * as AppContext from './app-context'
 
 export const Root = () => {
@@ -18,7 +18,9 @@ export const Root = () => {
     return (
         <AppContext.Root>
             <GlobalStyle />
-            <RouterProvider router={routerInstance} />
+            <Suspense fallback={<>loading...</>}>
+                <RouterProvider router={routerInstance} />
+            </Suspense>
         </AppContext.Root>
     )
 }

package/template/web-app/react-vite/domain/router/router.tsx

@@ -9,7 +9,6 @@ const routes: routeType[] = [
         path: '/',
         id: ids.root,
         Component: lazy(() => import('@/pages')),
-        hydrateFallbackElement: <>loading...</>,
         children: [
             ...home.routes,
             {

package/template/web-app/react-vite/package.json

@@ -18,6 +18,9 @@
         "commit": "git add . && npm run cz"
     },
     "dependencies": {
+        "@emotion/react": "11.14.0",
+        "@emotion/styled": "11.14.0",
+        "@tanstack/react-query": "5.51.15",
         "axios": "1.7.9",
         "define-zustand": "3.2.1",
         "immer": "10.0.1",
@@ -27,7 +30,6 @@
         "react-dom": "18.3.1",
         "react-router": "7.5.0",
         "react-use": "17.5.0",
-        "styled-components": "6.1.11",
         "type-fest": "4.33.0",
         "zustand": "5.0.3"
     },
@@ -35,6 +37,7 @@
         "@commitlint/cli": "17.6.1",
         "@commitlint/config-conventional": "17.6.1",
         "@commitlint/cz-commitlint": "17.5.0",
+        "@emotion/babel-plugin": "11.13.5",
         "@eslint/js": "9.15.0",
         "@faker-js/faker": "8.4.1",
         "@types/lodash-es": "4.17.12",

package/template/web-app/react-vite/pages/home/view.styled.ts

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

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

@@ -1,11 +1,10 @@
-import { useAsync } from 'react-use'
-import { fetchHomeData } from '@/shared/service'
+import { useHomeData } from '@/shared/service'
 import { StyledRoot } from './view.styled'
 
 export default function Home() {
-    const homeData = useAsync(fetchHomeData)
+    const { data } = useHomeData()
 
-    console.log('data', homeData.value)
+    console.log('data', data)
 
     return <StyledRoot>sdfs</StyledRoot>
 }

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

@@ -1,7 +1,9 @@
-import { request } from './request'
+import { useQuery, UndefinedInitialDataOptions } from '@tanstack/react-query'
 import { HOME_DATA } from './api'
 
-export async function fetchHomeData() {
-    const { data } = await request(HOME_DATA)
-    return data
+export const useHomeData = (options?: UndefinedInitialDataOptions) => {
+    return useQuery({
+        ...options,
+        queryKey: [HOME_DATA, ...(options?.queryKey || [])]
+    })
 }

package/template/web-app/react-vite/shared/styles/global-style.tsx

@@ -0,0 +1,14 @@
+import { FunctionComponent } from 'react'
+import { css, Global } from '@emotion/react'
+
+export const GlobalStyle: FunctionComponent<{ nameSpace?: string }> = props => {
+    return (
+        <Global
+            styles={css`
+                ${props.nameSpace ? '.' + props.nameSpace : 'body'} {
+                    margin: 0;
+                }
+            `}
+        />
+    )
+}

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

@@ -0,0 +1,2 @@
+export * from './theme.styled'
+export * from './global-style'

package/template/web-app/{react-rsbuild/shared/theme → react-vite/shared/styles}/theme.styled.ts

@@ -1,5 +1,4 @@
 import { CSSProperties } from 'react'
-
 import { isString } from 'lodash-es'
 
 export const theme = {

package/template/web-app/react-vite/vite-env.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="vite/client" />
 /// <reference types="vite-plugin-svgr/client" />
-import 'styled-components'
-import { themeType } from './shared/theme'
+
+import '@emotion/react'
+import { themeType } from './shared/styles'
 
 declare global {
     interface ImportMetaEnv {
@@ -15,6 +16,6 @@ declare global {
     }
 }
 
-declare module 'styled-components' {
-    export interface DefaultTheme extends themeType {}
+declare module '@emotion/react' {
+    export interface Theme extends themeType {}
 }

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

@@ -1,78 +1,78 @@
-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 { 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(),
-        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, '')
-                }
-            }
-        }
-    }
-})
+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 { 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(),
+        mockDevServer({
+            include: ['**/*.mock.{ts,js}']
+        }),
+        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
+                        }
+                    ]
+                ]
+            }
+        })
+    ]
+
+    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, '')
+                }
+            }
+        }
+    }
+})