From 2f653f7fbdf9dcf1c856faee2e24fef535b8026e Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 25 Nov 2024 17:11:13 -0800 Subject: [PATCH 1/7] feat: Add support for debug IDs --- package.json | 2 +- packages/vite/package.json | 2 +- packages/vite/src/node/plugins/importAnalysisBuild.ts | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3fcd358a893291..a1df185b6011b8 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "playwright-chromium": "^1.49.0", "premove": "^4.0.0", "prettier": "3.3.3", - "rollup": "^4.23.0", + "rollup": "^4.27.4", "rollup-plugin-esbuild": "^6.1.1", "simple-git-hooks": "^2.11.1", "tslib": "^2.8.1", diff --git a/packages/vite/package.json b/packages/vite/package.json index 646e7bf0cc89e2..b8dfae07545c7d 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -87,7 +87,7 @@ "dependencies": { "esbuild": "^0.24.0", "postcss": "^8.4.49", - "rollup": "^4.23.0" + "rollup": "^4.27.4" }, "optionalDependencies": { "fsevents": "~2.3.3" diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index d883e0c4cd222e..12656b43bfa26e 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -697,6 +697,8 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { chunk.map as RawSourceMap, ]) as SourceMap map.toUrl = () => genSourceMapUrl(map) + + const originalDebugId = (chunk.map as any).debugId chunk.map = map if (buildSourcemap === 'inline') { @@ -706,6 +708,10 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { ) chunk.code += `\n//# sourceMappingURL=${genSourceMapUrl(map)}` } else if (buildSourcemap) { + if (originalDebugId) { + // if the original source map had a debugId, we need to preserve it + ;(map as any).debugId = originalDebugId + } const mapAsset = bundle[chunk.fileName + '.map'] if (mapAsset && mapAsset.type === 'asset') { mapAsset.source = map.toString() From 6f60d63ca4bc818431991186eeb26eb5ee6b72e2 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 25 Nov 2024 17:54:42 -0800 Subject: [PATCH 2/7] fix --- packages/vite/src/node/plugins/importAnalysisBuild.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index 12656b43bfa26e..5944f253a74d45 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -710,7 +710,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { } else if (buildSourcemap) { if (originalDebugId) { // if the original source map had a debugId, we need to preserve it - ;(map as any).debugId = originalDebugId + (map as any).debugId = originalDebugId; } const mapAsset = bundle[chunk.fileName + '.map'] if (mapAsset && mapAsset.type === 'asset') { From 442c998abff1ef0355050d469c6d6241673b64bc Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 25 Nov 2024 18:04:46 -0800 Subject: [PATCH 3/7] Update lock file --- pnpm-lock.yaml | 265 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 243 insertions(+), 22 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c9a26e942e1160..b2003368aae6e2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -109,11 +109,11 @@ importers: specifier: 3.3.3 version: 3.3.3 rollup: - specifier: ^4.23.0 - version: 4.24.4 + specifier: ^4.27.4 + version: 4.27.4 rollup-plugin-esbuild: specifier: ^6.1.1 - version: 6.1.1(esbuild@0.24.0)(rollup@4.24.4) + version: 6.1.1(esbuild@0.24.0)(rollup@4.27.4) simple-git-hooks: specifier: ^2.11.1 version: 2.11.1 @@ -230,8 +230,8 @@ importers: specifier: ^8.4.49 version: 8.4.49 rollup: - specifier: ^4.23.0 - version: 4.24.4 + specifier: ^4.27.4 + version: 4.27.4 optionalDependencies: fsevents: specifier: ~2.3.3 @@ -251,22 +251,22 @@ importers: version: 1.0.0-next.25 '@rollup/plugin-alias': specifier: ^5.1.1 - version: 5.1.1(rollup@4.24.4) + version: 5.1.1(rollup@4.27.4) '@rollup/plugin-commonjs': specifier: ^28.0.1 - version: 28.0.1(rollup@4.24.4) + version: 28.0.1(rollup@4.27.4) '@rollup/plugin-dynamic-import-vars': specifier: 2.1.4 - version: 2.1.4(rollup@4.24.4) + version: 2.1.4(rollup@4.27.4) '@rollup/plugin-json': specifier: ^6.1.0 - version: 6.1.0(rollup@4.24.4) + version: 6.1.0(rollup@4.27.4) '@rollup/plugin-node-resolve': specifier: 15.3.0 - version: 15.3.0(rollup@4.24.4) + version: 15.3.0(rollup@4.27.4) '@rollup/pluginutils': specifier: ^5.1.3 - version: 5.1.3(rollup@4.24.4) + version: 5.1.3(rollup@4.27.4) '@types/escape-html': specifier: ^1.0.4 version: 1.0.4 @@ -371,13 +371,13 @@ importers: version: 2.0.2 rollup-plugin-dts: specifier: ^6.1.1 - version: 6.1.1(rollup@4.24.4)(typescript@5.6.3) + version: 6.1.1(rollup@4.27.4)(typescript@5.6.3) rollup-plugin-esbuild: specifier: ^6.1.1 - version: 6.1.1(esbuild@0.24.0)(rollup@4.24.4) + version: 6.1.1(esbuild@0.24.0)(rollup@4.27.4) rollup-plugin-license: specifier: ^3.5.3 - version: 3.5.3(picomatch@4.0.2)(rollup@4.24.4) + version: 3.5.3(picomatch@4.0.2)(rollup@4.27.4) sass: specifier: ^1.81.0 version: 1.81.0 @@ -2873,91 +2873,181 @@ packages: cpu: [arm] os: [android] + '@rollup/rollup-android-arm-eabi@4.27.4': + resolution: {integrity: sha512-2Y3JT6f5MrQkICUyRVCw4oa0sutfAsgaSsb0Lmmy1Wi2y7X5vT9Euqw4gOsCyy0YfKURBg35nhUKZS4mDcfULw==} + cpu: [arm] + os: [android] + '@rollup/rollup-android-arm64@4.24.4': resolution: {integrity: sha512-j4nrEO6nHU1nZUuCfRKoCcvh7PIywQPUCBa2UsootTHvTHIoIu2BzueInGJhhvQO/2FTRdNYpf63xsgEqH9IhA==} cpu: [arm64] os: [android] + '@rollup/rollup-android-arm64@4.27.4': + resolution: {integrity: sha512-wzKRQXISyi9UdCVRqEd0H4cMpzvHYt1f/C3CoIjES6cG++RHKhrBj2+29nPF0IB5kpy9MS71vs07fvrNGAl/iA==} + cpu: [arm64] + os: [android] + '@rollup/rollup-darwin-arm64@4.24.4': resolution: {integrity: sha512-GmU/QgGtBTeraKyldC7cDVVvAJEOr3dFLKneez/n7BvX57UdhOqDsVwzU7UOnYA7AAOt+Xb26lk79PldDHgMIQ==} cpu: [arm64] os: [darwin] + '@rollup/rollup-darwin-arm64@4.27.4': + resolution: {integrity: sha512-PlNiRQapift4LNS8DPUHuDX/IdXiLjf8mc5vdEmUR0fF/pyy2qWwzdLjB+iZquGr8LuN4LnUoSEvKRwjSVYz3Q==} + cpu: [arm64] + os: [darwin] + '@rollup/rollup-darwin-x64@4.24.4': resolution: {integrity: sha512-N6oDBiZCBKlwYcsEPXGDE4g9RoxZLK6vT98M8111cW7VsVJFpNEqvJeIPfsCzbf0XEakPslh72X0gnlMi4Ddgg==} cpu: [x64] os: [darwin] + '@rollup/rollup-darwin-x64@4.27.4': + resolution: {integrity: sha512-o9bH2dbdgBDJaXWJCDTNDYa171ACUdzpxSZt+u/AAeQ20Nk5x+IhA+zsGmrQtpkLiumRJEYef68gcpn2ooXhSQ==} + cpu: [x64] + os: [darwin] + '@rollup/rollup-freebsd-arm64@4.24.4': resolution: {integrity: sha512-py5oNShCCjCyjWXCZNrRGRpjWsF0ic8f4ieBNra5buQz0O/U6mMXCpC1LvrHuhJsNPgRt36tSYMidGzZiJF6mw==} cpu: [arm64] os: [freebsd] + '@rollup/rollup-freebsd-arm64@4.27.4': + resolution: {integrity: sha512-NBI2/i2hT9Q+HySSHTBh52da7isru4aAAo6qC3I7QFVsuhxi2gM8t/EI9EVcILiHLj1vfi+VGGPaLOUENn7pmw==} + cpu: [arm64] + os: [freebsd] + '@rollup/rollup-freebsd-x64@4.24.4': resolution: {integrity: sha512-L7VVVW9FCnTTp4i7KrmHeDsDvjB4++KOBENYtNYAiYl96jeBThFfhP6HVxL74v4SiZEVDH/1ILscR5U9S4ms4g==} cpu: [x64] os: [freebsd] + '@rollup/rollup-freebsd-x64@4.27.4': + resolution: {integrity: sha512-wYcC5ycW2zvqtDYrE7deary2P2UFmSh85PUpAx+dwTCO9uw3sgzD6Gv9n5X4vLaQKsrfTSZZ7Z7uynQozPVvWA==} + cpu: [x64] + os: [freebsd] + '@rollup/rollup-linux-arm-gnueabihf@4.24.4': resolution: {integrity: sha512-10ICosOwYChROdQoQo589N5idQIisxjaFE/PAnX2i0Zr84mY0k9zul1ArH0rnJ/fpgiqfu13TFZR5A5YJLOYZA==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-gnueabihf@4.27.4': + resolution: {integrity: sha512-9OwUnK/xKw6DyRlgx8UizeqRFOfi9mf5TYCw1uolDaJSbUmBxP85DE6T4ouCMoN6pXw8ZoTeZCSEfSaYo+/s1w==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.24.4': resolution: {integrity: sha512-ySAfWs69LYC7QhRDZNKqNhz2UKN8LDfbKSMAEtoEI0jitwfAG2iZwVqGACJT+kfYvvz3/JgsLlcBP+WWoKCLcw==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.27.4': + resolution: {integrity: sha512-Vgdo4fpuphS9V24WOV+KwkCVJ72u7idTgQaBoLRD0UxBAWTF9GWurJO9YD9yh00BzbkhpeXtm6na+MvJU7Z73A==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.24.4': resolution: {integrity: sha512-uHYJ0HNOI6pGEeZ/5mgm5arNVTI0nLlmrbdph+pGXpC9tFHFDQmDMOEqkmUObRfosJqpU8RliYoGz06qSdtcjg==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.27.4': + resolution: {integrity: sha512-pleyNgyd1kkBkw2kOqlBx+0atfIIkkExOTiifoODo6qKDSpnc6WzUY5RhHdmTdIJXBdSnh6JknnYTtmQyobrVg==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-arm64-musl@4.24.4': resolution: {integrity: sha512-38yiWLemQf7aLHDgTg85fh3hW9stJ0Muk7+s6tIkSUOMmi4Xbv5pH/5Bofnsb6spIwD5FJiR+jg71f0CH5OzoA==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-musl@4.27.4': + resolution: {integrity: sha512-caluiUXvUuVyCHr5DxL8ohaaFFzPGmgmMvwmqAITMpV/Q+tPoaHZ/PWa3t8B2WyoRcIIuu1hkaW5KkeTDNSnMA==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.24.4': resolution: {integrity: sha512-q73XUPnkwt9ZNF2xRS4fvneSuaHw2BXuV5rI4cw0fWYVIWIBeDZX7c7FWhFQPNTnE24172K30I+dViWRVD9TwA==} cpu: [ppc64] os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.27.4': + resolution: {integrity: sha512-FScrpHrO60hARyHh7s1zHE97u0KlT/RECzCKAdmI+LEoC1eDh/RDji9JgFqyO+wPDb86Oa/sXkily1+oi4FzJQ==} + cpu: [ppc64] + os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.24.4': resolution: {integrity: sha512-Aie/TbmQi6UXokJqDZdmTJuZBCU3QBDA8oTKRGtd4ABi/nHgXICulfg1KI6n9/koDsiDbvHAiQO3YAUNa/7BCw==} cpu: [riscv64] os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.27.4': + resolution: {integrity: sha512-qyyprhyGb7+RBfMPeww9FlHwKkCXdKHeGgSqmIXw9VSUtvyFZ6WZRtnxgbuz76FK7LyoN8t/eINRbPUcvXB5fw==} + cpu: [riscv64] + os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.24.4': resolution: {integrity: sha512-P8MPErVO/y8ohWSP9JY7lLQ8+YMHfTI4bAdtCi3pC2hTeqFJco2jYspzOzTUB8hwUWIIu1xwOrJE11nP+0JFAQ==} cpu: [s390x] os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.27.4': + resolution: {integrity: sha512-PFz+y2kb6tbh7m3A7nA9++eInGcDVZUACulf/KzDtovvdTizHpZaJty7Gp0lFwSQcrnebHOqxF1MaKZd7psVRg==} + cpu: [s390x] + os: [linux] + '@rollup/rollup-linux-x64-gnu@4.24.4': resolution: {integrity: sha512-K03TljaaoPK5FOyNMZAAEmhlyO49LaE4qCsr0lYHUKyb6QacTNF9pnfPpXnFlFD3TXuFbFbz7tJ51FujUXkXYA==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-gnu@4.27.4': + resolution: {integrity: sha512-Ni8mMtfo+o/G7DVtweXXV/Ol2TFf63KYjTtoZ5f078AUgJTmaIJnj4JFU7TK/9SVWTaSJGxPi5zMDgK4w+Ez7Q==} + cpu: [x64] + os: [linux] + '@rollup/rollup-linux-x64-musl@4.24.4': resolution: {integrity: sha512-VJYl4xSl/wqG2D5xTYncVWW+26ICV4wubwN9Gs5NrqhJtayikwCXzPL8GDsLnaLU3WwhQ8W02IinYSFJfyo34Q==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-musl@4.27.4': + resolution: {integrity: sha512-5AeeAF1PB9TUzD+3cROzFTnAJAcVUGLuR8ng0E0WXGkYhp6RD6L+6szYVX+64Rs0r72019KHZS1ka1q+zU/wUw==} + cpu: [x64] + os: [linux] + '@rollup/rollup-win32-arm64-msvc@4.24.4': resolution: {integrity: sha512-ku2GvtPwQfCqoPFIJCqZ8o7bJcj+Y54cZSr43hHca6jLwAiCbZdBUOrqE6y29QFajNAzzpIOwsckaTFmN6/8TA==} cpu: [arm64] os: [win32] + '@rollup/rollup-win32-arm64-msvc@4.27.4': + resolution: {integrity: sha512-yOpVsA4K5qVwu2CaS3hHxluWIK5HQTjNV4tWjQXluMiiiu4pJj4BN98CvxohNCpcjMeTXk/ZMJBRbgRg8HBB6A==} + cpu: [arm64] + os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.24.4': resolution: {integrity: sha512-V3nCe+eTt/W6UYNr/wGvO1fLpHUrnlirlypZfKCT1fG6hWfqhPgQV/K/mRBXBpxc0eKLIF18pIOFVPh0mqHjlg==} cpu: [ia32] os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.27.4': + resolution: {integrity: sha512-KtwEJOaHAVJlxV92rNYiG9JQwQAdhBlrjNRp7P9L8Cb4Rer3in+0A+IPhJC9y68WAi9H0sX4AiG2NTsVlmqJeQ==} + cpu: [ia32] + os: [win32] + '@rollup/rollup-win32-x64-msvc@4.24.4': resolution: {integrity: sha512-LTw1Dfd0mBIEqUVCxbvTE/LLo+9ZxVC9k99v1v4ahg9Aak6FpqOfNu5kRkeTAn0wphoC4JU7No1/rL+bBCEwhg==} cpu: [x64] os: [win32] + '@rollup/rollup-win32-x64-msvc@4.27.4': + resolution: {integrity: sha512-3j4jx1TppORdTAoBJRd+/wJRGCPC0ETWkXOecJ6PPZLj6SptXkrXcNqdj0oclbKML6FkQltdz7bBA3rUSirZug==} + cpu: [x64] + os: [win32] + '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} @@ -6318,6 +6408,11 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + rollup@4.27.4: + resolution: {integrity: sha512-RLKxqHEMjh/RGLsDxAEsaLO3mWgyoU6x9w6n1ikAzet4B3gI2/3yP6PWY2p9QzRTh6MfEIXB3MwsOY0Iv3vNrw==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + router@2.0.0: resolution: {integrity: sha512-dIM5zVoG8xhC6rnSN8uoAgFARwTE7BQs8YwHEvK0VCmfxQXMaOuA1uiR1IPwsW7JyK5iTt7Od/TC9StasS2NPQ==} engines: {node: '>= 0.10'} @@ -8427,6 +8522,10 @@ snapshots: optionalDependencies: rollup: 4.24.4 + '@rollup/plugin-alias@5.1.1(rollup@4.27.4)': + optionalDependencies: + rollup: 4.27.4 + '@rollup/plugin-commonjs@28.0.1(rollup@4.24.4)': dependencies: '@rollup/pluginutils': 5.1.3(rollup@4.24.4) @@ -8439,15 +8538,27 @@ snapshots: optionalDependencies: rollup: 4.24.4 - '@rollup/plugin-dynamic-import-vars@2.1.4(rollup@4.24.4)': + '@rollup/plugin-commonjs@28.0.1(rollup@4.27.4)': dependencies: - '@rollup/pluginutils': 5.1.3(rollup@4.24.4) + '@rollup/pluginutils': 5.1.3(rollup@4.27.4) + commondir: 1.0.1 + estree-walker: 2.0.2 + fdir: 6.4.2(picomatch@4.0.2) + is-reference: 1.2.1 + magic-string: 0.30.13 + picomatch: 4.0.2 + optionalDependencies: + rollup: 4.27.4 + + '@rollup/plugin-dynamic-import-vars@2.1.4(rollup@4.27.4)': + dependencies: + '@rollup/pluginutils': 5.1.3(rollup@4.27.4) astring: 1.9.0 estree-walker: 2.0.2 magic-string: 0.30.13 tinyglobby: 0.2.10 optionalDependencies: - rollup: 4.24.4 + rollup: 4.27.4 '@rollup/plugin-json@6.1.0(rollup@4.24.4)': dependencies: @@ -8455,6 +8566,12 @@ snapshots: optionalDependencies: rollup: 4.24.4 + '@rollup/plugin-json@6.1.0(rollup@4.27.4)': + dependencies: + '@rollup/pluginutils': 5.1.3(rollup@4.27.4) + optionalDependencies: + rollup: 4.27.4 + '@rollup/plugin-node-resolve@15.3.0(rollup@4.24.4)': dependencies: '@rollup/pluginutils': 5.1.3(rollup@4.24.4) @@ -8465,6 +8582,16 @@ snapshots: optionalDependencies: rollup: 4.24.4 + '@rollup/plugin-node-resolve@15.3.0(rollup@4.27.4)': + dependencies: + '@rollup/pluginutils': 5.1.3(rollup@4.27.4) + '@types/resolve': 1.20.2 + deepmerge: 4.3.1 + is-module: 1.0.0 + resolve: 1.22.8 + optionalDependencies: + rollup: 4.27.4 + '@rollup/plugin-replace@6.0.1(rollup@4.24.4)': dependencies: '@rollup/pluginutils': 5.1.3(rollup@4.24.4) @@ -8480,60 +8607,122 @@ snapshots: optionalDependencies: rollup: 4.24.4 + '@rollup/pluginutils@5.1.3(rollup@4.27.4)': + dependencies: + '@types/estree': 1.0.6 + estree-walker: 2.0.2 + picomatch: 4.0.2 + optionalDependencies: + rollup: 4.27.4 + '@rollup/rollup-android-arm-eabi@4.24.4': optional: true + '@rollup/rollup-android-arm-eabi@4.27.4': + optional: true + '@rollup/rollup-android-arm64@4.24.4': optional: true + '@rollup/rollup-android-arm64@4.27.4': + optional: true + '@rollup/rollup-darwin-arm64@4.24.4': optional: true + '@rollup/rollup-darwin-arm64@4.27.4': + optional: true + '@rollup/rollup-darwin-x64@4.24.4': optional: true + '@rollup/rollup-darwin-x64@4.27.4': + optional: true + '@rollup/rollup-freebsd-arm64@4.24.4': optional: true + '@rollup/rollup-freebsd-arm64@4.27.4': + optional: true + '@rollup/rollup-freebsd-x64@4.24.4': optional: true + '@rollup/rollup-freebsd-x64@4.27.4': + optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.24.4': optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.27.4': + optional: true + '@rollup/rollup-linux-arm-musleabihf@4.24.4': optional: true + '@rollup/rollup-linux-arm-musleabihf@4.27.4': + optional: true + '@rollup/rollup-linux-arm64-gnu@4.24.4': optional: true + '@rollup/rollup-linux-arm64-gnu@4.27.4': + optional: true + '@rollup/rollup-linux-arm64-musl@4.24.4': optional: true + '@rollup/rollup-linux-arm64-musl@4.27.4': + optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.24.4': optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.27.4': + optional: true + '@rollup/rollup-linux-riscv64-gnu@4.24.4': optional: true + '@rollup/rollup-linux-riscv64-gnu@4.27.4': + optional: true + '@rollup/rollup-linux-s390x-gnu@4.24.4': optional: true + '@rollup/rollup-linux-s390x-gnu@4.27.4': + optional: true + '@rollup/rollup-linux-x64-gnu@4.24.4': optional: true + '@rollup/rollup-linux-x64-gnu@4.27.4': + optional: true + '@rollup/rollup-linux-x64-musl@4.24.4': optional: true + '@rollup/rollup-linux-x64-musl@4.27.4': + optional: true + '@rollup/rollup-win32-arm64-msvc@4.24.4': optional: true + '@rollup/rollup-win32-arm64-msvc@4.27.4': + optional: true + '@rollup/rollup-win32-ia32-msvc@4.24.4': optional: true + '@rollup/rollup-win32-ia32-msvc@4.27.4': + optional: true + '@rollup/rollup-win32-x64-msvc@4.24.4': optional: true + '@rollup/rollup-win32-x64-msvc@4.27.4': + optional: true + '@sec-ant/readable-stream@0.4.1': {} '@shikijs/core@1.22.2': @@ -12170,18 +12359,26 @@ snapshots: optionalDependencies: '@babel/code-frame': 7.26.2 - rollup-plugin-esbuild@6.1.1(esbuild@0.24.0)(rollup@4.24.4): + rollup-plugin-dts@6.1.1(rollup@4.27.4)(typescript@5.6.3): dependencies: - '@rollup/pluginutils': 5.1.3(rollup@4.24.4) + magic-string: 0.30.13 + rollup: 4.27.4 + typescript: 5.6.3 + optionalDependencies: + '@babel/code-frame': 7.26.2 + + rollup-plugin-esbuild@6.1.1(esbuild@0.24.0)(rollup@4.27.4): + dependencies: + '@rollup/pluginutils': 5.1.3(rollup@4.27.4) debug: 4.3.7 es-module-lexer: 1.5.4 esbuild: 0.24.0 get-tsconfig: 4.8.1 - rollup: 4.24.4 + rollup: 4.27.4 transitivePeerDependencies: - supports-color - rollup-plugin-license@3.5.3(picomatch@4.0.2)(rollup@4.24.4): + rollup-plugin-license@3.5.3(picomatch@4.0.2)(rollup@4.27.4): dependencies: commenting: 1.1.0 fdir: 6.3.0(picomatch@4.0.2) @@ -12189,7 +12386,7 @@ snapshots: magic-string: 0.30.13 moment: 2.30.1 package-name-regex: 2.0.6 - rollup: 4.24.4 + rollup: 4.27.4 spdx-expression-validate: 2.0.0 spdx-satisfies: 5.0.1 transitivePeerDependencies: @@ -12219,6 +12416,30 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.24.4 fsevents: 2.3.3 + rollup@4.27.4: + dependencies: + '@types/estree': 1.0.6 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.27.4 + '@rollup/rollup-android-arm64': 4.27.4 + '@rollup/rollup-darwin-arm64': 4.27.4 + '@rollup/rollup-darwin-x64': 4.27.4 + '@rollup/rollup-freebsd-arm64': 4.27.4 + '@rollup/rollup-freebsd-x64': 4.27.4 + '@rollup/rollup-linux-arm-gnueabihf': 4.27.4 + '@rollup/rollup-linux-arm-musleabihf': 4.27.4 + '@rollup/rollup-linux-arm64-gnu': 4.27.4 + '@rollup/rollup-linux-arm64-musl': 4.27.4 + '@rollup/rollup-linux-powerpc64le-gnu': 4.27.4 + '@rollup/rollup-linux-riscv64-gnu': 4.27.4 + '@rollup/rollup-linux-s390x-gnu': 4.27.4 + '@rollup/rollup-linux-x64-gnu': 4.27.4 + '@rollup/rollup-linux-x64-musl': 4.27.4 + '@rollup/rollup-win32-arm64-msvc': 4.27.4 + '@rollup/rollup-win32-ia32-msvc': 4.27.4 + '@rollup/rollup-win32-x64-msvc': 4.27.4 + fsevents: 2.3.3 + router@2.0.0: dependencies: array-flatten: 3.0.0 From 91404f31939f8a12a3553610910b49d8a1ded75d Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 25 Nov 2024 18:11:24 -0800 Subject: [PATCH 4/7] remove comment --- packages/vite/src/node/plugins/importAnalysisBuild.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index 5944f253a74d45..d9e00cebbfdd6a 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -709,7 +709,6 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { chunk.code += `\n//# sourceMappingURL=${genSourceMapUrl(map)}` } else if (buildSourcemap) { if (originalDebugId) { - // if the original source map had a debugId, we need to preserve it (map as any).debugId = originalDebugId; } const mapAsset = bundle[chunk.fileName + '.map'] From 97808c89e3649a1d7b14144121b6b7d7e5443efd Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 13 Dec 2024 11:22:30 -0500 Subject: [PATCH 5/7] Remove `as any` --- package.json | 2 +- packages/vite/package.json | 2 +- .../src/node/plugins/importAnalysisBuild.ts | 4 +- pnpm-lock.yaml | 255 +++++++++--------- 4 files changed, 136 insertions(+), 127 deletions(-) diff --git a/package.json b/package.json index 7f4a76cc84552d..c56a27c404efb2 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "playwright-chromium": "^1.49.0", "premove": "^4.0.0", "prettier": "3.4.2", - "rollup": "^4.23.0", + "rollup": "^4.28.1", "rollup-plugin-esbuild": "^6.1.1", "simple-git-hooks": "^2.11.1", "tslib": "^2.8.1", diff --git a/packages/vite/package.json b/packages/vite/package.json index e7470c15a98445..df3cb48732c518 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -87,7 +87,7 @@ "dependencies": { "esbuild": "^0.24.0", "postcss": "^8.4.49", - "rollup": "^4.27.4" + "rollup": "^4.28.1" }, "optionalDependencies": { "fsevents": "~2.3.3" diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index 8042028b2697c8..cbe14f1c556a3f 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -698,7 +698,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { ]) as SourceMap map.toUrl = () => genSourceMapUrl(map) - const originalDebugId = (chunk.map as any).debugId + const originalDebugId = chunk.map.debugId chunk.map = map if (buildSourcemap === 'inline') { @@ -709,7 +709,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { chunk.code += `\n//# sourceMappingURL=${genSourceMapUrl(map)}` } else { if (originalDebugId) { - (map as any).debugId = originalDebugId; + map.debugId = originalDebugId; } const mapAsset = bundle[chunk.fileName + '.map'] if (mapAsset && mapAsset.type === 'asset') { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 930b84b937b04c..4f7c7a51686d0f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -109,11 +109,11 @@ importers: specifier: 3.4.2 version: 3.4.2 rollup: - specifier: ^4.23.0 - version: 4.24.4 + specifier: ^4.28.1 + version: 4.28.1 rollup-plugin-esbuild: specifier: ^6.1.1 - version: 6.1.1(esbuild@0.24.0)(rollup@4.24.4) + version: 6.1.1(esbuild@0.24.0)(rollup@4.28.1) simple-git-hooks: specifier: ^2.11.1 version: 2.11.1 @@ -230,8 +230,8 @@ importers: specifier: ^8.4.49 version: 8.4.49 rollup: - specifier: ^4.23.0 - version: 4.24.4 + specifier: ^4.28.1 + version: 4.28.1 optionalDependencies: fsevents: specifier: ~2.3.3 @@ -251,22 +251,22 @@ importers: version: 1.0.0-next.25 '@rollup/plugin-alias': specifier: ^5.1.1 - version: 5.1.1(rollup@4.24.4) + version: 5.1.1(rollup@4.28.1) '@rollup/plugin-commonjs': specifier: ^28.0.1 - version: 28.0.1(rollup@4.24.4) + version: 28.0.1(rollup@4.28.1) '@rollup/plugin-dynamic-import-vars': specifier: 2.1.4 - version: 2.1.4(rollup@4.24.4) + version: 2.1.4(rollup@4.28.1) '@rollup/plugin-json': specifier: ^6.1.0 - version: 6.1.0(rollup@4.24.4) + version: 6.1.0(rollup@4.28.1) '@rollup/plugin-node-resolve': specifier: 15.3.0 - version: 15.3.0(rollup@4.24.4) + version: 15.3.0(rollup@4.28.1) '@rollup/pluginutils': specifier: ^5.1.3 - version: 5.1.3(rollup@4.24.4) + version: 5.1.3(rollup@4.28.1) '@types/escape-html': specifier: ^1.0.4 version: 1.0.4 @@ -371,13 +371,13 @@ importers: version: 2.0.3 rollup-plugin-dts: specifier: ^6.1.1 - version: 6.1.1(rollup@4.24.4)(typescript@5.6.3) + version: 6.1.1(rollup@4.28.1)(typescript@5.6.3) rollup-plugin-esbuild: specifier: ^6.1.1 - version: 6.1.1(esbuild@0.24.0)(rollup@4.24.4) + version: 6.1.1(esbuild@0.24.0)(rollup@4.28.1) rollup-plugin-license: specifier: ^3.5.3 - version: 3.5.3(picomatch@4.0.2)(rollup@4.24.4) + version: 3.5.3(picomatch@4.0.2)(rollup@4.28.1) sass: specifier: ^1.82.0 version: 1.82.0 @@ -2885,93 +2885,98 @@ packages: rollup: optional: true - '@rollup/rollup-android-arm-eabi@4.24.4': - resolution: {integrity: sha512-jfUJrFct/hTA0XDM5p/htWKoNNTbDLY0KRwEt6pyOA6k2fmk0WVwl65PdUdJZgzGEHWx+49LilkcSaumQRyNQw==} + '@rollup/rollup-android-arm-eabi@4.28.1': + resolution: {integrity: sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.24.4': - resolution: {integrity: sha512-j4nrEO6nHU1nZUuCfRKoCcvh7PIywQPUCBa2UsootTHvTHIoIu2BzueInGJhhvQO/2FTRdNYpf63xsgEqH9IhA==} + '@rollup/rollup-android-arm64@4.28.1': + resolution: {integrity: sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.24.4': - resolution: {integrity: sha512-GmU/QgGtBTeraKyldC7cDVVvAJEOr3dFLKneez/n7BvX57UdhOqDsVwzU7UOnYA7AAOt+Xb26lk79PldDHgMIQ==} + '@rollup/rollup-darwin-arm64@4.28.1': + resolution: {integrity: sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.24.4': - resolution: {integrity: sha512-N6oDBiZCBKlwYcsEPXGDE4g9RoxZLK6vT98M8111cW7VsVJFpNEqvJeIPfsCzbf0XEakPslh72X0gnlMi4Ddgg==} + '@rollup/rollup-darwin-x64@4.28.1': + resolution: {integrity: sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.24.4': - resolution: {integrity: sha512-py5oNShCCjCyjWXCZNrRGRpjWsF0ic8f4ieBNra5buQz0O/U6mMXCpC1LvrHuhJsNPgRt36tSYMidGzZiJF6mw==} + '@rollup/rollup-freebsd-arm64@4.28.1': + resolution: {integrity: sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.24.4': - resolution: {integrity: sha512-L7VVVW9FCnTTp4i7KrmHeDsDvjB4++KOBENYtNYAiYl96jeBThFfhP6HVxL74v4SiZEVDH/1ILscR5U9S4ms4g==} + '@rollup/rollup-freebsd-x64@4.28.1': + resolution: {integrity: sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.24.4': - resolution: {integrity: sha512-10ICosOwYChROdQoQo589N5idQIisxjaFE/PAnX2i0Zr84mY0k9zul1ArH0rnJ/fpgiqfu13TFZR5A5YJLOYZA==} + '@rollup/rollup-linux-arm-gnueabihf@4.28.1': + resolution: {integrity: sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.24.4': - resolution: {integrity: sha512-ySAfWs69LYC7QhRDZNKqNhz2UKN8LDfbKSMAEtoEI0jitwfAG2iZwVqGACJT+kfYvvz3/JgsLlcBP+WWoKCLcw==} + '@rollup/rollup-linux-arm-musleabihf@4.28.1': + resolution: {integrity: sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.24.4': - resolution: {integrity: sha512-uHYJ0HNOI6pGEeZ/5mgm5arNVTI0nLlmrbdph+pGXpC9tFHFDQmDMOEqkmUObRfosJqpU8RliYoGz06qSdtcjg==} + '@rollup/rollup-linux-arm64-gnu@4.28.1': + resolution: {integrity: sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.24.4': - resolution: {integrity: sha512-38yiWLemQf7aLHDgTg85fh3hW9stJ0Muk7+s6tIkSUOMmi4Xbv5pH/5Bofnsb6spIwD5FJiR+jg71f0CH5OzoA==} + '@rollup/rollup-linux-arm64-musl@4.28.1': + resolution: {integrity: sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.24.4': - resolution: {integrity: sha512-q73XUPnkwt9ZNF2xRS4fvneSuaHw2BXuV5rI4cw0fWYVIWIBeDZX7c7FWhFQPNTnE24172K30I+dViWRVD9TwA==} + '@rollup/rollup-linux-loongarch64-gnu@4.28.1': + resolution: {integrity: sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==} + cpu: [loong64] + os: [linux] + + '@rollup/rollup-linux-powerpc64le-gnu@4.28.1': + resolution: {integrity: sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.24.4': - resolution: {integrity: sha512-Aie/TbmQi6UXokJqDZdmTJuZBCU3QBDA8oTKRGtd4ABi/nHgXICulfg1KI6n9/koDsiDbvHAiQO3YAUNa/7BCw==} + '@rollup/rollup-linux-riscv64-gnu@4.28.1': + resolution: {integrity: sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.24.4': - resolution: {integrity: sha512-P8MPErVO/y8ohWSP9JY7lLQ8+YMHfTI4bAdtCi3pC2hTeqFJco2jYspzOzTUB8hwUWIIu1xwOrJE11nP+0JFAQ==} + '@rollup/rollup-linux-s390x-gnu@4.28.1': + resolution: {integrity: sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.24.4': - resolution: {integrity: sha512-K03TljaaoPK5FOyNMZAAEmhlyO49LaE4qCsr0lYHUKyb6QacTNF9pnfPpXnFlFD3TXuFbFbz7tJ51FujUXkXYA==} + '@rollup/rollup-linux-x64-gnu@4.28.1': + resolution: {integrity: sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.24.4': - resolution: {integrity: sha512-VJYl4xSl/wqG2D5xTYncVWW+26ICV4wubwN9Gs5NrqhJtayikwCXzPL8GDsLnaLU3WwhQ8W02IinYSFJfyo34Q==} + '@rollup/rollup-linux-x64-musl@4.28.1': + resolution: {integrity: sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.24.4': - resolution: {integrity: sha512-ku2GvtPwQfCqoPFIJCqZ8o7bJcj+Y54cZSr43hHca6jLwAiCbZdBUOrqE6y29QFajNAzzpIOwsckaTFmN6/8TA==} + '@rollup/rollup-win32-arm64-msvc@4.28.1': + resolution: {integrity: sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.24.4': - resolution: {integrity: sha512-V3nCe+eTt/W6UYNr/wGvO1fLpHUrnlirlypZfKCT1fG6hWfqhPgQV/K/mRBXBpxc0eKLIF18pIOFVPh0mqHjlg==} + '@rollup/rollup-win32-ia32-msvc@4.28.1': + resolution: {integrity: sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.24.4': - resolution: {integrity: sha512-LTw1Dfd0mBIEqUVCxbvTE/LLo+9ZxVC9k99v1v4ahg9Aak6FpqOfNu5kRkeTAn0wphoC4JU7No1/rL+bBCEwhg==} + '@rollup/rollup-win32-x64-msvc@4.28.1': + resolution: {integrity: sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==} cpu: [x64] os: [win32] @@ -6367,8 +6372,8 @@ packages: peerDependencies: rollup: ^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 - rollup@4.24.4: - resolution: {integrity: sha512-vGorVWIsWfX3xbcyAS+I047kFKapHYivmkaT63Smj77XwvLSJos6M1xGqZnBPFQFBRZDOcG1QnYEIxAvTr/HjA==} + rollup@4.28.1: + resolution: {integrity: sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -8489,13 +8494,13 @@ snapshots: '@polka/url@1.0.0-next.28': {} - '@rollup/plugin-alias@5.1.1(rollup@4.24.4)': + '@rollup/plugin-alias@5.1.1(rollup@4.28.1)': optionalDependencies: - rollup: 4.24.4 + rollup: 4.28.1 - '@rollup/plugin-commonjs@28.0.1(rollup@4.24.4)': + '@rollup/plugin-commonjs@28.0.1(rollup@4.28.1)': dependencies: - '@rollup/pluginutils': 5.1.3(rollup@4.24.4) + '@rollup/pluginutils': 5.1.3(rollup@4.28.1) commondir: 1.0.1 estree-walker: 2.0.2 fdir: 6.4.2(picomatch@4.0.2) @@ -8503,101 +8508,104 @@ snapshots: magic-string: 0.30.14 picomatch: 4.0.2 optionalDependencies: - rollup: 4.24.4 + rollup: 4.28.1 - '@rollup/plugin-dynamic-import-vars@2.1.4(rollup@4.24.4)': + '@rollup/plugin-dynamic-import-vars@2.1.4(rollup@4.28.1)': dependencies: - '@rollup/pluginutils': 5.1.3(rollup@4.24.4) + '@rollup/pluginutils': 5.1.3(rollup@4.28.1) astring: 1.9.0 estree-walker: 2.0.2 magic-string: 0.30.14 tinyglobby: 0.2.10 optionalDependencies: - rollup: 4.24.4 + rollup: 4.28.1 - '@rollup/plugin-json@6.1.0(rollup@4.24.4)': + '@rollup/plugin-json@6.1.0(rollup@4.28.1)': dependencies: - '@rollup/pluginutils': 5.1.3(rollup@4.24.4) + '@rollup/pluginutils': 5.1.3(rollup@4.28.1) optionalDependencies: - rollup: 4.24.4 + rollup: 4.28.1 - '@rollup/plugin-node-resolve@15.3.0(rollup@4.24.4)': + '@rollup/plugin-node-resolve@15.3.0(rollup@4.28.1)': dependencies: - '@rollup/pluginutils': 5.1.3(rollup@4.24.4) + '@rollup/pluginutils': 5.1.3(rollup@4.28.1) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-module: 1.0.0 resolve: 1.22.8 optionalDependencies: - rollup: 4.24.4 + rollup: 4.28.1 - '@rollup/plugin-replace@6.0.1(rollup@4.24.4)': + '@rollup/plugin-replace@6.0.1(rollup@4.28.1)': dependencies: - '@rollup/pluginutils': 5.1.3(rollup@4.24.4) + '@rollup/pluginutils': 5.1.3(rollup@4.28.1) magic-string: 0.30.14 optionalDependencies: - rollup: 4.24.4 + rollup: 4.28.1 - '@rollup/pluginutils@5.1.3(rollup@4.24.4)': + '@rollup/pluginutils@5.1.3(rollup@4.28.1)': dependencies: '@types/estree': 1.0.6 estree-walker: 2.0.2 picomatch: 4.0.2 optionalDependencies: - rollup: 4.24.4 + rollup: 4.28.1 + + '@rollup/rollup-android-arm-eabi@4.28.1': + optional: true - '@rollup/rollup-android-arm-eabi@4.24.4': + '@rollup/rollup-android-arm64@4.28.1': optional: true - '@rollup/rollup-android-arm64@4.24.4': + '@rollup/rollup-darwin-arm64@4.28.1': optional: true - '@rollup/rollup-darwin-arm64@4.24.4': + '@rollup/rollup-darwin-x64@4.28.1': optional: true - '@rollup/rollup-darwin-x64@4.24.4': + '@rollup/rollup-freebsd-arm64@4.28.1': optional: true - '@rollup/rollup-freebsd-arm64@4.24.4': + '@rollup/rollup-freebsd-x64@4.28.1': optional: true - '@rollup/rollup-freebsd-x64@4.24.4': + '@rollup/rollup-linux-arm-gnueabihf@4.28.1': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.24.4': + '@rollup/rollup-linux-arm-musleabihf@4.28.1': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.24.4': + '@rollup/rollup-linux-arm64-gnu@4.28.1': optional: true - '@rollup/rollup-linux-arm64-gnu@4.24.4': + '@rollup/rollup-linux-arm64-musl@4.28.1': optional: true - '@rollup/rollup-linux-arm64-musl@4.24.4': + '@rollup/rollup-linux-loongarch64-gnu@4.28.1': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.24.4': + '@rollup/rollup-linux-powerpc64le-gnu@4.28.1': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.24.4': + '@rollup/rollup-linux-riscv64-gnu@4.28.1': optional: true - '@rollup/rollup-linux-s390x-gnu@4.24.4': + '@rollup/rollup-linux-s390x-gnu@4.28.1': optional: true - '@rollup/rollup-linux-x64-gnu@4.24.4': + '@rollup/rollup-linux-x64-gnu@4.28.1': optional: true - '@rollup/rollup-linux-x64-musl@4.24.4': + '@rollup/rollup-linux-x64-musl@4.28.1': optional: true - '@rollup/rollup-win32-arm64-msvc@4.24.4': + '@rollup/rollup-win32-arm64-msvc@4.28.1': optional: true - '@rollup/rollup-win32-ia32-msvc@4.24.4': + '@rollup/rollup-win32-ia32-msvc@4.28.1': optional: true - '@rollup/rollup-win32-x64-msvc@4.24.4': + '@rollup/rollup-win32-x64-msvc@4.28.1': optional: true '@sec-ant/readable-stream@0.4.1': {} @@ -12261,26 +12269,26 @@ snapshots: dependencies: glob: 7.2.3 - rollup-plugin-dts@6.1.1(rollup@4.24.4)(typescript@5.6.3): + rollup-plugin-dts@6.1.1(rollup@4.28.1)(typescript@5.6.3): dependencies: magic-string: 0.30.14 - rollup: 4.24.4 + rollup: 4.28.1 typescript: 5.6.3 optionalDependencies: '@babel/code-frame': 7.26.2 - rollup-plugin-esbuild@6.1.1(esbuild@0.24.0)(rollup@4.24.4): + rollup-plugin-esbuild@6.1.1(esbuild@0.24.0)(rollup@4.28.1): dependencies: - '@rollup/pluginutils': 5.1.3(rollup@4.24.4) + '@rollup/pluginutils': 5.1.3(rollup@4.28.1) debug: 4.4.0 es-module-lexer: 1.5.4 esbuild: 0.24.0 get-tsconfig: 4.8.1 - rollup: 4.24.4 + rollup: 4.28.1 transitivePeerDependencies: - supports-color - rollup-plugin-license@3.5.3(picomatch@4.0.2)(rollup@4.24.4): + rollup-plugin-license@3.5.3(picomatch@4.0.2)(rollup@4.28.1): dependencies: commenting: 1.1.0 fdir: 6.3.0(picomatch@4.0.2) @@ -12288,34 +12296,35 @@ snapshots: magic-string: 0.30.14 moment: 2.30.1 package-name-regex: 2.0.6 - rollup: 4.24.4 + rollup: 4.28.1 spdx-expression-validate: 2.0.0 spdx-satisfies: 5.0.1 transitivePeerDependencies: - picomatch - rollup@4.24.4: + rollup@4.28.1: dependencies: '@types/estree': 1.0.6 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.24.4 - '@rollup/rollup-android-arm64': 4.24.4 - '@rollup/rollup-darwin-arm64': 4.24.4 - '@rollup/rollup-darwin-x64': 4.24.4 - '@rollup/rollup-freebsd-arm64': 4.24.4 - '@rollup/rollup-freebsd-x64': 4.24.4 - '@rollup/rollup-linux-arm-gnueabihf': 4.24.4 - '@rollup/rollup-linux-arm-musleabihf': 4.24.4 - '@rollup/rollup-linux-arm64-gnu': 4.24.4 - '@rollup/rollup-linux-arm64-musl': 4.24.4 - '@rollup/rollup-linux-powerpc64le-gnu': 4.24.4 - '@rollup/rollup-linux-riscv64-gnu': 4.24.4 - '@rollup/rollup-linux-s390x-gnu': 4.24.4 - '@rollup/rollup-linux-x64-gnu': 4.24.4 - '@rollup/rollup-linux-x64-musl': 4.24.4 - '@rollup/rollup-win32-arm64-msvc': 4.24.4 - '@rollup/rollup-win32-ia32-msvc': 4.24.4 - '@rollup/rollup-win32-x64-msvc': 4.24.4 + '@rollup/rollup-android-arm-eabi': 4.28.1 + '@rollup/rollup-android-arm64': 4.28.1 + '@rollup/rollup-darwin-arm64': 4.28.1 + '@rollup/rollup-darwin-x64': 4.28.1 + '@rollup/rollup-freebsd-arm64': 4.28.1 + '@rollup/rollup-freebsd-x64': 4.28.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.28.1 + '@rollup/rollup-linux-arm-musleabihf': 4.28.1 + '@rollup/rollup-linux-arm64-gnu': 4.28.1 + '@rollup/rollup-linux-arm64-musl': 4.28.1 + '@rollup/rollup-linux-loongarch64-gnu': 4.28.1 + '@rollup/rollup-linux-powerpc64le-gnu': 4.28.1 + '@rollup/rollup-linux-riscv64-gnu': 4.28.1 + '@rollup/rollup-linux-s390x-gnu': 4.28.1 + '@rollup/rollup-linux-x64-gnu': 4.28.1 + '@rollup/rollup-linux-x64-musl': 4.28.1 + '@rollup/rollup-win32-arm64-msvc': 4.28.1 + '@rollup/rollup-win32-ia32-msvc': 4.28.1 + '@rollup/rollup-win32-x64-msvc': 4.28.1 fsevents: 2.3.3 router@2.0.0: @@ -12922,12 +12931,12 @@ snapshots: unbuild@3.0.0-rc.11(sass@1.82.0)(typescript@5.6.3): dependencies: - '@rollup/plugin-alias': 5.1.1(rollup@4.24.4) - '@rollup/plugin-commonjs': 28.0.1(rollup@4.24.4) - '@rollup/plugin-json': 6.1.0(rollup@4.24.4) - '@rollup/plugin-node-resolve': 15.3.0(rollup@4.24.4) - '@rollup/plugin-replace': 6.0.1(rollup@4.24.4) - '@rollup/pluginutils': 5.1.3(rollup@4.24.4) + '@rollup/plugin-alias': 5.1.1(rollup@4.28.1) + '@rollup/plugin-commonjs': 28.0.1(rollup@4.28.1) + '@rollup/plugin-json': 6.1.0(rollup@4.28.1) + '@rollup/plugin-node-resolve': 15.3.0(rollup@4.28.1) + '@rollup/plugin-replace': 6.0.1(rollup@4.28.1) + '@rollup/pluginutils': 5.1.3(rollup@4.28.1) citty: 0.1.6 consola: 3.2.3 defu: 6.1.4 @@ -12940,8 +12949,8 @@ snapshots: pathe: 1.1.2 pkg-types: 1.2.1 pretty-bytes: 6.1.1 - rollup: 4.24.4 - rollup-plugin-dts: 6.1.1(rollup@4.24.4)(typescript@5.6.3) + rollup: 4.28.1 + rollup-plugin-dts: 6.1.1(rollup@4.28.1)(typescript@5.6.3) scule: 1.3.0 tinyglobby: 0.2.10 ufo: 1.5.4 From 3b32bd976b1dcdaadde2239d2e8525389e8cbaf5 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 13 Dec 2024 14:27:05 -0500 Subject: [PATCH 6/7] lint --- packages/vite/src/node/plugins/importAnalysisBuild.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index cbe14f1c556a3f..0565a2a609d9ac 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -698,7 +698,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { ]) as SourceMap map.toUrl = () => genSourceMapUrl(map) - const originalDebugId = chunk.map.debugId + const originalDebugId = chunk.map.debugId; chunk.map = map if (buildSourcemap === 'inline') { From 87ef05c09ecb9e0cae9489626555bf5d011b42cb Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 13 Dec 2024 14:29:20 -0500 Subject: [PATCH 7/7] lint --- packages/vite/src/node/plugins/importAnalysisBuild.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index 0565a2a609d9ac..615bf6ad722b95 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -698,7 +698,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { ]) as SourceMap map.toUrl = () => genSourceMapUrl(map) - const originalDebugId = chunk.map.debugId; + const originalDebugId = chunk.map.debugId chunk.map = map if (buildSourcemap === 'inline') { @@ -709,7 +709,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { chunk.code += `\n//# sourceMappingURL=${genSourceMapUrl(map)}` } else { if (originalDebugId) { - map.debugId = originalDebugId; + map.debugId = originalDebugId } const mapAsset = bundle[chunk.fileName + '.map'] if (mapAsset && mapAsset.type === 'asset') {