create-packer 1.17.28 → 1.17.29

package/package.json

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

package/template/react/src/router/home/index.ts

@@ -1,2 +1,2 @@
 export { default as routes } from './routes'
-export { default as names } from './names'
+export { default as ids } from './ids'

package/template/react/src/router/home/routes.tsx

@@ -1,11 +1,11 @@
 import { lazy } from 'react'
-import names from './names'
+import ids from './ids'
 import type { routeType } from '../router.types'
 
 const routes: routeType[] = [
     {
         index: true,
-        name: names.home,
+        id: ids.home,
         Component: lazy(() => import('@/pages/home'))
     }
 ]

package/template/react/src/router/{names.ts → ids.ts}

@@ -1,5 +1,5 @@
 import * as home from './home'
 export default {
     root: 'root',
-    ...home.names
+    ...home.ids
 }

package/template/react/src/router/index.ts

@@ -1,3 +1,3 @@
-export { default as routeNames } from './names'
+export { default as ids } from './ids'
 export * from './router'
 export * from './router.provider'

package/template/react/src/router/router.provider.ts

@@ -1,22 +1,41 @@
 import { find, get } from 'lodash-es'
 import { stringify } from 'qs'
-import { NavigateOptions, redirect as routerRedirect } from 'react-router-dom'
+import { NavigateOptions } from 'react-router-dom'
+import { routeType } from '@/router/router.types'
 import { router, routesList } from './router'
 
-export function getRoute(name: string, path?: string | string[]) {
-    const route = find(routesList, o => o.name === name)
+export function getRoute(id: routeType['id'], path?: string | string[]) {
+    const route = find(routesList, o => o.id === id)
     if (path) {
         return get(route, path)
     }
     return route
 }
 
+export function genRouteUrl(id: routeType['id'], query?: Record<string, any>) {
+    const path = getRoute(id, 'path')
+    if (path) {
+        const { origin } = window.location
+        let url = origin + import.meta.env.VITE_BASE_URL + path
+        url += query ? `?${stringify(query)}` : ''
+        return url
+    }
+    return void 0
+}
+
+export function openRoute(id: routeType['id'], query?: Record<string, any>) {
+    const url = genRouteUrl(id, query)
+    if (url) {
+        window.open(url)
+    }
+}
+
 export function navigate(
-    to: { name: string; query?: Record<string, any> },
+    to: { id: routeType['id']; query?: Record<string, any> },
     opts?: NavigateOptions
 ) {
     return router.navigate(
-        { pathname: getRoute(to.name, 'path'), search: to.query ? stringify(to.query) : '' },
+        { pathname: getRoute(to.id, 'path'), search: to.query ? stringify(to.query) : '' },
         opts
     )
 }

package/template/react/src/router/router.tsx

@@ -1,30 +1,30 @@
 import { lazy } from 'react'
-import { concat, isArray, reduce } from 'lodash-es'
 import { createBrowserRouter } from 'react-router-dom'
-import * as home from './home'
-import names from './names'
+import { concat, isArray, reduce } from 'lodash-es'
+import ids from './ids'
 import type { routeType } from './router.types'
 
 const routes: routeType[] = [
     {
         path: '/',
-        name: names.root,
+        id: ids.root,
         Component: lazy(() => import('@/layout')),
-        children: [...home.routes]
+        children: []
     },
     {
         path: '*',
-        name: '404',
+        id: '404',
         Component: lazy(() => import('@/pages/notFound'))
     }
 ]
+
 export const routesList = (function flat(routes: routeType[], parentRoute?: routeType) {
     return reduce(
         routes,
         (result, route) => {
-            route.path = parentRoute
-                ? `${parentRoute.path === '/' ? '' : parentRoute.path}/${route.path}`
-                : route.path
+            if (parentRoute) {
+                route.path = `${parentRoute.path === '/' ? '' : parentRoute.path}/${route.path}`
+            }
             result.push(route)
             if (isArray(route.children)) {
                 result = concat(result, flat(route.children, route))
@@ -34,4 +34,6 @@ export const routesList = (function flat(routes: routeType[], parentRoute?: rout
         [] as routeType[]
     )
 })(routes)
-export const router = createBrowserRouter(routes as never)
+export const router = createBrowserRouter(routes as never, {
+    basename: import.meta.env.VITE_BASE_URL
+})

package/template/react/src/router/router.types.ts

@@ -1,6 +1,3 @@
 import { RouteObject } from 'react-router-dom'
 
-export type routeType = Omit<RouteObject, 'children'> & {
-    name: string | symbol
-    children?: routeType[]
-}
+export type routeType = RouteObject