chore: upgrade deps

.changeset/tiny-years-exercise.md

@@ -0,0 +1,8 @@
+---
+"vite-plugin-istanbul-widget": patch
+"istanbul-server-middleware": patch
+"istanbul-widget": patch
+---
+
+upgrade deps
+

.npmrc

@@ -1,2 +1,7 @@
+strict-peer-dependencies=false
+auto-install-peers=true
+link-workspace-packages=true
+ignore-workspace-root-check=true
+hoist=false
 hoist-workspace-packages=false
-save-workspace-protocol=false
+shamefully-hoist=true

eslint.config.js

@@ -1,7 +1,4 @@
-import { createRequire } from 'node:module'
-const require = createRequire(import.meta.url)
-
-const { defineConfig } = require('@minko-fe/eslint-config')
+import { defineConfig } from '@minko-fe/eslint-config'
 export default defineConfig(
   [
     {

package.json

@@ -21,6 +21,7 @@
     "dev": "turbo dev --filter=\"./packages/*\"",
     "build": "turbo build --filter=\"./packages/*\"",
     "lint": "turbo lint --filter=\"./packages/*\"",
+    "lint:playground": "eslint ./playground --fix",
     "prepare": "simple-git-hooks",
     "commitlint": "commitlint -e",
     "up": "taze -I -w",
@@ -30,22 +31,22 @@
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.7",
-    "@commitlint/cli": "^19.4.1",
+    "@changesets/cli": "^2.27.8",
+    "@commitlint/cli": "^19.5.0",
     "@minko-fe/commitlint-config": "^2.1.2",
-    "@minko-fe/eslint-config": "^4.0.0",
+    "@minko-fe/eslint-config": "^4.0.2",
     "@minko-fe/prettier-config": "^2.2.3",
     "@minko-fe/tsconfig": "latest",
-    "eslint": "^9.9.1",
-    "npm-run-all2": "^6.2.2",
-    "nyc": "^17.0.0",
+    "eslint": "^9.10.0",
+    "npm-run-all2": "^6.2.3",
+    "nyc": "^17.1.0",
     "prettier-plugin-astro": "^0.14.1",
     "prettier-plugin-tailwindcss": "^0.6.6",
     "simple-git-hooks": "^2.11.1",
-    "taze": "^0.16.7",
-    "tsup": "^8.2.4",
-    "turbo": "^2.1.0",
-    "typescript": "^5.5.4"
+    "taze": "^0.16.9",
+    "tsup": "^8.3.0",
+    "turbo": "^2.1.2",
+    "typescript": "^5.6.2"
   },
   "simple-git-hooks": {
     "commit-msg": "npm run commitlint",
@@ -56,8 +57,8 @@
   ],
   "pnpm": {
     "patchedDependencies": {
-      "vite-plugin-istanbul@6.0.0": "patches/vite-plugin-istanbul@6.0.0.patch",
-      "serialize-javascript@6.0.2": "patches/serialize-javascript@6.0.2.patch"
+      "vite-plugin-istanbul": "patches/vite-plugin-istanbul.patch",
+      "serialize-javascript": "patches/serialize-javascript.patch"
     }
   },
   "prettier": "@minko-fe/prettier-config",

packages/istanbul-server-middleware/package.json

@@ -22,18 +22,18 @@
   },
   "dependencies": {
     "archiver": "7.0.0",
-    "body-parser": "^1.20.2",
+    "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "execa": "^8.0.1",
-    "express": "^4.19.2",
+    "express": "^4.21.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
     "istanbul-lib-coverage": "^3.2.2",
     "node-html-parser": "^6.1.13",
     "nyc": "^15.1.0",
     "pm2": "^5.4.2",
     "rimraf": "^5.0.10",
-    "tsx": "^4.19.0"
+    "tsx": "^4.19.1"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.2",
@@ -44,7 +44,9 @@
     "@types/fs-extra": "^11.0.4",
     "@types/istanbul-lib-coverage": "^2.0.6",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.16.2",
-    "lodash-es": "^4.17.21"
+    "@types/node": "^20.16.5",
+    "lodash-es": "^4.17.21",
+    "tsup": "^8.3.0",
+    "typescript": "^5.6.2"
   }
 }

packages/istanbul-server-middleware/src/istanbul-middleware/lib/handlers.ts

@@ -117,7 +117,7 @@ export function createHandler(opts?: { resetOnGet: boolean }) {
 
   //return global coverage object on /object as JSON
   app.get('/object', Router.validateQuery, (req, res) => {
-    res.json(core.Coverage.get({ ns: Router.getNS(req), v: Router.getQuery(req).v } || {}))
+    res.json(core.Coverage.get({ ns: Router.getNS(req), v: Router.getQuery(req).v }))
   })
 
   //send self-contained download package with coverage and reports on /download
@@ -142,7 +142,7 @@ export function createHandler(opts?: { resetOnGet: boolean }) {
       filestream.on('end', () => {
         fs.rmSync(zipName, { recursive: true })
       })
-    } catch (err) {
+    } catch {
       res.statusCode = 404
     }
   })

packages/istanbul-server-middleware/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "@minko-fe/tsconfig/tsconfig.lib",
+  "compilerOptions": {
+    "noImplicitAny": false
+  },
+  "exclude": ["**/dist"]
+}

packages/istanbul-server-middleware/tsup.config.ts

@@ -9,6 +9,6 @@ export const tsup = defineConfig((option) => ({
   splitting: false,
   treeshake: true,
   clean: !option.watch,
-  minify: !option.watch,
+  minify: false,
   sourcemap: false,
 }))

packages/istanbul-widget/package.json

@@ -70,7 +70,7 @@
     }
   },
   "dependencies": {
-    "@iconify-json/vscode-icons": "^1.1.37",
+    "@iconify-json/vscode-icons": "^1.2.2",
     "@neodrag/react": "^2.0.4",
     "@radix-ui/react-alert-dialog": "^1.1.1",
     "@radix-ui/react-dialog": "^1.1.1",
@@ -80,34 +80,35 @@
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.0",
     "@radix-ui/react-toast": "^1.2.1",
-    "ahooks": "^3.8.1",
     "class-variance-authority": "^0.7.0",
     "consola": "^3.2.3",
-    "context-state": "^3.1.1",
+    "context-state": "^3.1.2",
     "eventemitter3": "^5.0.1",
     "tw-clsx": "^0.1.0"
   },
   "devDependencies": {
     "@iconify/tailwind": "^1.1.3",
-    "@swc/core": "^1.7.21",
+    "@swc/core": "^1.7.26",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.16.2",
-    "@types/react": "^18.3.4",
+    "@types/node": "^20.16.5",
+    "@types/react": "^18.3.8",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.3.1",
+    "ahooks": "^3.8.1",
     "autoprefixer": "^10.4.20",
     "lodash-es": "^4.17.21",
-    "npm-run-all2": "^6.2.2",
-    "postcss": "^8.4.41",
+    "npm-run-all2": "^6.2.3",
+    "postcss": "^8.4.47",
     "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.1",
-    "tsup-plugin-bundleless": "^0.4.0",
-    "tsup-plugin-css-legacy": "^0.0.1",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.2"
+    "tsup": "^8.3.0",
+    "tsup-plugin-bundleless": "^1.1.0",
+    "tsup-plugin-css-legacy": "^1.0.0",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.6"
   }
 }

packages/istanbul-widget/src/core/components/draggable.tsx

@@ -1,7 +1,7 @@
+import { memo, type PropsWithChildren, useEffect, useRef, useState } from 'react'
 import { type DragOptions, useDraggable } from '@neodrag/react'
 import { useLocalStorageState, useMemoizedFn } from 'ahooks'
 import { max } from 'lodash-es'
-import { memo, type PropsWithChildren, useEffect, useRef, useState } from 'react'
 import { cn } from '@/components/utils'
 import { ISTANBUL_WIDGET_ID } from '@/utils/const'
 import Context from '../context'

packages/istanbul-widget/src/plugins/setting/setting.tsx

@@ -1,6 +1,6 @@
+import { memo, useEffect, useMemo, useRef, useState } from 'react'
 import { useLocalStorageState, useMemoizedFn, useSetState, useUpdateEffect } from 'ahooks'
 import { isObject, remove, toNumber } from 'lodash-es'
-import { memo, useEffect, useMemo, useRef, useState } from 'react'
 import {
   AlertDialog,
   AlertDialogAction,

packages/istanbul-widget/tsup.config.ts

@@ -7,7 +7,7 @@ const common = (option: Options): Options => ({
   clean: true,
   outExtension: () => ({ js: '.js' }),
   outDir: 'dist',
-  minify: !option.watch,
+  minify: false,
   target: 'es3',
   define: {
     __VERSION__: JSON.stringify(pkg.version),
@@ -52,9 +52,8 @@ const esm = (option: Options): Options => ({
   dts: !option.watch,
   format: 'esm',
   outDir: 'dist/esm',
-  splitting: false,
   minify: false,
-  plugins: [bundleless()],
+  ...bundleless(),
 })
 
 export default defineConfig((option) => {
@@ -70,6 +69,7 @@ export default defineConfig((option) => {
     {
       ...common(option),
       ...esm(option),
+      plugins: [...(common(option).plugins || []), ...(esm(option).plugins || [])],
     },
   ]
 })

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

@@ -96,9 +96,7 @@ export default defineConfig({
   ],
   vite: {
     plugins: [
-      publicTypescript({
-        babel: true,
-      }),
+      publicTypescript(),
     ],
   },
 })

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

@@ -78,7 +78,7 @@
   },
   "dependencies": {
     "@istanbuljs/load-nyc-config": "1.1.0",
-    "debug": "^4.3.6",
+    "debug": "^4.3.7",
     "es-module-lexer": "1.5.3",
     "espree": "10.0.1",
     "execa": "8.0.1",
@@ -87,18 +87,19 @@
     "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.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.14.14",
-    "@types/react": "^18.3.3",
+    "@types/node": "^20.16.5",
+    "@types/react": "^18.3.8",
     "@types/serialize-javascript": "5.0.4",
     "lodash-es": "^4.17.21",
     "react": "^18.3.1",
     "serialize-javascript": "6.0.2",
-    "typescript": "^5.5.4",
-    "vite-plugin-istanbul": "6.0.0"
+    "tsup": "^8.3.0",
+    "typescript": "^5.6.2"
   }
 }

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

@@ -6,6 +6,11 @@ import { type VitePluginIstanbulWidgetOptions } from './types'
 import { checkPluginEnabled, ensureArray, getCommitId, resolveInlineScript, resolveOptions } from './utils'
 import { debug } from './utils/debug'
 
+declare global {
+  // eslint-disable-next-line vars-on-top, no-var
+  var __GIT_COMMIT_ID__: string
+}
+
 export function istanbulWidget(opts: VitePluginIstanbulWidgetOptions): any {
   const { enabled, fullReport, istanbulPluginConfig, istanbulWidgetConfig, checkProd, delayIstanbulWidgetInit } =
     resolveOptions(opts)

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

@@ -0,0 +1,7 @@
+{
+  "extends": "@minko-fe/tsconfig/tsconfig.lib",
+  "compilerOptions": {
+    "noImplicitAny": false
+  },
+  "exclude": ["**/dist"]
+}

patches/serialize-javascript@6.0.2.patch → patches/serialize-javascript.patch

@@ -1,5 +1,5 @@
 diff --git a/index.js b/index.js
-index 156f8f917f41ff5eea61809d4bcd7125091ff2c6..5ee15b3efc223f7d7c00762b511320a77a75f01f 100644
+index 156f8f917f41ff5eea61809d4bcd7125091ff2c6..d74926ced04afe4a00c48b887e441d1d3cd26a72 100644
 --- a/index.js
 +++ b/index.js
 @@ -6,7 +6,7 @@ See the accompanying LICENSE file for terms.