From 6738d73ba0fd1692262d04a713ab42445aa29c57 Mon Sep 17 00:00:00 2001 From: Vladimir Sheremet Date: Mon, 31 Oct 2022 19:51:49 +0100 Subject: [PATCH] chore: update source-map-support to newer @cspotcode/source-map-support --- packages/vite-node/package.json | 3 +-- packages/vite-node/src/source-map.ts | 7 ++++--- pnpm-lock.yaml | 16 ++++------------ 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/packages/vite-node/package.json b/packages/vite-node/package.json index f044f4c9df37..a8670f0f2501 100644 --- a/packages/vite-node/package.json +++ b/packages/vite-node/package.json @@ -75,15 +75,14 @@ "typecheck": "tsc --noEmit" }, "dependencies": { + "@cspotcode/source-map-support": "^0.8.1", "debug": "^4.3.4", "mlly": "^0.5.16", "pathe": "^0.2.0", - "source-map-support": "^0.5.21", "vite": "^3.0.0" }, "devDependencies": { "@types/debug": "^4.1.7", - "@types/source-map-support": "^0.5.6", "cac": "^6.7.14", "picocolors": "^1.0.0", "rollup": "^2.79.1" diff --git a/packages/vite-node/src/source-map.ts b/packages/vite-node/src/source-map.ts index b1438df029f9..6a4b37abaedd 100644 --- a/packages/vite-node/src/source-map.ts +++ b/packages/vite-node/src/source-map.ts @@ -1,8 +1,9 @@ -import { install } from 'source-map-support' +import type { RawSourceMap as SupportSourceMap } from '@cspotcode/source-map-support' +import { install } from '@cspotcode/source-map-support' import type { RawSourceMap } from './types' interface InstallSourceMapSupportOptions { - getSourceMap: (source: string) => RawSourceMap | null | undefined + getSourceMap: (source: string) => RawSourceMap | SupportSourceMap | null | undefined } export function installViteNodeSourcemaps(options: InstallSourceMapSupportOptions) { @@ -10,7 +11,7 @@ export function installViteNodeSourcemaps(options: InstallSourceMapSupportOption environment: 'node', handleUncaughtExceptions: false, retrieveSourceMap(source) { - const map = options.getSourceMap(source) + const map = options.getSourceMap(source) as unknown as SupportSourceMap if (map) { return { url: source, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e363d722199..f41338e67cc0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -745,25 +745,23 @@ importers: packages/vite-node: specifiers: + '@cspotcode/source-map-support': ^0.8.1 '@types/debug': ^4.1.7 - '@types/source-map-support': ^0.5.6 cac: ^6.7.14 debug: ^4.3.4 mlly: ^0.5.16 pathe: ^0.2.0 picocolors: ^1.0.0 rollup: ^2.79.0 - source-map-support: ^0.5.21 vite: ^3.2.0 dependencies: + '@cspotcode/source-map-support': 0.8.1 debug: 4.3.4 mlly: 0.5.16 pathe: 0.2.0 - source-map-support: 0.5.21 vite: 3.2.1 devDependencies: '@types/debug': 4.1.7 - '@types/source-map-support': 0.5.6 cac: 6.7.14 picocolors: 1.0.0 rollup: 2.79.0 @@ -4021,7 +4019,6 @@ packages: engines: {node: '>=12'} dependencies: '@jridgewell/trace-mapping': 0.3.9 - dev: true /@cypress/request/2.88.10: resolution: {integrity: sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==} @@ -4571,7 +4568,6 @@ packages: dependencies: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 - dev: true /@jsdevtools/ez-spawn/3.0.4: resolution: {integrity: sha512-f5DRIOZf7wxogefH03RjMPMdBF7ADTWUMoOs9kaJo06EfwF+aFhMZMDZxHg/Xe12hptN9xoZjGso2fdjapBRIA==} @@ -7186,12 +7182,6 @@ packages: resolution: {integrity: sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==} dev: true - /@types/source-map-support/0.5.6: - resolution: {integrity: sha512-b2nJ9YyXmkhGaa2b8VLM0kJ04xxwNyijcq12/kDoomCt43qbHBeK2SLNJ9iJmETaAj+bKUT05PQUu3Q66GvLhQ==} - dependencies: - source-map: 0.6.1 - dev: true - /@types/stack-utils/2.0.1: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} dev: true @@ -9480,6 +9470,7 @@ packages: /buffer-from/1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} + dev: true /buffer-xor/1.0.3: resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==} @@ -18485,6 +18476,7 @@ packages: dependencies: buffer-from: 1.1.2 source-map: 0.6.1 + dev: true /source-map-url/0.4.1: resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}