feat: upgrade dependencies

Author: qmhc

.commitlintrc.cjs

@@ -0,0 +1,6 @@
+/**
+ * @type {import('@commitlint/types').UserConfig}
+ */
+export default {
+  extends: ['@vexip-ui/commitlint-config']
+}

.commitlintrc.js

@@ -1,5 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 . "$(dirname "$0")/common.sh"
 
 npx --no-install commitlint --edit "$1"

.husky/commit-msg

@@ -1,5 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 . "$(dirname "$0")/common.sh"
 
 [ -n "$CI" ] && exit 0

.husky/pre-commit

@@ -0,0 +1,8 @@
+import commonConfig from '@vexip-ui/prettier-config'
+
+/**
+ * @type {import("prettier").Config}
+ */
+export default {
+  ...commonConfig
+}

.prettierrc.cjs

@@ -1,4 +1,7 @@
-module.exports = {
+/**
+ * @type {import('stylelint').Config}
+ */
+export default {
   extends: ['@vexip-ui/stylelint-config'],
   plugins: ['stylelint-prettier']
 }

.prettierrc.js

@@ -1,20 +1,21 @@
-import { Random } from 'mockjs'
-import { createBusinessBase, mockCommonRequests } from './common'
+import { faker } from '@faker-js/faker'
+import { mockCommonRequests } from './common'
+import { createBusinessBase } from './user'
 
 import type { Article } from '@/service/article'
 
 const richText =
   '<p>Some content for testing.</p><p><img src="https://www.vexipui.com/picture-4.jpg" alt="" data-href="" style="width: 610.00px;height: 381.25px;"/></p><p>Some content for testing.</p>'
 
-mockCommonRequests('/api/article', (): Article[] => {
+export const { handlers } = mockCommonRequests('/api/article', (): Article[] => {
   return Array.from({ length: 20 }, (_, index) => {
     return {
       ...createBusinessBase(),
       id: `${index}`,
-      title: Random.title(5, 10),
-      author: Random.first(),
-      date: Random.datetime(),
-      summary: Random.sentence(5, 15),
+      title: faker.book.title(),
+      author: faker.person.firstName(),
+      date: faker.date.past(),
+      summary: faker.lorem.sentence(),
       cover: [
         {
           url: 'https://www.vexipui.com/picture-1.jpg'

.stylelintrc.cjs .stylelintrc.js

@@ -1,7 +1,5 @@
-import Mock, { Random, mock } from 'mockjs'
-import { getUsers } from './user'
-
-import type { Result } from '@/service/common'
+import { faker } from '@faker-js/faker'
+import { HttpResponse, http } from 'msw'
 
 export interface MockParams {
   url: string,
@@ -10,182 +8,90 @@ export interface MockParams {
   headers?: Record<string, string>
 }
 
-type ResultType<T> = {
-  [P in keyof T]: T[P] extends () => any ? ReturnType<T[P]> : T[P]
+export function createResult<T>(
+  data: T | null = null,
+  success = true,
+  message?: string,
+  status = 200
+) {
+  return HttpResponse.json(
+    {
+      status: success ? 1 : 0,
+      message: message || (success ? 'ok' : 'fail'),
+      data
+    },
+    status !== 200 ? { status } : undefined
+  )
 }
 
-const XHR = (Mock as any).XHR
+export function mockCommonRequests<T extends { id?: any }>(url: string, getList: () => T[]) {
+  url = url.trim().replace(/\/+$/, '')
+  let list = getList()
 
-XHR.prototype.__send = XHR.prototype.send
-XHR.prototype.send = function (...args: any) {
-  if (this.custom.xhr) {
-    this.custom.xhr.withCredentials = this.withCredentials ?? false
+  const handlers = [
+    http.get(url, () => createResult(list)),
 
-    try {
-      // 同步请求时会报错
-      // 暂未找到方法判断是否为同步请求
-      this.custom.xhr.responseType = this.responseType
-    } catch (e) {}
-  }
+    http.get(`${url}/:id`, ({ params }) => {
+      const id = params.id
+      const entity = list.find(entity => String(entity.id) === id)
 
-  if (this.custom.requestHeaders) {
-    this.custom.options.headers = { ...this.custom.requestHeaders }
-  }
+      return createResult(entity)
+    }),
 
-  this.__send(...args)
-}
+    http.post(url, async ({ request }) => {
+      try {
+        const entity = (await request.json()) as T
 
-Mock.setup({ timeout: '200-600' })
+        entity.id = faker.string.uuid()
+        list.push(entity)
 
-Random.extend({
-  telephone() {
-    return `1${Random.pick(['30', '32', '35', '59', '80', '89'])}${mock(/\d{8}/)}`
-  }
-})
+        return createResult(entity)
+      } catch (error) {}
 
-export function createResponse<T extends { [x: string]: any } | { [x: string]: any }[]>(
-  data: T,
-  range?: string
-) {
-  return (): Result<T extends any[] ? ResultType<T[0]>[] : ResultType<T>> => {
-    const isArrayData = Array.isArray(data)
-
-    if (isArrayData && !range) {
-      range = '20-30'
-    }
-
-    const mockResult = mock(
-      isArrayData
-        ? {
-            [`data|${range}`]: data
-          }
-        : data
-    )
-
-    return {
-      status: 1,
-      message: 'ok',
-      data: isArrayData ? mockResult.data : mockResult
-    }
-  }
-}
+      return createResult()
+    }),
 
-export function mockCommonRequests<T extends { id?: any }>(url: string, getList: () => T[]) {
-  let list = getList()
+    http.put(url, async ({ request }) => {
+      try {
+        const newEntity = (await request.json()) as T
+        const entity = list.find(entity => entity.id === newEntity.id)
 
-  mock(url, 'get', () => {
-    return {
-      status: 1,
-      message: 'ok',
-      data: list
-    }
-  })
-
-  mock(new RegExp(`${url}\\/[^/]+`), 'get', ({ url }) => {
-    const id = url.split('/').at(-1)!
-    const entity = list.find(entity => String(entity.id) === id)
-
-    return {
-      status: 1,
-      message: 'ok',
-      data: entity || null
-    }
-  })
-
-  mock(url, 'post', ({ body }) => {
-    try {
-      const entity = JSON.parse(body)
-
-      entity.id = Random.guid()
-      list.push(entity)
-
-      return {
-        status: 1,
-        message: 'ok',
-        data: entity
-      }
-    } catch (error) {}
-
-    return {
-      status: 1,
-      message: 'ok',
-      data: null
-    }
-  })
-
-  mock(url, 'put', ({ body }) => {
-    try {
-      const newEntity = JSON.parse(body)
-      const entity = list.find(entity => entity.id === newEntity.id)
-
-      if (entity) {
-        Object.assign(entity, newEntity)
-
-        return {
-          status: 1,
-          message: 'ok',
-          data: entity
+        if (entity) {
+          Object.assign(entity, newEntity)
+
+          return createResult(entity)
         }
+      } catch (error) {}
+
+      return createResult()
+    }),
+
+    http.delete(`${url}/:id`, ({ params }) => {
+      const id = params.id
+      const index = list.findIndex(entity => entity.id === id)
+
+      if (index > -1) {
+        list.splice(index, 1)
       }
-    } catch (error) {}
-
-    return {
-      status: 1,
-      message: 'ok',
-      data: null
-    }
-  })
-
-  mock(new RegExp(`${url}\\/[^/]+`), 'delete', ({ url }) => {
-    const id = url.split('/').at(-1)!
-    const index = list.findIndex(entity => entity.id === id)
-
-    if (index > -1) {
-      list.splice(index, 1)
-    }
-
-    return {
-      status: 1,
-      message: 'ok',
-      data: index > -1
-    }
-  })
-
-  mock(url, 'delete', ({ body }) => {
-    try {
-      const ids = JSON.parse(body)
-
-      if (ids.length) {
-        const idSet = new Set(ids)
-
-        list = list.filter(entity => !idSet.has(entity.id))
-
-        return {
-          status: 1,
-          message: 'ok',
-          data: true
+
+      return createResult(index > -1)
+    }),
+
+    http.delete(url, async ({ request }) => {
+      try {
+        const ids = (await request.json()) as string[]
+
+        if (ids.length) {
+          const idSet = new Set(ids)
+          list = list.filter(entity => !idSet.has(entity.id))
+
+          return createResult(true)
         }
-      }
-    } catch (error) {}
-
-    return {
-      status: 1,
-      message: 'ok',
-      data: false
-    }
-  })
-}
+      } catch (error) {}
+
+      return createResult(false)
+    })
+  ]
 
-export function createBusinessBase() {
-  const user = Random.pick(getUsers())
-
-  return {
-    id: Random.guid(),
-    creatorId: user.id,
-    creatorName: user.alias,
-    createdTime: Random.datetime(),
-    modifierId: user.id,
-    modifierName: user.alias,
-    modifiedTime: Random.datetime()
-  }
+  return { handlers, getList: () => list }
 }

mock/article.ts

@@ -1,10 +1,21 @@
-import { Random, mock } from 'mockjs'
+import { Random } from 'mockjs'
+import { http } from 'msw'
+import { createResult } from './common'
 
-mock('/resource/file', async ({ body }) => {
-  if (body instanceof FormData) {
-    const file = body.get('file') as File
-    const reader = new FileReader()
+export const handlers = [
+  http.post('/resource/file', async ({ request }) => {
+    const data = await request.formData()
+    const file = data.get('file')
+
+    if (!file) {
+      return createResult(null, false, 'Missing file', 400)
+    }
+
+    if (!(file instanceof File)) {
+      return createResult(null, false, 'Uploaded stuff is not a File', 400)
+    }
 
+    const reader = new FileReader()
     reader.readAsDataURL(file)
 
     let base64: string | null = null
@@ -22,24 +33,16 @@ mock('/resource/file', async ({ body }) => {
       const name = units.slice(-1).join('.')
       const ext = units.at(-1)
 
-      return {
-        status: 1,
-        message: 'ok',
-        data: {
-          id,
-          name,
-          ext,
-          size: file.size,
-          med: '',
-          url: base64
-        }
-      }
+      return createResult({
+        id,
+        name,
+        ext,
+        size: file.size,
+        med: '',
+        url: base64
+      })
     }
-  }
-
-  return {
-    status: 0,
-    message: 'fail',
-    data: null
-  }
-})
+
+    return createResult(null, false)
+  })
+]