create-packer 1.25.32 → 1.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-packer",
-  "version": "1.25.32",
+  "version": "1.26.0",
   "main": "index.js",
   "repository": "https://github.com/kevily/create-packer",
   "author": "1k <bug_zero@163.com>",
@@ -27,12 +27,12 @@
     "@types/fs-extra": "9.0.12",
     "@types/inquirer": "7.3.3",
     "@types/node": "16.4.7",
-    "@typescript-eslint/eslint-plugin": "4.29.2",
-    "@typescript-eslint/parser": "4.29.2",
+    "@typescript-eslint/eslint-plugin": "6.17.0",
+    "@typescript-eslint/parser": "6.17.0",
     "commitizen": "4.3.0",
     "eslint": "7.32.0",
     "rimraf": "3.0.2",
-    "typescript": "5.1.6"
+    "typescript": "5.3.3"
   },
   "config": {
     "commitizen": {

package/template/docusaurus/package.json

@@ -32,7 +32,7 @@
         "@easyops-cn/docusaurus-search-local": "^0.36.0",
         "@tsconfig/docusaurus": "1.0.5",
         "prettier": "3.0.3",
-        "typescript": "5.2.2"
+        "typescript": "5.3.3"
     },
     "browserslist": {
         "production": [

package/template/lib/react/package.json

@@ -10,7 +10,7 @@
     "build-storybook": "storybook build"
   },
   "files": [
-        "dist"
+    "dist"
   ],
   "keywords": [],
   "author": "",
@@ -29,8 +29,8 @@
     "@storybook/testing-library": "0.0.14-next.2",
     "@types/react": "18.2.14",
     "@types/react-dom": "18.2.6",
-    "@typescript-eslint/eslint-plugin": "5.60.1",
-    "@typescript-eslint/parser": "5.60.1",
+    "@typescript-eslint/eslint-plugin": "6.17.0",
+    "@typescript-eslint/parser": "6.17.0",
     "eslint": "8.43.0",
     "eslint-import-resolver-typescript": "3.5.5",
     "eslint-plugin-import": "2.27.5",
@@ -45,7 +45,7 @@
     "storybook": "7.1.0",
     "stylelint": "15.9.0",
     "stylelint-config-standard": "33.0.0",
-    "typescript": "5.1.3",
+    "typescript": "5.3.3",
     "vite-plugin-svgr": "3.2.0"
   }
 }

package/template/lib/ts/package.json

@@ -14,8 +14,8 @@
     ],
     "license": "ISC",
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "5.60.1",
-        "@typescript-eslint/parser": "5.60.1",
+        "@typescript-eslint/eslint-plugin": "6.17.0",
+        "@typescript-eslint/parser": "6.17.0",
         "eslint": "8.43.0",
         "eslint-import-resolver-typescript": "3.5.5",
         "eslint-plugin-import": "2.27.5",
@@ -23,7 +23,7 @@
         "prettier": "2.8.8",
         "stylelint": "15.9.0",
         "stylelint-config-standard": "33.0.0",
-        "typescript": "5.1.3",
+        "typescript": "5.3.3",
         "vitest": "0.34.2"
     }
 }

package/template/nest/package.json

@@ -41,8 +41,8 @@
         "@types/jest": "29.4.0",
         "@types/node": "18.13.0",
         "@types/supertest": "2.0.12",
-        "@typescript-eslint/eslint-plugin": "5.51.0",
-        "@typescript-eslint/parser": "5.51.0",
+        "@typescript-eslint/eslint-plugin": "6.17.0",
+        "@typescript-eslint/parser": "6.17.0",
         "commitizen": "4.3.0",
         "cz-adapter-eslint": "0.3.0",
         "eslint": "8.34.0",
@@ -57,7 +57,7 @@
         "ts-loader": "9.4.2",
         "ts-node": "10.9.1",
         "tsconfig-paths": "4.1.2",
-        "typescript": "4.9.5"
+        "typescript": "5.3.3"
     },
     "jest": {
         "moduleFileExtensions": [

package/template/web-app/next/package.json

@@ -25,7 +25,7 @@
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "tailwindcss": "3.3.3",
-        "typescript": "5.1.6"
+        "typescript": "5.3.3"
     },
     "devDependencies": {
         "@commitlint/cli": "17.6.7",

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

@@ -18,7 +18,7 @@
         "commit": "git add . && npm run cz"
     },
     "dependencies": {
-        "1k-types": "1.0.1",
+        "1k-types": "1.1.2",
         "axios": "1.3.6",
         "define-zustand": "2.0.1",
         "immer": "10.0.1",
@@ -40,8 +40,8 @@
         "@types/qs": "6.9.7",
         "@types/react": "18.0.38",
         "@types/react-dom": "18.0.11",
-        "@typescript-eslint/eslint-plugin": "5.59.0",
-        "@typescript-eslint/parser": "5.59.0",
+        "@typescript-eslint/eslint-plugin": "6.17.0",
+        "@typescript-eslint/parser": "6.17.0",
         "@vitejs/plugin-react": "4.2.0",
         "autoprefixer": "10.4.14",
         "commitizen": "4.3.0",
@@ -63,7 +63,7 @@
         "stylelint": "15.7.0",
         "stylelint-config-standard": "33.0.0",
         "tailwindcss": "3.3.1",
-        "typescript": "5.2.2",
+        "typescript": "5.3.3",
         "vite": "4.3.1",
         "vite-plugin-checker": "0.6.2",
         "vite-plugin-mock-dev-server": "1.2.1",

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

@@ -19,7 +19,7 @@
         "commit": "git add . && npm run cz"
     },
     "dependencies": {
-        "1k-types": "1.0.1",
+        "1k-types": "1.1.2",
         "axios": "1.5.0",
         "define-zustand": "2.0.1",
         "immer": "10.0.2",
@@ -44,8 +44,8 @@
         "@types/react-redux": "7.1.26",
         "@types/react-router-config": "5.0.7",
         "@types/react-router-dom": "5.3.3",
-        "@typescript-eslint/eslint-plugin": "6.5.0",
-        "@typescript-eslint/parser": "6.5.0",
+        "@typescript-eslint/eslint-plugin": "6.17.0",
+        "@typescript-eslint/parser": "6.17.0",
         "autoprefixer": "10.4.15",
         "commitizen": "4.3.0",
         "css-loader": "6.8.1",
@@ -74,7 +74,7 @@
         "stylelint": "15.10.3",
         "stylelint-config-standard": "34.0.0",
         "stylelint-webpack-plugin": "4.1.1",
-        "typescript": "5.2.2",
+        "typescript": "5.3.3",
         "webpack": "5.88.2",
         "webpack-bundle-analyzer": "4.9.1",
         "webpack-cli": "5.1.4",

package/template/web-app/solid/package.json

@@ -35,7 +35,7 @@
         "stylelint": "15.7.0",
         "stylelint-config-standard": "33.0.0",
         "tailwindcss": "3.3.2",
-        "typescript": "5.0.4",
+        "typescript": "5.3.3",
         "vite": "4.3.5",
         "vite-plugin-solid": "2.7.0"
     },

package/template/web-app/svelte/package.json

@@ -25,8 +25,8 @@
         "@sveltejs/adapter-auto": "2.1.0",
         "@sveltejs/kit": "1.25.0",
         "@types/lodash-es": "4.17.9",
-        "@typescript-eslint/eslint-plugin": "6.7.2",
-        "@typescript-eslint/parser": "6.7.2",
+        "@typescript-eslint/eslint-plugin": "6.17.0",
+        "@typescript-eslint/parser": "6.17.0",
         "commitizen": "4.3.0",
         "cssnano": "6.0.1",
         "eslint": "8.50.0",
@@ -41,7 +41,7 @@
         "rollup-plugin-visualizer": "5.9.2",
         "svelte-check": "3.5.2",
         "tslib": "2.6.2",
-        "typescript": "5.2.2",
+        "typescript": "5.3.3",
         "vite": "4.4.9"
     },
     "dependencies": {

package/template/web-app/vue/package.json

@@ -17,7 +17,7 @@
         "commit": "git add . && npm run cz"
     },
     "dependencies": {
-        "1k-types": "1.0.1",
+        "1k-types": "1.1.2",
         "axios": "1.3.6",
         "lodash-es": "4.17.21",
         "pinia": "2.0.35",
@@ -30,8 +30,8 @@
         "@commitlint/cz-commitlint": "17.5.0",
         "@types/lodash-es": "4.17.7",
         "@types/mockjs": "1.0.7",
-        "@typescript-eslint/eslint-plugin": "5.59.0",
-        "@typescript-eslint/parser": "5.59.0",
+        "@typescript-eslint/eslint-plugin": "6.17.0",
+        "@typescript-eslint/parser": "6.17.0",
         "@vitejs/plugin-vue": "4.2.3",
         "@vitejs/plugin-vue-jsx": "3.0.1",
         "autoprefixer": "10.4.14",
@@ -53,7 +53,7 @@
         "stylelint": "15.7.0",
         "stylelint-config-standard": "33.0.0",
         "tailwindcss": "3.3.1",
-        "typescript": "5.0.4",
+        "typescript": "5.3.3",
         "vite": "4.3.8",
         "vite-plugin-checker": "0.6.1",
         "vite-plugin-mock-dev-server": "1.2.1",

package/template/web-extension/.env

@@ -1 +1 @@
-VITE_API_HOST=https://127.0.0.1
+VITE_API_HOST=/

package/template/web-extension/.env.development

@@ -1 +1 @@
-VITE_API_HOST=https://127.0.0.1
+VITE_API_HOST=/

package/template/web-extension/package.json

@@ -19,6 +19,7 @@
     "dependencies": {
         "define-zustand": "2.0.1",
         "immer": "10.0.1",
+        "ky": "1.1.3",
         "lodash-es": "4.17.21",
         "qs": "6.11.2",
         "react": "18.2.0",
@@ -26,6 +27,7 @@
         "zustand": "4.4.1"
     },
     "devDependencies": {
+        "1k-types": "1.1.2",
         "@commitlint/cli": "17.6.1",
         "@commitlint/config-conventional": "17.6.1",
         "@commitlint/cz-commitlint": "17.5.0",
@@ -36,8 +38,8 @@
         "@types/qs": "6.9.7",
         "@types/react": "18.0.38",
         "@types/react-dom": "18.0.11",
-        "@typescript-eslint/eslint-plugin": "5.59.0",
-        "@typescript-eslint/parser": "5.59.0",
+        "@typescript-eslint/eslint-plugin": "6.17.0",
+        "@typescript-eslint/parser": "6.17.0",
         "@vitejs/plugin-react": "4.0.0",
         "autoprefixer": "10.4.14",
         "commitizen": "4.3.0",
@@ -57,7 +59,7 @@
         "stylelint": "15.7.0",
         "stylelint-config-standard": "33.0.0",
         "tailwindcss": "3.3.1",
-        "typescript": "5.0.4",
+        "typescript": "5.3.3",
         "vite": "4.3.1",
         "vite-plugin-checker": "0.6.1"
     },

package/template/web-extension/shared/service/request.ts

@@ -1,84 +1,5 @@
-import { forEach, size } from 'lodash-es'
-import { stringify } from 'qs'
+import { createService } from './tools'
 
-type fetchConfigType = Required<Parameters<typeof fetch>>[1]
-
-interface configType {
-    baseURL: string
-    headers?: {
-        'Content-Type'?: string
-        [key: string]: string | undefined
-    }
-}
-type onErrorType = (e: Response) => void
-
-async function resFormatter(response: Response) {
-    const contentType = response.headers.get('Content-Type')
-
-    if (contentType?.startsWith('application/json')) {
-        return await response.json()
-    }
-
-    if (contentType?.startsWith('text/html')) {
-        return await response.text()
-    }
-
-    return response
-}
-
-class Request {
-    config: configType
-    interceptors: {
-        error: onErrorType[]
-    }
-    constructor(config: configType) {
-        this.config = {
-            ...config,
-            headers: {
-                'Content-Type': 'application/json',
-                ...config.headers
-            }
-        }
-        this.interceptors = {
-            error: []
-        }
-    }
-    onError(callback: onErrorType) {
-        this.interceptors.error.push(callback)
-    }
-    async request(url: string, config?: fetchConfigType) {
-        try {
-            const response = await fetch(this.config.baseURL + url, {
-                headers: this.config.headers as never,
-                redirect: 'manual',
-                ...config
-            })
-            if (response.status !== 200) {
-                const errMsg = `服务器错误状态：${response.status}`
-                forEach(this.interceptors.error, onError => {
-                    onError(response)
-                })
-                throw new Error(errMsg)
-            }
-            return resFormatter(response)
-        } catch (error: any) {
-            throw new Error(error.message)
-        }
-    }
-    get(url: string, data?: Record<string, any> | any[]) {
-        const query = size(data) > 0 ? `?${stringify(data)}` : ''
-        return this.request(url + query, {
-            method: 'GET'
-        })
-    }
-    post(url: string, body?: any) {
-        return this.request(url, {
-            method: 'POST',
-            body: JSON.stringify(body)
-        })
-    }
-}
-
-export function create(config: configType) {
-    return new Request(config)
-}
+export const request = createService({
+    prefixUrl: import.meta.env.VITE_API_HOST
+})

package/template/web-extension/shared/service/tools.ts

@@ -0,0 +1,126 @@
+import ky, { Hooks, KyInstance, Options } from 'ky'
+import { Input } from 'ky/distribution/types/options'
+import { assign, includes, isArray, isObject, omit } from 'lodash-es'
+import { parse, stringify } from 'qs'
+import { ArrayValues } from '1k-types'
+import { configType, requestOptionsType, serviceHooksType } from './types'
+
+function createServiceHooks() {
+    const serviceHooks: serviceHooksType = {
+        beforeError: [],
+        beforeRequest: []
+    }
+    const kyHooks: Hooks = {
+        beforeError: [
+            async error => {
+                await foreachHooks('beforeError', error)
+                return error
+            }
+        ],
+        beforeRequest: [
+            async req => {
+                // eslint-disable-next-line prefer-const
+                let [url, searchParams] = req.url.split('?')
+                const reqBody =
+                    !includes(['GET', 'HEAD'], req.method) && req.body ? await req.json() : void 0
+                const parsedSearchParams = parse(searchParams)
+                const reqConfig = {
+                    searchParams: parsedSearchParams,
+                    body: reqBody,
+                    headers: req.headers,
+                    method: req.method
+                }
+                await foreachHooks('beforeRequest', reqConfig)
+                url = url + stringify(reqConfig.searchParams, { addQueryPrefix: true })
+                return new Request(url, {
+                    ...omit(req, 'url'),
+                    headers: reqConfig.headers,
+                    body: reqBody ? JSON.stringify(reqConfig.body) : void 0
+                })
+            }
+        ]
+    }
+    function addHooks<K extends keyof serviceHooksType>(
+        key: K,
+        callback: ArrayValues<serviceHooksType[K]>
+    ) {
+        serviceHooks[key].push(callback as any)
+    }
+
+    async function foreachHooks<K extends keyof serviceHooksType>(
+        name: K,
+        arg: Parameters<ArrayValues<serviceHooksType[K]>>[0]
+    ) {
+        for (let i = 0; i < serviceHooks[name].length; i++) {
+            const fn = serviceHooks[name][i]
+            await fn(arg as never)
+        }
+    }
+
+    return {
+        kyHooks,
+        serviceHooks,
+        addHooks
+    }
+}
+
+function createRequestActions(request: KyInstance) {
+    function creator(method: Required<Options>['method']) {
+        return function <DATA = any>(url: Input, option?: requestOptionsType): Promise<DATA> {
+            return request[method](url, omit(option, 'responseType'))[
+                option?.responseType || 'json'
+            ]()
+        }
+    }
+
+    return {
+        get: creator('get'),
+        post: creator('post'),
+        put: creator('put'),
+        patch: creator('patch'),
+        head: creator('head'),
+        delete: creator('delete')
+    }
+}
+export type requestActionsType = ReturnType<typeof createRequestActions>
+
+export function createService(config: configType) {
+    const { kyHooks, addHooks } = createServiceHooks()
+    const globalParams: configType['globalParams'] = assign({}, config.globalParams)
+    const globalSearchParams: configType['globalSearchParams'] = assign(
+        {},
+        config.globalSearchParams
+    )
+    const request = ky.create({
+        prefixUrl: config.prefixUrl,
+        headers: config.headers,
+        hooks: kyHooks
+    })
+    const requestActions = createRequestActions(request)
+
+    function setGlobalParams(params: configType['globalParams']) {
+        assign(globalParams, params)
+    }
+    function setGlobalSearchParams(params: configType['globalSearchParams']) {
+        assign(globalSearchParams, params)
+    }
+
+    // 初始化
+    // ------------------------------------------------------------------------
+    addHooks('beforeRequest', async req => {
+        const { searchParams, body } = req
+        req.searchParams = { ...globalSearchParams, ...searchParams }
+
+        if (!isArray(body) && isObject(body)) {
+            req.body = { ...globalParams, ...body }
+        }
+    })
+
+    return {
+        instance: request,
+        ...requestActions,
+        addHooks,
+        setGlobalParams,
+        setGlobalSearchParams
+    }
+}

package/template/web-extension/shared/service/types.ts

@@ -0,0 +1,22 @@
+import { Options, HTTPError } from 'ky'
+import { Nullable } from '1k-types'
+
+export interface configType extends Pick<Options, 'prefixUrl' | 'headers'> {
+    globalParams?: Record<string, any>
+    globalSearchParams?: Record<string, any>
+}
+export interface requestOptionsType extends Options {
+    responseType?: 'json' | 'text' | 'blob'
+}
+
+export type beforeRequestType = (req: {
+    searchParams: Record<string, any>
+    body: Nullable<Record<string, any>>
+    headers: Headers
+    method: Options['method']
+}) => Promise<void> | void
+export type beforeErrorType = (error: HTTPError) => Promise<void> | void
+export interface serviceHooksType {
+    beforeError: beforeErrorType[]
+    beforeRequest: beforeRequestType[]
+}

package/template/web-extension/tsconfig.json

@@ -15,6 +15,7 @@
         "moduleResolution": "Node",
         "resolveJsonModule": true,
         "isolatedModules": true,
+        "noImplicitAny": false,
         "noEmit": true,
         "jsx": "react-jsx",
         "paths": {

package/template/web-extension/popup/popup.spec.tsx

@@ -1,15 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import Popup from './popup.container'
-
-describe('HelloWorld', () => {
-    it('should renders a msg', () => {
-        // arrange
-        render(<Popup />)
-
-        // act
-        const title = screen.getByTestId('title')
-
-        // assert
-        expect(title).toHaveTextContent(/Hello React!/i)
-    })
-})