From 6495797eba644d846e965fd30ed35d5740c783f8 Mon Sep 17 00:00:00 2001 From: Edmund Hung Date: Fri, 17 Jan 2025 13:41:53 +0000 Subject: [PATCH 1/6] feat(vitest-pool-workers): add vite pre-bundling support --- .../external-package-resolution/src/index.ts | 6 + .../vitest.config.ts | 8 + .../vitest-pool-workers-examples/package.json | 5 +- package.json | 2 +- .../vitest-pool-workers/src/config/index.ts | 19 + .../src/pool/module-fallback.ts | 16 +- packages/workers-editor-shared/package.json | 2 +- pnpm-lock.yaml | 1015 ++++++++--------- pnpm-workspace.yaml | 10 +- 9 files changed, 548 insertions(+), 535 deletions(-) diff --git a/fixtures/vitest-pool-workers-examples/external-package-resolution/src/index.ts b/fixtures/vitest-pool-workers-examples/external-package-resolution/src/index.ts index ad7ec6ace5c6..4dd57f5979c7 100644 --- a/fixtures/vitest-pool-workers-examples/external-package-resolution/src/index.ts +++ b/fixtures/vitest-pool-workers-examples/external-package-resolution/src/index.ts @@ -1,4 +1,10 @@ import { Toucan } from "toucan-js"; +// Test pre-bundling dependency relies on exports field without a default entrypoint +// @see https://github.com/cloudflare/workers-sdk/issues/6591 +import "discord-api-types/v10"; +// Test pre-bundling dependencies with browser field mapping +// @see https://github.com/cloudflare/workers-sdk/issues/6581 +import "@microlabs/otel-cf-workers"; export default { async fetch(): Promise { diff --git a/fixtures/vitest-pool-workers-examples/external-package-resolution/vitest.config.ts b/fixtures/vitest-pool-workers-examples/external-package-resolution/vitest.config.ts index 3f34c9327a9d..0b0f16e1ab7a 100644 --- a/fixtures/vitest-pool-workers-examples/external-package-resolution/vitest.config.ts +++ b/fixtures/vitest-pool-workers-examples/external-package-resolution/vitest.config.ts @@ -2,6 +2,14 @@ import { defineWorkersProject } from "@cloudflare/vitest-pool-workers/config"; export default defineWorkersProject({ test: { + deps: { + optimizer: { + ssr: { + enabled: true, + include: ["discord-api-types/v10", "@microlabs/otel-cf-workers"], + }, + }, + }, poolOptions: { workers: { wrangler: { configPath: "./wrangler.toml" }, diff --git a/fixtures/vitest-pool-workers-examples/package.json b/fixtures/vitest-pool-workers-examples/package.json index 4a6486ab0966..a5ecd70f5357 100644 --- a/fixtures/vitest-pool-workers-examples/package.json +++ b/fixtures/vitest-pool-workers-examples/package.json @@ -13,13 +13,16 @@ "devDependencies": { "@cloudflare/vitest-pool-workers": "workspace:*", "@cloudflare/workers-types": "^4.20250204.0", + "@microlabs/otel-cf-workers": "1.0.0-rc.45", "@types/node": "catalog:default", + "discord-api-types": "0.37.98", "ext-dep": "file:./internal-module-resolution/vendor/ext-dep", "jose": "^5.2.2", "miniflare": "workspace:*", "run-script-os": "^1.1.6", - "toucan-js": "^3.3.1", + "toucan-js": "3.4.0", "typescript": "catalog:default", + "vite": "catalog:default", "vitest": "catalog:default", "wrangler": "workspace:*" }, diff --git a/package.json b/package.json index 6e4abe7f20c3..4a4ad9253b56 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "tree-kill": "^1.2.2", "turbo": "^2.2.3", "typescript": "catalog:default", - "vite": "^5.0.12", + "vite": "catalog:default", "vitest": "catalog:default" }, "packageManager": "pnpm@9.12.0", diff --git a/packages/vitest-pool-workers/src/config/index.ts b/packages/vitest-pool-workers/src/config/index.ts index e00a1ba6c8c2..568907b202ac 100644 --- a/packages/vitest-pool-workers/src/config/index.ts +++ b/packages/vitest-pool-workers/src/config/index.ts @@ -1,6 +1,7 @@ import assert from "node:assert"; import crypto from "node:crypto"; import fs from "node:fs/promises"; +import { builtinModules } from "node:module"; import path from "node:path"; import { MessageChannel, receiveMessageOnPort } from "node:worker_threads"; import type { @@ -110,6 +111,13 @@ function ensureArrayExcludes(array: T[], items: T[]) { const requiredConditions = ["workerd", "worker", "browser"]; const requiredMainFields = ["browser", "module", "jsnext:main", "jsnext"]; +const cloudflareBuiltInModules = [ + "cloudflare:email", + "cloudflare:sockets", + "cloudflare:workers", + "cloudflare:workflows", +]; + function createConfigPlugin(): Plugin { // Use a unique ID for each `cloudflare:test` module so updates in one `main` // don't trigger re-runs in all other projects, just the one that changed. @@ -147,6 +155,17 @@ function createConfigPlugin(): Plugin { // https://github.com/vitejs/vite/blob/v5.1.4/packages/vite/src/node/plugins/resolve.ts#L175 config.ssr.target = "webworker"; + // Pre-bundling dependencies with vite + config.test.deps ??= {}; + config.test.deps.optimizer ??= {}; + config.test.deps.optimizer.ssr ??= {}; + config.test.deps.optimizer.ssr.enabled ??= true; + config.test.deps.optimizer.ssr.exclude ??= []; + ensureArrayIncludes(config.test.deps.optimizer.ssr.exclude, [ + ...cloudflareBuiltInModules, + ...builtinModules.concat(builtinModules.map((m) => `node:${m}`)), + ]); + // Ideally, we would force `pool` to be @cloudflare/vitest-pool-workers here, // but the tests in `packages/vitest-pool-workers` define `pool` as "../..". config.test.pool ??= "@cloudflare/vitest-pool-workers"; diff --git a/packages/vitest-pool-workers/src/pool/module-fallback.ts b/packages/vitest-pool-workers/src/pool/module-fallback.ts index f7d0d63d4492..55e4fca037a7 100644 --- a/packages/vitest-pool-workers/src/pool/module-fallback.ts +++ b/packages/vitest-pool-workers/src/pool/module-fallback.ts @@ -41,6 +41,19 @@ function trimSuffix(suffix: string, value: string) { return value.substring(0, value.length - suffix.length); } +/** + * When pre-bundling is enabled, Vite will add a hash to the end of the file path + * e.g. `/node_modules/.vite/deps/my-dep.js?v=f3sf2ebd` + * + * @see https://vite.dev/guide/features.html#npm-dependency-resolving-and-pre-bundling + * @see https://github.com/cloudflare/workers-sdk/pull/5673 + */ +const versionHashRegExp = /\?v=[0-9a-f]+$/; + +function trimViteVersionHash(filePath: string) { + return filePath.replace(versionHashRegExp, ""); +} + // RegExp for path suffix to force loading module as specific type. // (e.g. `/path/to/module.wasm?mf_vitest_force=CompiledWasm`) // This suffix will be added by the pool when fetching a module that matches a @@ -323,7 +336,8 @@ async function viteResolve( // (Specifically, the "tinyrainbow" module imports `node:tty` as `tty`) return id; } - return resolved.id; + + return trimViteVersionHash(resolved.id); } type ResolveMethod = "import" | "require"; diff --git a/packages/workers-editor-shared/package.json b/packages/workers-editor-shared/package.json index 93ab1cf37612..e01b2bb24a72 100644 --- a/packages/workers-editor-shared/package.json +++ b/packages/workers-editor-shared/package.json @@ -42,7 +42,7 @@ "eslint": "^8.49.0", "react": "^18.3.1", "react-dom": "^18.3.1", - "vite": "^5.0.12", + "vite": "catalog:default", "vite-plugin-dts": "^4.0.1" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5016f0b687ec..71abebca438b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,14 +7,14 @@ settings: catalogs: default: '@vitest/runner': - specifier: ~2.1.8 - version: 2.1.8 + specifier: ~2.1.9 + version: 2.1.9 '@vitest/snapshot': - specifier: ~2.1.8 - version: 2.1.8 + specifier: ~2.1.9 + version: 2.1.9 '@vitest/ui': - specifier: ~2.1.8 - version: 2.1.8 + specifier: ~2.1.9 + version: 2.1.9 rimraf: specifier: ^5.0.10 version: 5.0.10 @@ -25,11 +25,11 @@ catalogs: specifier: ^5.28.4 version: 5.28.4 vite: - specifier: ^5.0.12 - version: 5.0.12 + specifier: ^5.4.14 + version: 5.4.14 vitest: - specifier: ~2.1.8 - version: 2.1.8 + specifier: ~2.1.9 + version: 2.1.9 vite-plugin: vite: specifier: ^6.1.0 @@ -122,11 +122,11 @@ importers: specifier: catalog:default version: 5.7.3 vite: - specifier: ^5.0.12 - version: 5.0.12(@types/node@18.19.74) + specifier: catalog:default + version: 5.4.14(@types/node@18.19.74) vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) fixtures/additional-modules: devDependencies: @@ -144,7 +144,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -162,7 +162,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -189,7 +189,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -210,7 +210,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -228,7 +228,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -249,7 +249,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -273,7 +273,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -297,7 +297,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) fixtures/isomorphic-random-example: {} @@ -322,7 +322,7 @@ importers: version: 5.7.3 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -334,7 +334,7 @@ importers: version: 7.0.0 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -359,7 +359,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -377,7 +377,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -404,7 +404,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -422,7 +422,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -443,7 +443,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -471,7 +471,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -489,7 +489,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -507,7 +507,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -528,7 +528,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -546,7 +546,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -583,7 +583,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -604,7 +604,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -619,7 +619,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -640,7 +640,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -658,7 +658,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -676,7 +676,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -694,7 +694,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -712,7 +712,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -730,7 +730,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -748,7 +748,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -766,7 +766,7 @@ importers: version: 5.7.3 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -787,7 +787,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -802,7 +802,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -827,7 +827,7 @@ importers: devDependencies: vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -846,9 +846,15 @@ importers: '@cloudflare/workers-types': specifier: ^4.20250204.0 version: 4.20250204.0 + '@microlabs/otel-cf-workers': + specifier: 1.0.0-rc.45 + version: 1.0.0-rc.45(@opentelemetry/api@1.7.0) '@types/node': specifier: ^18.19.71 version: 18.19.74 + discord-api-types: + specifier: 0.37.98 + version: 0.37.98 ext-dep: specifier: file:./internal-module-resolution/vendor/ext-dep version: file:fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep @@ -862,14 +868,17 @@ importers: specifier: ^1.1.6 version: 1.1.6 toucan-js: - specifier: ^3.3.1 - version: 3.3.1(patch_hash=b5gffumfuckaq3c77sda2gdfuq) + specifier: 3.4.0 + version: 3.4.0 typescript: specifier: catalog:default version: 5.7.3 + vite: + specifier: catalog:default + version: 5.4.14(@types/node@18.19.74) vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -896,7 +905,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -928,7 +937,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -949,7 +958,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -970,7 +979,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -988,7 +997,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -1006,7 +1015,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -1222,13 +1231,13 @@ importers: version: 5.28.4 vite: specifier: catalog:default - version: 5.0.12(@types/node@18.19.74) + version: 5.4.14(@types/node@18.19.74) vite-tsconfig-paths: specifier: ^4.0.8 - version: 4.2.0(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.74)) + version: 4.2.0(typescript@5.7.3)(vite@5.4.14(@types/node@18.19.74)) vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) which-pm-runs: specifier: ^1.1.0 version: 1.1.0 @@ -1704,7 +1713,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../wrangler @@ -2275,10 +2284,10 @@ importers: version: 7.5.1 '@vitest/runner': specifier: catalog:default - version: 2.1.8 + version: 2.1.9 '@vitest/snapshot': specifier: catalog:default - version: 2.1.8 + version: 2.1.9 capnp-es: specifier: ^0.0.7 version: 0.0.7(typescript@5.7.3) @@ -2293,7 +2302,7 @@ importers: version: 5.28.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) packages/workers-editor-shared: dependencies: @@ -2324,7 +2333,7 @@ importers: version: 6.10.0(eslint@8.57.0)(typescript@5.7.3) '@vitejs/plugin-react': specifier: ^4.3.3 - version: 4.3.3(vite@5.0.12(@types/node@18.19.74)) + version: 4.3.3(vite@5.4.14(@types/node@18.19.74)) eslint: specifier: ^8.49.0 version: 8.57.0 @@ -2335,11 +2344,11 @@ importers: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) vite: - specifier: ^5.0.12 - version: 5.0.12(@types/node@18.19.74) + specifier: catalog:default + version: 5.4.14(@types/node@18.19.74) vite-plugin-dts: specifier: ^4.0.1 - version: 4.0.1(@types/node@18.19.74)(rollup@4.30.1)(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.74)) + version: 4.0.1(@types/node@18.19.74)(rollup@4.30.1)(typescript@5.7.3)(vite@5.4.14(@types/node@18.19.74)) packages/workers-playground: dependencies: @@ -2445,7 +2454,7 @@ importers: version: 6.10.0(eslint@8.57.0)(typescript@5.7.3) '@vitejs/plugin-react': specifier: ^4.3.3 - version: 4.3.3(vite@5.0.12(@types/node@18.19.74)) + version: 4.3.3(vite@5.4.14(@types/node@18.19.74)) eslint: specifier: ^8.49.0 version: 8.57.0 @@ -2457,7 +2466,7 @@ importers: version: 5.28.4 vite: specifier: catalog:default - version: 5.0.12(@types/node@18.19.74) + version: 5.4.14(@types/node@18.19.74) wrangler: specifier: workspace:^ version: link:../wrangler @@ -2476,7 +2485,7 @@ importers: version: link:../eslint-config-worker '@cloudflare/vitest-pool-workers': specifier: ^0.5.31 - version: 0.5.31(@cloudflare/workers-types@4.20250204.0)(@vitest/runner@2.1.8)(@vitest/snapshot@2.1.8)(vitest@2.1.8) + version: 0.5.31(@cloudflare/workers-types@4.20250204.0)(@vitest/runner@2.1.9)(@vitest/snapshot@2.1.9)(vitest@2.1.9) '@cloudflare/workers-tsconfig': specifier: workspace:* version: link:../workers-tsconfig @@ -2506,7 +2515,7 @@ importers: version: 5.7.3 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) packages/workers-tsconfig: {} @@ -2529,7 +2538,7 @@ importers: version: 5.7.3 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: specifier: workspace:* version: link:../wrangler @@ -2572,7 +2581,7 @@ importers: version: 5.7.3 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) packages/wrangler: dependencies: @@ -2700,7 +2709,7 @@ importers: version: 17.0.24 '@vitest/ui': specifier: catalog:default - version: 2.1.8(vitest@2.1.8) + version: 2.1.9(vitest@2.1.9) '@webcontainer/env': specifier: ^1.1.0 version: 1.1.0 @@ -2838,10 +2847,10 @@ importers: version: 1.5.4 vitest: specifier: catalog:default - version: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + version: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) vitest-websocket-mock: specifier: ^0.4.0 - version: 0.4.0(vitest@2.1.8) + version: 0.4.0(vitest@2.1.9) ws: specifier: ^8.18.0 version: 8.18.0 @@ -3453,121 +3462,121 @@ packages: vitest: 2.0.x - 2.1.x '@cloudflare/workerd-darwin-64@1.20241106.1': - resolution: {integrity: sha512-zxvaToi1m0qzAScrxFt7UvFVqU8DxrCO2CinM1yQkv5no7pA1HolpIrwZ0xOhR3ny64Is2s/J6BrRjpO5dM9Zw==, tarball: https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20241106.1.tgz} + resolution: {integrity: sha512-zxvaToi1m0qzAScrxFt7UvFVqU8DxrCO2CinM1yQkv5no7pA1HolpIrwZ0xOhR3ny64Is2s/J6BrRjpO5dM9Zw==} engines: {node: '>=16'} cpu: [x64] os: [darwin] '@cloudflare/workerd-darwin-64@1.20241230.0': - resolution: {integrity: sha512-BZHLg4bbhNQoaY1Uan81O3FV/zcmWueC55juhnaI7NAobiQth9RppadPNpxNAmS9fK2mR5z8xrwMQSQrHmztyQ==, tarball: https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20241230.0.tgz} + resolution: {integrity: sha512-BZHLg4bbhNQoaY1Uan81O3FV/zcmWueC55juhnaI7NAobiQth9RppadPNpxNAmS9fK2mR5z8xrwMQSQrHmztyQ==} engines: {node: '>=16'} cpu: [x64] os: [darwin] '@cloudflare/workerd-darwin-64@1.20250124.0': - resolution: {integrity: sha512-P5Z5KfVAuoCidIc0o2JPQZFLNTXDjtxN8vhtreCUr6V+xF5pqDNwQqeBDnDDF0gcszFQOYi2OZAB9e1MwssTwA==, tarball: https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20250124.0.tgz} + resolution: {integrity: sha512-P5Z5KfVAuoCidIc0o2JPQZFLNTXDjtxN8vhtreCUr6V+xF5pqDNwQqeBDnDDF0gcszFQOYi2OZAB9e1MwssTwA==} engines: {node: '>=16'} cpu: [x64] os: [darwin] '@cloudflare/workerd-darwin-64@1.20250204.0': - resolution: {integrity: sha512-HpsgbWEfvdcwuZ8WAZhi1TlSCyyHC3tbghpKsOqGDaQNltyAFAWqa278TPNfcitYf/FmV4961v3eqUE+RFdHNQ==, tarball: https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20250204.0.tgz} + resolution: {integrity: sha512-HpsgbWEfvdcwuZ8WAZhi1TlSCyyHC3tbghpKsOqGDaQNltyAFAWqa278TPNfcitYf/FmV4961v3eqUE+RFdHNQ==} engines: {node: '>=16'} cpu: [x64] os: [darwin] '@cloudflare/workerd-darwin-arm64@1.20241106.1': - resolution: {integrity: sha512-j3dg/42D/bPgfNP3cRUBxF+4waCKO/5YKwXNj+lnVOwHxDu+ne5pFw9TIkKYcWTcwn0ZUkbNZNM5rhJqRn4xbg==, tarball: https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20241106.1.tgz} + resolution: {integrity: sha512-j3dg/42D/bPgfNP3cRUBxF+4waCKO/5YKwXNj+lnVOwHxDu+ne5pFw9TIkKYcWTcwn0ZUkbNZNM5rhJqRn4xbg==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] '@cloudflare/workerd-darwin-arm64@1.20241230.0': - resolution: {integrity: sha512-lllxycj7EzYoJ0VOJh8M3palUgoonVrILnzGrgsworgWlIpgjfXGS7b41tEGCw6AxSxL9prmTIGtfSPUvn/rjg==, tarball: https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20241230.0.tgz} + resolution: {integrity: sha512-lllxycj7EzYoJ0VOJh8M3palUgoonVrILnzGrgsworgWlIpgjfXGS7b41tEGCw6AxSxL9prmTIGtfSPUvn/rjg==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] '@cloudflare/workerd-darwin-arm64@1.20250124.0': - resolution: {integrity: sha512-lVxf6qIfmJ5rS6rmGKV7lt6ApY6nhD4kAQTK4vKYm/npk2sXod6LASIY0U4WBCwy4N+S75a8hP2QtmQf+KV3Iw==, tarball: https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20250124.0.tgz} + resolution: {integrity: sha512-lVxf6qIfmJ5rS6rmGKV7lt6ApY6nhD4kAQTK4vKYm/npk2sXod6LASIY0U4WBCwy4N+S75a8hP2QtmQf+KV3Iw==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] '@cloudflare/workerd-darwin-arm64@1.20250204.0': - resolution: {integrity: sha512-AJ8Tk7KMJqePlch3SH8oL41ROtsrb07hKRHD6M+FvGC3tLtf26rpteAAMNYKMDYKzFNFUIKZNijYDFZjBFndXQ==, tarball: https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20250204.0.tgz} + resolution: {integrity: sha512-AJ8Tk7KMJqePlch3SH8oL41ROtsrb07hKRHD6M+FvGC3tLtf26rpteAAMNYKMDYKzFNFUIKZNijYDFZjBFndXQ==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] '@cloudflare/workerd-linux-64@1.20241106.1': - resolution: {integrity: sha512-Ih+Ye8E1DMBXcKrJktGfGztFqHKaX1CeByqshmTbODnWKHt6O65ax3oTecUwyC0+abuyraOpAtdhHNpFMhUkmw==, tarball: https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20241106.1.tgz} + resolution: {integrity: sha512-Ih+Ye8E1DMBXcKrJktGfGztFqHKaX1CeByqshmTbODnWKHt6O65ax3oTecUwyC0+abuyraOpAtdhHNpFMhUkmw==} engines: {node: '>=16'} cpu: [x64] os: [linux] '@cloudflare/workerd-linux-64@1.20241230.0': - resolution: {integrity: sha512-Y3mHcW0KghOmWdNZyHYpEOG4Ba/ga8tht5vj1a+WXfagEjMO8Y98XhZUlCaYa9yB7Wh5jVcK5LM2jlO/BLgqpA==, tarball: https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20241230.0.tgz} + resolution: {integrity: sha512-Y3mHcW0KghOmWdNZyHYpEOG4Ba/ga8tht5vj1a+WXfagEjMO8Y98XhZUlCaYa9yB7Wh5jVcK5LM2jlO/BLgqpA==} engines: {node: '>=16'} cpu: [x64] os: [linux] '@cloudflare/workerd-linux-64@1.20250124.0': - resolution: {integrity: sha512-5S4GzN08vW/CfzaM1rVAkRhPPSDX1O1t7u0pj+xdbGl4GcazBzE4ZLre+y9OMplZ9PBCkxXkRWqHXzabWA1x4A==, tarball: https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20250124.0.tgz} + resolution: {integrity: sha512-5S4GzN08vW/CfzaM1rVAkRhPPSDX1O1t7u0pj+xdbGl4GcazBzE4ZLre+y9OMplZ9PBCkxXkRWqHXzabWA1x4A==} engines: {node: '>=16'} cpu: [x64] os: [linux] '@cloudflare/workerd-linux-64@1.20250204.0': - resolution: {integrity: sha512-RIUfUSnDC8h73zAa+u1K2Frc7nc+eeQoBBP7SaqsRe6JdX8jfIv/GtWjQWCoj8xQFgLvhpJKZ4sTTTV+AilQbw==, tarball: https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20250204.0.tgz} + resolution: {integrity: sha512-RIUfUSnDC8h73zAa+u1K2Frc7nc+eeQoBBP7SaqsRe6JdX8jfIv/GtWjQWCoj8xQFgLvhpJKZ4sTTTV+AilQbw==} engines: {node: '>=16'} cpu: [x64] os: [linux] '@cloudflare/workerd-linux-arm64@1.20241106.1': - resolution: {integrity: sha512-mdQFPk4+14Yywn7n1xIzI+6olWM8Ybz10R7H3h+rk0XulMumCWUCy1CzIDauOx6GyIcSgKIibYMssVHZR30ObA==, tarball: https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20241106.1.tgz} + resolution: {integrity: sha512-mdQFPk4+14Yywn7n1xIzI+6olWM8Ybz10R7H3h+rk0XulMumCWUCy1CzIDauOx6GyIcSgKIibYMssVHZR30ObA==} engines: {node: '>=16'} cpu: [arm64] os: [linux] '@cloudflare/workerd-linux-arm64@1.20241230.0': - resolution: {integrity: sha512-IAjhsWPlHzhhkJ6I49sDG6XfMnhPvv0szKGXxTWQK/IWMrbGdHm4RSfNKBSoLQm67jGMIzbmcrX9UIkms27Y1g==, tarball: https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20241230.0.tgz} + resolution: {integrity: sha512-IAjhsWPlHzhhkJ6I49sDG6XfMnhPvv0szKGXxTWQK/IWMrbGdHm4RSfNKBSoLQm67jGMIzbmcrX9UIkms27Y1g==} engines: {node: '>=16'} cpu: [arm64] os: [linux] '@cloudflare/workerd-linux-arm64@1.20250124.0': - resolution: {integrity: sha512-CHSYnutDfXgUWL9WcP0GbzIb5OyC9RZVCJGhKbDTQy6/uH7AivNcLzXtOhNdqetKjERmOxUbL9Us7vcMQLztog==, tarball: https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20250124.0.tgz} + resolution: {integrity: sha512-CHSYnutDfXgUWL9WcP0GbzIb5OyC9RZVCJGhKbDTQy6/uH7AivNcLzXtOhNdqetKjERmOxUbL9Us7vcMQLztog==} engines: {node: '>=16'} cpu: [arm64] os: [linux] '@cloudflare/workerd-linux-arm64@1.20250204.0': - resolution: {integrity: sha512-8Ql8jDjoIgr2J7oBD01kd9kduUz60njofrBpAOkjCPed15He8e8XHkYaYow3g0xpae4S2ryrPOeoD3M64sRxeg==, tarball: https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20250204.0.tgz} + resolution: {integrity: sha512-8Ql8jDjoIgr2J7oBD01kd9kduUz60njofrBpAOkjCPed15He8e8XHkYaYow3g0xpae4S2ryrPOeoD3M64sRxeg==} engines: {node: '>=16'} cpu: [arm64] os: [linux] '@cloudflare/workerd-windows-64@1.20241106.1': - resolution: {integrity: sha512-4rtcss31E/Rb/PeFocZfr+B9i1MdrkhsTBWizh8siNR4KMmkslU2xs2wPaH1z8+ErxkOsHrKRa5EPLh5rIiFeg==, tarball: https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20241106.1.tgz} + resolution: {integrity: sha512-4rtcss31E/Rb/PeFocZfr+B9i1MdrkhsTBWizh8siNR4KMmkslU2xs2wPaH1z8+ErxkOsHrKRa5EPLh5rIiFeg==} engines: {node: '>=16'} cpu: [x64] os: [win32] '@cloudflare/workerd-windows-64@1.20241230.0': - resolution: {integrity: sha512-y5SPIk9iOb2gz+yWtHxoeMnjPnkYQswiCJ480oHC6zexnJLlKTpcmBCjDH1nWCT4pQi8F25gaH8thgElf4NvXQ==, tarball: https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20241230.0.tgz} + resolution: {integrity: sha512-y5SPIk9iOb2gz+yWtHxoeMnjPnkYQswiCJ480oHC6zexnJLlKTpcmBCjDH1nWCT4pQi8F25gaH8thgElf4NvXQ==} engines: {node: '>=16'} cpu: [x64] os: [win32] '@cloudflare/workerd-windows-64@1.20250124.0': - resolution: {integrity: sha512-5TunEy5x4pNUQ10Z47qP5iF6m3X9uB2ZScKDLkNaWtbQ7EcMCapOWzuynVkTKIMBgDeKw6DAB8nbbkybPyMS9w==, tarball: https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20250124.0.tgz} + resolution: {integrity: sha512-5TunEy5x4pNUQ10Z47qP5iF6m3X9uB2ZScKDLkNaWtbQ7EcMCapOWzuynVkTKIMBgDeKw6DAB8nbbkybPyMS9w==} engines: {node: '>=16'} cpu: [x64] os: [win32] '@cloudflare/workerd-windows-64@1.20250204.0': - resolution: {integrity: sha512-RpDJO3+to+e17X3EWfRCagboZYwBz2fowc+jL53+fd7uD19v3F59H48lw2BDpHJMRyhg6ouWcpM94OhsHv8ecA==, tarball: https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20250204.0.tgz} + resolution: {integrity: sha512-RpDJO3+to+e17X3EWfRCagboZYwBz2fowc+jL53+fd7uD19v3F59H48lw2BDpHJMRyhg6ouWcpM94OhsHv8ecA==} engines: {node: '>=16'} cpu: [x64] os: [win32] @@ -3619,12 +3628,6 @@ packages: peerDependencies: esbuild: '*' - '@esbuild/aix-ppc64@0.19.12': - resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - '@esbuild/aix-ppc64@0.21.5': resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} engines: {node: '>=12'} @@ -3655,12 +3658,6 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.19.12': - resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - '@esbuild/android-arm64@0.21.5': resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==} engines: {node: '>=12'} @@ -3691,12 +3688,6 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.19.12': - resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - '@esbuild/android-arm@0.21.5': resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} engines: {node: '>=12'} @@ -3727,12 +3718,6 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.19.12': - resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - '@esbuild/android-x64@0.21.5': resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} engines: {node: '>=12'} @@ -3763,12 +3748,6 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.19.12': - resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - '@esbuild/darwin-arm64@0.21.5': resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} engines: {node: '>=12'} @@ -3799,12 +3778,6 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.19.12': - resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - '@esbuild/darwin-x64@0.21.5': resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} engines: {node: '>=12'} @@ -3835,12 +3808,6 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.19.12': - resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - '@esbuild/freebsd-arm64@0.21.5': resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} engines: {node: '>=12'} @@ -3871,12 +3838,6 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.19.12': - resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - '@esbuild/freebsd-x64@0.21.5': resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==} engines: {node: '>=12'} @@ -3907,12 +3868,6 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.19.12': - resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - '@esbuild/linux-arm64@0.21.5': resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} engines: {node: '>=12'} @@ -3943,12 +3898,6 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.19.12': - resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - '@esbuild/linux-arm@0.21.5': resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} engines: {node: '>=12'} @@ -3979,12 +3928,6 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.19.12': - resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - '@esbuild/linux-ia32@0.21.5': resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} engines: {node: '>=12'} @@ -4015,12 +3958,6 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.19.12': - resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - '@esbuild/linux-loong64@0.21.5': resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} engines: {node: '>=12'} @@ -4051,12 +3988,6 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.19.12': - resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - '@esbuild/linux-mips64el@0.21.5': resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} engines: {node: '>=12'} @@ -4087,12 +4018,6 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.19.12': - resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - '@esbuild/linux-ppc64@0.21.5': resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==} engines: {node: '>=12'} @@ -4123,12 +4048,6 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.19.12': - resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - '@esbuild/linux-riscv64@0.21.5': resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} engines: {node: '>=12'} @@ -4159,12 +4078,6 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.19.12': - resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - '@esbuild/linux-s390x@0.21.5': resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} engines: {node: '>=12'} @@ -4195,12 +4108,6 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.19.12': - resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - '@esbuild/linux-x64@0.21.5': resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} engines: {node: '>=12'} @@ -4237,12 +4144,6 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.19.12': - resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - '@esbuild/netbsd-x64@0.21.5': resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} engines: {node: '>=12'} @@ -4285,12 +4186,6 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.19.12': - resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - '@esbuild/openbsd-x64@0.21.5': resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} engines: {node: '>=12'} @@ -4321,12 +4216,6 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.19.12': - resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - '@esbuild/sunos-x64@0.21.5': resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} engines: {node: '>=12'} @@ -4357,12 +4246,6 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.19.12': - resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - '@esbuild/win32-arm64@0.21.5': resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} engines: {node: '>=12'} @@ -4393,12 +4276,6 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.19.12': - resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - '@esbuild/win32-ia32@0.21.5': resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} engines: {node: '>=12'} @@ -4429,12 +4306,6 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.19.12': - resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - '@esbuild/win32-x64@0.21.5': resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} engines: {node: '>=12'} @@ -4709,6 +4580,11 @@ packages: resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} hasBin: true + '@microlabs/otel-cf-workers@1.0.0-rc.45': + resolution: {integrity: sha512-PDHHTlgH1rwDGKe77DoNYjMvUlqE4uu2536/s2CqVBZFjSeKV5WK3/aeg6J6bd6h7ENJ6tndDprreiBHlimUsw==} + peerDependencies: + '@opentelemetry/api': ~1.9.0 + '@microsoft/api-extractor-model@7.29.4': resolution: {integrity: sha512-LHOMxmT8/tU1IiiiHOdHFF83Qsi+V8d0kLfscG4EvQE9cafiR8blOYr8SfkQKWB1wgEilQgXJX3MIA4vetDLZw==} @@ -4849,10 +4725,88 @@ packages: '@open-draft/until@2.1.0': resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==} + '@opentelemetry/api-logs@0.52.1': + resolution: {integrity: sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==} + engines: {node: '>=14'} + '@opentelemetry/api@1.7.0': resolution: {integrity: sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==} engines: {node: '>=8.0.0'} + '@opentelemetry/core@1.25.1': + resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/core@1.30.1': + resolution: {integrity: sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/exporter-trace-otlp-http@0.52.1': + resolution: {integrity: sha512-05HcNizx0BxcFKKnS5rwOV+2GevLTVIRA0tRgWYyw4yCgR53Ic/xk83toYKts7kbzcI+dswInUg/4s8oyA+tqg==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': ^1.0.0 + + '@opentelemetry/otlp-exporter-base@0.52.1': + resolution: {integrity: sha512-z175NXOtX5ihdlshtYBe5RpGeBoTXVCKPPLiQlD6FHvpM4Ch+p2B0yWKYSrBfLH24H9zjJiBdTrtD+hLlfnXEQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': ^1.0.0 + + '@opentelemetry/otlp-transformer@0.52.1': + resolution: {integrity: sha512-I88uCZSZZtVa0XniRqQWKbjAUm73I8tpEy/uJYPPYw5d7BRdVk0RfTBQw8kSUl01oVWEuqxLDa802222MYyWHg==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.3.0 <1.10.0' + + '@opentelemetry/resources@1.25.1': + resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/resources@1.30.1': + resolution: {integrity: sha512-5UxZqiAgLYGFjS4s9qm5mBVo433u+dSPUFWVWXmLAD4wB65oMCoXaJP1KJa9DIYYMeHu3z4BZcStG3LC593cWA==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/sdk-logs@0.52.1': + resolution: {integrity: sha512-MBYh+WcPPsN8YpRHRmK1Hsca9pVlyyKd4BxOC4SsgHACnl/bPp4Cri9hWhVm5+2tiQ9Zf4qSc1Jshw9tOLGWQA==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.4.0 <1.10.0' + + '@opentelemetry/sdk-metrics@1.25.1': + resolution: {integrity: sha512-9Mb7q5ioFL4E4dDrc4wC/A3NTHDat44v4I3p2pLPSxRvqUbDIQyMVr9uK+EU69+HWhlET1VaSrRzwdckWqY15Q==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.3.0 <1.10.0' + + '@opentelemetry/sdk-trace-base@1.25.1': + resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/sdk-trace-base@1.30.1': + resolution: {integrity: sha512-jVPgBbH1gCy2Lb7X0AVQ8XAfgg0pJ4nvl8/IiQA6nxOsPvS+0zMJaFSs2ltXe0J6C8dqjcnpyqINDJmU30+uOg==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/semantic-conventions@1.25.1': + resolution: {integrity: sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==} + engines: {node: '>=14'} + + '@opentelemetry/semantic-conventions@1.28.0': + resolution: {integrity: sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==} + engines: {node: '>=14'} + '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -4932,6 +4886,36 @@ packages: '@protobuf-ts/runtime@2.9.3': resolution: {integrity: sha512-nivzCpg/qYD0RX2OmHOahJALb8ndjGmUhNBcTJ0BbXoqKwCSM6vYA+vegzS3rhuaPgbyC7Ec8idlnizzUfIRuw==} + '@protobufjs/aspromise@1.1.2': + resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} + + '@protobufjs/base64@1.1.2': + resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==} + + '@protobufjs/codegen@2.0.4': + resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==} + + '@protobufjs/eventemitter@1.1.0': + resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==} + + '@protobufjs/fetch@1.1.0': + resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==} + + '@protobufjs/float@1.0.2': + resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==} + + '@protobufjs/inquire@1.1.0': + resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==} + + '@protobufjs/path@1.1.2': + resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==} + + '@protobufjs/pool@1.1.0': + resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==} + + '@protobufjs/utf8@1.1.0': + resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==} + '@radix-ui/number@1.0.1': resolution: {integrity: sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==} @@ -5126,41 +5110,21 @@ packages: cpu: [arm] os: [android] - '@rollup/rollup-android-arm-eabi@4.9.6': - resolution: {integrity: sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==} - cpu: [arm] - os: [android] - '@rollup/rollup-android-arm64@4.30.1': resolution: {integrity: sha512-/NA2qXxE3D/BRjOJM8wQblmArQq1YoBVJjrjoTSBS09jgUisq7bqxNHJ8kjCHeV21W/9WDGwJEWSN0KQ2mtD/w==} cpu: [arm64] os: [android] - '@rollup/rollup-android-arm64@4.9.6': - resolution: {integrity: sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==} - cpu: [arm64] - os: [android] - '@rollup/rollup-darwin-arm64@4.30.1': resolution: {integrity: sha512-r7FQIXD7gB0WJ5mokTUgUWPl0eYIH0wnxqeSAhuIwvnnpjdVB8cRRClyKLQr7lgzjctkbp5KmswWszlwYln03Q==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-arm64@4.9.6': - resolution: {integrity: sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==} - cpu: [arm64] - os: [darwin] - '@rollup/rollup-darwin-x64@4.30.1': resolution: {integrity: sha512-x78BavIwSH6sqfP2xeI1hd1GpHL8J4W2BXcVM/5KYKoAD3nNsfitQhvWSw+TFtQTLZ9OmlF+FEInEHyubut2OA==} cpu: [x64] os: [darwin] - '@rollup/rollup-darwin-x64@4.9.6': - resolution: {integrity: sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==} - cpu: [x64] - os: [darwin] - '@rollup/rollup-freebsd-arm64@4.30.1': resolution: {integrity: sha512-HYTlUAjbO1z8ywxsDFWADfTRfTIIy/oUlfIDmlHYmjUP2QRDTzBuWXc9O4CXM+bo9qfiCclmHk1x4ogBjOUpUQ==} cpu: [arm64] @@ -5176,11 +5140,6 @@ packages: cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-gnueabihf@4.9.6': - resolution: {integrity: sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.30.1': resolution: {integrity: sha512-B8Rcyj9AV7ZlEFqvB5BubG5iO6ANDsRKlhIxySXcF1axXYUyqwBok+XZPgIYGBgs7LDXfWfifxhw0Ik57T0Yug==} cpu: [arm] @@ -5191,21 +5150,11 @@ packages: cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.9.6': - resolution: {integrity: sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-musl@4.30.1': resolution: {integrity: sha512-i4Ab2vnvS1AE1PyOIGp2kXni69gU2DAUVt6FSXeIqUCPIR3ZlheMW3oP2JkukDfu3PsexYRbOiJrY+yVNSk9oA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.9.6': - resolution: {integrity: sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-loongarch64-gnu@4.30.1': resolution: {integrity: sha512-fARcF5g296snX0oLGkVxPmysetwUk2zmHcca+e9ObOovBR++9ZPOhqFUM61UUZ2EYpXVPN1redgqVoBB34nTpQ==} cpu: [loong64] @@ -5221,11 +5170,6 @@ packages: cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.9.6': - resolution: {integrity: sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==} - cpu: [riscv64] - os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.30.1': resolution: {integrity: sha512-GWFs97Ruxo5Bt+cvVTQkOJ6TIx0xJDD/bMAOXWJg8TCSTEK8RnFeOeiFTxKniTc4vMIaWvCplMAFBt9miGxgkA==} cpu: [s390x] @@ -5236,51 +5180,26 @@ packages: cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.9.6': - resolution: {integrity: sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-musl@4.30.1': resolution: {integrity: sha512-V9U8Ey2UqmQsBT+xTOeMzPzwDzyXmnAoO4edZhL7INkwQcaW1Ckv3WJX3qrrp/VHaDkEWIBWhRwP47r8cdrOow==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.9.6': - resolution: {integrity: sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==} - cpu: [x64] - os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.30.1': resolution: {integrity: sha512-WabtHWiPaFF47W3PkHnjbmWawnX/aE57K47ZDT1BXTS5GgrBUEpvOzq0FI0V/UYzQJgdb8XlhVNH8/fwV8xDjw==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-arm64-msvc@4.9.6': - resolution: {integrity: sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==} - cpu: [arm64] - os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.30.1': resolution: {integrity: sha512-pxHAU+Zv39hLUTdQQHUVHf4P+0C47y/ZloorHpzs2SXMRqeAWmGghzAhfOlzFHHwjvgokdFAhC4V+6kC1lRRfw==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.9.6': - resolution: {integrity: sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==} - cpu: [ia32] - os: [win32] - '@rollup/rollup-win32-x64-msvc@4.30.1': resolution: {integrity: sha512-D6qjsXGcvhTjv0kI4fU8tUuBDF/Ueee4SVX79VfNDXZa64TfCW1Slkb6Z7O1p7vflqZjcmOVdZlqf8gvJxc6og==} cpu: [x64] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.9.6': - resolution: {integrity: sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==} - cpu: [x64] - os: [win32] - '@rushstack/node-core-library@5.10.2': resolution: {integrity: sha512-xOF/2gVJZTfjTxbo4BDj9RtQq/HFnrrKdtem4JkyRLnwsRz2UDTg8gA1/et10fBx5RxmZD9bYVGST69W8ME5OQ==} peerDependencies: @@ -5372,6 +5291,10 @@ packages: engines: {node: '>= 10'} hasBin: true + '@sentry/core@7.112.2': + resolution: {integrity: sha512-gHPCcJobbMkk0VR18J65WYQTt3ED4qC6X9lHKp27Ddt63E+MDGkG6lvYBU1LS8cV7CdyBGC1XXDCfor61GvLsA==} + engines: {node: '>=8'} + '@sentry/core@7.76.0': resolution: {integrity: sha512-M+ptkCTeCNf6fn7p2MmEb1Wd9/JXUWxIT/0QEc+t11DNR4FYy1ZP2O9Zb3Zp2XacO7ORrlL3Yc+VIfl5JTgjfw==} engines: {node: '>=8'} @@ -5380,6 +5303,10 @@ packages: resolution: {integrity: sha512-jkoXqK/nuYh8DYS+n7uaSuSIdw4HJemyRkXsWjAEPtEgD7taGMafZGbP5pl+XE38SE59jTBxmKnkUEZOFMgZGA==} engines: {node: '>=8'} + '@sentry/integrations@7.112.2': + resolution: {integrity: sha512-ioC2yyU6DqtLkdmWnm87oNvdn2+9oKctJeA4t+jkS6JaJ10DcezjCwiLscX4rhB9aWJV3IWF7Op0O6K3w0t2Hg==} + engines: {node: '>=8'} + '@sentry/integrations@7.76.0': resolution: {integrity: sha512-4ea0PNZrGN9wKuE/8bBCRrxxw4Cq5T710y8rhdKHAlSUpbLqr/atRF53h8qH3Fi+ec0m38PB+MivKem9zUwlwA==} engines: {node: '>=8'} @@ -5388,6 +5315,10 @@ packages: resolution: {integrity: sha512-mGcZMCL3/IMTLIRcWLF+H9z2Bb2d34gKmg2rhXqI8BqhhUA551jMRlZv/y4za2Osjy550KwVoNsA1qtEe5mYyQ==} engines: {node: '>=8'} + '@sentry/types@7.112.2': + resolution: {integrity: sha512-kCMLt7yhY5OkWE9MeowlTNmox9pqDxcpvqguMo4BDNZM5+v9SEb1AauAdR78E1a1V8TyCzjBD7JDfXWhvpYBcQ==} + engines: {node: '>=8'} + '@sentry/types@7.76.0': resolution: {integrity: sha512-vj6z+EAbVrKAXmJPxSv/clpwS9QjPqzkraMFk2hIdE/kii8s8kwnkBwTSpIrNc8GnzV3qYC4r3qD+BXDxAGPaw==} engines: {node: '>=8'} @@ -5396,6 +5327,10 @@ packages: resolution: {integrity: sha512-w8jKFHq/Llupmr2FezmFgQsnm3y/CnqLjb7s6PstI78E409wrhH7p7oqX/OEuzccH1qNCNwes/3QKvPTRQDB4Q==} engines: {node: '>=8'} + '@sentry/utils@7.112.2': + resolution: {integrity: sha512-OjLh0hx0t1EcL4ZIjf+4svlmmP+tHUDGcr5qpFWH78tjmkPW4+cqPuZCZfHSuWcDdeiaXi8TnYoVRqDcJKK/eQ==} + engines: {node: '>=8'} + '@sentry/utils@7.76.0': resolution: {integrity: sha512-40jFD+yfQaKpFYINghdhovzec4IEpB7aAuyH/GtE7E0gLpcqnC72r55krEIVILfqIR2Mlr5OKUzyeoCyWAU/yw==} engines: {node: '>=8'} @@ -6123,11 +6058,11 @@ packages: peerDependencies: vite: ^4.2.0 || ^5.0.0 || ^6.0.0 - '@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 @@ -6140,23 +6075,29 @@ packages: '@vitest/pretty-format@2.1.8': resolution: {integrity: sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==} - '@vitest/runner@2.1.8': - resolution: {integrity: sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==} + '@vitest/pretty-format@2.1.9': + resolution: {integrity: sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==} + + '@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/ui@2.1.8': - resolution: {integrity: sha512-5zPJ1fs0ixSVSs5+5V2XJjXLmNzjugHRyV11RqxYVR+oMcogZ9qTuSfKW+OcTV0JeFNznI83BNylzH6SSNJ1+w==} + '@vitest/ui@2.1.9': + resolution: {integrity: sha512-izzd2zmnk8Nl5ECYkW27328RbQ1nKvkm6Bb5DAaz1Gk59EbLkiCMa6OLT0NoaAYTjOFS6N+SMYW1nh4/9ljPiw==} peerDependencies: - vitest: 2.1.8 + vitest: 2.1.9 '@vitest/utils@2.1.8': resolution: {integrity: sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==} + '@vitest/utils@2.1.9': + resolution: {integrity: sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==} + '@volar/language-core@2.3.4': resolution: {integrity: sha512-wXBhY11qG6pCDAqDnbBRFIDSIwbqkWI7no+lj5+L7IlA7HRIjRP7YQLGzT0LF4lS6eHkMSsclXqy9DwYJasZTQ==} @@ -7578,11 +7519,6 @@ packages: engines: {node: '>=12'} hasBin: true - esbuild@0.19.12: - resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} - engines: {node: '>=12'} - hasBin: true - esbuild@0.21.5: resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} engines: {node: '>=12'} @@ -9029,6 +8965,9 @@ packages: resolution: {integrity: sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + long@5.2.4: + resolution: {integrity: sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg==} + loose-envify@1.4.0: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true @@ -10290,6 +10229,10 @@ packages: proto-list@1.2.4: resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==} + protobufjs@7.4.0: + resolution: {integrity: sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==} + engines: {node: '>=12.0.0'} + proxy-addr@2.0.7: resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} engines: {node: '>= 0.10'} @@ -10646,11 +10589,6 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - rollup@4.9.6: - resolution: {integrity: sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - run-applescript@5.0.0: resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==} engines: {node: '>=12'} @@ -11277,6 +11215,9 @@ packages: toucan-js@3.3.1: resolution: {integrity: sha512-9BpkHb/Pzsrtl1ItNq9OEQPnuUHwzce0nV2uG+DYFiQ4fPyiA6mKTBcDwQzcvNkfSER038U+8TzvdkCev+Maww==} + toucan-js@3.4.0: + resolution: {integrity: sha512-ifqPB5QIBC07gDGhWyMpSFp6Z6cjRLsjxhQ3wZmE6YGDntJZNCage77AIyrVihQLQM6/6T8TQumEJDuWlBw56w==} + tough-cookie@4.1.4: resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==} engines: {node: '>=6'} @@ -11725,8 +11666,8 @@ packages: resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==} engines: {'0': node >=0.6.0} - vite-node@2.1.8: - resolution: {integrity: sha512-uPAwSr57kYjAUux+8E2j0q0Fxpn8M9VoyfGiRI8Kfktz9NcYMCenwY5RnZxnF1WTu3TGiYipirIzacLL3VVGFg==} + vite-node@2.1.9: + resolution: {integrity: sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -11748,8 +11689,8 @@ packages: vite: optional: true - vite@5.0.12: - resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} + vite@5.4.14: + resolution: {integrity: sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -11757,6 +11698,7 @@ packages: less: '*' lightningcss: ^1.21.0 sass: '*' + sass-embedded: '*' stylus: '*' sugarss: '*' terser: ^5.4.0 @@ -11769,6 +11711,8 @@ packages: optional: true sass: optional: true + sass-embedded: + optional: true stylus: optional: true sugarss: @@ -11821,15 +11765,15 @@ packages: peerDependencies: vitest: '>=2' - 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.19.71 - '@vitest/browser': 2.1.8 - '@vitest/ui': 2.1.8 + '@vitest/browser': 2.1.9 + '@vitest/ui': 2.1.9 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -13329,17 +13273,17 @@ snapshots: lodash.memoize: 4.1.2 marked: 0.3.19 - '@cloudflare/vitest-pool-workers@0.5.31(@cloudflare/workers-types@4.20250204.0)(@vitest/runner@2.1.8)(@vitest/snapshot@2.1.8)(vitest@2.1.8)': + '@cloudflare/vitest-pool-workers@0.5.31(@cloudflare/workers-types@4.20250204.0)(@vitest/runner@2.1.9)(@vitest/snapshot@2.1.9)(vitest@2.1.9)': dependencies: - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 + '@vitest/runner': 2.1.9 + '@vitest/snapshot': 2.1.9 birpc: 0.2.14 cjs-module-lexer: 1.2.3 devalue: 4.3.2 esbuild: 0.17.19 miniflare: 3.20241106.1 semver: 7.6.3 - vitest: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + vitest: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) wrangler: 3.90.0(@cloudflare/workers-types@4.20250204.0) zod: 3.22.3 transitivePeerDependencies: @@ -13475,9 +13419,6 @@ snapshots: escape-string-regexp: 4.0.0 rollup-plugin-node-polyfills: 0.2.1 - '@esbuild/aix-ppc64@0.19.12': - optional: true - '@esbuild/aix-ppc64@0.21.5': optional: true @@ -13493,9 +13434,6 @@ snapshots: '@esbuild/android-arm64@0.18.20': optional: true - '@esbuild/android-arm64@0.19.12': - optional: true - '@esbuild/android-arm64@0.21.5': optional: true @@ -13511,9 +13449,6 @@ snapshots: '@esbuild/android-arm@0.18.20': optional: true - '@esbuild/android-arm@0.19.12': - optional: true - '@esbuild/android-arm@0.21.5': optional: true @@ -13529,9 +13464,6 @@ snapshots: '@esbuild/android-x64@0.18.20': optional: true - '@esbuild/android-x64@0.19.12': - optional: true - '@esbuild/android-x64@0.21.5': optional: true @@ -13547,9 +13479,6 @@ snapshots: '@esbuild/darwin-arm64@0.18.20': optional: true - '@esbuild/darwin-arm64@0.19.12': - optional: true - '@esbuild/darwin-arm64@0.21.5': optional: true @@ -13565,9 +13494,6 @@ snapshots: '@esbuild/darwin-x64@0.18.20': optional: true - '@esbuild/darwin-x64@0.19.12': - optional: true - '@esbuild/darwin-x64@0.21.5': optional: true @@ -13583,9 +13509,6 @@ snapshots: '@esbuild/freebsd-arm64@0.18.20': optional: true - '@esbuild/freebsd-arm64@0.19.12': - optional: true - '@esbuild/freebsd-arm64@0.21.5': optional: true @@ -13601,9 +13524,6 @@ snapshots: '@esbuild/freebsd-x64@0.18.20': optional: true - '@esbuild/freebsd-x64@0.19.12': - optional: true - '@esbuild/freebsd-x64@0.21.5': optional: true @@ -13619,9 +13539,6 @@ snapshots: '@esbuild/linux-arm64@0.18.20': optional: true - '@esbuild/linux-arm64@0.19.12': - optional: true - '@esbuild/linux-arm64@0.21.5': optional: true @@ -13637,9 +13554,6 @@ snapshots: '@esbuild/linux-arm@0.18.20': optional: true - '@esbuild/linux-arm@0.19.12': - optional: true - '@esbuild/linux-arm@0.21.5': optional: true @@ -13655,9 +13569,6 @@ snapshots: '@esbuild/linux-ia32@0.18.20': optional: true - '@esbuild/linux-ia32@0.19.12': - optional: true - '@esbuild/linux-ia32@0.21.5': optional: true @@ -13673,9 +13584,6 @@ snapshots: '@esbuild/linux-loong64@0.18.20': optional: true - '@esbuild/linux-loong64@0.19.12': - optional: true - '@esbuild/linux-loong64@0.21.5': optional: true @@ -13691,9 +13599,6 @@ snapshots: '@esbuild/linux-mips64el@0.18.20': optional: true - '@esbuild/linux-mips64el@0.19.12': - optional: true - '@esbuild/linux-mips64el@0.21.5': optional: true @@ -13709,9 +13614,6 @@ snapshots: '@esbuild/linux-ppc64@0.18.20': optional: true - '@esbuild/linux-ppc64@0.19.12': - optional: true - '@esbuild/linux-ppc64@0.21.5': optional: true @@ -13727,9 +13629,6 @@ snapshots: '@esbuild/linux-riscv64@0.18.20': optional: true - '@esbuild/linux-riscv64@0.19.12': - optional: true - '@esbuild/linux-riscv64@0.21.5': optional: true @@ -13745,9 +13644,6 @@ snapshots: '@esbuild/linux-s390x@0.18.20': optional: true - '@esbuild/linux-s390x@0.19.12': - optional: true - '@esbuild/linux-s390x@0.21.5': optional: true @@ -13763,9 +13659,6 @@ snapshots: '@esbuild/linux-x64@0.18.20': optional: true - '@esbuild/linux-x64@0.19.12': - optional: true - '@esbuild/linux-x64@0.21.5': optional: true @@ -13784,9 +13677,6 @@ snapshots: '@esbuild/netbsd-x64@0.18.20': optional: true - '@esbuild/netbsd-x64@0.19.12': - optional: true - '@esbuild/netbsd-x64@0.21.5': optional: true @@ -13808,9 +13698,6 @@ snapshots: '@esbuild/openbsd-x64@0.18.20': optional: true - '@esbuild/openbsd-x64@0.19.12': - optional: true - '@esbuild/openbsd-x64@0.21.5': optional: true @@ -13826,9 +13713,6 @@ snapshots: '@esbuild/sunos-x64@0.18.20': optional: true - '@esbuild/sunos-x64@0.19.12': - optional: true - '@esbuild/sunos-x64@0.21.5': optional: true @@ -13844,9 +13728,6 @@ snapshots: '@esbuild/win32-arm64@0.18.20': optional: true - '@esbuild/win32-arm64@0.19.12': - optional: true - '@esbuild/win32-arm64@0.21.5': optional: true @@ -13862,9 +13743,6 @@ snapshots: '@esbuild/win32-ia32@0.18.20': optional: true - '@esbuild/win32-ia32@0.19.12': - optional: true - '@esbuild/win32-ia32@0.21.5': optional: true @@ -13880,9 +13758,6 @@ snapshots: '@esbuild/win32-x64@0.18.20': optional: true - '@esbuild/win32-x64@0.19.12': - optional: true - '@esbuild/win32-x64@0.21.5': optional: true @@ -14184,6 +14059,17 @@ snapshots: - encoding - supports-color + '@microlabs/otel-cf-workers@1.0.0-rc.45(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.7.0) + '@opentelemetry/exporter-trace-otlp-http': 0.52.1(@opentelemetry/api@1.7.0) + '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.7.0) + '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.7.0) + '@opentelemetry/resources': 1.30.1(@opentelemetry/api@1.7.0) + '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.7.0) + '@opentelemetry/semantic-conventions': 1.28.0 + '@microsoft/api-extractor-model@7.29.4(@types/node@18.19.74)': dependencies: '@microsoft/tsdoc': 0.15.0 @@ -14423,8 +14309,92 @@ snapshots: '@open-draft/until@2.1.0': {} + '@opentelemetry/api-logs@0.52.1': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/api@1.7.0': {} + '@opentelemetry/core@1.25.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/semantic-conventions': 1.25.1 + + '@opentelemetry/core@1.30.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/semantic-conventions': 1.28.0 + + '@opentelemetry/exporter-trace-otlp-http@0.52.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.7.0) + '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.7.0) + '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.7.0) + + '@opentelemetry/otlp-exporter-base@0.52.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.7.0) + + '@opentelemetry/otlp-transformer@0.52.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/api-logs': 0.52.1 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/sdk-logs': 0.52.1(@opentelemetry/api@1.7.0) + '@opentelemetry/sdk-metrics': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.7.0) + protobufjs: 7.4.0 + + '@opentelemetry/resources@1.25.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/semantic-conventions': 1.25.1 + + '@opentelemetry/resources@1.30.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.7.0) + '@opentelemetry/semantic-conventions': 1.28.0 + + '@opentelemetry/sdk-logs@0.52.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/api-logs': 0.52.1 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.7.0) + + '@opentelemetry/sdk-metrics@1.25.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.7.0) + lodash.merge: 4.6.2 + + '@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.7.0) + '@opentelemetry/semantic-conventions': 1.25.1 + + '@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.7.0)': + dependencies: + '@opentelemetry/api': 1.7.0 + '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.7.0) + '@opentelemetry/resources': 1.30.1(@opentelemetry/api@1.7.0) + '@opentelemetry/semantic-conventions': 1.28.0 + + '@opentelemetry/semantic-conventions@1.25.1': {} + + '@opentelemetry/semantic-conventions@1.28.0': {} + '@pkgjs/parseargs@0.11.0': optional: true @@ -14511,6 +14481,29 @@ snapshots: '@protobuf-ts/runtime@2.9.3': {} + '@protobufjs/aspromise@1.1.2': {} + + '@protobufjs/base64@1.1.2': {} + + '@protobufjs/codegen@2.0.4': {} + + '@protobufjs/eventemitter@1.1.0': {} + + '@protobufjs/fetch@1.1.0': + dependencies: + '@protobufjs/aspromise': 1.1.2 + '@protobufjs/inquire': 1.1.0 + + '@protobufjs/float@1.0.2': {} + + '@protobufjs/inquire@1.1.0': {} + + '@protobufjs/path@1.1.2': {} + + '@protobufjs/pool@1.1.0': {} + + '@protobufjs/utf8@1.1.0': {} + '@radix-ui/number@1.0.1': dependencies: '@babel/runtime': 7.22.5 @@ -14686,27 +14679,15 @@ snapshots: '@rollup/rollup-android-arm-eabi@4.30.1': optional: true - '@rollup/rollup-android-arm-eabi@4.9.6': - optional: true - '@rollup/rollup-android-arm64@4.30.1': optional: true - '@rollup/rollup-android-arm64@4.9.6': - optional: true - '@rollup/rollup-darwin-arm64@4.30.1': optional: true - '@rollup/rollup-darwin-arm64@4.9.6': - optional: true - '@rollup/rollup-darwin-x64@4.30.1': optional: true - '@rollup/rollup-darwin-x64@4.9.6': - optional: true - '@rollup/rollup-freebsd-arm64@4.30.1': optional: true @@ -14716,24 +14697,15 @@ snapshots: '@rollup/rollup-linux-arm-gnueabihf@4.30.1': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.9.6': - optional: true - '@rollup/rollup-linux-arm-musleabihf@4.30.1': optional: true '@rollup/rollup-linux-arm64-gnu@4.30.1': optional: true - '@rollup/rollup-linux-arm64-gnu@4.9.6': - optional: true - '@rollup/rollup-linux-arm64-musl@4.30.1': optional: true - '@rollup/rollup-linux-arm64-musl@4.9.6': - optional: true - '@rollup/rollup-linux-loongarch64-gnu@4.30.1': optional: true @@ -14743,42 +14715,24 @@ snapshots: '@rollup/rollup-linux-riscv64-gnu@4.30.1': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.9.6': - optional: true - '@rollup/rollup-linux-s390x-gnu@4.30.1': optional: true '@rollup/rollup-linux-x64-gnu@4.30.1': optional: true - '@rollup/rollup-linux-x64-gnu@4.9.6': - optional: true - '@rollup/rollup-linux-x64-musl@4.30.1': optional: true - '@rollup/rollup-linux-x64-musl@4.9.6': - optional: true - '@rollup/rollup-win32-arm64-msvc@4.30.1': optional: true - '@rollup/rollup-win32-arm64-msvc@4.9.6': - optional: true - '@rollup/rollup-win32-ia32-msvc@4.30.1': optional: true - '@rollup/rollup-win32-ia32-msvc@4.9.6': - optional: true - '@rollup/rollup-win32-x64-msvc@4.30.1': optional: true - '@rollup/rollup-win32-x64-msvc@4.9.6': - optional: true - '@rushstack/node-core-library@5.10.2(@types/node@18.19.74)': dependencies: ajv: 8.13.0 @@ -14888,6 +14842,11 @@ snapshots: - encoding - supports-color + '@sentry/core@7.112.2': + dependencies: + '@sentry/types': 7.112.2 + '@sentry/utils': 7.112.2 + '@sentry/core@7.76.0': dependencies: '@sentry/types': 7.76.0 @@ -14898,6 +14857,13 @@ snapshots: '@sentry/types': 7.87.0 '@sentry/utils': 7.87.0 + '@sentry/integrations@7.112.2': + dependencies: + '@sentry/core': 7.112.2 + '@sentry/types': 7.112.2 + '@sentry/utils': 7.112.2 + localforage: 1.10.0 + '@sentry/integrations@7.76.0': dependencies: '@sentry/core': 7.76.0 @@ -14915,10 +14881,16 @@ snapshots: transitivePeerDependencies: - supports-color + '@sentry/types@7.112.2': {} + '@sentry/types@7.76.0': {} '@sentry/types@7.87.0': {} + '@sentry/utils@7.112.2': + dependencies: + '@sentry/types': 7.112.2 + '@sentry/utils@7.76.0': dependencies: '@sentry/types': 7.76.0 @@ -15930,14 +15902,14 @@ snapshots: minimatch: 7.4.6 semver: 7.6.3 - '@vitejs/plugin-react@4.3.3(vite@5.0.12(@types/node@18.19.74))': + '@vitejs/plugin-react@4.3.3(vite@5.4.14(@types/node@18.19.74))': dependencies: '@babel/core': 7.26.0 '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.0) '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.0) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.0.12(@types/node@18.19.74) + vite: 5.4.14(@types/node@18.19.74) transitivePeerDependencies: - supports-color @@ -15952,51 +15924,55 @@ snapshots: 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.4.3(typescript@5.7.3))(vite@5.0.12(@types/node@18.19.74))': + '@vitest/mocker@2.1.9(msw@2.4.3(typescript@5.7.3))(vite@5.4.14(@types/node@18.19.74))': dependencies: - '@vitest/spy': 2.1.8 + '@vitest/spy': 2.1.9 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: msw: 2.4.3(typescript@5.7.3) - vite: 5.0.12(@types/node@18.19.74) + vite: 5.4.14(@types/node@18.19.74) '@vitest/pretty-format@2.1.8': dependencies: tinyrainbow: 1.2.0 - '@vitest/runner@2.1.8': + '@vitest/pretty-format@2.1.9': dependencies: - '@vitest/utils': 2.1.8 + tinyrainbow: 1.2.0 + + '@vitest/runner@2.1.9': + dependencies: + '@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/ui@2.1.8(vitest@2.1.8)': + '@vitest/ui@2.1.9(vitest@2.1.9)': dependencies: - '@vitest/utils': 2.1.8 + '@vitest/utils': 2.1.9 fflate: 0.8.2 flatted: 3.3.1 pathe: 1.1.2 sirv: 3.0.0 tinyglobby: 0.2.10 tinyrainbow: 1.2.0 - vitest: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + vitest: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) '@vitest/utils@2.1.8': dependencies: @@ -16004,6 +15980,12 @@ snapshots: loupe: 3.1.2 tinyrainbow: 1.2.0 + '@vitest/utils@2.1.9': + dependencies: + '@vitest/pretty-format': 2.1.9 + loupe: 3.1.2 + tinyrainbow: 1.2.0 + '@volar/language-core@2.3.4': dependencies: '@volar/source-map': 2.3.4 @@ -17667,32 +17649,6 @@ snapshots: '@esbuild/win32-ia32': 0.18.20 '@esbuild/win32-x64': 0.18.20 - esbuild@0.19.12: - optionalDependencies: - '@esbuild/aix-ppc64': 0.19.12 - '@esbuild/android-arm': 0.19.12 - '@esbuild/android-arm64': 0.19.12 - '@esbuild/android-x64': 0.19.12 - '@esbuild/darwin-arm64': 0.19.12 - '@esbuild/darwin-x64': 0.19.12 - '@esbuild/freebsd-arm64': 0.19.12 - '@esbuild/freebsd-x64': 0.19.12 - '@esbuild/linux-arm': 0.19.12 - '@esbuild/linux-arm64': 0.19.12 - '@esbuild/linux-ia32': 0.19.12 - '@esbuild/linux-loong64': 0.19.12 - '@esbuild/linux-mips64el': 0.19.12 - '@esbuild/linux-ppc64': 0.19.12 - '@esbuild/linux-riscv64': 0.19.12 - '@esbuild/linux-s390x': 0.19.12 - '@esbuild/linux-x64': 0.19.12 - '@esbuild/netbsd-x64': 0.19.12 - '@esbuild/openbsd-x64': 0.19.12 - '@esbuild/sunos-x64': 0.19.12 - '@esbuild/win32-arm64': 0.19.12 - '@esbuild/win32-ia32': 0.19.12 - '@esbuild/win32-x64': 0.19.12 - esbuild@0.21.5: optionalDependencies: '@esbuild/aix-ppc64': 0.21.5 @@ -19309,6 +19265,8 @@ snapshots: strip-ansi: 7.1.0 wrap-ansi: 8.1.0 + long@5.2.4: {} + loose-envify@1.4.0: dependencies: js-tokens: 4.0.0 @@ -20576,6 +20534,21 @@ snapshots: proto-list@1.2.4: {} + protobufjs@7.4.0: + dependencies: + '@protobufjs/aspromise': 1.1.2 + '@protobufjs/base64': 1.1.2 + '@protobufjs/codegen': 2.0.4 + '@protobufjs/eventemitter': 1.1.0 + '@protobufjs/fetch': 1.1.0 + '@protobufjs/float': 1.0.2 + '@protobufjs/inquire': 1.1.0 + '@protobufjs/path': 1.1.2 + '@protobufjs/pool': 1.1.0 + '@protobufjs/utf8': 1.1.0 + '@types/node': 18.19.74 + long: 5.2.4 + proxy-addr@2.0.7: dependencies: forwarded: 0.2.0 @@ -20988,25 +20961,6 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.30.1 fsevents: 2.3.3 - rollup@4.9.6: - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.9.6 - '@rollup/rollup-android-arm64': 4.9.6 - '@rollup/rollup-darwin-arm64': 4.9.6 - '@rollup/rollup-darwin-x64': 4.9.6 - '@rollup/rollup-linux-arm-gnueabihf': 4.9.6 - '@rollup/rollup-linux-arm64-gnu': 4.9.6 - '@rollup/rollup-linux-arm64-musl': 4.9.6 - '@rollup/rollup-linux-riscv64-gnu': 4.9.6 - '@rollup/rollup-linux-x64-gnu': 4.9.6 - '@rollup/rollup-linux-x64-musl': 4.9.6 - '@rollup/rollup-win32-arm64-msvc': 4.9.6 - '@rollup/rollup-win32-ia32-msvc': 4.9.6 - '@rollup/rollup-win32-x64-msvc': 4.9.6 - fsevents: 2.3.3 - run-applescript@5.0.0: dependencies: execa: 5.1.1 @@ -21734,6 +21688,13 @@ snapshots: '@sentry/types': 7.76.0 '@sentry/utils': 7.76.0 + toucan-js@3.4.0: + dependencies: + '@sentry/core': 7.112.2 + '@sentry/integrations': 7.112.2 + '@sentry/types': 7.112.2 + '@sentry/utils': 7.112.2 + tough-cookie@4.1.4: dependencies: psl: 1.9.0 @@ -22265,24 +22226,25 @@ snapshots: core-util-is: 1.0.2 extsprintf: 1.3.0 - vite-node@2.1.8(@types/node@18.19.74)(supports-color@9.2.2): + vite-node@2.1.9(@types/node@18.19.74)(supports-color@9.2.2): dependencies: cac: 6.7.14 debug: 4.4.0(supports-color@9.2.2) es-module-lexer: 1.5.4 pathe: 1.1.2 - vite: 5.0.12(@types/node@18.19.74) + vite: 5.4.14(@types/node@18.19.74) transitivePeerDependencies: - '@types/node' - less - lightningcss - sass + - sass-embedded - stylus - sugarss - supports-color - terser - vite-plugin-dts@4.0.1(@types/node@18.19.74)(rollup@4.30.1)(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.74)): + vite-plugin-dts@4.0.1(@types/node@18.19.74)(rollup@4.30.1)(typescript@5.7.3)(vite@5.4.14(@types/node@18.19.74)): dependencies: '@microsoft/api-extractor': 7.47.4(@types/node@18.19.74) '@rollup/pluginutils': 5.1.0(rollup@4.30.1) @@ -22296,28 +22258,28 @@ snapshots: typescript: 5.7.3 vue-tsc: 2.0.29(typescript@5.7.3) optionalDependencies: - vite: 5.0.12(@types/node@18.19.74) + vite: 5.4.14(@types/node@18.19.74) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-tsconfig-paths@4.2.0(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.74)): + vite-tsconfig-paths@4.2.0(typescript@5.7.3)(vite@5.4.14(@types/node@18.19.74)): dependencies: debug: 4.3.7(supports-color@9.2.2) globrex: 0.1.2 tsconfck: 2.1.1(typescript@5.7.3) optionalDependencies: - vite: 5.0.12(@types/node@18.19.74) + vite: 5.4.14(@types/node@18.19.74) transitivePeerDependencies: - supports-color - typescript - vite@5.0.12(@types/node@18.19.74): + vite@5.4.14(@types/node@18.19.74): dependencies: - esbuild: 0.19.12 - postcss: 8.4.49 - rollup: 4.9.6 + esbuild: 0.21.5 + postcss: 8.5.1 + rollup: 4.30.1 optionalDependencies: '@types/node': 18.19.74 fsevents: 2.3.3 @@ -22332,21 +22294,21 @@ snapshots: fsevents: 2.3.3 jiti: 2.4.2 - vitest-websocket-mock@0.4.0(vitest@2.1.8): + vitest-websocket-mock@0.4.0(vitest@2.1.9): dependencies: '@vitest/utils': 2.1.8 mock-socket: 9.3.1 - vitest: 2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) + vitest: 2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) - vitest@2.1.8(@types/node@18.19.74)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2): + vitest@2.1.9(@types/node@18.19.74)(@vitest/ui@2.1.9)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2): dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.4.3(typescript@5.7.3))(vite@5.0.12(@types/node@18.19.74)) - '@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.4.3(typescript@5.7.3))(vite@5.4.14(@types/node@18.19.74)) + '@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.4.0(supports-color@9.2.2) expect-type: 1.1.0 @@ -22357,17 +22319,18 @@ snapshots: tinyexec: 0.3.1 tinypool: 1.0.1 tinyrainbow: 1.2.0 - vite: 5.0.12(@types/node@18.19.74) - vite-node: 2.1.8(@types/node@18.19.74)(supports-color@9.2.2) + vite: 5.4.14(@types/node@18.19.74) + vite-node: 2.1.9(@types/node@18.19.74)(supports-color@9.2.2) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 18.19.74 - '@vitest/ui': 2.1.8(vitest@2.1.8) + '@vitest/ui': 2.1.9(vitest@2.1.9) transitivePeerDependencies: - less - lightningcss - msw - sass + - sass-embedded - stylus - sugarss - supports-color diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 710d78a068f0..6d1a201722ca 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -7,15 +7,15 @@ packages: catalog: "@types/node": "^18.19.71" - "@vitest/runner": ~2.1.8 - "@vitest/snapshot": ~2.1.8 - "@vitest/ui": ~2.1.8 + "@vitest/runner": "~2.1.9" + "@vitest/snapshot": "~2.1.9" + "@vitest/ui": "~2.1.9" # rimraf@6 requires node 20 or >=22 rimraf: "^5.0.10" typescript: "^5.7.2" undici: "^5.28.4" - vitest: "~2.1.8" - vite: "^5.0.12" + vitest: "~2.1.9" + vite: "^5.4.14" catalogs: vite-plugin: From b6f02d7db362608744ef4430c0cc1a1e5ec22ea7 Mon Sep 17 00:00:00 2001 From: Edmund Hung Date: Thu, 6 Feb 2025 20:26:58 +0000 Subject: [PATCH 2/6] add changeset --- .changeset/gold-frogs-rest.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .changeset/gold-frogs-rest.md diff --git a/.changeset/gold-frogs-rest.md b/.changeset/gold-frogs-rest.md new file mode 100644 index 000000000000..2cf9da8148c5 --- /dev/null +++ b/.changeset/gold-frogs-rest.md @@ -0,0 +1,29 @@ +--- +"@cloudflare/vitest-pool-workers": patch +--- + +Added [Vite dependency pre-bundling](https://vite.dev/guide/dep-pre-bundling) support. If you encounter module resolution issues—such as: `Error: Cannot use require() to import an ES Module` or `Error: No such module`—you can now bundle these dependencies using the [deps.optimizer](https://vitest.dev/config/#deps-optimizer) option: + +```tsx +import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config"; + +export default defineWorkersConfig({ + test: { + deps: { + optimizer: { + ssr: { + enabled: true, + include: ["your-package-name"], + }, + }, + }, + poolOptions: { + workers: { + // ... + }, + }, + }, +}); +``` + +Fixed #6591, #6581, #6405. From 25a2dfa574224b8ff24d5753034965ddfcafb978 Mon Sep 17 00:00:00 2001 From: Edmund Hung Date: Fri, 7 Feb 2025 13:04:09 +0000 Subject: [PATCH 3/6] merge external-package-resolution and internal-module-resolution example with guidelines on readme --- .../test/index.spec.ts | 9 ----- .../test/tsconfig.json | 4 --- .../internal-module-resolution/README.md | 5 --- .../test/index.spec.ts | 8 ----- .../internal-module-resolution/tsconfig.json | 4 --- .../vitest.config.ts | 11 ------ .../internal-module-resolution/wrangler.toml | 2 -- .../module-resolution/README.md | 34 +++++++++++++++++++ .../src/index.ts | 4 +-- .../src/tsconfig.json | 0 .../test/index.d.ts | 0 .../module-resolution/test/index.spec.ts | 20 +++++++++++ .../test/tsconfig.json | 0 .../tsconfig.json | 0 .../vendor/ext-dep/index.js | 0 .../vendor/ext-dep/package.json | 0 .../vendor/ext-dep/subfolder/index.js | 0 .../vitest.config.ts | 0 .../wrangler.toml | 2 +- .../vitest-pool-workers-examples/package.json | 2 +- pnpm-lock.yaml | 10 +++--- 21 files changed, 63 insertions(+), 52 deletions(-) delete mode 100644 fixtures/vitest-pool-workers-examples/external-package-resolution/test/index.spec.ts delete mode 100644 fixtures/vitest-pool-workers-examples/external-package-resolution/test/tsconfig.json delete mode 100644 fixtures/vitest-pool-workers-examples/internal-module-resolution/README.md delete mode 100644 fixtures/vitest-pool-workers-examples/internal-module-resolution/test/index.spec.ts delete mode 100644 fixtures/vitest-pool-workers-examples/internal-module-resolution/tsconfig.json delete mode 100644 fixtures/vitest-pool-workers-examples/internal-module-resolution/vitest.config.ts delete mode 100644 fixtures/vitest-pool-workers-examples/internal-module-resolution/wrangler.toml create mode 100644 fixtures/vitest-pool-workers-examples/module-resolution/README.md rename fixtures/vitest-pool-workers-examples/{external-package-resolution => module-resolution}/src/index.ts (78%) rename fixtures/vitest-pool-workers-examples/{external-package-resolution => module-resolution}/src/tsconfig.json (100%) rename fixtures/vitest-pool-workers-examples/{internal-module-resolution => module-resolution}/test/index.d.ts (100%) create mode 100644 fixtures/vitest-pool-workers-examples/module-resolution/test/index.spec.ts rename fixtures/vitest-pool-workers-examples/{internal-module-resolution => module-resolution}/test/tsconfig.json (100%) rename fixtures/vitest-pool-workers-examples/{external-package-resolution => module-resolution}/tsconfig.json (100%) rename fixtures/vitest-pool-workers-examples/{internal-module-resolution => module-resolution}/vendor/ext-dep/index.js (100%) rename fixtures/vitest-pool-workers-examples/{internal-module-resolution => module-resolution}/vendor/ext-dep/package.json (100%) rename fixtures/vitest-pool-workers-examples/{internal-module-resolution => module-resolution}/vendor/ext-dep/subfolder/index.js (100%) rename fixtures/vitest-pool-workers-examples/{external-package-resolution => module-resolution}/vitest.config.ts (100%) rename fixtures/vitest-pool-workers-examples/{external-package-resolution => module-resolution}/wrangler.toml (60%) diff --git a/fixtures/vitest-pool-workers-examples/external-package-resolution/test/index.spec.ts b/fixtures/vitest-pool-workers-examples/external-package-resolution/test/index.spec.ts deleted file mode 100644 index ea00855929af..000000000000 --- a/fixtures/vitest-pool-workers-examples/external-package-resolution/test/index.spec.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { SELF } from "cloudflare:test"; -import { assert, describe, test } from "vitest"; - -describe("test", () => { - test("responds with a success", async () => { - const response = await SELF.fetch("https://example.com"); - assert(response.ok); - }); -}); diff --git a/fixtures/vitest-pool-workers-examples/external-package-resolution/test/tsconfig.json b/fixtures/vitest-pool-workers-examples/external-package-resolution/test/tsconfig.json deleted file mode 100644 index 49d66320eafc..000000000000 --- a/fixtures/vitest-pool-workers-examples/external-package-resolution/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.workerd-test.json", - "include": ["./**/*.ts", "../src/env.d.ts"] -} diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/README.md b/fixtures/vitest-pool-workers-examples/internal-module-resolution/README.md deleted file mode 100644 index 9c4f159eabdb..000000000000 --- a/fixtures/vitest-pool-workers-examples/internal-module-resolution/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# internal-module-resolution - -This simple fixture checks that the Vitest integration import resolution works correctly when a CommonJS packages has a require to a directory rather than a specific file. - -There is no Worker defined here but we still need a minimal wrangler.toml that we can pass to the vitest-pool-workers plugin to trigger that plugin to handle import resolution and file loading. diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/test/index.spec.ts b/fixtures/vitest-pool-workers-examples/internal-module-resolution/test/index.spec.ts deleted file mode 100644 index 16ee2bf406e2..000000000000 --- a/fixtures/vitest-pool-workers-examples/internal-module-resolution/test/index.spec.ts +++ /dev/null @@ -1,8 +0,0 @@ -import dep from "ext-dep"; -import { assert, describe, test } from "vitest"; - -describe("test", () => { - test("resolves commonjs directory dependencies correctly", async () => { - assert.equal(dep, 123); - }); -}); diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/tsconfig.json b/fixtures/vitest-pool-workers-examples/internal-module-resolution/tsconfig.json deleted file mode 100644 index 90e58bf03ef0..000000000000 --- a/fixtures/vitest-pool-workers-examples/internal-module-resolution/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../tsconfig.node.json", - "include": ["./*.ts"] -} diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/vitest.config.ts b/fixtures/vitest-pool-workers-examples/internal-module-resolution/vitest.config.ts deleted file mode 100644 index 3f34c9327a9d..000000000000 --- a/fixtures/vitest-pool-workers-examples/internal-module-resolution/vitest.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { defineWorkersProject } from "@cloudflare/vitest-pool-workers/config"; - -export default defineWorkersProject({ - test: { - poolOptions: { - workers: { - wrangler: { configPath: "./wrangler.toml" }, - }, - }, - }, -}); diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/wrangler.toml b/fixtures/vitest-pool-workers-examples/internal-module-resolution/wrangler.toml deleted file mode 100644 index e9ac5d285f72..000000000000 --- a/fixtures/vitest-pool-workers-examples/internal-module-resolution/wrangler.toml +++ /dev/null @@ -1,2 +0,0 @@ -name = "internal-module-resolution" -compatibility_date = "2024-04-05" diff --git a/fixtures/vitest-pool-workers-examples/module-resolution/README.md b/fixtures/vitest-pool-workers-examples/module-resolution/README.md new file mode 100644 index 000000000000..c778ac5cb109 --- /dev/null +++ b/fixtures/vitest-pool-workers-examples/module-resolution/README.md @@ -0,0 +1,34 @@ +# ⚡ module-resolution + +This fixture demonstrates that the Vitest integration correctly resolves modules, including: + +- A CommonJS package that requires a directory rather than a specific file. +- A package without a main entrypoint or with browser field mapping, handled via [Dependency Pre-Bundling](#dependency-pre-bundling). + +## Dependency Pre-Bundling + +[Dependency Pre-Bundling](https://vite.dev/guide/dep-pre-bundling) is a Vite feature that converts dependencies shipped as CommonJS or UMD into ESM. If you encounter module resolution issues—such as: `Error: Cannot use require() to import an ES Module` or `Error: No such module`—you can pre-bundle these dependencies using the [deps.optimizer](https://vitest.dev/config/#deps-optimizer) option: + +```ts +import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config"; + +export default defineWorkersConfig({ + test: { + deps: { + optimizer: { + ssr: { + enabled: true, + include: ["your-package-name"], + }, + }, + }, + poolOptions: { + workers: { + // ... + }, + }, + }, +}); +``` + +See our [vitest config](./vitest.config.ts) for an example of how we pre-bundled `discord-api-types/v10` and `@microlabs/otel-cf-workers`. diff --git a/fixtures/vitest-pool-workers-examples/external-package-resolution/src/index.ts b/fixtures/vitest-pool-workers-examples/module-resolution/src/index.ts similarity index 78% rename from fixtures/vitest-pool-workers-examples/external-package-resolution/src/index.ts rename to fixtures/vitest-pool-workers-examples/module-resolution/src/index.ts index 4dd57f5979c7..e4bb52a21512 100644 --- a/fixtures/vitest-pool-workers-examples/external-package-resolution/src/index.ts +++ b/fixtures/vitest-pool-workers-examples/module-resolution/src/index.ts @@ -1,8 +1,8 @@ import { Toucan } from "toucan-js"; -// Test pre-bundling dependency relies on exports field without a default entrypoint +// Testing dependency without a main entrypoint // @see https://github.com/cloudflare/workers-sdk/issues/6591 import "discord-api-types/v10"; -// Test pre-bundling dependencies with browser field mapping +// Testing dependency with browser field mapping // @see https://github.com/cloudflare/workers-sdk/issues/6581 import "@microlabs/otel-cf-workers"; diff --git a/fixtures/vitest-pool-workers-examples/external-package-resolution/src/tsconfig.json b/fixtures/vitest-pool-workers-examples/module-resolution/src/tsconfig.json similarity index 100% rename from fixtures/vitest-pool-workers-examples/external-package-resolution/src/tsconfig.json rename to fixtures/vitest-pool-workers-examples/module-resolution/src/tsconfig.json diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/test/index.d.ts b/fixtures/vitest-pool-workers-examples/module-resolution/test/index.d.ts similarity index 100% rename from fixtures/vitest-pool-workers-examples/internal-module-resolution/test/index.d.ts rename to fixtures/vitest-pool-workers-examples/module-resolution/test/index.d.ts diff --git a/fixtures/vitest-pool-workers-examples/module-resolution/test/index.spec.ts b/fixtures/vitest-pool-workers-examples/module-resolution/test/index.spec.ts new file mode 100644 index 000000000000..3b1ce706d030 --- /dev/null +++ b/fixtures/vitest-pool-workers-examples/module-resolution/test/index.spec.ts @@ -0,0 +1,20 @@ +import { instrument } from "@microlabs/otel-cf-workers"; +import { Utils } from "discord-api-types/v10"; +import dep from "ext-dep"; +import { assert, describe, test } from "vitest"; + +describe("test", () => { + test("resolves commonjs directory dependencies correctly", async () => { + assert.equal(dep, 123); + }); + + // This requires the `deps.optimizer` option to be set in the vitest config + test("resolves dependency without a default entrypoint", async () => { + assert.isFunction(Utils.isDMInteraction); + }); + + // This requires the `deps.optimizer` option to be set in the vitest config + test("resolves dependency with mapping on the browser field", async () => { + assert.isFunction(instrument); + }); +}); diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/test/tsconfig.json b/fixtures/vitest-pool-workers-examples/module-resolution/test/tsconfig.json similarity index 100% rename from fixtures/vitest-pool-workers-examples/internal-module-resolution/test/tsconfig.json rename to fixtures/vitest-pool-workers-examples/module-resolution/test/tsconfig.json diff --git a/fixtures/vitest-pool-workers-examples/external-package-resolution/tsconfig.json b/fixtures/vitest-pool-workers-examples/module-resolution/tsconfig.json similarity index 100% rename from fixtures/vitest-pool-workers-examples/external-package-resolution/tsconfig.json rename to fixtures/vitest-pool-workers-examples/module-resolution/tsconfig.json diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep/index.js b/fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep/index.js similarity index 100% rename from fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep/index.js rename to fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep/index.js diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep/package.json b/fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep/package.json similarity index 100% rename from fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep/package.json rename to fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep/package.json diff --git a/fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep/subfolder/index.js b/fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep/subfolder/index.js similarity index 100% rename from fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep/subfolder/index.js rename to fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep/subfolder/index.js diff --git a/fixtures/vitest-pool-workers-examples/external-package-resolution/vitest.config.ts b/fixtures/vitest-pool-workers-examples/module-resolution/vitest.config.ts similarity index 100% rename from fixtures/vitest-pool-workers-examples/external-package-resolution/vitest.config.ts rename to fixtures/vitest-pool-workers-examples/module-resolution/vitest.config.ts diff --git a/fixtures/vitest-pool-workers-examples/external-package-resolution/wrangler.toml b/fixtures/vitest-pool-workers-examples/module-resolution/wrangler.toml similarity index 60% rename from fixtures/vitest-pool-workers-examples/external-package-resolution/wrangler.toml rename to fixtures/vitest-pool-workers-examples/module-resolution/wrangler.toml index 8b21069c7756..3d09da998e69 100644 --- a/fixtures/vitest-pool-workers-examples/external-package-resolution/wrangler.toml +++ b/fixtures/vitest-pool-workers-examples/module-resolution/wrangler.toml @@ -1,3 +1,3 @@ -name = "external-package-resolution" +name = "module-resolution" main = "src/index.ts" compatibility_date = "2024-04-05" diff --git a/fixtures/vitest-pool-workers-examples/package.json b/fixtures/vitest-pool-workers-examples/package.json index a5ecd70f5357..907a885278f0 100644 --- a/fixtures/vitest-pool-workers-examples/package.json +++ b/fixtures/vitest-pool-workers-examples/package.json @@ -16,7 +16,7 @@ "@microlabs/otel-cf-workers": "1.0.0-rc.45", "@types/node": "catalog:default", "discord-api-types": "0.37.98", - "ext-dep": "file:./internal-module-resolution/vendor/ext-dep", + "ext-dep": "file:./module-resolution/vendor/ext-dep", "jose": "^5.2.2", "miniflare": "workspace:*", "run-script-os": "^1.1.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 71abebca438b..04529e3afb08 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -856,8 +856,8 @@ importers: specifier: 0.37.98 version: 0.37.98 ext-dep: - specifier: file:./internal-module-resolution/vendor/ext-dep - version: file:fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep + specifier: file:./module-resolution/vendor/ext-dep + version: file:fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep jose: specifier: ^5.2.2 version: 5.9.3 @@ -7772,8 +7772,8 @@ packages: resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==} engines: {node: '>= 0.10.0'} - ext-dep@file:fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep: - resolution: {directory: fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep, type: directory} + ext-dep@file:fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep: + resolution: {directory: fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep, type: directory} extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} @@ -18033,7 +18033,7 @@ snapshots: transitivePeerDependencies: - supports-color - ext-dep@file:fixtures/vitest-pool-workers-examples/internal-module-resolution/vendor/ext-dep: {} + ext-dep@file:fixtures/vitest-pool-workers-examples/module-resolution/vendor/ext-dep: {} extend@3.0.2: {} From 641c544f0621c87d9fa8acb08b2e5ed44b6c76ca Mon Sep 17 00:00:00 2001 From: Edmund Hung Date: Fri, 7 Feb 2025 18:57:20 +0000 Subject: [PATCH 4/6] improve error message --- packages/vitest-pool-workers/src/pool/module-fallback.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/vitest-pool-workers/src/pool/module-fallback.ts b/packages/vitest-pool-workers/src/pool/module-fallback.ts index 55e4fca037a7..a23cd7a89ae0 100644 --- a/packages/vitest-pool-workers/src/pool/module-fallback.ts +++ b/packages/vitest-pool-workers/src/pool/module-fallback.ts @@ -579,6 +579,11 @@ export async function handleModuleFallbackRequest( return await load(vite, logBase, method, target, specifier, filePath); } catch (e) { debuglog(logBase, "error:", e); + console.error( + `[vitest-pool-workers] Failed to ${method} ${JSON.stringify(target)} from ${JSON.stringify(referrer)}.`, + "To resolve this, try bundling the relevant dependency with Vite.", + "For more details, see: https://developers.cloudflare.com/workers/testing/vitest-integration/known-issues/#module-resolution" + ); } return new Response(null, { status: 404 }); From 8382495f7cf6d6e9ee61c2de26a2e4bacedb4530 Mon Sep 17 00:00:00 2001 From: Edmund Hung Date: Mon, 10 Feb 2025 20:52:15 +0000 Subject: [PATCH 5/6] update error message --- packages/vitest-pool-workers/src/pool/module-fallback.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vitest-pool-workers/src/pool/module-fallback.ts b/packages/vitest-pool-workers/src/pool/module-fallback.ts index a23cd7a89ae0..826ae563776e 100644 --- a/packages/vitest-pool-workers/src/pool/module-fallback.ts +++ b/packages/vitest-pool-workers/src/pool/module-fallback.ts @@ -582,7 +582,7 @@ export async function handleModuleFallbackRequest( console.error( `[vitest-pool-workers] Failed to ${method} ${JSON.stringify(target)} from ${JSON.stringify(referrer)}.`, "To resolve this, try bundling the relevant dependency with Vite.", - "For more details, see: https://developers.cloudflare.com/workers/testing/vitest-integration/known-issues/#module-resolution" + "For more details, refer to https://developers.cloudflare.com/workers/testing/vitest-integration/known-issues/#module-resolution" ); } From 4d4a05cf08452de0958a5050bda2682e04443c1a Mon Sep 17 00:00:00 2001 From: Edmund Hung Date: Tue, 11 Feb 2025 11:52:47 +0000 Subject: [PATCH 6/6] share workerdBuiltinModules --- packages/vitest-pool-workers/src/config/index.ts | 10 ++-------- packages/vitest-pool-workers/src/pool/index.ts | 2 +- .../vitest-pool-workers/src/pool/module-fallback.ts | 7 +------ .../vitest-pool-workers/src/shared/builtin-modules.ts | 5 +++++ .../src/{pool => shared}/types-global.d.ts | 0 packages/vitest-pool-workers/tsconfig.emit.json | 2 +- 6 files changed, 10 insertions(+), 16 deletions(-) create mode 100644 packages/vitest-pool-workers/src/shared/builtin-modules.ts rename packages/vitest-pool-workers/src/{pool => shared}/types-global.d.ts (100%) diff --git a/packages/vitest-pool-workers/src/config/index.ts b/packages/vitest-pool-workers/src/config/index.ts index 568907b202ac..7d702c02c642 100644 --- a/packages/vitest-pool-workers/src/config/index.ts +++ b/packages/vitest-pool-workers/src/config/index.ts @@ -4,6 +4,7 @@ import fs from "node:fs/promises"; import { builtinModules } from "node:module"; import path from "node:path"; import { MessageChannel, receiveMessageOnPort } from "node:worker_threads"; +import { workerdBuiltinModules } from "../shared/builtin-modules"; import type { WorkersConfigPluginAPI, WorkersPoolOptions, @@ -111,13 +112,6 @@ function ensureArrayExcludes(array: T[], items: T[]) { const requiredConditions = ["workerd", "worker", "browser"]; const requiredMainFields = ["browser", "module", "jsnext:main", "jsnext"]; -const cloudflareBuiltInModules = [ - "cloudflare:email", - "cloudflare:sockets", - "cloudflare:workers", - "cloudflare:workflows", -]; - function createConfigPlugin(): Plugin { // Use a unique ID for each `cloudflare:test` module so updates in one `main` // don't trigger re-runs in all other projects, just the one that changed. @@ -162,7 +156,7 @@ function createConfigPlugin(): Plugin { config.test.deps.optimizer.ssr.enabled ??= true; config.test.deps.optimizer.ssr.exclude ??= []; ensureArrayIncludes(config.test.deps.optimizer.ssr.exclude, [ - ...cloudflareBuiltInModules, + ...workerdBuiltinModules, ...builtinModules.concat(builtinModules.map((m) => `node:${m}`)), ]); diff --git a/packages/vitest-pool-workers/src/pool/index.ts b/packages/vitest-pool-workers/src/pool/index.ts index cd68091bb267..e594b408128b 100644 --- a/packages/vitest-pool-workers/src/pool/index.ts +++ b/packages/vitest-pool-workers/src/pool/index.ts @@ -23,6 +23,7 @@ import { } from "miniflare"; import semverSatisfies from "semver/functions/satisfies.js"; import { createMethodsRPC } from "vitest/node"; +import { workerdBuiltinModules } from "../shared/builtin-modules"; import { createChunkingSocket } from "../shared/chunking-socket"; import { CompatibilityFlagAssertions } from "./compatibility-flag-assertions"; import { OPTIONS_PATH, parseProjectOptions } from "./config"; @@ -41,7 +42,6 @@ import { import { ensurePosixLikePath, handleModuleFallbackRequest, - workerdBuiltinModules, } from "./module-fallback"; import type { SourcelessWorkerOptions, diff --git a/packages/vitest-pool-workers/src/pool/module-fallback.ts b/packages/vitest-pool-workers/src/pool/module-fallback.ts index 826ae563776e..8109dcc7943c 100644 --- a/packages/vitest-pool-workers/src/pool/module-fallback.ts +++ b/packages/vitest-pool-workers/src/pool/module-fallback.ts @@ -8,6 +8,7 @@ import util from "node:util"; import * as cjsModuleLexer from "cjs-module-lexer"; import { buildSync } from "esbuild"; import { ModuleRuleTypeSchema, Response } from "miniflare"; +import { workerdBuiltinModules } from "../shared/builtin-modules"; import { isFileNotFoundError } from "./helpers"; import type { ModuleRuleType, Request, Worker_Module } from "miniflare"; import type { ViteDevServer } from "vite"; @@ -67,12 +68,6 @@ const forceModuleTypeRegexp = new RegExp( `\\?mf_vitest_force=(${ModuleRuleTypeSchema.options.join("|")})$` ); -// Node.js built-in modules provided by `workerd` -export const workerdBuiltinModules = new Set([ - ...VITEST_POOL_WORKERS_DEFINE_BUILTIN_MODULES, - "__STATIC_CONTENT_MANIFEST", -]); - // `chai` contains circular `require()`s which aren't supported by `workerd` // TODO(someday): support circular `require()` in `workerd` const bundleDependencies = ["chai"]; diff --git a/packages/vitest-pool-workers/src/shared/builtin-modules.ts b/packages/vitest-pool-workers/src/shared/builtin-modules.ts new file mode 100644 index 000000000000..d44836ece6ee --- /dev/null +++ b/packages/vitest-pool-workers/src/shared/builtin-modules.ts @@ -0,0 +1,5 @@ +// Node.js built-in modules provided by `workerd` +export const workerdBuiltinModules = new Set([ + ...VITEST_POOL_WORKERS_DEFINE_BUILTIN_MODULES, + "__STATIC_CONTENT_MANIFEST", +]); diff --git a/packages/vitest-pool-workers/src/pool/types-global.d.ts b/packages/vitest-pool-workers/src/shared/types-global.d.ts similarity index 100% rename from packages/vitest-pool-workers/src/pool/types-global.d.ts rename to packages/vitest-pool-workers/src/shared/types-global.d.ts diff --git a/packages/vitest-pool-workers/tsconfig.emit.json b/packages/vitest-pool-workers/tsconfig.emit.json index 5f2cf13916a5..a029494da0fb 100644 --- a/packages/vitest-pool-workers/tsconfig.emit.json +++ b/packages/vitest-pool-workers/tsconfig.emit.json @@ -8,5 +8,5 @@ "incremental": false }, // Only want to emit `.d.ts` for `/config` sub-export - "include": ["./src/config/**/*.ts"] + "include": ["./src/shared/types-global.d.ts", "./src/config/**/*.ts"] }