From 6a8a8bc2d6c4dfefa8ede947076bfda02ccd28b8 Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Fri, 7 Feb 2025 07:48:59 -0400 Subject: [PATCH 01/13] update normalizePath to handle vite legacy builds --- .../src/utils/__tests__/normalizePath.test.ts | 10 ++++++++++ .../bundler-plugin-core/src/utils/normalizePath.ts | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts b/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts index ac814e8d..a0f30bfc 100644 --- a/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts +++ b/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts @@ -115,6 +115,16 @@ const tests: Test[] = [ }, expected: "test.*.chunk.js", }, + { + name: "should handle vite legacy builds", + input: { + path: "test-legacy-12345678.js", + // in testing i've found that the format is just an empty string so we + // have to brute force it in a different way + format: "", + }, + expected: "test-legacy-*.js", + }, ]; describe("normalizePath", () => { diff --git a/packages/bundler-plugin-core/src/utils/normalizePath.ts b/packages/bundler-plugin-core/src/utils/normalizePath.ts index a82c4f21..f4eb42a2 100644 --- a/packages/bundler-plugin-core/src/utils/normalizePath.ts +++ b/packages/bundler-plugin-core/src/utils/normalizePath.ts @@ -55,6 +55,17 @@ export const normalizePath = (path: string, format: string): string => { ); } + // handle vite legacy builds + if (path.includes("legacy")) { + const regexReplacement = + /(?\S+-legacy-)(?[0-9a-zA-Z\/+=_\/+=-]+)(?.\S+)/i; + + normalizedPath = normalizedPath.replace( + regexReplacement, + "$*$", + ); + } + // if the path is the same as the normalized path, and the path contains a // hash, then we can assume that something went wrong and we should just // replace/brute force the hash with a wildcard From 46e5899920ade5cdd93d14b8b73a6fdf40d42bfa Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Fri, 7 Feb 2025 07:50:13 -0400 Subject: [PATCH 02/13] bump vitest to latest version --- package.json | 2 +- packages/astro-plugin/package.json | 2 +- packages/bundle-analyzer/package.json | 2 +- packages/bundler-plugin-core/package.json | 2 +- packages/nextjs-webpack-plugin/package.json | 2 +- packages/nuxt-plugin/package.json | 2 +- packages/remix-vite-plugin/package.json | 2 +- packages/rollup-plugin/package.json | 2 +- packages/solidstart-plugin/package.json | 2 +- packages/sveltekit-plugin/package.json | 2 +- packages/vite-plugin/package.json | 2 +- packages/webpack-plugin/package.json | 2 +- pnpm-lock.yaml | 303 +++++++++++--------- 13 files changed, 184 insertions(+), 143 deletions(-) diff --git a/package.json b/package.json index 9715e7d8..f74f2f0a 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "typedoc": "^0.27.5", "typescript": "^5.3.3", "vite": "^6.0.3", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "lint-staged": { "*.{js,jsx,ts,tsx,json,css,scss,md,json}": [ diff --git a/packages/astro-plugin/package.json b/packages/astro-plugin/package.json index e399f778..118af0a4 100644 --- a/packages/astro-plugin/package.json +++ b/packages/astro-plugin/package.json @@ -67,7 +67,7 @@ "typescript": "^5.3.3", "unbuild": "^2.0.0", "vite": "^6.0.3", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "peerDependencies": { "astro": "4.x || 5.x" diff --git a/packages/bundle-analyzer/package.json b/packages/bundle-analyzer/package.json index d515d7c2..db118848 100644 --- a/packages/bundle-analyzer/package.json +++ b/packages/bundle-analyzer/package.json @@ -70,7 +70,7 @@ "typedoc": "^0.27.5", "unbuild": "^2.0.0", "vite": "^6.0.3", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "volta": { "extends": "../../package.json" diff --git a/packages/bundler-plugin-core/package.json b/packages/bundler-plugin-core/package.json index 49db1f0d..466b183f 100644 --- a/packages/bundler-plugin-core/package.json +++ b/packages/bundler-plugin-core/package.json @@ -60,7 +60,7 @@ "typedoc": "^0.27.5", "typescript": "^5.3.3", "unbuild": "^2.0.0", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "volta": { "extends": "../../package.json" diff --git a/packages/nextjs-webpack-plugin/package.json b/packages/nextjs-webpack-plugin/package.json index 8a0b56b8..3758a5a1 100644 --- a/packages/nextjs-webpack-plugin/package.json +++ b/packages/nextjs-webpack-plugin/package.json @@ -61,7 +61,7 @@ "typedoc": "^0.27.5", "typescript": "^5.3.3", "unbuild": "^2.0.0", - "vitest": "^2.1.8", + "vitest": "^2.1.9", "webpack": "^5.96.1" }, "peerDependencies": { diff --git a/packages/nuxt-plugin/package.json b/packages/nuxt-plugin/package.json index aef52373..d70b3316 100644 --- a/packages/nuxt-plugin/package.json +++ b/packages/nuxt-plugin/package.json @@ -62,7 +62,7 @@ "nuxt": "3.14.1592", "unbuild": "^2.0.0", "vite": "^6.0.3", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "peerDependencies": { "nuxt": "3.x" diff --git a/packages/remix-vite-plugin/package.json b/packages/remix-vite-plugin/package.json index 308910fd..770ddb26 100644 --- a/packages/remix-vite-plugin/package.json +++ b/packages/remix-vite-plugin/package.json @@ -60,7 +60,7 @@ "typescript": "^5.3.3", "unbuild": "^2.0.0", "vite": "^6.0.3", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "peerDependencies": { "remix": "2.x" diff --git a/packages/rollup-plugin/package.json b/packages/rollup-plugin/package.json index a6cd7899..d0a186b5 100644 --- a/packages/rollup-plugin/package.json +++ b/packages/rollup-plugin/package.json @@ -59,7 +59,7 @@ "typedoc": "^0.27.5", "typescript": "^5.3.3", "unbuild": "^2.0.0", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "peerDependencies": { "rollup": "3.x || 4.x" diff --git a/packages/solidstart-plugin/package.json b/packages/solidstart-plugin/package.json index d981c205..8717d646 100644 --- a/packages/solidstart-plugin/package.json +++ b/packages/solidstart-plugin/package.json @@ -60,7 +60,7 @@ "typescript": "^5.3.3", "unbuild": "^2.0.0", "vite": "^6.0.3", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "peerDependencies": { "@solidjs/start": "1.x" diff --git a/packages/sveltekit-plugin/package.json b/packages/sveltekit-plugin/package.json index 463b75d4..04e33f4c 100644 --- a/packages/sveltekit-plugin/package.json +++ b/packages/sveltekit-plugin/package.json @@ -60,7 +60,7 @@ "typescript": "^5.3.3", "unbuild": "^2.0.0", "vite": "^6.0.3", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "peerDependencies": { "@sveltejs/kit": "2.x", diff --git a/packages/vite-plugin/package.json b/packages/vite-plugin/package.json index e98a78b8..909c3693 100644 --- a/packages/vite-plugin/package.json +++ b/packages/vite-plugin/package.json @@ -59,7 +59,7 @@ "typescript": "^5.3.3", "unbuild": "^2.0.0", "vite": "^6.0.3", - "vitest": "^2.1.8" + "vitest": "^2.1.9" }, "peerDependencies": { "vite": "4.x || 5.x || 6.x" diff --git a/packages/webpack-plugin/package.json b/packages/webpack-plugin/package.json index a57f53f6..5801303a 100644 --- a/packages/webpack-plugin/package.json +++ b/packages/webpack-plugin/package.json @@ -60,7 +60,7 @@ "typedoc": "^0.27.5", "typescript": "^5.3.3", "unbuild": "^2.0.0", - "vitest": "^2.1.8", + "vitest": "^2.1.9", "webpack": "^5.96.1" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f6d4a00b..6a260851 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ^6.0.3 version: 6.0.3(@types/node@20.11.15)(jiti@2.4.0)(terser@5.27.0)(yaml@2.6.1) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) examples/astro: dependencies: @@ -928,7 +928,7 @@ importers: version: 20.12.12 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0)) astro: specifier: ^5.0.9 version: 5.0.9(@types/node@20.12.12)(jiti@2.4.0)(rollup@3.29.4)(terser@5.27.0)(typescript@5.7.2)(yaml@2.6.1) @@ -954,8 +954,8 @@ importers: specifier: ^6.0.3 version: 6.0.3(@types/node@20.12.12)(jiti@2.4.0)(terser@5.27.0)(yaml@2.6.1) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0) packages/bundle-analyzer: dependencies: @@ -983,7 +983,7 @@ importers: version: 17.0.33 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1003,8 +1003,8 @@ importers: specifier: ^6.0.3 version: 6.0.3(@types/node@20.12.12)(jiti@2.4.0)(terser@5.27.0)(yaml@2.6.1) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0) packages/bundler-plugin-core: dependencies: @@ -1041,7 +1041,7 @@ importers: version: 7.5.6 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1053,7 +1053,7 @@ importers: version: 3.20.1 testdouble-vitest: specifier: ^0.2.0 - version: 0.2.0(testdouble@3.20.1)(vitest@2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + version: 0.2.0(testdouble@3.20.1)(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) ts-node: specifier: ^10.9.2 version: 10.9.2(@types/node@20.11.15)(typescript@5.3.3) @@ -1067,8 +1067,8 @@ importers: specifier: ^2.0.0 version: 2.0.0(typescript@5.3.3) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) packages/nextjs-webpack-plugin: dependencies: @@ -1096,7 +1096,7 @@ importers: version: 5.28.5 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1116,8 +1116,8 @@ importers: specifier: ^2.0.0 version: 2.0.0(typescript@5.4.5) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0) webpack: specifier: ^5.96.1 version: 5.96.1 @@ -1145,7 +1145,7 @@ importers: version: 20.11.15 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1171,8 +1171,8 @@ importers: specifier: ^6.0.3 version: 6.0.3(@types/node@20.11.15)(jiti@2.4.0)(terser@5.27.0)(yaml@2.6.1) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) packages/remix-vite-plugin: dependencies: @@ -1197,7 +1197,7 @@ importers: version: 20.12.12 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1220,8 +1220,8 @@ importers: specifier: ^6.0.3 version: 6.0.3(@types/node@20.12.12)(jiti@2.4.0)(terser@5.27.0)(yaml@2.6.1) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0) packages/rollup-plugin: dependencies: @@ -1240,7 +1240,7 @@ importers: version: 20.11.15 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.22.4)' @@ -1263,8 +1263,8 @@ importers: specifier: ^2.0.0 version: 2.0.0(typescript@5.3.3) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) packages/solidstart-plugin: dependencies: @@ -1289,7 +1289,7 @@ importers: version: 20.12.12 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1312,8 +1312,8 @@ importers: specifier: ^6.0.3 version: 6.0.3(@types/node@20.12.12)(jiti@2.4.0)(terser@5.27.0)(yaml@2.6.1) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0) packages/sveltekit-plugin: dependencies: @@ -1341,7 +1341,7 @@ importers: version: 20.11.15 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1364,8 +1364,8 @@ importers: specifier: ^6.0.3 version: 6.0.3(@types/node@20.11.15)(jiti@2.4.0)(terser@5.27.0)(yaml@2.6.1) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) packages/vite-plugin: dependencies: @@ -1384,7 +1384,7 @@ importers: version: 20.11.15 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1407,8 +1407,8 @@ importers: specifier: ^6.0.3 version: 6.0.3(@types/node@20.11.15)(jiti@2.4.0)(terser@5.27.0)(yaml@2.6.1) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) packages/webpack-plugin: dependencies: @@ -1430,7 +1430,7 @@ importers: version: 5.28.5 '@vitest/coverage-v8': specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.8(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0)) + version: 2.1.8(vitest@2.1.9(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0)) chalk: specifier: 4.1.2 version: 4.1.2 @@ -1453,8 +1453,8 @@ importers: specifier: ^2.0.0 version: 2.0.0(typescript@5.3.3) vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0) + specifier: ^2.1.9 + version: 2.1.9(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0) webpack: specifier: ^5.96.1 version: 5.96.1 @@ -4489,11 +4489,11 @@ packages: '@vitest/browser': optional: true - '@vitest/expect@2.1.8': - resolution: {integrity: sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==} + '@vitest/expect@2.1.9': + resolution: {integrity: sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==} - '@vitest/mocker@2.1.8': - resolution: {integrity: sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==} + '@vitest/mocker@2.1.9': + resolution: {integrity: sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 @@ -4503,20 +4503,20 @@ packages: vite: optional: true - '@vitest/pretty-format@2.1.8': - resolution: {integrity: sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==} + '@vitest/pretty-format@2.1.9': + resolution: {integrity: sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==} - '@vitest/runner@2.1.8': - resolution: {integrity: sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==} + '@vitest/runner@2.1.9': + resolution: {integrity: sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==} - '@vitest/snapshot@2.1.8': - resolution: {integrity: sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==} + '@vitest/snapshot@2.1.9': + resolution: {integrity: sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==} - '@vitest/spy@2.1.8': - resolution: {integrity: sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==} + '@vitest/spy@2.1.9': + resolution: {integrity: sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==} - '@vitest/utils@2.1.8': - resolution: {integrity: sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==} + '@vitest/utils@2.1.9': + resolution: {integrity: sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==} '@volar/kit@2.4.10': resolution: {integrity: sha512-ul+rLeO9RlFDgkY/FhPWMnpFqAsjvjkKz8VZeOY5YCJMwTblmmSBlNJtFNxSBx9t/k1q80nEthLyxiJ50ZbIAg==} @@ -10626,6 +10626,11 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} hasBin: true + vite-node@2.1.9: + resolution: {integrity: sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + vite-plugin-checker@0.8.0: resolution: {integrity: sha512-UA5uzOGm97UvZRTdZHiQVYFnd86AVn8EVaD4L3PoVzxH+IZSfaAw14WGFwX9QS23UW3lV/5bVKZn6l0w+q9P0g==} engines: {node: '>=14.16'} @@ -10836,15 +10841,15 @@ packages: vite: optional: true - vitest@2.1.8: - resolution: {integrity: sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==} + vitest@2.1.9: + resolution: {integrity: sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 2.1.8 - '@vitest/ui': 2.1.8 + '@vitest/browser': 2.1.9 + '@vitest/ui': 2.1.9 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -12197,7 +12202,7 @@ snapshots: '@babel/helper-split-export-declaration': 7.24.7 '@babel/parser': 7.26.2 '@babel/types': 7.25.6 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -15736,7 +15741,7 @@ snapshots: vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) vue: 3.5.13(typescript@5.7.2) - '@vitest/coverage-v8@2.1.8(vitest@2.1.8(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0))': + '@vitest/coverage-v8@2.1.8(vitest@2.1.9(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 @@ -15750,11 +15755,11 @@ snapshots: std-env: 3.8.0 test-exclude: 7.0.1 tinyrainbow: 1.2.0 - vitest: 2.1.8(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0) + vitest: 2.1.9(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0) transitivePeerDependencies: - supports-color - '@vitest/coverage-v8@2.1.8(vitest@2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0))': + '@vitest/coverage-v8@2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 @@ -15768,11 +15773,11 @@ snapshots: std-env: 3.8.0 test-exclude: 7.0.1 tinyrainbow: 1.2.0 - vitest: 2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) + vitest: 2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) transitivePeerDependencies: - supports-color - '@vitest/coverage-v8@2.1.8(vitest@2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0))': + '@vitest/coverage-v8@2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 @@ -15786,11 +15791,11 @@ snapshots: std-env: 3.8.0 test-exclude: 7.0.1 tinyrainbow: 1.2.0 - vitest: 2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0) + vitest: 2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0) transitivePeerDependencies: - supports-color - '@vitest/coverage-v8@2.1.8(vitest@2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0))': + '@vitest/coverage-v8@2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 @@ -15804,75 +15809,75 @@ snapshots: std-env: 3.8.0 test-exclude: 7.0.1 tinyrainbow: 1.2.0 - vitest: 2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0) + vitest: 2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0) transitivePeerDependencies: - supports-color - '@vitest/expect@2.1.8': + '@vitest/expect@2.1.9': dependencies: - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 + '@vitest/spy': 2.1.9 + '@vitest/utils': 2.1.9 chai: 5.1.2 tinyrainbow: 1.2.0 - '@vitest/mocker@2.1.8(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(vite@5.4.11(@types/node@20.10.0)(terser@5.27.0))': + '@vitest/mocker@2.1.9(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(vite@5.4.11(@types/node@20.10.0)(terser@5.27.0))': dependencies: - '@vitest/spy': 2.1.8 + '@vitest/spy': 2.1.9 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: msw: 2.7.0(@types/node@20.10.0)(typescript@5.3.3) vite: 5.4.11(@types/node@20.10.0)(terser@5.27.0) - '@vitest/mocker@2.1.8(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(vite@5.4.11(@types/node@20.11.15)(terser@5.27.0))': + '@vitest/mocker@2.1.9(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(vite@5.4.11(@types/node@20.11.15)(terser@5.27.0))': dependencies: - '@vitest/spy': 2.1.8 + '@vitest/spy': 2.1.9 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: msw: 2.7.0(@types/node@20.11.15)(typescript@5.3.3) vite: 5.4.11(@types/node@20.11.15)(terser@5.27.0) - '@vitest/mocker@2.1.8(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(vite@5.4.11(@types/node@20.12.12)(terser@5.27.0))': + '@vitest/mocker@2.1.9(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(vite@5.4.11(@types/node@20.12.12)(terser@5.27.0))': dependencies: - '@vitest/spy': 2.1.8 + '@vitest/spy': 2.1.9 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: msw: 2.7.0(@types/node@20.12.12)(typescript@5.4.5) vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) - '@vitest/mocker@2.1.8(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(vite@5.4.11(@types/node@20.12.12)(terser@5.27.0))': + '@vitest/mocker@2.1.9(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(vite@5.4.11(@types/node@20.12.12)(terser@5.27.0))': dependencies: - '@vitest/spy': 2.1.8 + '@vitest/spy': 2.1.9 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: msw: 2.7.0(@types/node@20.12.12)(typescript@5.7.2) vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) - '@vitest/pretty-format@2.1.8': + '@vitest/pretty-format@2.1.9': dependencies: tinyrainbow: 1.2.0 - '@vitest/runner@2.1.8': + '@vitest/runner@2.1.9': dependencies: - '@vitest/utils': 2.1.8 + '@vitest/utils': 2.1.9 pathe: 1.1.2 - '@vitest/snapshot@2.1.8': + '@vitest/snapshot@2.1.9': dependencies: - '@vitest/pretty-format': 2.1.8 + '@vitest/pretty-format': 2.1.9 magic-string: 0.30.17 pathe: 1.1.2 - '@vitest/spy@2.1.8': + '@vitest/spy@2.1.9': dependencies: tinyspy: 3.0.2 - '@vitest/utils@2.1.8': + '@vitest/utils@2.1.9': dependencies: - '@vitest/pretty-format': 2.1.8 + '@vitest/pretty-format': 2.1.9 loupe: 3.1.2 tinyrainbow: 1.2.0 @@ -16379,7 +16384,7 @@ snapshots: agent-base@6.0.2: dependencies: - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) transitivePeerDependencies: - supports-color @@ -20610,7 +20615,7 @@ snapshots: micromark@4.0.1: dependencies: '@types/debug': 4.1.12 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) decode-named-character-reference: 1.0.2 devlop: 1.1.0 micromark-core-commonmark: 2.0.2 @@ -23978,10 +23983,10 @@ snapshots: glob: 10.4.5 minimatch: 9.0.5 - testdouble-vitest@0.2.0(testdouble@3.20.1)(vitest@2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)): + testdouble-vitest@0.2.0(testdouble@3.20.1)(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)): dependencies: testdouble: 3.20.1 - vitest: 2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) + vitest: 2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0) testdouble@3.20.1: dependencies: @@ -25070,13 +25075,13 @@ snapshots: - supports-color - terser - vite-node@2.1.8(@types/node@20.10.0)(terser@5.27.0): + vite-node@2.1.8(@types/node@20.11.15)(terser@5.27.0): dependencies: cac: 6.7.14 debug: 4.3.7 es-module-lexer: 1.5.4 pathe: 1.1.2 - vite: 5.4.11(@types/node@20.10.0)(terser@5.27.0) + vite: 5.4.11(@types/node@20.11.15)(terser@5.27.0) transitivePeerDependencies: - '@types/node' - less @@ -25088,12 +25093,48 @@ snapshots: - supports-color - terser - vite-node@2.1.8(@types/node@20.11.15)(terser@5.27.0): + vite-node@2.1.8(@types/node@20.12.12)(terser@5.27.0): dependencies: cac: 6.7.14 debug: 4.3.7 es-module-lexer: 1.5.4 pathe: 1.1.2 + vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - sass-embedded + - stylus + - sugarss + - supports-color + - terser + + vite-node@2.1.9(@types/node@20.10.0)(terser@5.27.0): + dependencies: + cac: 6.7.14 + debug: 4.4.0(supports-color@9.4.0) + es-module-lexer: 1.5.4 + pathe: 1.1.2 + vite: 5.4.11(@types/node@20.10.0)(terser@5.27.0) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - sass-embedded + - stylus + - sugarss + - supports-color + - terser + + vite-node@2.1.9(@types/node@20.11.15)(terser@5.27.0): + dependencies: + cac: 6.7.14 + debug: 4.4.0(supports-color@9.4.0) + es-module-lexer: 1.5.4 + pathe: 1.1.2 vite: 5.4.11(@types/node@20.11.15)(terser@5.27.0) transitivePeerDependencies: - '@types/node' @@ -25106,10 +25147,10 @@ snapshots: - supports-color - terser - vite-node@2.1.8(@types/node@20.12.12)(terser@5.27.0): + vite-node@2.1.9(@types/node@20.12.12)(terser@5.27.0): dependencies: cac: 6.7.14 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) es-module-lexer: 1.5.4 pathe: 1.1.2 vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) @@ -25379,17 +25420,17 @@ snapshots: optionalDependencies: vite: 6.0.3(@types/node@20.12.12)(jiti@2.4.0)(terser@5.27.0)(yaml@2.6.1) - vitest@2.1.8(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0): + vitest@2.1.9(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0): dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(vite@5.4.11(@types/node@20.10.0)(terser@5.27.0)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 + '@vitest/expect': 2.1.9 + '@vitest/mocker': 2.1.9(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(vite@5.4.11(@types/node@20.10.0)(terser@5.27.0)) + '@vitest/pretty-format': 2.1.9 + '@vitest/runner': 2.1.9 + '@vitest/snapshot': 2.1.9 + '@vitest/spy': 2.1.9 + '@vitest/utils': 2.1.9 chai: 5.1.2 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) expect-type: 1.1.0 magic-string: 0.30.17 pathe: 1.1.2 @@ -25399,7 +25440,7 @@ snapshots: tinypool: 1.0.2 tinyrainbow: 1.2.0 vite: 5.4.11(@types/node@20.10.0)(terser@5.27.0) - vite-node: 2.1.8(@types/node@20.10.0)(terser@5.27.0) + vite-node: 2.1.9(@types/node@20.10.0)(terser@5.27.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 20.10.0 @@ -25414,17 +25455,17 @@ snapshots: - supports-color - terser - vitest@2.1.8(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0): + vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0): dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(vite@5.4.11(@types/node@20.11.15)(terser@5.27.0)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 + '@vitest/expect': 2.1.9 + '@vitest/mocker': 2.1.9(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(vite@5.4.11(@types/node@20.11.15)(terser@5.27.0)) + '@vitest/pretty-format': 2.1.9 + '@vitest/runner': 2.1.9 + '@vitest/snapshot': 2.1.9 + '@vitest/spy': 2.1.9 + '@vitest/utils': 2.1.9 chai: 5.1.2 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) expect-type: 1.1.0 magic-string: 0.30.17 pathe: 1.1.2 @@ -25434,7 +25475,7 @@ snapshots: tinypool: 1.0.2 tinyrainbow: 1.2.0 vite: 5.4.11(@types/node@20.11.15)(terser@5.27.0) - vite-node: 2.1.8(@types/node@20.11.15)(terser@5.27.0) + vite-node: 2.1.9(@types/node@20.11.15)(terser@5.27.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 20.11.15 @@ -25449,17 +25490,17 @@ snapshots: - supports-color - terser - vitest@2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0): + vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0): dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(vite@5.4.11(@types/node@20.12.12)(terser@5.27.0)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 + '@vitest/expect': 2.1.9 + '@vitest/mocker': 2.1.9(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(vite@5.4.11(@types/node@20.12.12)(terser@5.27.0)) + '@vitest/pretty-format': 2.1.9 + '@vitest/runner': 2.1.9 + '@vitest/snapshot': 2.1.9 + '@vitest/spy': 2.1.9 + '@vitest/utils': 2.1.9 chai: 5.1.2 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) expect-type: 1.1.0 magic-string: 0.30.17 pathe: 1.1.2 @@ -25469,7 +25510,7 @@ snapshots: tinypool: 1.0.2 tinyrainbow: 1.2.0 vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) - vite-node: 2.1.8(@types/node@20.12.12)(terser@5.27.0) + vite-node: 2.1.9(@types/node@20.12.12)(terser@5.27.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 20.12.12 @@ -25484,17 +25525,17 @@ snapshots: - supports-color - terser - vitest@2.1.8(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0): + vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0): dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(vite@5.4.11(@types/node@20.12.12)(terser@5.27.0)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 + '@vitest/expect': 2.1.9 + '@vitest/mocker': 2.1.9(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(vite@5.4.11(@types/node@20.12.12)(terser@5.27.0)) + '@vitest/pretty-format': 2.1.9 + '@vitest/runner': 2.1.9 + '@vitest/snapshot': 2.1.9 + '@vitest/spy': 2.1.9 + '@vitest/utils': 2.1.9 chai: 5.1.2 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) expect-type: 1.1.0 magic-string: 0.30.17 pathe: 1.1.2 @@ -25504,7 +25545,7 @@ snapshots: tinypool: 1.0.2 tinyrainbow: 1.2.0 vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) - vite-node: 2.1.8(@types/node@20.12.12)(terser@5.27.0) + vite-node: 2.1.9(@types/node@20.12.12)(terser@5.27.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 20.12.12 From 46feff242db27efa5271ee53c5e41ddeeadab1be Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Fri, 7 Feb 2025 07:50:58 -0400 Subject: [PATCH 03/13] make sure we only run the legacy hash normalization if the path hasn't already been normalized --- packages/bundler-plugin-core/src/utils/normalizePath.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bundler-plugin-core/src/utils/normalizePath.ts b/packages/bundler-plugin-core/src/utils/normalizePath.ts index f4eb42a2..2e722201 100644 --- a/packages/bundler-plugin-core/src/utils/normalizePath.ts +++ b/packages/bundler-plugin-core/src/utils/normalizePath.ts @@ -56,7 +56,7 @@ export const normalizePath = (path: string, format: string): string => { } // handle vite legacy builds - if (path.includes("legacy")) { + if (normalizedPath === path && path.includes("legacy")) { const regexReplacement = /(?\S+-legacy-)(?[0-9a-zA-Z\/+=_\/+=-]+)(?.\S+)/i; From 2b9318528a734d3a4e06b41b60e3e4605081c736 Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Fri, 7 Feb 2025 07:51:48 -0400 Subject: [PATCH 04/13] add in changeset --- .changeset/empty-hounds-grow.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .changeset/empty-hounds-grow.md diff --git a/.changeset/empty-hounds-grow.md b/.changeset/empty-hounds-grow.md new file mode 100644 index 00000000..ee377c27 --- /dev/null +++ b/.changeset/empty-hounds-grow.md @@ -0,0 +1,15 @@ +--- +"@codecov/nextjs-webpack-plugin": minor +"@codecov/bundler-plugin-core": minor +"@codecov/remix-vite-plugin": minor +"@codecov/solidstart-plugin": minor +"@codecov/sveltekit-plugin": minor +"@codecov/bundle-analyzer": minor +"@codecov/webpack-plugin": minor +"@codecov/rollup-plugin": minor +"@codecov/astro-plugin": minor +"@codecov/nuxt-plugin": minor +"@codecov/vite-plugin": minor +--- + +Update normalizePath to handle Vite legacy builds as they currently are not being normalized From 739d1c07d17a2d64adc6cb54e6e2302e791e159f Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Fri, 7 Feb 2025 07:56:53 -0400 Subject: [PATCH 05/13] bump vitest/coverage-v8 to latest --- packages/astro-plugin/package.json | 2 +- packages/bundle-analyzer/package.json | 2 +- packages/bundler-plugin-core/package.json | 2 +- packages/nextjs-webpack-plugin/package.json | 2 +- packages/nuxt-plugin/package.json | 2 +- packages/remix-vite-plugin/package.json | 2 +- packages/rollup-plugin/package.json | 2 +- packages/solidstart-plugin/package.json | 2 +- packages/sveltekit-plugin/package.json | 2 +- packages/vite-plugin/package.json | 2 +- packages/webpack-plugin/package.json | 2 +- pnpm-lock.yaml | 88 ++++++++++----------- 12 files changed, 55 insertions(+), 55 deletions(-) diff --git a/packages/astro-plugin/package.json b/packages/astro-plugin/package.json index 118af0a4..5e8d0f39 100644 --- a/packages/astro-plugin/package.json +++ b/packages/astro-plugin/package.json @@ -58,7 +58,7 @@ "devDependencies": { "@rollup/plugin-replace": "^5.0.5", "@types/node": "^20.11.15", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "astro": "^5.0.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", diff --git a/packages/bundle-analyzer/package.json b/packages/bundle-analyzer/package.json index db118848..2738d7fa 100644 --- a/packages/bundle-analyzer/package.json +++ b/packages/bundle-analyzer/package.json @@ -63,7 +63,7 @@ "@types/micromatch": "^4.0.9", "@types/node": "^20.11.15", "@types/yargs": "^17.0.33", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", "ts-node": "^10.9.2", diff --git a/packages/bundler-plugin-core/package.json b/packages/bundler-plugin-core/package.json index 466b183f..31ab5e74 100644 --- a/packages/bundler-plugin-core/package.json +++ b/packages/bundler-plugin-core/package.json @@ -51,7 +51,7 @@ "@sentry/core": "^8.42.0", "@types/node": "^20.11.15", "@types/semver": "^7.5.6", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", "testdouble": "^3.20.1", diff --git a/packages/nextjs-webpack-plugin/package.json b/packages/nextjs-webpack-plugin/package.json index 3758a5a1..7fa851d9 100644 --- a/packages/nextjs-webpack-plugin/package.json +++ b/packages/nextjs-webpack-plugin/package.json @@ -54,7 +54,7 @@ "@rollup/plugin-replace": "^5.0.5", "@types/node": "^20.10.0", "@types/webpack": "^5.28.5", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", "ts-node": "^10.9.2", diff --git a/packages/nuxt-plugin/package.json b/packages/nuxt-plugin/package.json index d70b3316..5536bd54 100644 --- a/packages/nuxt-plugin/package.json +++ b/packages/nuxt-plugin/package.json @@ -53,7 +53,7 @@ "devDependencies": { "@rollup/plugin-replace": "^5.0.5", "@types/node": "^20.11.15", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", "ts-node": "^10.9.2", diff --git a/packages/remix-vite-plugin/package.json b/packages/remix-vite-plugin/package.json index 770ddb26..d1113231 100644 --- a/packages/remix-vite-plugin/package.json +++ b/packages/remix-vite-plugin/package.json @@ -52,7 +52,7 @@ "devDependencies": { "@rollup/plugin-replace": "^5.0.5", "@types/node": "^20.11.15", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", "ts-node": "^10.9.2", diff --git a/packages/rollup-plugin/package.json b/packages/rollup-plugin/package.json index d0a186b5..0be1b42d 100644 --- a/packages/rollup-plugin/package.json +++ b/packages/rollup-plugin/package.json @@ -51,7 +51,7 @@ "devDependencies": { "@rollup/plugin-replace": "^5.0.5", "@types/node": "^20.11.15", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", "rollup": "4.22.4", diff --git a/packages/solidstart-plugin/package.json b/packages/solidstart-plugin/package.json index 8717d646..ae07b698 100644 --- a/packages/solidstart-plugin/package.json +++ b/packages/solidstart-plugin/package.json @@ -52,7 +52,7 @@ "devDependencies": { "@rollup/plugin-replace": "^5.0.5", "@types/node": "^20.11.15", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", "ts-node": "^10.9.2", diff --git a/packages/sveltekit-plugin/package.json b/packages/sveltekit-plugin/package.json index 04e33f4c..13c8e1ea 100644 --- a/packages/sveltekit-plugin/package.json +++ b/packages/sveltekit-plugin/package.json @@ -52,7 +52,7 @@ "devDependencies": { "@rollup/plugin-replace": "^5.0.5", "@types/node": "^20.11.15", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", "ts-node": "^10.9.2", diff --git a/packages/vite-plugin/package.json b/packages/vite-plugin/package.json index 909c3693..c5e8fb9e 100644 --- a/packages/vite-plugin/package.json +++ b/packages/vite-plugin/package.json @@ -51,7 +51,7 @@ "devDependencies": { "@rollup/plugin-replace": "^5.0.5", "@types/node": "^20.11.15", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", "ts-node": "^10.9.2", diff --git a/packages/webpack-plugin/package.json b/packages/webpack-plugin/package.json index 5801303a..fe949e52 100644 --- a/packages/webpack-plugin/package.json +++ b/packages/webpack-plugin/package.json @@ -52,7 +52,7 @@ "@rollup/plugin-replace": "^5.0.5", "@types/node": "^20.10.0", "@types/webpack": "^5.28.5", - "@vitest/coverage-v8": "^2.1.8", + "@vitest/coverage-v8": "^2.1.9", "chalk": "4.1.2", "codecovProdRollupPlugin": "npm:@codecov/rollup-plugin@1.5.0", "msw": "^2.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a260851..6cd72db6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -927,8 +927,8 @@ importers: specifier: ^20.11.15 version: 20.12.12 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0)) astro: specifier: ^5.0.9 version: 5.0.9(@types/node@20.12.12)(jiti@2.4.0)(rollup@3.29.4)(terser@5.27.0)(typescript@5.7.2)(yaml@2.6.1) @@ -982,8 +982,8 @@ importers: specifier: ^17.0.33 version: 17.0.33 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1040,8 +1040,8 @@ importers: specifier: ^7.5.6 version: 7.5.6 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1095,8 +1095,8 @@ importers: specifier: ^5.28.5 version: 5.28.5 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1144,8 +1144,8 @@ importers: specifier: ^20.11.15 version: 20.11.15 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1196,8 +1196,8 @@ importers: specifier: ^20.11.15 version: 20.12.12 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1239,8 +1239,8 @@ importers: specifier: ^20.11.15 version: 20.11.15 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.22.4)' @@ -1288,8 +1288,8 @@ importers: specifier: ^20.11.15 version: 20.12.12 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1340,8 +1340,8 @@ importers: specifier: ^20.11.15 version: 20.11.15 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1383,8 +1383,8 @@ importers: specifier: ^20.11.15 version: 20.11.15 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0)) codecovProdRollupPlugin: specifier: npm:@codecov/rollup-plugin@1.5.0 version: '@codecov/rollup-plugin@1.5.0(rollup@4.27.3)' @@ -1429,8 +1429,8 @@ importers: specifier: ^5.28.5 version: 5.28.5 '@vitest/coverage-v8': - specifier: ^2.1.8 - version: 2.1.8(vitest@2.1.9(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0)) + specifier: ^2.1.9 + version: 2.1.9(vitest@2.1.9(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0)) chalk: specifier: 4.1.2 version: 4.1.2 @@ -4480,11 +4480,11 @@ packages: vite: ^5.0.0 vue: ^3.2.25 - '@vitest/coverage-v8@2.1.8': - resolution: {integrity: sha512-2Y7BPlKH18mAZYAW1tYByudlCYrQyl5RGvnnDYJKW5tCiO5qg3KSAy3XAxcxKz900a0ZXxWtKrMuZLe3lKBpJw==} + '@vitest/coverage-v8@2.1.9': + resolution: {integrity: sha512-Z2cOr0ksM00MpEfyVE8KXIYPEcBFxdbLSs56L8PO0QQMxt/6bDj45uQfxoc96v05KW3clk7vvgP0qfDit9DmfQ==} peerDependencies: - '@vitest/browser': 2.1.8 - vitest: 2.1.8 + '@vitest/browser': 2.1.9 + vitest: 2.1.9 peerDependenciesMeta: '@vitest/browser': optional: true @@ -11602,7 +11602,7 @@ snapshots: '@babel/traverse': 7.25.6 '@babel/types': 7.25.6 convert-source-map: 2.0.0 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -12214,7 +12214,7 @@ snapshots: '@babel/parser': 7.26.2 '@babel/template': 7.25.0 '@babel/types': 7.25.6 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -15741,11 +15741,11 @@ snapshots: vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) vue: 3.5.13(typescript@5.7.2) - '@vitest/coverage-v8@2.1.8(vitest@2.1.9(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0))': + '@vitest/coverage-v8@2.1.9(vitest@2.1.9(@types/node@20.10.0)(msw@2.7.0(@types/node@20.10.0)(typescript@5.3.3))(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) istanbul-lib-coverage: 3.2.2 istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 5.0.6 @@ -15759,11 +15759,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@vitest/coverage-v8@2.1.8(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0))': + '@vitest/coverage-v8@2.1.9(vitest@2.1.9(@types/node@20.11.15)(msw@2.7.0(@types/node@20.11.15)(typescript@5.3.3))(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) istanbul-lib-coverage: 3.2.2 istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 5.0.6 @@ -15777,11 +15777,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@vitest/coverage-v8@2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0))': + '@vitest/coverage-v8@2.1.9(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.4.5))(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) istanbul-lib-coverage: 3.2.2 istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 5.0.6 @@ -15795,11 +15795,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@vitest/coverage-v8@2.1.8(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0))': + '@vitest/coverage-v8@2.1.9(vitest@2.1.9(@types/node@20.12.12)(msw@2.7.0(@types/node@20.12.12)(typescript@5.7.2))(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) istanbul-lib-coverage: 3.2.2 istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 5.0.6 @@ -19234,7 +19234,7 @@ snapshots: https-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) transitivePeerDependencies: - supports-color @@ -19343,7 +19343,7 @@ snapshots: dependencies: '@ioredis/commands': 1.2.0 cluster-key-slot: 1.1.2 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) denque: 2.1.0 lodash.defaults: 4.2.0 lodash.isarguments: 3.1.0 @@ -19597,7 +19597,7 @@ snapshots: istanbul-lib-source-maps@5.0.6: dependencies: '@jridgewell/trace-mapping': 0.3.25 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) istanbul-lib-coverage: 3.2.2 transitivePeerDependencies: - supports-color @@ -20593,7 +20593,7 @@ snapshots: micromark@3.2.0: dependencies: '@types/debug': 4.1.12 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) decode-named-character-reference: 1.0.2 micromark-core-commonmark: 1.1.0 micromark-factory-space: 1.1.0 @@ -25024,7 +25024,7 @@ snapshots: vite-node@1.5.0(@types/node@20.11.15)(terser@5.27.0): dependencies: cac: 6.7.14 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) pathe: 1.1.2 picocolors: 1.1.1 vite: 5.4.11(@types/node@20.11.15)(terser@5.27.0) @@ -25042,7 +25042,7 @@ snapshots: vite-node@1.5.0(@types/node@20.12.12)(terser@5.27.0): dependencies: cac: 6.7.14 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) pathe: 1.1.2 picocolors: 1.1.1 vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) @@ -25078,7 +25078,7 @@ snapshots: vite-node@2.1.8(@types/node@20.11.15)(terser@5.27.0): dependencies: cac: 6.7.14 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) es-module-lexer: 1.5.4 pathe: 1.1.2 vite: 5.4.11(@types/node@20.11.15)(terser@5.27.0) @@ -25096,7 +25096,7 @@ snapshots: vite-node@2.1.8(@types/node@20.12.12)(terser@5.27.0): dependencies: cac: 6.7.14 - debug: 4.3.7 + debug: 4.4.0(supports-color@9.4.0) es-module-lexer: 1.5.4 pathe: 1.1.2 vite: 5.4.11(@types/node@20.12.12)(terser@5.27.0) From 3e0a5d2838714a645d0df385228965712b19faa3 Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Mon, 10 Feb 2025 10:03:18 -0400 Subject: [PATCH 06/13] update Output to take in other options, atm just metaFramework --- .../astroBundleAnalysisPlugin.test.ts | 23 +- packages/astro-plugin/src/index.ts | 8 +- packages/bundle-analyzer/src/index.ts | 4 +- packages/bundler-plugin-core/src/index.ts | 2 + packages/bundler-plugin-core/src/types.ts | 6 +- .../bundler-plugin-core/src/utils/Output.ts | 14 +- .../src/utils/__tests__/Output.test.ts | 462 ++++++++++-------- .../src/utils/__tests__/provider.test.ts | 42 +- .../providers/__tests__/AppVeyorCI.test.ts | 84 ++-- .../__tests__/AzurePipelines.test.ts | 126 +++-- .../providers/__tests__/Bitbucket.test.ts | 105 ++-- .../utils/providers/__tests__/Bitrise.test.ts | 84 ++-- .../providers/__tests__/Buildkite.test.ts | 42 +- .../providers/__tests__/CircleCI.test.ts | 63 ++- .../utils/providers/__tests__/Cirrus.test.ts | 42 +- .../__tests__/CloudflarePages.test.ts | 63 ++- .../providers/__tests__/CodeBuild.test.ts | 42 +- .../utils/providers/__tests__/Drone.test.ts | 63 ++- .../providers/__tests__/GitHubActions.test.ts | 168 ++++--- .../providers/__tests__/GitLabCI.test.ts | 105 ++-- .../providers/__tests__/HerokuCI.test.ts | 63 ++- .../providers/__tests__/JenkinsCI.test.ts | 84 ++-- .../utils/providers/__tests__/Local.test.ts | 126 +++-- .../utils/providers/__tests__/Netlify.test.ts | 63 ++- .../utils/providers/__tests__/Render.test.ts | 63 ++- .../providers/__tests__/TeamCity.test.ts | 84 ++-- .../providers/__tests__/TravisCI.test.ts | 105 ++-- .../utils/providers/__tests__/Vercel.test.ts | 63 ++- .../utils/providers/__tests__/Werker.test.ts | 63 ++- .../providers/__tests__/Woodpecker.test.ts | 63 ++- .../utils/providers/__tests__/index.test.ts | 42 +- packages/nextjs-webpack-plugin/src/index.ts | 8 +- .../nextJSWebpackBundleAnalysisPlugin.test.ts | 23 +- packages/nuxt-plugin/src/index.ts | 7 +- .../nuxtBundleAnalysisPlugin.test.ts | 23 +- packages/remix-vite-plugin/src/index.ts | 7 +- .../remixBundleAnalysisPlugin.test.ts | 23 +- packages/rollup-plugin/src/index.ts | 7 +- .../rollupBundleAnalysisPlugin.test.ts | 23 +- packages/solidstart-plugin/src/index.ts | 7 +- .../solidstartBundleAnalysisPlugin.test.ts | 23 +- packages/sveltekit-plugin/src/index.ts | 7 +- .../sveltekitBundleAnalysisPlugin.test.ts | 23 +- packages/vite-plugin/src/index.ts | 7 +- .../viteBundleAnalysisPlugin.test.ts | 23 +- packages/webpack-plugin/src/index.ts | 7 +- .../webpackBundleAnalysisPlugin.test.ts | 23 +- 47 files changed, 1514 insertions(+), 1094 deletions(-) diff --git a/packages/astro-plugin/src/astro-bundle-analysis/__tests__/astroBundleAnalysisPlugin.test.ts b/packages/astro-plugin/src/astro-bundle-analysis/__tests__/astroBundleAnalysisPlugin.test.ts index 8f4b5440..d0d8a701 100644 --- a/packages/astro-plugin/src/astro-bundle-analysis/__tests__/astroBundleAnalysisPlugin.test.ts +++ b/packages/astro-plugin/src/astro-bundle-analysis/__tests__/astroBundleAnalysisPlugin.test.ts @@ -12,16 +12,19 @@ describe("astroBundleAnalysisPlugin", () => { it("returns a plugin object", () => { const plugin = astroBundleAnalysisPlugin({ target: "client", - output: new Output({ - apiUrl: "http://localhost", - bundleName: "test-bundle", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "test-token", - telemetry: false, - }), + output: new Output( + { + apiUrl: "http://localhost", + bundleName: "test-bundle", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "test-token", + telemetry: false, + }, + { metaFramework: "vite" }, + ), pluginName: PLUGIN_NAME, pluginVersion: PLUGIN_VERSION, }); diff --git a/packages/astro-plugin/src/index.ts b/packages/astro-plugin/src/index.ts index eb51dce4..485dfe08 100644 --- a/packages/astro-plugin/src/index.ts +++ b/packages/astro-plugin/src/index.ts @@ -51,7 +51,13 @@ const astroPluginFactory = createVitePlugin( bundler: unpluginMetaContext.framework, metaFramework: "astro", }); - const output = new Output(options, sentryConfig); + + const output = new Output( + options, + { metaFramework: unpluginMetaContext.framework }, + sentryConfig, + ); + if (options.enableBundleAnalysis) { plugins.push( telemetryPlugin({ diff --git a/packages/bundle-analyzer/src/index.ts b/packages/bundle-analyzer/src/index.ts index 07f6731f..39da421a 100644 --- a/packages/bundle-analyzer/src/index.ts +++ b/packages/bundle-analyzer/src/index.ts @@ -90,7 +90,9 @@ const createReport = async ( normalizedBundleAnalyzerOptions: NormalizedBundleAnalyzerOptions, ): Promise => { // initialize report - const output: Output = new Output(normalizedCoreOptions); + const output: Output = new Output(normalizedCoreOptions, { + metaFramework: "bundle-analyzer", + }); output.start(); output.setPlugin(PLUGIN_NAME, PLUGIN_VERSION); diff --git a/packages/bundler-plugin-core/src/index.ts b/packages/bundler-plugin-core/src/index.ts index 231bf2d3..dcb4f20d 100644 --- a/packages/bundler-plugin-core/src/index.ts +++ b/packages/bundler-plugin-core/src/index.ts @@ -8,6 +8,7 @@ import { type ExtendedBAUploadPlugin, type Chunk, type Module, + type MetaFramework, type Options, type ProviderUtilInputs, type UploadOverrides, @@ -38,6 +39,7 @@ export type { ExtendedBAUploadArgs, ExtendedBAUploadPlugin, Chunk, + MetaFramework, Module, Options, NormalizedOptions, diff --git a/packages/bundler-plugin-core/src/types.ts b/packages/bundler-plugin-core/src/types.ts index ea7860d1..22a4c2ed 100644 --- a/packages/bundler-plugin-core/src/types.ts +++ b/packages/bundler-plugin-core/src/types.ts @@ -1,4 +1,4 @@ -import { type UnpluginOptions } from "unplugin"; +import { type UnpluginContextMeta, type UnpluginOptions } from "unplugin"; import { type Output } from "./utils/Output"; import { type ValidGitService } from "./utils/normalizeOptions"; @@ -7,6 +7,10 @@ export interface Dependency { version: string; } +export type MetaFramework = + | UnpluginContextMeta["framework"] + | "bundle-analyzer"; + export interface Asset { name: string; size: number; diff --git a/packages/bundler-plugin-core/src/utils/Output.ts b/packages/bundler-plugin-core/src/utils/Output.ts index 7b6d8563..0bc53d78 100644 --- a/packages/bundler-plugin-core/src/utils/Output.ts +++ b/packages/bundler-plugin-core/src/utils/Output.ts @@ -2,6 +2,7 @@ import { type Client, type Scope, startSpan } from "@sentry/core"; import { type Asset, type Chunk, + type MetaFramework, type Module, type OutputPayload, type ProviderUtilInputs, @@ -15,6 +16,10 @@ import { type ValidGitService } from "./normalizeOptions"; import { debug } from "./logging.ts"; import { safeFlushTelemetry } from "../sentry/telemetry.ts"; +interface OtherOptions { + metaFramework: MetaFramework; +} + interface SentryConfig { sentryClient?: Client; sentryScope?: Scope; @@ -47,6 +52,7 @@ class Output { name: string; version: string; }; + metaFramework: MetaFramework; outputPath?: string; builtAt?: number; duration?: number; @@ -66,7 +72,11 @@ class Output { sentryClient?: Client; sentryScope?: Scope; - constructor(userOptions: NormalizedOptions, sentryConfig?: SentryConfig) { + constructor( + userOptions: NormalizedOptions, + otherOptions: OtherOptions, + sentryConfig?: SentryConfig, + ) { this.version = "3"; this.apiUrl = userOptions.apiUrl; this.dryRun = userOptions.dryRun; @@ -80,7 +90,7 @@ class Output { this.telemetry = userOptions.telemetry; this.sentryClient = sentryConfig?.sentryClient; this.sentryScope = sentryConfig?.sentryScope; - + this.metaFramework = otherOptions.metaFramework; if (userOptions.uploadOverrides) { this.branch = userOptions.uploadOverrides.branch; this.build = userOptions.uploadOverrides.build; diff --git a/packages/bundler-plugin-core/src/utils/__tests__/Output.test.ts b/packages/bundler-plugin-core/src/utils/__tests__/Output.test.ts index 666b5dd3..5acd4a8a 100644 --- a/packages/bundler-plugin-core/src/utils/__tests__/Output.test.ts +++ b/packages/bundler-plugin-core/src/utils/__tests__/Output.test.ts @@ -116,16 +116,19 @@ describe("Output", () => { }); it("should set builtAt to the current time", () => { - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); @@ -144,16 +147,19 @@ describe("Output", () => { describe("builtAt is set", () => { it("should set duration to the difference between now and builtAt", () => { - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -164,16 +170,19 @@ describe("Output", () => { describe("builtAt is not set", () => { it("should set duration to the difference between now and 0", () => { - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.end(); expect(output?.duration).toBe(1000); @@ -184,16 +193,19 @@ describe("Output", () => { describe("setPlugin method", () => { describe("frozen is not set", () => { it("sets the plugin details", () => { - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.setPlugin("test-plugin", "0.0.1"); @@ -206,16 +218,19 @@ describe("Output", () => { describe("locking the plugin details", () => { it("does not change the plugin details", () => { - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.setPlugin("test-plugin", "0.0.1"); output.lockPluginDetails(); @@ -232,16 +247,19 @@ describe("Output", () => { describe("setBundleName method", () => { describe("bundle name is not locked", () => { it("sets the bundle name", () => { - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.setBundleName("new-bundle"); @@ -251,16 +269,19 @@ describe("Output", () => { describe("bundle name is locked", () => { it("does not change the bundle name", () => { - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.setBundleName("new-bundle"); output.lockBundleName(); @@ -275,16 +296,19 @@ describe("Output", () => { describe("dryRun is enabled", () => { it("immediately returns", async () => { const { preSignedUrlBody } = setup({}); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -298,15 +322,18 @@ describe("Output", () => { it("immediately returns", async () => { const { preSignedUrlBody } = setup({}); - // @ts-expect-error - no bundle name included for test - const output = new Output({ - apiUrl: "http://localhost", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - }); + const output = new Output( + // @ts-expect-error - no bundle name included for test + { + apiUrl: "http://localhost", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -320,16 +347,19 @@ describe("Output", () => { describe("bundle name is empty", () => { it("immediately returns", async () => { const { preSignedUrlBody } = setup({}); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -347,16 +377,19 @@ describe("Output", () => { }); it("throws an error", async () => { - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -370,16 +403,19 @@ describe("Output", () => { }); it("logs error when debug is enabled", async () => { - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: true, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: true, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -415,6 +451,7 @@ describe("Output", () => { uploadToken: "token", telemetry: false, }, + { metaFramework: "vite" }, { sentryClient, sentryScope }, ); @@ -464,6 +501,7 @@ describe("Output", () => { uploadToken: "token", telemetry: false, }, + { metaFramework: "vite" }, { sentryClient, sentryScope }, ); @@ -497,16 +535,19 @@ describe("Output", () => { it("immediately returns", async () => { setup({ urlSendError: true }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -517,16 +558,19 @@ describe("Output", () => { it("logs error when debug is enabled", async () => { setup({ urlSendError: true }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: true, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: true, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -543,16 +587,19 @@ describe("Output", () => { it("optionally emits error", async () => { setup({ urlSendError: true }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -586,6 +633,7 @@ describe("Output", () => { uploadToken: "token", telemetry: false, }, + { metaFramework: "vite" }, { sentryClient, sentryScope }, ); @@ -618,16 +666,19 @@ describe("Output", () => { urlStatus: 200, }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -666,16 +717,19 @@ describe("Output", () => { statsSendError: true, }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -690,16 +744,19 @@ describe("Output", () => { statsSendError: true, }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: true, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: true, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -720,16 +777,19 @@ describe("Output", () => { statsSendError: true, }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); @@ -767,6 +827,7 @@ describe("Output", () => { uploadToken: "token", telemetry: false, }, + { metaFramework: "vite" }, { sentryClient, sentryScope }, ); @@ -801,16 +862,19 @@ describe("Output", () => { statsStatus: 200, }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "output-test", - debug: false, - dryRun: false, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "token", - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "output-test", + debug: false, + dryRun: false, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "token", + telemetry: false, + }, + { metaFramework: "vite" }, + ); output.start(); output.end(); diff --git a/packages/bundler-plugin-core/src/utils/__tests__/provider.test.ts b/packages/bundler-plugin-core/src/utils/__tests__/provider.test.ts index 837fb013..730b996f 100644 --- a/packages/bundler-plugin-core/src/utils/__tests__/provider.test.ts +++ b/packages/bundler-plugin-core/src/utils/__tests__/provider.test.ts @@ -40,15 +40,18 @@ describe("detectProvider", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "provider-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "provider-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const result = await detectProvider(inputs, output); expect(result.service).toEqual("appveyor"); @@ -59,15 +62,18 @@ describe("detectProvider", () => { it("throws an error", async () => { let error; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "provider-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "provider-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); try { const inputs: ProviderUtilInputs = { diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/AppVeyorCI.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/AppVeyorCI.test.ts index 41cf2940..488f1b15 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/AppVeyorCI.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/AppVeyorCI.test.ts @@ -81,15 +81,18 @@ describe("AppveyorCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AppVeyorCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AppVeyorCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AppVeyorCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -124,15 +127,18 @@ describe("AppveyorCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AppVeyorCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AppVeyorCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AppVeyorCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -166,15 +172,18 @@ describe("AppveyorCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AppVeyorCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AppVeyorCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AppVeyorCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -196,15 +205,18 @@ describe("AppveyorCI Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AppVeyorCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AppVeyorCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AppVeyorCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/AzurePipelines.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/AzurePipelines.test.ts index c371a453..0b2880b9 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/AzurePipelines.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/AzurePipelines.test.ts @@ -58,15 +58,18 @@ describe("Azure Pipelines CI Params", () => { }), ).thenReturn({ stdout: Buffer.from("") }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AzurePipelines-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AzurePipelines-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AzurePipelines.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -101,15 +104,18 @@ describe("Azure Pipelines CI Params", () => { execFileSync("git", ["show", "--no-patch", "--format=%P"]), ).thenReturn(Buffer.from("nonmergesha23456789012345678901234567890")); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AzurePipelines-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AzurePipelines-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AzurePipelines.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -144,15 +150,18 @@ describe("Azure Pipelines CI Params", () => { execFileSync("git", ["show", "--no-patch", "--format=%P"]), ).thenReturn(Buffer.from("nonmergesha23456789012345678901234567890")); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AzurePipelines-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AzurePipelines-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AzurePipelines.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -190,15 +199,18 @@ describe("Azure Pipelines CI Params", () => { stdout: Buffer.from("https://github.com/testOrg/testRepo.git"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AzurePipelines-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AzurePipelines-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AzurePipelines.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -237,15 +249,18 @@ describe("Azure Pipelines CI Params", () => { ), ); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AzurePipelines-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AzurePipelines-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AzurePipelines.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -278,15 +293,18 @@ describe("Azure Pipelines CI Params", () => { slug: "testOrg/otherTestRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "AzurePipelines-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "AzurePipelines-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await AzurePipelines.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Bitbucket.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Bitbucket.test.ts index f8f62417..e2b21701 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Bitbucket.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Bitbucket.test.ts @@ -62,15 +62,18 @@ describe("Bitbucket Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Bitbucket-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Bitbucket-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Bitbucket.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -98,15 +101,18 @@ describe("Bitbucket Params", () => { slug: "testOwner/testSlug", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Bitbucket-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Bitbucket-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Bitbucket.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -133,15 +139,18 @@ describe("Bitbucket Params", () => { slug: "testOwner/testSlug", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Bitbucket-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Bitbucket-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Bitbucket.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -176,15 +185,18 @@ describe("Bitbucket Params", () => { }), ).thenReturn({ stdout: Buffer.from("0e8f15380b54") }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Bitbucket-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Bitbucket-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Bitbucket.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -221,15 +233,18 @@ describe("Bitbucket Params", () => { slug: "overwriteOwner/overwriteRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Bitbucket-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Bitbucket-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Bitbucket.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Bitrise.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Bitrise.test.ts index 50ec3543..21a0a2e7 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Bitrise.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Bitrise.test.ts @@ -77,15 +77,18 @@ describe("Bitrise Params", () => { }), ).thenReturn({ stdout: Buffer.from("") }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Bitrise-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Bitrise-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Bitrise.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -122,15 +125,18 @@ describe("Bitrise Params", () => { stdout: Buffer.from("https://github.com/testOrg/testRepo.git"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Bitrise-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Bitrise-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Bitrise.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -167,15 +173,18 @@ describe("Bitrise Params", () => { stdout: Buffer.from("https://github.com/testOrg/testRepo.git"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Bitrise-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Bitrise-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Bitrise.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -222,15 +231,18 @@ describe("Bitrise Params", () => { stdout: Buffer.from("https://github.com/testOrg/testRepo.git"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Bitrise-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Bitrise-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Bitrise.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Buildkite.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Buildkite.test.ts index 00e10f1d..95fc4459 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Buildkite.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Buildkite.test.ts @@ -61,15 +61,18 @@ describe("Buildkite Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Buildkite-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Buildkite-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Buildkite.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -102,15 +105,18 @@ describe("Buildkite Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Buildkite-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Buildkite-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Buildkite.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/CircleCI.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/CircleCI.test.ts index 973d94e7..dbbad449 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/CircleCI.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/CircleCI.test.ts @@ -64,15 +64,18 @@ describe("CircleCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "CircleCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "CircleCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await CircleCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -103,15 +106,18 @@ describe("CircleCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "CircleCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "CircleCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await CircleCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -149,15 +155,18 @@ describe("CircleCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "CircleCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "CircleCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await CircleCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Cirrus.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Cirrus.test.ts index 84ba5d07..7dad175f 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Cirrus.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Cirrus.test.ts @@ -61,15 +61,18 @@ describe("Cirrus Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Cirrus-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Cirrus-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Cirrus.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -108,15 +111,18 @@ describe("Cirrus Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Cirrus-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Cirrus-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Cirrus.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/CloudflarePages.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/CloudflarePages.test.ts index d1eca607..7a35fbd9 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/CloudflarePages.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/CloudflarePages.test.ts @@ -58,15 +58,18 @@ describe("CloudflarePages Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "CloudflarePages-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "CloudflarePages-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await CloudflarePages.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -98,15 +101,18 @@ describe("CloudflarePages Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "CloudflarePages-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "CloudflarePages-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await CloudflarePages.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -128,15 +134,18 @@ describe("CloudflarePages Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "CloudflarePages-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "CloudflarePages-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await CloudflarePages.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/CodeBuild.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/CodeBuild.test.ts index e1b0d263..f96a7903 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/CodeBuild.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/CodeBuild.test.ts @@ -61,15 +61,18 @@ describe("CodeBuild Params", () => { slug: "repo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "CodeBuild-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "CodeBuild-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await CodeBuild.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -107,15 +110,18 @@ describe("CodeBuild Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "CodeBuild-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "CodeBuild-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await CodeBuild.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Drone.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Drone.test.ts index c3c72989..0c98092d 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Drone.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Drone.test.ts @@ -61,15 +61,18 @@ describe("Drone Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Drone-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Drone-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Drone.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -109,15 +112,18 @@ describe("Drone Params", () => { slug: "cool-slug", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Drone-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Drone-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Drone.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -147,15 +153,18 @@ describe("Drone Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Drone-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Drone-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Drone.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/GitHubActions.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/GitHubActions.test.ts index cb2d06fa..98216944 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/GitHubActions.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/GitHubActions.test.ts @@ -146,15 +146,18 @@ describe("GitHub Actions Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GHA-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GHA-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitHubActions.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -175,15 +178,18 @@ describe("GitHub Actions Params", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GHA-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GHA-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitHubActions.getServiceParams(inputs, output); const expected: ProviderServiceParams = { @@ -239,15 +245,18 @@ describe("GitHub Actions Params", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GHA-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GHA-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitHubActions.getServiceParams(inputs, output); const expected: ProviderServiceParams = { @@ -296,15 +305,18 @@ describe("GitHub Actions Params", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GHA-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GHA-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitHubActions.getServiceParams(inputs, output); const expected: ProviderServiceParams = { @@ -352,15 +364,18 @@ describe("GitHub Actions Params", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GHA-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GHA-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitHubActions.getServiceParams(inputs, output); const expected: ProviderServiceParams = { @@ -417,15 +432,18 @@ describe("GitHub Actions Params", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GHA-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GHA-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitHubActions.getServiceParams(inputs, output); const expected: ProviderServiceParams = { @@ -458,15 +476,18 @@ describe("GitHub Actions Params", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GHA-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GHA-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitHubActions.getServiceParams(inputs, output); const expected: ProviderServiceParams = { @@ -503,15 +524,18 @@ describe("GitHub Actions Params", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GHA-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GHA-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitHubActions.getServiceParams(inputs, output); const expected: ProviderServiceParams = { diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/GitLabCI.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/GitLabCI.test.ts index f7a0e41f..5bc48309 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/GitLabCI.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/GitLabCI.test.ts @@ -61,15 +61,18 @@ describe("GitLabCI Params", () => { }), ).thenReturn({ stdout: Buffer.from("") }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GLCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GLCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitLabCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -99,15 +102,18 @@ describe("GitLabCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GLCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GLCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitLabCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -134,15 +140,18 @@ describe("GitLabCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GLCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GLCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitLabCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -155,15 +164,18 @@ describe("GitLabCI Params", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GLCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GLCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); it("can get the slug from http", async () => { inputs.envs.CI_BUILD_REPO = "https://gitlab.com/testOrg/testRepo.git"; @@ -247,15 +259,18 @@ describe("GitLabCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "GLCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "GLCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await GitLabCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/HerokuCI.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/HerokuCI.test.ts index 183a04f9..17694032 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/HerokuCI.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/HerokuCI.test.ts @@ -60,15 +60,18 @@ describe("HerokuCI Params", () => { }), ).thenReturn({ stdout: Buffer.from("") }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Heroku-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Heroku-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await HerokuCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -102,15 +105,18 @@ describe("HerokuCI Params", () => { stdout: Buffer.from("https://github.com/testOrg/testRepo.git"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Heroku-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Heroku-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await HerokuCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -140,15 +146,18 @@ describe("HerokuCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Heroku-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Heroku-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await HerokuCI.getServiceParams(inputs, output); expect(expected).toBeTruthy(); expect(params).toMatchObject(expected); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/JenkinsCI.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/JenkinsCI.test.ts index b61f2d7f..b034248d 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/JenkinsCI.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/JenkinsCI.test.ts @@ -70,15 +70,18 @@ describe("Jenkins CI Params", () => { }), ).thenReturn({ stdout: Buffer.from("") }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Jenkins-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Jenkins-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await JenkinsCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -104,15 +107,18 @@ describe("Jenkins CI Params", () => { stdout: Buffer.from("https://github.com/testOrg/testRepo.git"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Jenkins-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Jenkins-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await JenkinsCI.getServiceParams(inputs, output); expect(params.slug).toBe("testOrg/testRepo"); }); @@ -144,15 +150,18 @@ describe("Jenkins CI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Jenkins-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Jenkins-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await JenkinsCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -183,15 +192,18 @@ describe("Jenkins CI Params", () => { stdout: Buffer.from(""), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Jenkins-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Jenkins-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await JenkinsCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Local.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Local.test.ts index 62359082..78411dc4 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Local.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Local.test.ts @@ -62,15 +62,18 @@ describe("Local Params", () => { slug: "owner/repo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Local-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Local-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Local.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -101,15 +104,18 @@ describe("Local Params", () => { slug: "owner/repo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Local-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Local-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Local.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -120,15 +126,18 @@ describe("Local Params", () => { envs: {}, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Local-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Local-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const spawnSync = td.replace(childProcess, "spawnSync"); await expect(Local.getServiceParams(inputs, output)).rejects.toThrow(); @@ -184,15 +193,18 @@ describe("Local Params", () => { stdout: Buffer.from("testSHA"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Local-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Local-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Local.getServiceParams(inputs, output); expect(params.slug).toBe("testOrg/testRepo"); }); @@ -223,15 +235,18 @@ describe("Local Params", () => { stdout: Buffer.from("testSHA"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Local-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Local-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); await expect(Local.getServiceParams(inputs, output)).rejects.toThrow(); }); @@ -262,15 +277,18 @@ describe("Local Params", () => { stdout: Buffer.from("testSHA"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Local-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Local-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Local.getServiceParams(inputs, output); expect(params.slug).toBe("testOrg/testRepo"); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Netlify.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Netlify.test.ts index db531efe..ce22090f 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Netlify.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Netlify.test.ts @@ -59,15 +59,18 @@ describe("Netlify Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Netlify-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Netlify-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Netlify.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -100,15 +103,18 @@ describe("Netlify Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Netlify-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Netlify-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Netlify.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -130,15 +136,18 @@ describe("Netlify Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Netlify-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Netlify-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Netlify.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Render.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Render.test.ts index c1ab9e96..75e670f8 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Render.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Render.test.ts @@ -59,15 +59,18 @@ describe("Render Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Render-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Render-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Render.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -100,15 +103,18 @@ describe("Render Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Render-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Render-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Render.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -130,15 +136,18 @@ describe("Render Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Render-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Render-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Render.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/TeamCity.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/TeamCity.test.ts index 24621c77..eb0c0b00 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/TeamCity.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/TeamCity.test.ts @@ -66,15 +66,18 @@ describe("TeamCity Params", () => { }), ).thenReturn({ stdout: Buffer.from("") }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "TeamCity-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "TeamCity-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await TeamCity.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -109,15 +112,18 @@ describe("TeamCity Params", () => { stdout: Buffer.from("https://github.com/testOrg/testRepo.git"), }); - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "TeamCity-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "TeamCity-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await TeamCity.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -159,15 +165,18 @@ describe("TeamCity Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "TeamCity-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "TeamCity-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await TeamCity.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -196,15 +205,18 @@ describe("TeamCity Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "TeamCity-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "TeamCity-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await TeamCity.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/TravisCI.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/TravisCI.test.ts index b1bc9655..04f70e47 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/TravisCI.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/TravisCI.test.ts @@ -76,15 +76,18 @@ describe("TravisCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "TravisCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "TravisCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await TravisCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -118,15 +121,18 @@ describe("TravisCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "TravisCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "TravisCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await TravisCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -159,15 +165,18 @@ describe("TravisCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "TravisCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "TravisCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await TravisCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -201,15 +210,18 @@ describe("TravisCI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "TravisCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "TravisCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await TravisCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -231,15 +243,18 @@ describe("TravisCI Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "TravisCI-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "TravisCI-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await TravisCI.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Vercel.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Vercel.test.ts index 4c92fe98..026ed944 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Vercel.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Vercel.test.ts @@ -60,15 +60,18 @@ describe("Vercel Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Vercel-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Vercel-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Vercel.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -102,15 +105,18 @@ describe("Vercel Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Vercel-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Vercel-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Vercel.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -132,15 +138,18 @@ describe("Vercel Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Vercel-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Vercel-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Vercel.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Werker.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Werker.test.ts index 01c3a7a3..754ff26b 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Werker.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Werker.test.ts @@ -61,15 +61,18 @@ describe("Wercker CI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Wercker-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Wercker-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Wercker.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -108,15 +111,18 @@ describe("Wercker CI Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Wercker-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Wercker-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Wercker.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -137,15 +143,18 @@ describe("Wercker CI Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Wercker-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Wercker-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await Wercker.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/Woodpecker.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/Woodpecker.test.ts index 333ccb7c..e32c328e 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/Woodpecker.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/Woodpecker.test.ts @@ -62,15 +62,18 @@ describe("Woodpecker Params", () => { slug: "testOrg/testRepo", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Woodpecker-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Woodpecker-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await providerWoodpecker.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -113,15 +116,18 @@ describe("Woodpecker Params", () => { slug: "cool-slug", }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Woodpecker-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Woodpecker-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await providerWoodpecker.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); @@ -142,15 +148,18 @@ describe("Woodpecker Params", () => { slug: null, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "Woodpecker-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "Woodpecker-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const params = await providerWoodpecker.getServiceParams(inputs, output); expect(params).toMatchObject(expected); }); diff --git a/packages/bundler-plugin-core/src/utils/providers/__tests__/index.test.ts b/packages/bundler-plugin-core/src/utils/providers/__tests__/index.test.ts index fa8dc384..a4fd47b3 100644 --- a/packages/bundler-plugin-core/src/utils/providers/__tests__/index.test.ts +++ b/packages/bundler-plugin-core/src/utils/providers/__tests__/index.test.ts @@ -65,15 +65,18 @@ describe("CI Providers", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "service-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "service-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const serviceParams = await provider.getServiceParams(inputs, output); @@ -94,15 +97,18 @@ describe("CI Providers", () => { }, }; - const output = new Output({ - apiUrl: "http://localhost", - bundleName: "service-test", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 0, - telemetry: false, - }); + const output = new Output( + { + apiUrl: "http://localhost", + bundleName: "service-test", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 0, + telemetry: false, + }, + { metaFramework: "vite" }, + ); const serviceParams = await provider.getServiceParams(inputs, output); diff --git a/packages/nextjs-webpack-plugin/src/index.ts b/packages/nextjs-webpack-plugin/src/index.ts index 5405283c..aba90db8 100644 --- a/packages/nextjs-webpack-plugin/src/index.ts +++ b/packages/nextjs-webpack-plugin/src/index.ts @@ -55,7 +55,13 @@ const codecovNextJSWebpackPluginFactory = createWebpackPlugin< bundler: unpluginMetaContext.framework, metaFramework: "nextjs", }); - const output = new Output(options, sentryConfig); + + const output = new Output( + options, + { metaFramework: unpluginMetaContext.framework }, + sentryConfig, + ); + if (options.enableBundleAnalysis) { plugins.push( telemetryPlugin({ diff --git a/packages/nextjs-webpack-plugin/src/nextjs-webpack-bundle-analysis/__tests__/nextJSWebpackBundleAnalysisPlugin.test.ts b/packages/nextjs-webpack-plugin/src/nextjs-webpack-bundle-analysis/__tests__/nextJSWebpackBundleAnalysisPlugin.test.ts index 9b826a5b..56494949 100644 --- a/packages/nextjs-webpack-plugin/src/nextjs-webpack-bundle-analysis/__tests__/nextJSWebpackBundleAnalysisPlugin.test.ts +++ b/packages/nextjs-webpack-plugin/src/nextjs-webpack-bundle-analysis/__tests__/nextJSWebpackBundleAnalysisPlugin.test.ts @@ -12,16 +12,19 @@ describe("webpackBundleAnalysisPlugin", () => { describe("when called", () => { it("returns a plugin object", () => { const plugin = nextJSWebpackBundleAnalysisPlugin({ - output: new Output({ - apiUrl: "http://localhost", - bundleName: "test-bundle", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "test-token", - telemetry: false, - }), + output: new Output( + { + apiUrl: "http://localhost", + bundleName: "test-bundle", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "test-token", + telemetry: false, + }, + { metaFramework: "webpack" }, + ), options: { webpack: webpack, }, diff --git a/packages/nuxt-plugin/src/index.ts b/packages/nuxt-plugin/src/index.ts index d1130262..0ab5ed0b 100644 --- a/packages/nuxt-plugin/src/index.ts +++ b/packages/nuxt-plugin/src/index.ts @@ -47,7 +47,12 @@ const codecovNuxtPluginFactory = createVitePlugin( bundler: unpluginMetaContext.framework, metaFramework: "nuxt", }); - const output = new Output(options, sentryConfig); + + const output = new Output( + options, + { metaFramework: unpluginMetaContext.framework }, + sentryConfig, + ); if (options.enableBundleAnalysis) { plugins.push( diff --git a/packages/nuxt-plugin/src/nuxt-bundle-analysis/__tests__/nuxtBundleAnalysisPlugin.test.ts b/packages/nuxt-plugin/src/nuxt-bundle-analysis/__tests__/nuxtBundleAnalysisPlugin.test.ts index 84da0a9f..c84eb2be 100644 --- a/packages/nuxt-plugin/src/nuxt-bundle-analysis/__tests__/nuxtBundleAnalysisPlugin.test.ts +++ b/packages/nuxt-plugin/src/nuxt-bundle-analysis/__tests__/nuxtBundleAnalysisPlugin.test.ts @@ -11,16 +11,19 @@ describe("nuxtBundleAnalysisPlugin", () => { describe("when called", () => { it("returns a plugin object", () => { const plugin = nuxtBundleAnalysisPlugin({ - output: new Output({ - apiUrl: "http://localhost", - bundleName: "test-bundle", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "test-token", - telemetry: false, - }), + output: new Output( + { + apiUrl: "http://localhost", + bundleName: "test-bundle", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "test-token", + telemetry: false, + }, + { metaFramework: "vite" }, + ), pluginName: PLUGIN_NAME, pluginVersion: PLUGIN_VERSION, }); diff --git a/packages/remix-vite-plugin/src/index.ts b/packages/remix-vite-plugin/src/index.ts index 1f43145c..d3146d20 100644 --- a/packages/remix-vite-plugin/src/index.ts +++ b/packages/remix-vite-plugin/src/index.ts @@ -49,7 +49,12 @@ const codecovRemixVitePluginFactory = createVitePlugin( bundler: unpluginMetaContext.framework, metaFramework: "remix", }); - const output = new Output(options, sentryConfig); + + const output = new Output( + options, + { metaFramework: unpluginMetaContext.framework }, + sentryConfig, + ); if (options.enableBundleAnalysis) { plugins.push( diff --git a/packages/remix-vite-plugin/src/remix-bundle-analysis/__tests__/remixBundleAnalysisPlugin.test.ts b/packages/remix-vite-plugin/src/remix-bundle-analysis/__tests__/remixBundleAnalysisPlugin.test.ts index 0383c1d2..62d8aaba 100644 --- a/packages/remix-vite-plugin/src/remix-bundle-analysis/__tests__/remixBundleAnalysisPlugin.test.ts +++ b/packages/remix-vite-plugin/src/remix-bundle-analysis/__tests__/remixBundleAnalysisPlugin.test.ts @@ -11,16 +11,19 @@ describe("remixBundleAnalysisPlugin", () => { describe("when called", () => { it("returns a plugin object", () => { const plugin = remixBundleAnalysisPlugin({ - output: new Output({ - apiUrl: "http://localhost", - bundleName: "test-bundle", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "test-token", - telemetry: false, - }), + output: new Output( + { + apiUrl: "http://localhost", + bundleName: "test-bundle", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "test-token", + telemetry: false, + }, + { metaFramework: "vite" }, + ), pluginName: PLUGIN_NAME, pluginVersion: PLUGIN_VERSION, }); diff --git a/packages/rollup-plugin/src/index.ts b/packages/rollup-plugin/src/index.ts index c11aae0d..7c1409ee 100644 --- a/packages/rollup-plugin/src/index.ts +++ b/packages/rollup-plugin/src/index.ts @@ -47,7 +47,12 @@ const codecovRollupPluginFactory = createRollupPlugin( options, bundler: unpluginMetaContext.framework, }); - const output = new Output(options, sentryConfig); + + const output = new Output( + options, + { metaFramework: unpluginMetaContext.framework }, + sentryConfig, + ); if (options.enableBundleAnalysis) { plugins.push( diff --git a/packages/rollup-plugin/src/rollup-bundle-analysis/__tests__/rollupBundleAnalysisPlugin.test.ts b/packages/rollup-plugin/src/rollup-bundle-analysis/__tests__/rollupBundleAnalysisPlugin.test.ts index a4e63639..8b6d9eb9 100644 --- a/packages/rollup-plugin/src/rollup-bundle-analysis/__tests__/rollupBundleAnalysisPlugin.test.ts +++ b/packages/rollup-plugin/src/rollup-bundle-analysis/__tests__/rollupBundleAnalysisPlugin.test.ts @@ -11,16 +11,19 @@ describe("rollupBundleAnalysisPlugin", () => { describe("when called", () => { it("returns a plugin object", () => { const plugin = rollupBundleAnalysisPlugin({ - output: new Output({ - apiUrl: "http://localhost", - bundleName: "test-bundle", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "test-token", - telemetry: false, - }), + output: new Output( + { + apiUrl: "http://localhost", + bundleName: "test-bundle", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "test-token", + telemetry: false, + }, + { metaFramework: "rollup" }, + ), pluginName: PLUGIN_NAME, pluginVersion: PLUGIN_VERSION, }); diff --git a/packages/solidstart-plugin/src/index.ts b/packages/solidstart-plugin/src/index.ts index 06b5e299..e3fa2551 100644 --- a/packages/solidstart-plugin/src/index.ts +++ b/packages/solidstart-plugin/src/index.ts @@ -49,7 +49,12 @@ const codecovSolidStartPluginFactory = createVitePlugin( bundler: unpluginMetaContext.framework, metaFramework: "solidstart", }); - const output = new Output(options, sentryConfig); + + const output = new Output( + options, + { metaFramework: unpluginMetaContext.framework }, + sentryConfig, + ); if (options.enableBundleAnalysis) { plugins.push( diff --git a/packages/solidstart-plugin/src/solidstart-bundle-analysis/__tests__/solidstartBundleAnalysisPlugin.test.ts b/packages/solidstart-plugin/src/solidstart-bundle-analysis/__tests__/solidstartBundleAnalysisPlugin.test.ts index 5123109c..d9fb04b9 100644 --- a/packages/solidstart-plugin/src/solidstart-bundle-analysis/__tests__/solidstartBundleAnalysisPlugin.test.ts +++ b/packages/solidstart-plugin/src/solidstart-bundle-analysis/__tests__/solidstartBundleAnalysisPlugin.test.ts @@ -11,16 +11,19 @@ describe("solidstartBundleAnalysisPlugin", () => { describe("when called", () => { it("returns a plugin object", () => { const plugin = solidstartBundleAnalysisPlugin({ - output: new Output({ - apiUrl: "http://localhost", - bundleName: "test-bundle", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "test-token", - telemetry: false, - }), + output: new Output( + { + apiUrl: "http://localhost", + bundleName: "test-bundle", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "test-token", + telemetry: false, + }, + { metaFramework: "vite" }, + ), pluginName: PLUGIN_NAME, pluginVersion: PLUGIN_VERSION, }); diff --git a/packages/sveltekit-plugin/src/index.ts b/packages/sveltekit-plugin/src/index.ts index d34bb76a..8d95a868 100644 --- a/packages/sveltekit-plugin/src/index.ts +++ b/packages/sveltekit-plugin/src/index.ts @@ -50,7 +50,12 @@ const codecovSvelteKitPluginFactory = createVitePlugin( bundler: unpluginMetaContext.framework, metaFramework: "sveltekit", }); - const output = new Output(options, sentryConfig); + + const output = new Output( + options, + { metaFramework: unpluginMetaContext.framework }, + sentryConfig, + ); if (options.enableBundleAnalysis) { plugins.push( diff --git a/packages/sveltekit-plugin/src/sveltekit-bundle-analysis/__tests__/sveltekitBundleAnalysisPlugin.test.ts b/packages/sveltekit-plugin/src/sveltekit-bundle-analysis/__tests__/sveltekitBundleAnalysisPlugin.test.ts index ae1cf5a8..db781144 100644 --- a/packages/sveltekit-plugin/src/sveltekit-bundle-analysis/__tests__/sveltekitBundleAnalysisPlugin.test.ts +++ b/packages/sveltekit-plugin/src/sveltekit-bundle-analysis/__tests__/sveltekitBundleAnalysisPlugin.test.ts @@ -11,16 +11,19 @@ describe("sveltekitBundleAnalysisPlugin", () => { describe("when called", () => { it("returns a plugin object", () => { const plugin = sveltekitBundleAnalysisPlugin({ - output: new Output({ - apiUrl: "http://localhost", - bundleName: "test-bundle", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "test-token", - telemetry: false, - }), + output: new Output( + { + apiUrl: "http://localhost", + bundleName: "test-bundle", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "test-token", + telemetry: false, + }, + { metaFramework: "vite" }, + ), pluginName: PLUGIN_NAME, pluginVersion: PLUGIN_VERSION, }); diff --git a/packages/vite-plugin/src/index.ts b/packages/vite-plugin/src/index.ts index 63d4cbd4..4a9fb643 100644 --- a/packages/vite-plugin/src/index.ts +++ b/packages/vite-plugin/src/index.ts @@ -47,7 +47,12 @@ const codecovVitePluginFactory = createVitePlugin( options, bundler: unpluginMetaContext.framework, }); - const output = new Output(options, sentryConfig); + + const output = new Output( + options, + { metaFramework: unpluginMetaContext.framework }, + sentryConfig, + ); if (options.enableBundleAnalysis) { plugins.push( diff --git a/packages/vite-plugin/src/vite-bundle-analysis/__tests__/viteBundleAnalysisPlugin.test.ts b/packages/vite-plugin/src/vite-bundle-analysis/__tests__/viteBundleAnalysisPlugin.test.ts index 2fd50f0c..84bf764c 100644 --- a/packages/vite-plugin/src/vite-bundle-analysis/__tests__/viteBundleAnalysisPlugin.test.ts +++ b/packages/vite-plugin/src/vite-bundle-analysis/__tests__/viteBundleAnalysisPlugin.test.ts @@ -11,16 +11,19 @@ describe("viteBundleAnalysisPlugin", () => { describe("when called", () => { it("returns a plugin object", () => { const plugin = viteBundleAnalysisPlugin({ - output: new Output({ - apiUrl: "http://localhost", - bundleName: "test-bundle", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "test-token", - telemetry: false, - }), + output: new Output( + { + apiUrl: "http://localhost", + bundleName: "test-bundle", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "test-token", + telemetry: false, + }, + { metaFramework: "vite" }, + ), pluginName: PLUGIN_NAME, pluginVersion: PLUGIN_VERSION, }); diff --git a/packages/webpack-plugin/src/index.ts b/packages/webpack-plugin/src/index.ts index 36bdc0e5..b0dae842 100644 --- a/packages/webpack-plugin/src/index.ts +++ b/packages/webpack-plugin/src/index.ts @@ -54,7 +54,12 @@ const codecovWebpackPluginFactory = createWebpackPlugin( options, bundler: unpluginMetaContext.framework, }); - const output = new Output(options, sentryConfig); + + const output = new Output( + options, + { metaFramework: unpluginMetaContext.framework }, + sentryConfig, + ); if (options.enableBundleAnalysis) { plugins.push( diff --git a/packages/webpack-plugin/src/webpack-bundle-analysis/__tests__/webpackBundleAnalysisPlugin.test.ts b/packages/webpack-plugin/src/webpack-bundle-analysis/__tests__/webpackBundleAnalysisPlugin.test.ts index f4e31285..7a10c7fe 100644 --- a/packages/webpack-plugin/src/webpack-bundle-analysis/__tests__/webpackBundleAnalysisPlugin.test.ts +++ b/packages/webpack-plugin/src/webpack-bundle-analysis/__tests__/webpackBundleAnalysisPlugin.test.ts @@ -11,16 +11,19 @@ describe("webpackBundleAnalysisPlugin", () => { describe("when called", () => { it("returns a plugin object", () => { const plugin = webpackBundleAnalysisPlugin({ - output: new Output({ - apiUrl: "http://localhost", - bundleName: "test-bundle", - debug: false, - dryRun: true, - enableBundleAnalysis: true, - retryCount: 1, - uploadToken: "test-token", - telemetry: false, - }), + output: new Output( + { + apiUrl: "http://localhost", + bundleName: "test-bundle", + debug: false, + dryRun: true, + enableBundleAnalysis: true, + retryCount: 1, + uploadToken: "test-token", + telemetry: false, + }, + { metaFramework: "webpack" }, + ), pluginName: PLUGIN_NAME, pluginVersion: PLUGIN_VERSION, }); From 206f9d486ad7063cc084b67433d5a7efe209768a Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Mon, 10 Feb 2025 10:03:49 -0400 Subject: [PATCH 07/13] update normalizePath to take a metaFramework argument --- .../src/utils/__tests__/normalizePath.test.ts | 23 +++++++++++++++++-- .../src/utils/normalizePath.ts | 14 +++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts b/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts index a0f30bfc..73ba0c4d 100644 --- a/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts +++ b/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts @@ -1,11 +1,12 @@ import { describe, expect, it } from "vitest"; import { normalizePath } from "../normalizePath"; - +import { type MetaFramework } from "../../types"; interface Test { name: string; input: { path: string; format: string; + metaFramework: MetaFramework; }; expected: string; } @@ -16,6 +17,7 @@ const tests: Test[] = [ input: { path: "test.123.chunk.js", format: "[name].[hash].chunk.js", + metaFramework: "webpack", }, expected: "test.*.chunk.js", }, @@ -24,6 +26,7 @@ const tests: Test[] = [ input: { path: "test.ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=-.js", format: "[name].[hash].js", + metaFramework: "webpack", }, expected: "test.*.js", }, @@ -32,6 +35,7 @@ const tests: Test[] = [ input: { path: "test.123.chunk.js", format: "[name].[contenthash].chunk.js", + metaFramework: "webpack", }, expected: "test.*.chunk.js", }, @@ -40,6 +44,7 @@ const tests: Test[] = [ input: { path: "test.123.chunk.js", format: "[name].[fullhash].chunk.js", + metaFramework: "webpack", }, expected: "test.*.chunk.js", }, @@ -48,6 +53,7 @@ const tests: Test[] = [ input: { path: "test.123.chunk.js", format: "[name].[chunkhash].chunk.js", + metaFramework: "webpack", }, expected: "test.*.chunk.js", }, @@ -56,6 +62,7 @@ const tests: Test[] = [ input: { path: "test.123.456.chunk.js", format: "[name].[hash].[chunkhash].chunk.js", + metaFramework: "webpack", }, expected: "test.*.*.chunk.js", }, @@ -64,6 +71,7 @@ const tests: Test[] = [ input: { path: "test.12345678.chunk.js", format: "[name].chunk.js", + metaFramework: "webpack", }, expected: "test.*.chunk.js", }, @@ -72,6 +80,7 @@ const tests: Test[] = [ input: { path: "test.12345678.js", format: "[name].[hash][extname]", + metaFramework: "webpack", }, expected: "test.*.js", }, @@ -80,6 +89,7 @@ const tests: Test[] = [ input: { path: "test.12345678", format: "[name].[hash]", + metaFramework: "webpack", }, expected: "test.*", }, @@ -88,6 +98,7 @@ const tests: Test[] = [ input: { path: "test.CoScjXRp_rD9HKS--kYO73.chunk.js", format: "[name].[hash:22].chunk.js", + metaFramework: "webpack", }, expected: "test.*.chunk.js", }, @@ -96,6 +107,7 @@ const tests: Test[] = [ input: { path: "test.CoScjXRp_rD9HKS--kYO73.chunk.js", format: "[name].[contenthash:22].chunk.js", + metaFramework: "webpack", }, expected: "test.*.chunk.js", }, @@ -104,6 +116,7 @@ const tests: Test[] = [ input: { path: "test.CoScjXRp_rD9HKS--kYO73.chunk.js", format: "[name].[fullhash:22].chunk.js", + metaFramework: "webpack", }, expected: "test.*.chunk.js", }, @@ -112,6 +125,7 @@ const tests: Test[] = [ input: { path: "test.CoScjXRp_rD9HKS--kYO73.chunk.js", format: "[name].[chunkhash:22].chunk.js", + metaFramework: "webpack", }, expected: "test.*.chunk.js", }, @@ -122,6 +136,7 @@ const tests: Test[] = [ // in testing i've found that the format is just an empty string so we // have to brute force it in a different way format: "", + metaFramework: "vite", }, expected: "test-legacy-*.js", }, @@ -129,7 +144,11 @@ const tests: Test[] = [ describe("normalizePath", () => { it.each(tests)("$name", ({ input, expected }) => { - const expectation = normalizePath(input.path, input.format); + const expectation = normalizePath( + input.path, + input.format, + input.metaFramework, + ); expect(expectation).toEqual(expected); }); }); diff --git a/packages/bundler-plugin-core/src/utils/normalizePath.ts b/packages/bundler-plugin-core/src/utils/normalizePath.ts index 2e722201..1a0c3e50 100644 --- a/packages/bundler-plugin-core/src/utils/normalizePath.ts +++ b/packages/bundler-plugin-core/src/utils/normalizePath.ts @@ -1,3 +1,5 @@ +import { type MetaFramework } from "../types"; + const HASH_REGEX = /[a-f0-9]{8,}/i; const POTENTIAL_HASHES = ["[contenthash", "[fullhash", "[chunkhash", "[hash"]; @@ -9,7 +11,11 @@ interface HashMatch { hashIndex: number; } -export const normalizePath = (path: string, format: string): string => { +export const normalizePath = ( + path: string, + format: string, + metaFramework: MetaFramework, +): string => { // grab all potential hashes in the format string const matches: HashMatch[] = []; for (const hash of POTENTIAL_HASHES) { @@ -56,7 +62,11 @@ export const normalizePath = (path: string, format: string): string => { } // handle vite legacy builds - if (normalizedPath === path && path.includes("legacy")) { + if ( + normalizedPath === path && + metaFramework === "vite" && + path.includes("legacy") + ) { const regexReplacement = /(?\S+-legacy-)(?[0-9a-zA-Z\/+=_\/+=-]+)(?.\S+)/i; From 11c4b21d87122ced93f7d1d3a908ecf9bde38d06 Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Mon, 10 Feb 2025 10:04:16 -0400 Subject: [PATCH 08/13] pass metaFramework value in bundle analyzer --- packages/bundle-analyzer/src/assets.test.ts | 2 ++ packages/bundle-analyzer/src/assets.ts | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/bundle-analyzer/src/assets.test.ts b/packages/bundle-analyzer/src/assets.test.ts index 62ec630c..7f7c921c 100644 --- a/packages/bundle-analyzer/src/assets.test.ts +++ b/packages/bundle-analyzer/src/assets.test.ts @@ -105,6 +105,7 @@ describe("getAsset", () => { expect(normalizePath).toHaveBeenCalledWith( path.relative(mockParentPath, mockFilePath), "", + "bundle-analyzer", ); expect(asset).toEqual({ name: path.relative(mockParentPath, mockFilePath), @@ -127,6 +128,7 @@ describe("getAsset", () => { expect(normalizePath).toHaveBeenCalledWith( path.relative(mockParentPath, mockFilePath), inputPattern, + "bundle-analyzer", ); expect(asset.normalized).toBe(expectedNormalizedName); diff --git a/packages/bundle-analyzer/src/assets.ts b/packages/bundle-analyzer/src/assets.ts index cd60f746..66a5267d 100644 --- a/packages/bundle-analyzer/src/assets.ts +++ b/packages/bundle-analyzer/src/assets.ts @@ -55,7 +55,11 @@ export const getAsset = async ( // normalize the file name if a pattern is provided. By default (when pattern is ""), this // will replace anything "hashlike" with *. For example index-1dca144e.js --> index-*.js - const normalizedName = normalizePath(fileName, normalizeAssetsPattern); + const normalizedName = normalizePath( + fileName, + normalizeAssetsPattern, + "bundle-analyzer", + ); return { name: fileName, From 7e02d313bdc2d5fa2897ca6634bda21554884a2e Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Mon, 10 Feb 2025 10:12:45 -0400 Subject: [PATCH 09/13] update createRollupAsset to take in metaFramework --- .../src/utils/__tests__/createRollupAsset.test.ts | 6 ++++++ packages/bundler-plugin-core/src/utils/createRollupAsset.ts | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/bundler-plugin-core/src/utils/__tests__/createRollupAsset.test.ts b/packages/bundler-plugin-core/src/utils/__tests__/createRollupAsset.test.ts index 4ce6773e..e9351758 100644 --- a/packages/bundler-plugin-core/src/utils/__tests__/createRollupAsset.test.ts +++ b/packages/bundler-plugin-core/src/utils/__tests__/createRollupAsset.test.ts @@ -8,6 +8,7 @@ describe("createRollupAsset", () => { fileName: "test.D4lWaVuy.js", source: Buffer.from("test"), formatString: "[name].[hash].js", + metaFramework: "rollup", }); expect(asset.name).toBe("test.D4lWaVuy.js"); @@ -18,6 +19,7 @@ describe("createRollupAsset", () => { fileName: "test.D4lWaVuy.js", source: Buffer.from("test"), formatString: "[name].[hash].js", + metaFramework: "rollup", }); expect(asset.normalized).toBe("test.*.js"); @@ -29,6 +31,7 @@ describe("createRollupAsset", () => { fileName: "test.D4lWaVuy.js", source: Buffer.from("test"), formatString: "[name].[hash].js", + metaFramework: "rollup", }); expect(asset.size).toBe(4); @@ -39,6 +42,7 @@ describe("createRollupAsset", () => { fileName: "test.D4lWaVuy.js", source: Buffer.from("test"), formatString: "[name].[hash].js", + metaFramework: "rollup", }); expect(asset.gzipSize).toBe(24); }); @@ -50,6 +54,7 @@ describe("createRollupAsset", () => { fileName: "test.D4lWaVuy.js", source: "test", formatString: "[name].[hash].js", + metaFramework: "rollup", }); expect(asset.size).toBe(4); @@ -60,6 +65,7 @@ describe("createRollupAsset", () => { fileName: "test.D4lWaVuy.js", source: "test", formatString: "[name].[hash].js", + metaFramework: "rollup", }); expect(asset.gzipSize).toBe(24); }); diff --git a/packages/bundler-plugin-core/src/utils/createRollupAsset.ts b/packages/bundler-plugin-core/src/utils/createRollupAsset.ts index 740c42e3..c960bbc9 100644 --- a/packages/bundler-plugin-core/src/utils/createRollupAsset.ts +++ b/packages/bundler-plugin-core/src/utils/createRollupAsset.ts @@ -1,3 +1,4 @@ +import { type MetaFramework } from "../types"; import { getCompressedSize } from "./getCompressedSize.ts"; import { normalizePath } from "./normalizePath.ts"; @@ -5,12 +6,14 @@ interface CreateAssetOptions { fileName: string; source: Uint8Array | string; formatString: string; + metaFramework: MetaFramework; } export const createRollupAsset = async ({ source, fileName, formatString, + metaFramework, }: CreateAssetOptions) => { const size = source instanceof Buffer @@ -26,6 +29,6 @@ export const createRollupAsset = async ({ name: fileName, size: size, gzipSize: gzipSize, - normalized: normalizePath(fileName, formatString), + normalized: normalizePath(fileName, formatString, metaFramework), }; }; From 206f93e3570e8855b923b0307266493c01304753 Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Mon, 10 Feb 2025 10:13:03 -0400 Subject: [PATCH 10/13] update processAssets to take in metaFramework --- .../utils/__tests__/processAssets.test.ts | 18 +++++++++++++++--- .../utils/processAssets.ts | 5 ++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/packages/webpack-plugin/src/webpack-bundle-analysis/utils/__tests__/processAssets.test.ts b/packages/webpack-plugin/src/webpack-bundle-analysis/utils/__tests__/processAssets.test.ts index 734c88b3..31d783b4 100644 --- a/packages/webpack-plugin/src/webpack-bundle-analysis/utils/__tests__/processAssets.test.ts +++ b/packages/webpack-plugin/src/webpack-bundle-analysis/utils/__tests__/processAssets.test.ts @@ -34,7 +34,11 @@ describe("processAssets", () => { // This is a fairly complex type to mock out, so we're just using the values that are needed for this test } as unknown as Compilation; - const processedAssets = await processAssets({ assets, compilation }); + const processedAssets = await processAssets({ + assets, + compilation, + metaFramework: "webpack", + }); expect(processedAssets).toEqual([ { @@ -77,7 +81,11 @@ describe("processAssets", () => { // This is a fairly complex type to mock out, so we're just using the values that are needed for this test } as unknown as Compilation; - const processedAssets = await processAssets({ assets, compilation }); + const processedAssets = await processAssets({ + assets, + compilation, + metaFramework: "webpack", + }); expect(processedAssets).toEqual([ { @@ -126,7 +134,11 @@ describe("processAssets", () => { // This is a fairly complex type to mock out, so we're just using the values that are needed for this test } as unknown as Compilation; - const processedAssets = await processAssets({ assets, compilation }); + const processedAssets = await processAssets({ + assets, + compilation, + metaFramework: "webpack", + }); expect(processedAssets).toEqual([ { diff --git a/packages/webpack-plugin/src/webpack-bundle-analysis/utils/processAssets.ts b/packages/webpack-plugin/src/webpack-bundle-analysis/utils/processAssets.ts index 41f9e300..988c63f1 100644 --- a/packages/webpack-plugin/src/webpack-bundle-analysis/utils/processAssets.ts +++ b/packages/webpack-plugin/src/webpack-bundle-analysis/utils/processAssets.ts @@ -3,6 +3,7 @@ import { normalizePath, type Asset, getCompressedSize, + type MetaFramework, } from "@codecov/bundler-plugin-core"; import { type StatsAsset, type Compilation } from "webpack"; import { findFilenameFormat } from "./findFileFormat.ts"; @@ -10,11 +11,13 @@ import { findFilenameFormat } from "./findFileFormat.ts"; export interface ProcessAssetsArgs { assets: StatsAsset[]; compilation: Compilation; + metaFramework: MetaFramework; } export const processAssets = async ({ assets, compilation, + metaFramework, }: ProcessAssetsArgs) => { const outputOptions = compilation.outputOptions; const collectedAssets: Asset[] = []; @@ -67,7 +70,7 @@ export const processAssets = async ({ name: asset.name, size: asset.size, gzipSize: compressedSize, - normalized: normalizePath(asset.name, format), + normalized: normalizePath(asset.name, format, metaFramework), }); }), ); From 9119acb84f27cd13c419f85d4279985f1f493b24 Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Mon, 10 Feb 2025 10:15:57 -0400 Subject: [PATCH 11/13] update nextjs and webpack --- .../nextJSWebpackBundleAnalysisPlugin.ts | 1 + .../src/webpack-bundle-analysis/webpackBundleAnalysisPlugin.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/nextjs-webpack-plugin/src/nextjs-webpack-bundle-analysis/nextJSWebpackBundleAnalysisPlugin.ts b/packages/nextjs-webpack-plugin/src/nextjs-webpack-bundle-analysis/nextJSWebpackBundleAnalysisPlugin.ts index 1ee70da5..498d5027 100644 --- a/packages/nextjs-webpack-plugin/src/nextjs-webpack-bundle-analysis/nextJSWebpackBundleAnalysisPlugin.ts +++ b/packages/nextjs-webpack-plugin/src/nextjs-webpack-bundle-analysis/nextJSWebpackBundleAnalysisPlugin.ts @@ -82,6 +82,7 @@ export const nextJSWebpackBundleAnalysisPlugin: ExtendedBAUploadPlugin<{ const collectedAssets = await processAssets({ assets, compilation, + metaFramework: output.metaFramework, }); output.assets = collectedAssets; diff --git a/packages/webpack-plugin/src/webpack-bundle-analysis/webpackBundleAnalysisPlugin.ts b/packages/webpack-plugin/src/webpack-bundle-analysis/webpackBundleAnalysisPlugin.ts index 23a837fe..92ba5aed 100644 --- a/packages/webpack-plugin/src/webpack-bundle-analysis/webpackBundleAnalysisPlugin.ts +++ b/packages/webpack-plugin/src/webpack-bundle-analysis/webpackBundleAnalysisPlugin.ts @@ -70,6 +70,7 @@ export const webpackBundleAnalysisPlugin: BundleAnalysisUploadPlugin = ({ const collectedAssets = await processAssets({ assets, compilation, + metaFramework: output.metaFramework, }); output.assets = collectedAssets; From 1394164c3eb119da2f0e582d334a5b23878177e6 Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Mon, 10 Feb 2025 10:16:19 -0400 Subject: [PATCH 12/13] update rollup based packages --- .../src/rollup-bundle-analysis/rollupBundleAnalysisPlugin.ts | 2 ++ .../src/vite-bundle-analysis/viteBundleAnalysisPlugin.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/rollup-plugin/src/rollup-bundle-analysis/rollupBundleAnalysisPlugin.ts b/packages/rollup-plugin/src/rollup-bundle-analysis/rollupBundleAnalysisPlugin.ts index fcf4a199..9a193112 100644 --- a/packages/rollup-plugin/src/rollup-bundle-analysis/rollupBundleAnalysisPlugin.ts +++ b/packages/rollup-plugin/src/rollup-bundle-analysis/rollupBundleAnalysisPlugin.ts @@ -77,6 +77,7 @@ export const rollupBundleAnalysisPlugin: BundleAnalysisUploadPlugin = ({ fileName: fileName, source: item.source, formatString: assetFormatString, + metaFramework: output.metaFramework, }); assets.push(asset); } else if (item?.type === "chunk") { @@ -89,6 +90,7 @@ export const rollupBundleAnalysisPlugin: BundleAnalysisUploadPlugin = ({ fileName, source: item.code, formatString: chunkFormatString, + metaFramework: output.metaFramework, }); assets.push(asset); diff --git a/packages/vite-plugin/src/vite-bundle-analysis/viteBundleAnalysisPlugin.ts b/packages/vite-plugin/src/vite-bundle-analysis/viteBundleAnalysisPlugin.ts index 8ae9677b..22b2316c 100644 --- a/packages/vite-plugin/src/vite-bundle-analysis/viteBundleAnalysisPlugin.ts +++ b/packages/vite-plugin/src/vite-bundle-analysis/viteBundleAnalysisPlugin.ts @@ -78,6 +78,7 @@ export const viteBundleAnalysisPlugin: BundleAnalysisUploadPlugin = ({ fileName: fileName, source: item.source, formatString: assetFormatString, + metaFramework: output.metaFramework, }); assets.push(asset); } else if (item?.type === "chunk") { @@ -90,6 +91,7 @@ export const viteBundleAnalysisPlugin: BundleAnalysisUploadPlugin = ({ fileName, source: item.code, formatString: chunkFormatString, + metaFramework: output.metaFramework, }); assets.push(asset); From bbce28d1c1605ac11629977dde471f0a7d9c441d Mon Sep 17 00:00:00 2001 From: nicholas-codecov Date: Mon, 10 Feb 2025 11:14:50 -0400 Subject: [PATCH 13/13] adjust regex after testing with gazebo --- .../src/utils/__tests__/normalizePath.test.ts | 4 ++-- packages/bundler-plugin-core/src/utils/normalizePath.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts b/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts index 73ba0c4d..499a1138 100644 --- a/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts +++ b/packages/bundler-plugin-core/src/utils/__tests__/normalizePath.test.ts @@ -132,13 +132,13 @@ const tests: Test[] = [ { name: "should handle vite legacy builds", input: { - path: "test-legacy-12345678.js", + path: "test-legacy.12345678.js", // in testing i've found that the format is just an empty string so we // have to brute force it in a different way format: "", metaFramework: "vite", }, - expected: "test-legacy-*.js", + expected: "test-legacy.*.js", }, ]; diff --git a/packages/bundler-plugin-core/src/utils/normalizePath.ts b/packages/bundler-plugin-core/src/utils/normalizePath.ts index 1a0c3e50..78f8e633 100644 --- a/packages/bundler-plugin-core/src/utils/normalizePath.ts +++ b/packages/bundler-plugin-core/src/utils/normalizePath.ts @@ -68,7 +68,7 @@ export const normalizePath = ( path.includes("legacy") ) { const regexReplacement = - /(?\S+-legacy-)(?[0-9a-zA-Z\/+=_\/+=-]+)(?.\S+)/i; + /(?\S+-legacy\S)(?[0-9a-zA-Z\/+=_\/+=-]+)(?.\S+)/i; normalizedPath = normalizedPath.replace( regexReplacement,