chore: release

eslint.config.js

@@ -7,13 +7,10 @@ export default defineConfig(
     {
       ignores: ['**/packages/istanbul-widget/src/components/**/*'],
     },
-    {
-      rules: {
-        'node/no-deprecated-api': 'off',
-      },
-    },
   ],
   {
     astro: true,
+    react: true,
+    vue: true,
   },
 )

packages/istanbul-widget/CHANGELOG.md

@@ -1,5 +1,11 @@
 # istanbul-widget
 
+## 1.5.6
+
+### Patch Changes
+
+- use merge replace with deepmerge
+
 ## 1.5.5
 
 ### Patch Changes

packages/istanbul-widget/components.json

@@ -4,7 +4,7 @@
   "rsc": false,
   "tsx": true,
   "tailwind": {
-    "config": "tailwind.config.js",
+    "config": "tailwind.config.cjs",
     "css": "src/styles/global.css",
     "baseColor": "slate",
     "cssVariables": true,

packages/istanbul-widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "istanbul-widget",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "收集 istanbul 代码覆盖率的web小组件",
   "type": "module",
   "keywords": [

packages/istanbul-widget/src/core/core.ts

@@ -1,4 +1,4 @@
-import { deepMerge, isArray, isFunction, isObject, set } from '@minko-fe/lodash-pro'
+import { isArray, isFunction, isObject, merge, set } from '@minko-fe/lodash-pro'
 import { type ConsolaInstance, LogLevels, createConsola } from 'consola/browser'
 import { ButtonGroupPlugin } from '@/plugins/button-group/ButtonGroupPlugin'
 import { ReportPlugin } from '@/plugins/report/ReportPlugin'
@@ -59,9 +59,8 @@ export class IstanbulWidget {
     this.isInited = false
 
     if (isObject(opts)) {
-      this.option = deepMerge(this.option, opts, {
-        arrayMerge: (_, source) => source,
-      })
+      this.option = merge(this.option, opts)
+      IstanbulWidget.logger.debug('final options:', this.option)
     }
 
     // add built-in plugins

packages/istanbul-widget/tsup.config.ts

@@ -29,6 +29,7 @@ const lib = (option: Options): Options => ({
       },
   noExternal: Object.keys(pkg.dependencies) || [],
   splitting: false,
+  minify: false,
   injectStyle: true,
 })
 

packages/vite-plugin-istanbul-widget/CHANGELOG.md

@@ -1,5 +1,13 @@
 # vite-plugin-istanbul-widget
 
+## 1.5.9
+
+### Patch Changes
+
+- log error message when git not found
+- Updated dependencies
+  - istanbul-widget@1.5.6
+
 ## 1.5.8
 
 ### Patch Changes

packages/vite-plugin-istanbul-widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-istanbul-widget",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "集成了 istanbul-widget 和 vite-plugin-istanbul 的vite插件",
   "type": "module",
   "keywords": [

packages/vite-plugin-istanbul-widget/src/astro/index.ts

@@ -23,7 +23,7 @@ export function istanbulWidget(opts: VitePluginIstanbulWidgetOptions): any {
                 },
               }),
               {
-                name: 'vite:plugin-istanbul-widget:astro',
+                name: 'vite:plugin-istanbul-widget:astro:pre',
                 enforce: 'pre',
                 transform(code, id) {
                   if (opts.istanbulWidgetConfig !== false) {
@@ -50,19 +50,17 @@ export function istanbulWidget(opts: VitePluginIstanbulWidgetOptions): any {
                     for (const file in bundle) {
                       const chunk = bundle[file]
                       if (chunk.type === 'chunk') {
-                        if (chunk.code.includes('/* empty css')) {
-                          if (chunk.name === VENDOR) {
-                            const { format } = opts
-                            const emptyCss = `\\/\\*\\s*empty\\s*css\\s*\\*\\/`
-                            const emptyChunkRE = new RegExp(
-                              format === 'es'
-                                ? `${emptyCss}\\bimport\\s*["'][^"']*(?:.*)["'];`
-                                : `${emptyCss}(\\b|,\\s*)require\\(\\s*["'][^"']*(?:.*)["']\\)(;|,)`,
-                              'g',
-                            )
+                        if (chunk.name === VENDOR) {
+                          const { format } = opts
+                          const emptyCss = `\\/\\*\\s*empty\\s*css\\s*\\*\\/`
+                          const emptyChunkRE = new RegExp(
+                            format === 'es'
+                              ? `${emptyCss}\\bimport\\s*["'][^"']*(?:.*)["'];`
+                              : `${emptyCss}(\\b|,\\s*)require\\(\\s*["'][^"']*(?:.*)["']\\)(;|,)`,
+                            'g',
+                          )
 
-                            chunk.code = chunk.code.replace(emptyChunkRE, '')
-                          }
+                          chunk.code = chunk.code.replace(emptyChunkRE, '')
                         }
                       }
                     }

packages/vite-plugin-istanbul-widget/src/utils/index.ts

@@ -8,8 +8,8 @@ import serialize from './serialize'
 export function getCommitId() {
   try {
     return execSync('git rev-parse HEAD').toString().trim()
-  } catch {
-    return ''
+  } catch (e) {
+    console.error(`Failed to resolve git HEAD:\n${e}`)
   }
 }
 

playground/astro-app/package.json

@@ -16,7 +16,7 @@
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5",
     "vite-plugin-istanbul-widget": "workspace:*",
-    "vite-plugin-public-typescript": "^2.4.0"
+    "vite-plugin-public-typescript": "latest"
   },
   "devDependencies": {
     "@astrojs/react": "^3.3.1",

playground/astro3-app/package.json

@@ -21,6 +21,6 @@
     "@types/react": "^18.2.0",
     "typescript": "^5.4.5",
     "vite-plugin-istanbul-widget": "workspace:*",
-    "vite-plugin-public-typescript": "^2.4.0"
+    "vite-plugin-public-typescript": "latest"
   }
 }

playground/nextjs14-app/.babelrc

@@ -0,0 +1,11 @@
+{
+  "presets": ["next/babel"],
+  "plugins": [
+    [
+      "istanbul",
+      {
+        "exclude": ["**/middleware.*"]
+      }
+    ]
+  ]
+}

playground/nextjs14-app/.gitignore

@@ -0,0 +1,39 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+public/assets/js/
+public-typescript/manifest.json

playground/nextjs14-app/@types/global.d.ts

@@ -0,0 +1,8 @@
+declare global {
+  interface Window {
+    __report: (coverage: any, ...args: any[]) => Promise<void>
+    __customClick: (...args: any[]) => void
+  }
+}
+
+export {}

playground/nextjs14-app/index.html

@@ -0,0 +1,17 @@
+<!-- Entry for vite -->
+<!-- DO NOT EDIT -->
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <title>Document</title>
+</head>
+
+<body>
+
+</body>
+
+</html>

playground/nextjs14-app/next.config.mjs

@@ -0,0 +1,12 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  reactStrictMode: false,
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
+  typescript: {
+    ignoreBuildErrors: true,
+  },
+}
+
+export default nextConfig

playground/nextjs14-app/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "nextjs-app",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "dev": "NODE_ENV=development next dev",
+    "build": "next build",
+    "start": "next start",
+    "prebuild": "pnpm vite:build",
+    "predev": "NODE_ENV=development pnpm vite:build",
+    "vite:build": "vite build",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "next": "^14.2.3",
+    "react": "^18",
+    "react-dom": "^18"
+  },
+  "devDependencies": {
+    "@types/node": "^20",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
+    "babel-plugin-istanbul": "^6.1.1",
+    "istanbul-widget": "workspace:*",
+    "postcss": "^8",
+    "tailwindcss": "^3.4.1",
+    "typescript": "^5",
+    "vite": "^5.2.11",
+    "vite-plugin-istanbul-widget": "workspace:*",
+    "vite-plugin-public-typescript": "latest"
+  }
+}

playground/nextjs14-app/postcss.config.mjs

@@ -0,0 +1,8 @@
+/** @type {import('postcss-load-config').Config} */
+const config = {
+  plugins: {
+    tailwindcss: {},
+  },
+}
+
+export default config

playground/nextjs14-app/public-typescript/istanbul.ts

@@ -0,0 +1,44 @@
+import { IstanbulWidget } from 'istanbul-widget/lib'
+
+const toFormData = (obj) => {
+  const formData = new FormData()
+  Object.keys(obj).forEach((key) => {
+    formData.append(key, obj[key])
+  })
+  return formData
+}
+
+async function report(coverage, params, ..._args) {
+  console.log(coverage, 'coverage')
+  const reponame = 'nextjs-app'
+  const res = await fetch(`http://localhost:3000/${reponame}/coverage/client?v=${__GIT_COMMIT_ID__}`, {
+    body: toFormData({
+      coverage,
+      params,
+    }),
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  })
+  if (!res.ok) {
+    throw new Error('上报失败')
+  }
+}
+
+new IstanbulWidget({
+  defaultPosition: {
+    y: 100,
+  },
+  plugin: {
+    report: {
+      async onReport(...args) {
+        await report(...args)
+      },
+    },
+    setting: {
+      requireReporter: false,
+      autoReport: false,
+    },
+  },
+})

playground/nextjs14-app/src/app/globals.css

@@ -0,0 +1,33 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+:root {
+  --foreground-rgb: 0, 0, 0;
+  --background-start-rgb: 214, 219, 220;
+  --background-end-rgb: 255, 255, 255;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --foreground-rgb: 255, 255, 255;
+    --background-start-rgb: 0, 0, 0;
+    --background-end-rgb: 0, 0, 0;
+  }
+}
+
+body {
+  color: rgb(var(--foreground-rgb));
+  background: linear-gradient(
+      to bottom,
+      transparent,
+      rgb(var(--background-end-rgb))
+    )
+    rgb(var(--background-start-rgb));
+}
+
+@layer utilities {
+  .text-balance {
+    text-wrap: balance;
+  }
+}