chore: update deps

.changeset/healthy-impalas-sneeze.md

@@ -0,0 +1,7 @@
+---
+"vite-plugin-istanbul-widget": patch
+"istanbul-widget": patch
+---
+
+update deps
+

package.json

@@ -29,22 +29,22 @@
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.3",
+    "@changesets/cli": "^2.27.7",
     "@commitlint/cli": "^19.3.0",
-    "@minko-fe/commitlint-config": "^2.0.7",
-    "@minko-fe/eslint-config": "^3.2.0",
+    "@minko-fe/commitlint-config": "^2.1.0",
+    "@minko-fe/eslint-config": "^3.3.1",
     "@minko-fe/prettier-config": "^2.2.2",
     "@minko-fe/tsconfig": "latest",
-    "eslint": "^8.57.0",
-    "npm-run-all2": "^6.2.0",
-    "nyc": "^15.1.0",
-    "prettier-plugin-astro": "^0.13.0",
-    "prettier-plugin-tailwindcss": "^0.5.14",
+    "eslint": "^9.8.0",
+    "npm-run-all2": "^6.2.2",
+    "nyc": "^17.0.0",
+    "prettier-plugin-astro": "^0.14.1",
+    "prettier-plugin-tailwindcss": "^0.6.5",
     "simple-git-hooks": "^2.11.1",
-    "taze": "^0.13.8",
-    "tsup": "^8.0.2",
-    "turbo": "^1.13.3",
-    "typescript": "^5.4.5"
+    "taze": "^0.16.3",
+    "tsup": "^8.2.4",
+    "turbo": "^1.13.4",
+    "typescript": "^5.5.4"
   },
   "simple-git-hooks": {
     "commit-msg": "npm run commitlint",

packages/istanbul-widget/package.json

@@ -70,45 +70,43 @@
     }
   },
   "dependencies": {
-    "@iconify-json/vscode-icons": "^1.1.34",
+    "@iconify-json/vscode-icons": "^1.1.37",
     "@minko-fe/lodash-pro": "^0.3.3",
-    "@minko-fe/react-hook": "^0.3.6",
+    "@minko-fe/react-hook": "^0.3.7",
     "@neodrag/react": "^2.0.4",
-    "@radix-ui/react-alert-dialog": "^1.0.5",
-    "@radix-ui/react-dialog": "^1.0.5",
+    "@radix-ui/react-alert-dialog": "^1.1.1",
+    "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-label": "^2.0.2",
-    "@radix-ui/react-popover": "^1.0.7",
-    "@radix-ui/react-slot": "^1.0.2",
-    "@radix-ui/react-switch": "^1.0.3",
-    "@radix-ui/react-toast": "^1.1.5",
+    "@radix-ui/react-label": "^2.1.0",
+    "@radix-ui/react-popover": "^1.1.1",
+    "@radix-ui/react-slot": "^1.1.0",
+    "@radix-ui/react-switch": "^1.1.0",
+    "@radix-ui/react-toast": "^1.2.1",
     "class-variance-authority": "^0.7.0",
-    "clsx": "^2.1.1",
     "consola": "^3.2.3",
     "context-state": "^3.0.0",
     "eventemitter3": "^5.0.1",
-    "tailwind-merge": "^2.3.0",
-    "tailwind-variants": "^0.2.1",
-    "tailwindcss-animate": "^1.0.7"
+    "tw-clsx": "^0.1.0"
   },
   "devDependencies": {
-    "@iconify/tailwind": "^1.1.1",
-    "@swc/core": "^1.5.7",
-    "@types/node": "^20.12.12",
-    "@types/react": "^18.2.79",
-    "@types/react-dom": "^18.2.25",
-    "@vitejs/plugin-react": "^4.3.0",
-    "autoprefixer": "^10.4.19",
-    "npm-run-all2": "^6.2.0",
-    "postcss": "^8.4.38",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "@iconify/tailwind": "^1.1.2",
+    "@swc/core": "^1.7.6",
+    "@types/node": "^20.14.14",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
+    "@vitejs/plugin-react": "^4.3.1",
+    "autoprefixer": "^10.4.20",
+    "npm-run-all2": "^6.2.2",
+    "postcss": "^8.4.40",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "rollup-plugin-visualizer": "^5.12.0",
     "tailwindcss": "3.2.7",
+    "tailwindcss-animate": "^1.0.7",
     "tailwindcss-rem-to-px": "^0.1.0",
-    "tsup-plugin-bundleless": "^0.3.2",
+    "tsup-plugin-bundleless": "^0.4.0",
     "tsup-plugin-css-legacy": "^0.0.1",
-    "typescript": "^5.4.5",
-    "vite": "^5.2.11"
+    "typescript": "^5.5.4",
+    "vite": "^5.3.5"
   }
 }

packages/istanbul-widget/src/components/utils.ts

@@ -1,6 +1,6 @@
-import { type ClassValue, clsx } from "clsx"
-import { twMerge } from "tailwind-merge"
+import { ClassValue } from 'class-variance-authority/types'
+import { classNames } from 'tw-clsx'
 
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
+  return classNames(inputs)
 }

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

@@ -75,25 +75,25 @@
   "dependencies": {
     "@istanbuljs/load-nyc-config": "1.1.0",
     "@minko-fe/lodash-pro": "^0.3.3",
-    "debug": "^4.3.4",
-    "es-module-lexer": "^1.5.3",
+    "debug": "^4.3.6",
+    "es-module-lexer": "1.5.3",
     "espree": "10.0.1",
-    "execa": "^8.0.1",
+    "execa": "8.0.1",
     "istanbul-lib-instrument": "6.0.2",
     "istanbul-widget": "workspace:*",
-    "magic-string": "^0.30.10",
+    "magic-string": "^0.30.11",
     "picocolors": "1.0.0",
     "source-map": "0.7.4",
-    "test-exclude": "6.0.0"
+    "test-exclude": "6.0.0",
+    "vite-plugin-istanbul": "6.0.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "@types/node": "^20.12.12",
+    "@types/node": "^20.14.14",
     "@types/react": "^18.3.3",
     "@types/serialize-javascript": "5.0.4",
     "react": "^18.3.1",
     "serialize-javascript": "6.0.2",
-    "typescript": "^5.4.5",
-    "vite-plugin-istanbul": "6.0.0"
+    "typescript": "^5.5.4"
   }
 }

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

@@ -1,5 +1,6 @@
 import type { AstroIntegration } from 'astro'
-import { vendor, istanbulWidget as viteIstanbulWidget } from '../index'
+import { istanbulWidget as viteIstanbulWidget } from '../index'
+import { vendor } from '../meta'
 import { type VitePluginIstanbulWidgetOptions } from '../types'
 import { checkPluginEnabled, ensureArray, resolveInlineScript, resolveOptions } from '../utils'
 import { debug } from '../utils/debug'

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

@@ -1,11 +1,11 @@
 import type { Plugin } from 'vite'
 import { isArray, set } from '@minko-fe/lodash-pro'
 import istanbul from 'vite-plugin-istanbul'
+import { vendor } from './meta'
 import { type VitePluginIstanbulWidgetOptions } from './types'
 import { checkPluginEnabled, ensureArray, getCommitId, resolveInlineScript, resolveOptions } from './utils'
 import { debug } from './utils/debug'
 
-export const vendor = 'vendor'
 export function istanbulWidget(opts: VitePluginIstanbulWidgetOptions): any {
   const { enabled, fullReport, istanbulPluginConfig, istanbulWidgetConfig, checkProd, delayIstanbulWidgetInit } =
     resolveOptions(opts)

packages/vite-plugin-istanbul-widget/src/meta.ts

@@ -0,0 +1 @@
+export const vendor = 'vendor'

packages/vite-plugin-istanbul-widget/src/remix/client.tsx

@@ -14,7 +14,7 @@ function useHydrated() {
   return hydrated
 }
 
-export const withIstanbulWidget = (Component: ComponentType, istanbulWidgetConfig: IstanbulWidgetOptions) => () => {
+export function withIstanbulWidget(Component: ComponentType, istanbulWidgetConfig: IstanbulWidgetOptions) {
   function AppWithIstanbulWidget(props) {
     const hydrated = useHydrated()
     useEffect(() => {

packages/vite-plugin-istanbul-widget/src/remix/index.tsx

@@ -9,7 +9,6 @@ import { debug } from '../utils/debug'
 
 export function istanbulWidget(opts: VitePluginIstanbulWidgetOptions): any {
   const { enabled, checkProd, istanbulWidgetConfig } = resolveOptions(opts)
-
   if (!checkPluginEnabled(enabled, checkProd)) return
 
   debug('remix istanbulWidget options:', opts)
@@ -21,7 +20,7 @@ export function istanbulWidget(opts: VitePluginIstanbulWidgetOptions): any {
       transform: {
         order: 'pre',
         async handler(code, id) {
-          if (id.endsWith('/root.tsx')) {
+          if (/.+\/root\.[t|j]sx?$/.test(id)) {
             const app = 'AppExport'
 
             const s = new MagicString(code)

playground/vue-app/src/App.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import HelloWorld from './components/HelloWorld.vue'
+  import HelloWorld from './components/HelloWorld.vue'
 </script>
 
 <template>
@@ -15,16 +15,16 @@ import HelloWorld from './components/HelloWorld.vue'
 </template>
 
 <style scoped>
-.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
-}
-.logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
-}
-.logo.vue:hover {
-  filter: drop-shadow(0 0 2em #42b883aa);
-}
+  .logo {
+    height: 6em;
+    padding: 1.5em;
+    will-change: filter;
+    transition: filter 300ms;
+  }
+  .logo:hover {
+    filter: drop-shadow(0 0 2em #646cffaa);
+  }
+  .logo.vue:hover {
+    filter: drop-shadow(0 0 2em #42b883aa);
+  }
 </style>

playground/vue-app/src/components/HelloWorld.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+  import { ref } from 'vue'
 
-defineProps<{ msg: string }>()
+  defineProps<{ msg: string }>()
 
-const count = ref(0)
+  const count = ref(0)
 </script>
 
 <template>
@@ -19,9 +19,8 @@ const count = ref(0)
 
   <p>
     Check out
-    <a href="https://vuejs.org/guide/quick-start.html#local" target="_blank"
-      >create-vue</a
-    >, the official Vue + Vite starter
+    <a href="https://vuejs.org/guide/quick-start.html#local" target="_blank">create-vue</a>, the official Vue + Vite
+    starter
   </p>
   <p>
     Install
@@ -32,7 +31,7 @@ const count = ref(0)
 </template>
 
 <style scoped>
-.read-the-docs {
-  color: #888;
-}
+  .read-the-docs {
+    color: #888;
+  }
 </style>

playground/vue-app/vite.config.ts

@@ -17,7 +17,7 @@ export default defineConfig(() => ({
           setting: {
             autoReport: false,
             onLeavePage: true,
-            requireReporter: true,
+            requireReporter: false,
             text: '!设置文案!',
           },
         },