diff --git a/package.json b/package.json index cc84419e70b6..73ae7f18495d 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,6 @@ "packages/integration-shims", "packages/nestjs", "packages/nextjs", - "packages/nitro-utils", "packages/node", "packages/nuxt", "packages/opentelemetry", diff --git a/packages/nitro-utils/.eslintrc.js b/packages/nitro-utils/.eslintrc.js deleted file mode 100644 index 7ac3732750a5..000000000000 --- a/packages/nitro-utils/.eslintrc.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - extends: ['../../.eslintrc.js'], - env: { - node: true, - }, -}; diff --git a/packages/nitro-utils/LICENSE b/packages/nitro-utils/LICENSE deleted file mode 100644 index 5af93a5bdae5..000000000000 --- a/packages/nitro-utils/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020-2024 Functional Software, Inc. dba Sentry - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/nitro-utils/README.md b/packages/nitro-utils/README.md deleted file mode 100644 index 321352938655..000000000000 --- a/packages/nitro-utils/README.md +++ /dev/null @@ -1,19 +0,0 @@ -

- - Sentry - -

- -# Sentry Utilities for Nitro-based SDKs - -## Links - -- [Official SDK Docs](https://docs.sentry.io/quickstart/) -- [TypeDoc](http://getsentry.github.io/sentry-node/) - -## General - -Common utilities used by Sentry SDKs that use Nitro on the server-side. - -Note: This package is only meant to be used internally, and as such is not part of our public API contract and does not -follow semver. diff --git a/packages/nitro-utils/package.json b/packages/nitro-utils/package.json deleted file mode 100644 index a55180baa4bf..000000000000 --- a/packages/nitro-utils/package.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name": "@sentry-internal/nitro-utils", - "version": "8.45.0", - "description": "Utilities for all Sentry SDKs with Nitro on the server-side", - "repository": "git://github.com/getsentry/sentry-javascript.git", - "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nitro-utils", - "author": "Sentry", - "license": "MIT", - "private": true, - "engines": { - "node": ">=18.19.1" - }, - "files": [ - "/build" - ], - "main": "build/cjs/index.js", - "module": "build/esm/index.js", - "types": "build/types/index.d.ts", - "exports": { - "./package.json": "./package.json", - ".": { - "import": { - "types": "./build/types/index.d.ts", - "default": "./build/esm/index.js" - }, - "require": { - "types": "./build/types/index.d.ts", - "default": "./build/cjs/index.js" - } - } - }, - "typesVersions": { - "<5.0": { - "build/types/index.d.ts": [ - "build/types-ts3.8/index.d.ts" - ] - } - }, - "dependencies": { - "@sentry/core": "8.45.0" - }, - "devDependencies": { - "rollup": "^4.24.4" - }, - "scripts": { - "build": "run-p build:transpile build:types", - "build:dev": "yarn build", - "build:transpile": "rollup -c rollup.npm.config.mjs", - "build:types": "run-s build:types:core build:types:downlevel", - "build:types:core": "tsc -p tsconfig.types.json", - "build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8", - "build:watch": "run-p build:transpile:watch build:types:watch", - "build:dev:watch": "run-p build:transpile:watch build:types:watch", - "build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch", - "build:types:watch": "tsc -p tsconfig.types.json --watch", - "clean": "rimraf build coverage sentry-internal-nitro-utils-*.tgz", - "fix": "eslint . --format stylish --fix", - "lint": "eslint . --format stylish", - "test": "yarn test:unit", - "test:unit": "vitest run", - "test:watch": "vitest --watch", - "yalc:publish": "yalc publish --push --sig" - }, - "volta": { - "extends": "../../package.json" - }, - "sideEffects": false -} diff --git a/packages/nitro-utils/rollup.npm.config.mjs b/packages/nitro-utils/rollup.npm.config.mjs deleted file mode 100644 index d28a7a6f54a0..000000000000 --- a/packages/nitro-utils/rollup.npm.config.mjs +++ /dev/null @@ -1,17 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; - -export default makeNPMConfigVariants( - makeBaseNPMConfig({ - packageSpecificConfig: { - output: { - // set exports to 'named' or 'auto' so that rollup doesn't warn - exports: 'named', - // set preserveModules to true because we don't want to bundle everything into one file. - preserveModules: - process.env.SENTRY_BUILD_PRESERVE_MODULES === undefined - ? true - : Boolean(process.env.SENTRY_BUILD_PRESERVE_MODULES), - }, - }, - }), -); diff --git a/packages/nitro-utils/src/index.ts b/packages/nitro-utils/src/index.ts deleted file mode 100644 index 92a212e16f1d..000000000000 --- a/packages/nitro-utils/src/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -export { patchEventHandler } from './nitro/patchEventHandler'; - -export { - wrapServerEntryWithDynamicImport, - type WrapServerEntryPluginOptions, -} from './rollupPlugins/wrapServerEntryWithDynamicImport'; diff --git a/packages/nitro-utils/src/nitro/patchEventHandler.ts b/packages/nitro-utils/src/nitro/patchEventHandler.ts deleted file mode 100644 index d15da9f0db27..000000000000 --- a/packages/nitro-utils/src/nitro/patchEventHandler.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { getDefaultIsolationScope, getIsolationScope, logger, withIsolationScope } from '@sentry/core'; -import type { EventHandler } from 'h3'; -import { flushIfServerless } from '../util/flush'; - -/** - * A helper to patch a given `h3` event handler, ensuring that - * requests are properly isolated and data is flushed to Sentry. - */ -export function patchEventHandler(handler: EventHandler): EventHandler { - return new Proxy(handler, { - async apply(handlerTarget, handlerThisArg, handlerArgs: Parameters) { - // In environments where we cannot make use of the OTel - // http instrumentation (e.g. when using top level import - // of the server instrumentation file instead of - // `--import` or dynamic import, like on vercel) - // we still need to ensure requests are properly isolated - // by comparing the current isolation scope to the default - // one. - // Requests are properly isolated if they differ. - // If that's not the case, we fork the isolation scope here. - const isolationScope = getIsolationScope(); - const newIsolationScope = isolationScope === getDefaultIsolationScope() ? isolationScope.clone() : isolationScope; - - logger.log( - `Patched h3 event handler. ${ - isolationScope === newIsolationScope ? 'Using existing' : 'Created new' - } isolation scope.`, - ); - - return withIsolationScope(newIsolationScope, async () => { - try { - return await handlerTarget.apply(handlerThisArg, handlerArgs); - } finally { - await flushIfServerless(); - } - }); - }, - }); -} diff --git a/packages/nitro-utils/src/nitro/utils.ts b/packages/nitro-utils/src/nitro/utils.ts deleted file mode 100644 index 8e8f08cf1a3b..000000000000 --- a/packages/nitro-utils/src/nitro/utils.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { GLOBAL_OBJ, flush, getClient, logger, vercelWaitUntil } from '@sentry/core'; - -/** - * Flushes Sentry for serverless environments. - */ -export async function flushIfServerless(): Promise { - const isServerless = !!process.env.LAMBDA_TASK_ROOT || !!process.env.VERCEL || !!process.env.NETLIFY; - - // @ts-expect-error - this is not typed - if (GLOBAL_OBJ[Symbol.for('@vercel/request-context')]) { - vercelWaitUntil(flushWithTimeout()); - } else if (isServerless) { - await flushWithTimeout(); - } -} - -/** - * Flushes Sentry. - */ -export async function flushWithTimeout(): Promise { - const isDebug = getClient()?.getOptions()?.debug; - - try { - isDebug && logger.log('Flushing events...'); - await flush(2000); - isDebug && logger.log('Done flushing events'); - } catch (e) { - isDebug && logger.log('Error while flushing events:\n', e); - } -} diff --git a/packages/nitro-utils/src/rollupPlugins/wrapServerEntryWithDynamicImport.ts b/packages/nitro-utils/src/rollupPlugins/wrapServerEntryWithDynamicImport.ts deleted file mode 100644 index 58b838741c32..000000000000 --- a/packages/nitro-utils/src/rollupPlugins/wrapServerEntryWithDynamicImport.ts +++ /dev/null @@ -1,238 +0,0 @@ -import { consoleSandbox } from '@sentry/core'; -import type { InputPluginOption } from 'rollup'; - -export const SENTRY_WRAPPED_ENTRY = '?sentry-query-wrapped-entry'; -export const SENTRY_WRAPPED_FUNCTIONS = '?sentry-query-wrapped-functions='; -export const SENTRY_REEXPORTED_FUNCTIONS = '?sentry-query-reexported-functions='; -export const QUERY_END_INDICATOR = 'SENTRY-QUERY-END'; - -export type WrapServerEntryPluginOptions = { - serverEntrypointFileName: string; - serverConfigFileName: string; - resolvedServerConfigPath: string; - entrypointWrappedFunctions: string[]; - additionalImports?: string[]; - debug?: boolean; -}; - -/** - * A Rollup plugin which wraps the server entry with a dynamic `import()`. This makes it possible to initialize Sentry first - * by using a regular `import` and load the server after that. - * This also works with serverless `handler` functions, as it re-exports the `handler`. - * - * @param config Configuration options for the Rollup Plugin - * @param config.serverConfigFileName Name of the Sentry server config (without file extension). E.g. 'sentry.server.config' - * @param config.resolvedServerConfigPath Resolved path of the Sentry server config (based on `src` directory) - * @param config.entryPointWrappedFunctions Exported bindings of the server entry file, which are wrapped as async function. E.g. ['default', 'handler', 'server'] - * @param config.additionalImports Adds additional imports to the entry file. Can be e.g. 'import-in-the-middle/hook.mjs' - * @param config.debug Whether debug logs are enabled in the build time environment - */ -export function wrapServerEntryWithDynamicImport(config: WrapServerEntryPluginOptions): InputPluginOption { - const { - serverEntrypointFileName, - serverConfigFileName, - resolvedServerConfigPath, - entrypointWrappedFunctions, - additionalImports, - debug, - } = config; - - // In order to correctly import the server config file - // and dynamically import the nitro runtime, we need to - // mark the resolutionId with '\0raw' to fall into the - // raw chunk group, c.f. https://github.com/nitrojs/nitro/commit/8b4a408231bdc222569a32ce109796a41eac4aa6#diff-e58102d2230f95ddeef2662957b48d847a6e891e354cfd0ae6e2e03ce848d1a2R142 - const resolutionIdPrefix = '\0raw'; - - return { - name: 'sentry-wrap-server-entry-with-dynamic-import', - async resolveId(source, importer, options) { - if (source.includes(`/${serverConfigFileName}`)) { - return { id: source, moduleSideEffects: true }; - } - - if (additionalImports?.includes(source)) { - // When importing additional imports like "import-in-the-middle/hook.mjs" in the returned code of the `load()` function below: - // By setting `moduleSideEffects` to `true`, the import is added to the bundle, although nothing is imported from it - // By importing "import-in-the-middle/hook.mjs", we can make sure this file is included, as not all node builders are including files imported with `module.register()`. - // Prevents the error "Failed to register ESM hook Error: Cannot find module 'import-in-the-middle/hook.mjs'" - return { id: source, moduleSideEffects: true, external: true }; - } - - if ( - options.isEntry && - source.includes(serverEntrypointFileName) && - source.includes('.mjs') && - !source.includes(`.mjs${SENTRY_WRAPPED_ENTRY}`) - ) { - const resolution = await this.resolve(source, importer, options); - - // If it cannot be resolved or is external, just return it so that Rollup can display an error - if (!resolution || resolution?.external) return resolution; - - const moduleInfo = await this.load(resolution); - - moduleInfo.moduleSideEffects = true; - - // The enclosing `if` already checks for the suffix in `source`, but a check in `resolution.id` is needed as well to prevent multiple attachment of the suffix - return resolution.id.includes(`.mjs${SENTRY_WRAPPED_ENTRY}`) - ? resolution.id - : `${resolutionIdPrefix}${resolution.id - // Concatenates the query params to mark the file (also attaches names of re-exports - this is needed for serverless functions to re-export the handler) - .concat(SENTRY_WRAPPED_ENTRY) - .concat( - constructWrappedFunctionExportQuery(moduleInfo.exportedBindings, entrypointWrappedFunctions, debug), - ) - .concat(QUERY_END_INDICATOR)}`; - } - return null; - }, - load(id: string) { - if (id.includes(`.mjs${SENTRY_WRAPPED_ENTRY}`)) { - const entryId = removeSentryQueryFromPath(id).slice(resolutionIdPrefix.length); - - // Mostly useful for serverless `handler` functions - const reExportedFunctions = - id.includes(SENTRY_WRAPPED_FUNCTIONS) || id.includes(SENTRY_REEXPORTED_FUNCTIONS) - ? constructFunctionReExport(id, entryId) - : ''; - - return ( - // Regular `import` of the Sentry config - `import ${JSON.stringify(resolvedServerConfigPath)};\n` + - // Dynamic `import()` for the previous, actual entry point. - // `import()` can be used for any code that should be run after the hooks are registered (https://nodejs.org/api/module.html#enabling) - `import(${JSON.stringify(entryId)});\n` + - // By importing additional imports like "import-in-the-middle/hook.mjs", we can make sure this file wil be included, as not all node builders are including files imported with `module.register()`. - `${additionalImports ? additionalImports.map(importPath => `import "${importPath}";\n`) : ''}` + - `${reExportedFunctions}\n` - ); - } - - return null; - }, - }; -} - -/** - * Strips the Sentry query part from a path. - * Example: example/path?sentry-query-wrapped-entry?sentry-query-functions-reexport=foo,SENTRY-QUERY-END -> /example/path - * - * **Only exported for testing** - */ -export function removeSentryQueryFromPath(url: string): string { - // eslint-disable-next-line @sentry-internal/sdk/no-regexp-constructor - const regex = new RegExp(`\\${SENTRY_WRAPPED_ENTRY}.*?\\${QUERY_END_INDICATOR}`); - return url.replace(regex, ''); -} - -/** - * Extracts and sanitizes function re-export and function wrap query parameters from a query string. - * If it is a default export, it is not considered for re-exporting. - * - * **Only exported for testing** - */ -export function extractFunctionReexportQueryParameters(query: string): { wrap: string[]; reexport: string[] } { - // Regex matches the comma-separated params between the functions query - // eslint-disable-next-line @sentry-internal/sdk/no-regexp-constructor - const wrapRegex = new RegExp( - `\\${SENTRY_WRAPPED_FUNCTIONS}(.*?)(\\${QUERY_END_INDICATOR}|\\${SENTRY_REEXPORTED_FUNCTIONS})`, - ); - // eslint-disable-next-line @sentry-internal/sdk/no-regexp-constructor - const reexportRegex = new RegExp(`\\${SENTRY_REEXPORTED_FUNCTIONS}(.*?)(\\${QUERY_END_INDICATOR})`); - - const wrapMatch = query.match(wrapRegex); - const reexportMatch = query.match(reexportRegex); - - const wrap = - wrapMatch?.[1] - ?.split(',') - .filter(param => param !== '') - // Sanitize, as code could be injected with another rollup plugin - .map((str: string) => str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')) || []; - - const reexport = - reexportMatch?.[1] - ?.split(',') - .filter(param => param !== '' && param !== 'default') - // Sanitize, as code could be injected with another rollup plugin - .map((str: string) => str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')) || []; - - return { wrap, reexport }; -} - -/** - * Constructs a comma-separated string with all functions that need to be re-exported later from the server entry. - * It uses Rollup's `exportedBindings` to determine the functions to re-export. Functions which should be wrapped - * (e.g. serverless handlers) are wrapped by Sentry. - * - * **Only exported for testing** - */ -export function constructWrappedFunctionExportQuery( - exportedBindings: Record | null, - entrypointWrappedFunctions: string[], - debug?: boolean, -): string { - const functionsToExport: { wrap: string[]; reexport: string[] } = { - wrap: [], - reexport: [], - }; - - // `exportedBindings` can look like this: `{ '.': [ 'handler' ] }` or `{ '.': [], './firebase-gen-1.mjs': [ 'server' ] }` - // The key `.` refers to exports within the current file, while other keys show from where exports were imported first. - Object.values(exportedBindings || {}).forEach(functions => - functions.forEach(fn => { - if (entrypointWrappedFunctions.includes(fn)) { - functionsToExport.wrap.push(fn); - } else { - functionsToExport.reexport.push(fn); - } - }), - ); - - if (debug && functionsToExport.wrap.length === 0) { - consoleSandbox(() => - // eslint-disable-next-line no-console - console.warn( - '[Sentry] No functions found to wrap. In case the server needs to export async functions other than `handler` or `server`, consider adding the name(s) to `entrypointWrappedFunctions`.', - ), - ); - } - - const wrapQuery = functionsToExport.wrap.length - ? `${SENTRY_WRAPPED_FUNCTIONS}${functionsToExport.wrap.join(',')}` - : ''; - const reexportQuery = functionsToExport.reexport.length - ? `${SENTRY_REEXPORTED_FUNCTIONS}${functionsToExport.reexport.join(',')}` - : ''; - - return [wrapQuery, reexportQuery].join(''); -} - -/** - * Constructs a code snippet with function reexports (can be used in Rollup plugins as a return value for `load()`) - * - * **Only exported for testing** - */ -export function constructFunctionReExport(pathWithQuery: string, entryId: string): string { - const { wrap: wrapFunctions, reexport: reexportFunctions } = extractFunctionReexportQueryParameters(pathWithQuery); - - return wrapFunctions - .reduce( - (functionsCode, currFunctionName) => - functionsCode.concat( - `async function ${currFunctionName}_sentryWrapped(...args) {\n` + - ` const res = await import(${JSON.stringify(entryId)});\n` + - ` return res.${currFunctionName}.call(this, ...args);\n` + - '}\n' + - `export { ${currFunctionName}_sentryWrapped as ${currFunctionName} };\n`, - ), - '', - ) - .concat( - reexportFunctions.reduce( - (functionsCode, currFunctionName) => - functionsCode.concat(`export { ${currFunctionName} } from ${JSON.stringify(entryId)};`), - '', - ), - ); -} diff --git a/packages/nitro-utils/src/util/flush.ts b/packages/nitro-utils/src/util/flush.ts deleted file mode 100644 index 8e8f08cf1a3b..000000000000 --- a/packages/nitro-utils/src/util/flush.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { GLOBAL_OBJ, flush, getClient, logger, vercelWaitUntil } from '@sentry/core'; - -/** - * Flushes Sentry for serverless environments. - */ -export async function flushIfServerless(): Promise { - const isServerless = !!process.env.LAMBDA_TASK_ROOT || !!process.env.VERCEL || !!process.env.NETLIFY; - - // @ts-expect-error - this is not typed - if (GLOBAL_OBJ[Symbol.for('@vercel/request-context')]) { - vercelWaitUntil(flushWithTimeout()); - } else if (isServerless) { - await flushWithTimeout(); - } -} - -/** - * Flushes Sentry. - */ -export async function flushWithTimeout(): Promise { - const isDebug = getClient()?.getOptions()?.debug; - - try { - isDebug && logger.log('Flushing events...'); - await flush(2000); - isDebug && logger.log('Done flushing events'); - } catch (e) { - isDebug && logger.log('Error while flushing events:\n', e); - } -} diff --git a/packages/nitro-utils/test/rollupPlugins/wrapServerEntryWithDynamicImport.test.ts b/packages/nitro-utils/test/rollupPlugins/wrapServerEntryWithDynamicImport.test.ts deleted file mode 100644 index c13973cc4afe..000000000000 --- a/packages/nitro-utils/test/rollupPlugins/wrapServerEntryWithDynamicImport.test.ts +++ /dev/null @@ -1,193 +0,0 @@ -import { describe, expect, it, vi } from 'vitest'; -import { - QUERY_END_INDICATOR, - SENTRY_REEXPORTED_FUNCTIONS, - SENTRY_WRAPPED_ENTRY, - SENTRY_WRAPPED_FUNCTIONS, - constructFunctionReExport, - constructWrappedFunctionExportQuery, - extractFunctionReexportQueryParameters, - removeSentryQueryFromPath, -} from '../../src/rollupPlugins/wrapServerEntryWithDynamicImport'; - -describe('removeSentryQueryFromPath', () => { - it('strips the Sentry query part from the path', () => { - const url = `/example/path${SENTRY_WRAPPED_ENTRY}${SENTRY_WRAPPED_FUNCTIONS}foo,${QUERY_END_INDICATOR}`; - const url2 = `/example/path${SENTRY_WRAPPED_ENTRY}${QUERY_END_INDICATOR}`; - const result = removeSentryQueryFromPath(url); - const result2 = removeSentryQueryFromPath(url2); - expect(result).toBe('/example/path'); - expect(result2).toBe('/example/path'); - }); - - it('returns the same path if the specific query part is not present', () => { - const url = '/example/path?other-query=param'; - const result = removeSentryQueryFromPath(url); - expect(result).toBe(url); - }); -}); - -describe('extractFunctionReexportQueryParameters', () => { - it.each([ - [`${SENTRY_WRAPPED_FUNCTIONS}foo,bar,${QUERY_END_INDICATOR}`, { wrap: ['foo', 'bar'], reexport: [] }], - [ - `${SENTRY_WRAPPED_FUNCTIONS}foo,bar,default${QUERY_END_INDICATOR}`, - { wrap: ['foo', 'bar', 'default'], reexport: [] }, - ], - [ - `${SENTRY_WRAPPED_FUNCTIONS}foo,a.b*c?d[e]f(g)h|i\\\\j(){hello},${QUERY_END_INDICATOR}`, - { wrap: ['foo', 'a\\.b\\*c\\?d\\[e\\]f\\(g\\)h\\|i\\\\\\\\j\\(\\)\\{hello\\}'], reexport: [] }, - ], - [`/example/path/${SENTRY_WRAPPED_FUNCTIONS}foo,bar${QUERY_END_INDICATOR}`, { wrap: ['foo', 'bar'], reexport: [] }], - [ - `${SENTRY_WRAPPED_FUNCTIONS}foo,bar,${SENTRY_REEXPORTED_FUNCTIONS}${QUERY_END_INDICATOR}`, - { wrap: ['foo', 'bar'], reexport: [] }, - ], - [`${SENTRY_REEXPORTED_FUNCTIONS}${QUERY_END_INDICATOR}`, { wrap: [], reexport: [] }], - [ - `/path${SENTRY_WRAPPED_FUNCTIONS}foo,bar${SENTRY_REEXPORTED_FUNCTIONS}bar${QUERY_END_INDICATOR}`, - { wrap: ['foo', 'bar'], reexport: ['bar'] }, - ], - ['?other-query=param', { wrap: [], reexport: [] }], - ])('extracts parameters from the query string: %s', (query, expected) => { - const result = extractFunctionReexportQueryParameters(query); - expect(result).toEqual(expected); - }); -}); - -describe('constructWrappedFunctionExportQuery', () => { - it.each([ - [{ '.': ['handler'] }, ['handler'], `${SENTRY_WRAPPED_FUNCTIONS}handler`], - [{ '.': ['handler'], './module': ['server'] }, [], `${SENTRY_REEXPORTED_FUNCTIONS}handler,server`], - [ - { '.': ['handler'], './module': ['server'] }, - ['server'], - `${SENTRY_WRAPPED_FUNCTIONS}server${SENTRY_REEXPORTED_FUNCTIONS}handler`, - ], - [ - { '.': ['handler', 'otherFunction'] }, - ['handler'], - `${SENTRY_WRAPPED_FUNCTIONS}handler${SENTRY_REEXPORTED_FUNCTIONS}otherFunction`, - ], - [{ '.': ['handler', 'otherFn'] }, ['handler', 'otherFn'], `${SENTRY_WRAPPED_FUNCTIONS}handler,otherFn`], - [{ '.': ['bar'], './module': ['foo'] }, ['bar', 'foo'], `${SENTRY_WRAPPED_FUNCTIONS}bar,foo`], - [{ '.': ['foo', 'bar'] }, ['foo'], `${SENTRY_WRAPPED_FUNCTIONS}foo${SENTRY_REEXPORTED_FUNCTIONS}bar`], - [{ '.': ['foo', 'bar'] }, ['bar'], `${SENTRY_WRAPPED_FUNCTIONS}bar${SENTRY_REEXPORTED_FUNCTIONS}foo`], - [{ '.': ['foo', 'bar'] }, ['foo', 'bar'], `${SENTRY_WRAPPED_FUNCTIONS}foo,bar`], - [{ '.': ['foo', 'bar'] }, [], `${SENTRY_REEXPORTED_FUNCTIONS}foo,bar`], - ])( - 'constructs re-export query for exportedBindings: %j and entrypointWrappedFunctions: %j', - (exportedBindings, entrypointWrappedFunctions, expected) => { - const result = constructWrappedFunctionExportQuery(exportedBindings, entrypointWrappedFunctions); - expect(result).toBe(expected); - }, - ); - - it('logs a warning if no functions are found for re-export and debug is true', () => { - const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}); - const exportedBindings = { '.': ['handler'] }; - const entrypointWrappedFunctions = ['nonExistentFunction']; - const debug = true; - - const result = constructWrappedFunctionExportQuery(exportedBindings, entrypointWrappedFunctions, debug); - expect(result).toBe('?sentry-query-reexported-functions=handler'); - expect(consoleWarnSpy).toHaveBeenCalledWith( - '[Sentry] No functions found to wrap. In case the server needs to export async functions other than `handler` or `server`, consider adding the name(s) to `entrypointWrappedFunctions`.', - ); - - consoleWarnSpy.mockRestore(); - }); -}); - -describe('constructFunctionReExport', () => { - it('constructs re-export code for given query parameters and entry ID', () => { - const query = `${SENTRY_WRAPPED_FUNCTIONS}foo,bar,${QUERY_END_INDICATOR}}`; - const query2 = `${SENTRY_WRAPPED_FUNCTIONS}foo,bar${QUERY_END_INDICATOR}}`; - const entryId = './module'; - const result = constructFunctionReExport(query, entryId); - const result2 = constructFunctionReExport(query2, entryId); - - const expected = ` -async function foo_sentryWrapped(...args) { - const res = await import("./module"); - return res.foo.call(this, ...args); -} -export { foo_sentryWrapped as foo }; -async function bar_sentryWrapped(...args) { - const res = await import("./module"); - return res.bar.call(this, ...args); -} -export { bar_sentryWrapped as bar }; -`; - expect(result.trim()).toBe(expected.trim()); - expect(result2.trim()).toBe(expected.trim()); - }); - - it('constructs re-export code for a "default" query parameters and entry ID', () => { - const query = `${SENTRY_WRAPPED_FUNCTIONS}default${QUERY_END_INDICATOR}}`; - const entryId = './index'; - const result = constructFunctionReExport(query, entryId); - - const expected = ` -async function default_sentryWrapped(...args) { - const res = await import("./index"); - return res.default.call(this, ...args); -} -export { default_sentryWrapped as default }; -`; - expect(result.trim()).toBe(expected.trim()); - }); - - it('constructs re-export code for a "default" query parameters and entry ID', () => { - const query = `${SENTRY_WRAPPED_FUNCTIONS}default${QUERY_END_INDICATOR}}`; - const entryId = './index'; - const result = constructFunctionReExport(query, entryId); - - const expected = ` -async function default_sentryWrapped(...args) { - const res = await import("./index"); - return res.default.call(this, ...args); -} -export { default_sentryWrapped as default }; -`; - expect(result.trim()).toBe(expected.trim()); - }); - - it('constructs re-export code for a mix of wrapped and re-exported functions', () => { - const query = `${SENTRY_WRAPPED_FUNCTIONS}foo,${SENTRY_REEXPORTED_FUNCTIONS}bar${QUERY_END_INDICATOR}`; - const entryId = './module'; - const result = constructFunctionReExport(query, entryId); - - const expected = ` -async function foo_sentryWrapped(...args) { - const res = await import("./module"); - return res.foo.call(this, ...args); -} -export { foo_sentryWrapped as foo }; -export { bar } from "./module"; -`; - expect(result.trim()).toBe(expected.trim()); - }); - - it('does not re-export a default export for regular re-exported functions', () => { - const query = `${SENTRY_WRAPPED_FUNCTIONS}foo${SENTRY_REEXPORTED_FUNCTIONS}default${QUERY_END_INDICATOR}`; - const entryId = './module'; - const result = constructFunctionReExport(query, entryId); - - const expected = ` -async function foo_sentryWrapped(...args) { - const res = await import("./module"); - return res.foo.call(this, ...args); -} -export { foo_sentryWrapped as foo }; -`; - expect(result.trim()).toBe(expected.trim()); - }); - - it('returns an empty string if the query string is empty', () => { - const query = ''; - const entryId = './module'; - const result = constructFunctionReExport(query, entryId); - expect(result).toBe(''); - }); -}); diff --git a/packages/nitro-utils/test/tsconfig.json b/packages/nitro-utils/test/tsconfig.json deleted file mode 100644 index 38ca0b13bcdd..000000000000 --- a/packages/nitro-utils/test/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../tsconfig.test.json" -} diff --git a/packages/nitro-utils/test/vitest.setup.ts b/packages/nitro-utils/test/vitest.setup.ts deleted file mode 100644 index 7676ce96afef..000000000000 --- a/packages/nitro-utils/test/vitest.setup.ts +++ /dev/null @@ -1,8 +0,0 @@ -export function setup() {} - -if (!globalThis.fetch) { - // @ts-expect-error - Needed for vitest to work with our fetch instrumentation - globalThis.Request = class Request {}; - // @ts-expect-error - Needed for vitest to work with our fetch instrumentation - globalThis.Response = class Response {}; -} diff --git a/packages/nitro-utils/tsconfig.json b/packages/nitro-utils/tsconfig.json deleted file mode 100644 index 425f0657515d..000000000000 --- a/packages/nitro-utils/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - - "compilerOptions": { - "lib": ["ES2018"], - } -} diff --git a/packages/nitro-utils/tsconfig.test.json b/packages/nitro-utils/tsconfig.test.json deleted file mode 100644 index 3fbe012384ee..000000000000 --- a/packages/nitro-utils/tsconfig.test.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - - "include": ["test/**/*", "vite.config.ts"], - - "compilerOptions": { - // should include all types from `./tsconfig.json` plus types for all test frameworks used - "types": ["node", "vitest/globals"] - } -} diff --git a/packages/nitro-utils/tsconfig.types.json b/packages/nitro-utils/tsconfig.types.json deleted file mode 100644 index 65455f66bd75..000000000000 --- a/packages/nitro-utils/tsconfig.types.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - - "compilerOptions": { - "declaration": true, - "declarationMap": true, - "emitDeclarationOnly": true, - "outDir": "build/types" - } -} diff --git a/packages/nitro-utils/vite.config.ts b/packages/nitro-utils/vite.config.ts deleted file mode 100644 index 0229ec105e04..000000000000 --- a/packages/nitro-utils/vite.config.ts +++ /dev/null @@ -1,9 +0,0 @@ -import baseConfig from '../../vite/vite.config'; - -export default { - ...baseConfig, - test: { - environment: 'jsdom', - setupFiles: ['./test/vitest.setup.ts'], - }, -}; diff --git a/packages/nuxt/src/runtime/plugins/sentry.server.ts b/packages/nuxt/src/runtime/plugins/sentry.server.ts index ec2678e8e7c7..6152c0b63380 100644 --- a/packages/nuxt/src/runtime/plugins/sentry.server.ts +++ b/packages/nuxt/src/runtime/plugins/sentry.server.ts @@ -75,7 +75,6 @@ async function flushWithTimeout(): Promise { } } -// copied from '@sentry-internal/nitro-utils' - the nuxt-module-builder does not inline devDependencies function patchEventHandler(handler: EventHandler): EventHandler { return new Proxy(handler, { async apply(handlerTarget, handlerThisArg, handlerArgs: Parameters) { diff --git a/yarn.lock b/yarn.lock index 4dcea7f876b0..5184b4a37e2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6887,181 +6887,91 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.2.tgz#07db37fcd9d401aae165f662c0069efd61d4ffcc" integrity sha512-ufoveNTKDg9t/b7nqI3lwbCG/9IJMhADBNjjz/Jn6LxIZxD7T5L8l2uO/wD99945F1Oo8FvgbbZJRguyk/BdzA== -"@rollup/rollup-android-arm-eabi@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.4.tgz#c460b54c50d42f27f8254c435a4f3b3e01910bc8" - integrity sha512-jfUJrFct/hTA0XDM5p/htWKoNNTbDLY0KRwEt6pyOA6k2fmk0WVwl65PdUdJZgzGEHWx+49LilkcSaumQRyNQw== - "@rollup/rollup-android-arm64@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.2.tgz#160975402adf85ecd58a0721ad60ae1779a68147" integrity sha512-iZoYCiJz3Uek4NI0J06/ZxUgwAfNzqltK0MptPDO4OR0a88R4h0DSELMsflS6ibMCJ4PnLvq8f7O1d7WexUvIA== -"@rollup/rollup-android-arm64@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.4.tgz#96e01f3a04675d8d5973ab8d3fd6bc3be21fa5e1" - integrity sha512-j4nrEO6nHU1nZUuCfRKoCcvh7PIywQPUCBa2UsootTHvTHIoIu2BzueInGJhhvQO/2FTRdNYpf63xsgEqH9IhA== - "@rollup/rollup-darwin-arm64@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.2.tgz#2b126f0aa4349694fe2941bcbcc4b0982b7f1a49" integrity sha512-/UhrIxobHYCBfhi5paTkUDQ0w+jckjRZDZ1kcBL132WeHZQ6+S5v9jQPVGLVrLbNUebdIRpIt00lQ+4Z7ys4Rg== -"@rollup/rollup-darwin-arm64@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.4.tgz#9b2ec23b17b47cbb2f771b81f86ede3ac6730bce" - integrity sha512-GmU/QgGtBTeraKyldC7cDVVvAJEOr3dFLKneez/n7BvX57UdhOqDsVwzU7UOnYA7AAOt+Xb26lk79PldDHgMIQ== - "@rollup/rollup-darwin-x64@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.2.tgz#3f4987eff6195532037c50b8db92736e326b5bb2" integrity sha512-1F/jrfhxJtWILusgx63WeTvGTwE4vmsT9+e/z7cZLKU8sBMddwqw3UV5ERfOV+H1FuRK3YREZ46J4Gy0aP3qDA== -"@rollup/rollup-darwin-x64@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.4.tgz#f30e4ee6929e048190cf10e0daa8e8ae035b6e46" - integrity sha512-N6oDBiZCBKlwYcsEPXGDE4g9RoxZLK6vT98M8111cW7VsVJFpNEqvJeIPfsCzbf0XEakPslh72X0gnlMi4Ddgg== - "@rollup/rollup-freebsd-arm64@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.2.tgz#15fe184ecfafc635879500f6985c954e57697c44" integrity sha512-1YWOpFcGuC6iGAS4EI+o3BV2/6S0H+m9kFOIlyFtp4xIX5rjSnL3AwbTBxROX0c8yWtiWM7ZI6mEPTI7VkSpZw== -"@rollup/rollup-freebsd-arm64@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.4.tgz#c54b2373ec5bcf71f08c4519c7ae80a0b6c8e03b" - integrity sha512-py5oNShCCjCyjWXCZNrRGRpjWsF0ic8f4ieBNra5buQz0O/U6mMXCpC1LvrHuhJsNPgRt36tSYMidGzZiJF6mw== - "@rollup/rollup-freebsd-x64@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.2.tgz#c72d37315d36b6e0763b7aabb6ae53c361b45e05" integrity sha512-3qAqTewYrCdnOD9Gl9yvPoAoFAVmPJsBvleabvx4bnu1Kt6DrB2OALeRVag7BdWGWLhP1yooeMLEi6r2nYSOjg== -"@rollup/rollup-freebsd-x64@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.4.tgz#3bc53aa29d5a34c28ba8e00def76aa612368458e" - integrity sha512-L7VVVW9FCnTTp4i7KrmHeDsDvjB4++KOBENYtNYAiYl96jeBThFfhP6HVxL74v4SiZEVDH/1ILscR5U9S4ms4g== - "@rollup/rollup-linux-arm-gnueabihf@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.2.tgz#f274f81abf845dcca5f1f40d434a09a79a3a73a0" integrity sha512-ArdGtPHjLqWkqQuoVQ6a5UC5ebdX8INPuJuJNWRe0RGa/YNhVvxeWmCTFQ7LdmNCSUzVZzxAvUznKaYx645Rig== -"@rollup/rollup-linux-arm-gnueabihf@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.4.tgz#c85aedd1710c9e267ee86b6d1ce355ecf7d9e8d9" - integrity sha512-10ICosOwYChROdQoQo589N5idQIisxjaFE/PAnX2i0Zr84mY0k9zul1ArH0rnJ/fpgiqfu13TFZR5A5YJLOYZA== - "@rollup/rollup-linux-arm-musleabihf@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.2.tgz#9edaeb1a9fa7d4469917cb0614f665f1cf050625" integrity sha512-B6UHHeNnnih8xH6wRKB0mOcJGvjZTww1FV59HqJoTJ5da9LCG6R4SEBt6uPqzlawv1LoEXSS0d4fBlHNWl6iYw== -"@rollup/rollup-linux-arm-musleabihf@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.4.tgz#e77313408bf13995aecde281aec0cceb08747e42" - integrity sha512-ySAfWs69LYC7QhRDZNKqNhz2UKN8LDfbKSMAEtoEI0jitwfAG2iZwVqGACJT+kfYvvz3/JgsLlcBP+WWoKCLcw== - "@rollup/rollup-linux-arm64-gnu@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.2.tgz#6eb6851f594336bfa00f074f58a00a61e9751493" integrity sha512-kr3gqzczJjSAncwOS6i7fpb4dlqcvLidqrX5hpGBIM1wtt0QEVtf4wFaAwVv8QygFU8iWUMYEoJZWuWxyua4GQ== -"@rollup/rollup-linux-arm64-gnu@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.4.tgz#633f632397b3662108cfaa1abca2a80b85f51102" - integrity sha512-uHYJ0HNOI6pGEeZ/5mgm5arNVTI0nLlmrbdph+pGXpC9tFHFDQmDMOEqkmUObRfosJqpU8RliYoGz06qSdtcjg== - "@rollup/rollup-linux-arm64-musl@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.2.tgz#9d8dc8e80df8f156d2888ecb8d6c96d653580731" integrity sha512-TDdHLKCWgPuq9vQcmyLrhg/bgbOvIQ8rtWQK7MRxJ9nvaxKx38NvY7/Lo6cYuEnNHqf6rMqnivOIPIQt6H2AoA== -"@rollup/rollup-linux-arm64-musl@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.4.tgz#63edd72b29c4cced93e16113a68e1be9fef88907" - integrity sha512-38yiWLemQf7aLHDgTg85fh3hW9stJ0Muk7+s6tIkSUOMmi4Xbv5pH/5Bofnsb6spIwD5FJiR+jg71f0CH5OzoA== - "@rollup/rollup-linux-powerpc64le-gnu@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.2.tgz#358e3e7dda2d60c46ff7c74f7075045736df5b50" integrity sha512-xv9vS648T3X4AxFFZGWeB5Dou8ilsv4VVqJ0+loOIgDO20zIhYfDLkk5xoQiej2RiSQkld9ijF/fhLeonrz2mw== -"@rollup/rollup-linux-powerpc64le-gnu@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.4.tgz#a9418a4173df80848c0d47df0426a0bf183c4e75" - integrity sha512-q73XUPnkwt9ZNF2xRS4fvneSuaHw2BXuV5rI4cw0fWYVIWIBeDZX7c7FWhFQPNTnE24172K30I+dViWRVD9TwA== - "@rollup/rollup-linux-riscv64-gnu@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.2.tgz#b08461ace599c3f0b5f27051f1756b6cf1c78259" integrity sha512-tbtXwnofRoTt223WUZYiUnbxhGAOVul/3StZ947U4A5NNjnQJV5irKMm76G0LGItWs6y+SCjUn/Q0WaMLkEskg== -"@rollup/rollup-linux-riscv64-gnu@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.4.tgz#bc9c195db036a27e5e3339b02f51526b4ce1e988" - integrity sha512-Aie/TbmQi6UXokJqDZdmTJuZBCU3QBDA8oTKRGtd4ABi/nHgXICulfg1KI6n9/koDsiDbvHAiQO3YAUNa/7BCw== - "@rollup/rollup-linux-s390x-gnu@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.2.tgz#daab36c9b5c8ac4bfe5a9c4c39ad711464b7dfee" integrity sha512-gc97UebApwdsSNT3q79glOSPdfwgwj5ELuiyuiMY3pEWMxeVqLGKfpDFoum4ujivzxn6veUPzkGuSYoh5deQ2Q== -"@rollup/rollup-linux-s390x-gnu@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.4.tgz#1651fdf8144ae89326c01da5d52c60be63e71a82" - integrity sha512-P8MPErVO/y8ohWSP9JY7lLQ8+YMHfTI4bAdtCi3pC2hTeqFJco2jYspzOzTUB8hwUWIIu1xwOrJE11nP+0JFAQ== - "@rollup/rollup-linux-x64-gnu@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.2.tgz#4cc3a4f31920bdb028dbfd7ce0e972a17424a63c" integrity sha512-jOG/0nXb3z+EM6SioY8RofqqmZ+9NKYvJ6QQaa9Mvd3RQxlH68/jcB/lpyVt4lCiqr04IyaC34NzhUqcXbB5FQ== -"@rollup/rollup-linux-x64-gnu@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.4.tgz#e473de5e4acb95fcf930a35cbb7d3e8080e57a6f" - integrity sha512-K03TljaaoPK5FOyNMZAAEmhlyO49LaE4qCsr0lYHUKyb6QacTNF9pnfPpXnFlFD3TXuFbFbz7tJ51FujUXkXYA== - "@rollup/rollup-linux-x64-musl@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.2.tgz#59800e26c538517ee05f4645315d9e1aded93200" integrity sha512-XAo7cJec80NWx9LlZFEJQxqKOMz/lX3geWs2iNT5CHIERLFfd90f3RYLLjiCBm1IMaQ4VOX/lTC9lWfzzQm14Q== -"@rollup/rollup-linux-x64-musl@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.4.tgz#0af12dd2578c29af4037f0c834b4321429dd5b01" - integrity sha512-VJYl4xSl/wqG2D5xTYncVWW+26ICV4wubwN9Gs5NrqhJtayikwCXzPL8GDsLnaLU3WwhQ8W02IinYSFJfyo34Q== - "@rollup/rollup-win32-arm64-msvc@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.2.tgz#c80e2c33c952b6b171fa6ad9a97dfbb2e4ebee44" integrity sha512-A+JAs4+EhsTjnPQvo9XY/DC0ztaws3vfqzrMNMKlwQXuniBKOIIvAAI8M0fBYiTCxQnElYu7mLk7JrhlQ+HeOw== -"@rollup/rollup-win32-arm64-msvc@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.4.tgz#e48e78cdd45313b977c1390f4bfde7ab79be8871" - integrity sha512-ku2GvtPwQfCqoPFIJCqZ8o7bJcj+Y54cZSr43hHca6jLwAiCbZdBUOrqE6y29QFajNAzzpIOwsckaTFmN6/8TA== - "@rollup/rollup-win32-ia32-msvc@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.2.tgz#a1e9d275cb16f6d5feb9c20aee7e897b1e193359" integrity sha512-ZhcrakbqA1SCiJRMKSU64AZcYzlZ/9M5LaYil9QWxx9vLnkQ9Vnkve17Qn4SjlipqIIBFKjBES6Zxhnvh0EAEw== -"@rollup/rollup-win32-ia32-msvc@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.4.tgz#a3fc8536d243fe161c796acb93eba43c250f311c" - integrity sha512-V3nCe+eTt/W6UYNr/wGvO1fLpHUrnlirlypZfKCT1fG6hWfqhPgQV/K/mRBXBpxc0eKLIF18pIOFVPh0mqHjlg== - "@rollup/rollup-win32-x64-msvc@4.24.2": version "4.24.2" resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.2.tgz#0610af0fb8fec52be779d5b163bbbd6930150467" integrity sha512-2mLH46K1u3r6uwc95hU+OR9q/ggYMpnS7pSp83Ece1HUQgF9Nh/QwTK5rcgbFnV9j+08yBrU5sA/P0RK2MSBNA== -"@rollup/rollup-win32-x64-msvc@4.24.4": - version "4.24.4" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.4.tgz#e2a9d1fd56524103a6cc8a54404d9d3ebc73c454" - integrity sha512-LTw1Dfd0mBIEqUVCxbvTE/LLo+9ZxVC9k99v1v4ahg9Aak6FpqOfNu5kRkeTAn0wphoC4JU7No1/rL+bBCEwhg== - "@schematics/angular@14.2.13": version "14.2.13" resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-14.2.13.tgz#35ee9120a3ac07077bad169fa74fdf4ce4e193d7" @@ -28258,33 +28168,6 @@ rollup@^4.13.0, rollup@^4.18.0, rollup@^4.20.0, rollup@^4.24.2: "@rollup/rollup-win32-x64-msvc" "4.24.2" fsevents "~2.3.2" -rollup@^4.24.4: - version "4.24.4" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.24.4.tgz#fdc76918de02213c95447c9ffff5e35dddb1d058" - integrity sha512-vGorVWIsWfX3xbcyAS+I047kFKapHYivmkaT63Smj77XwvLSJos6M1xGqZnBPFQFBRZDOcG1QnYEIxAvTr/HjA== - dependencies: - "@types/estree" "1.0.6" - optionalDependencies: - "@rollup/rollup-android-arm-eabi" "4.24.4" - "@rollup/rollup-android-arm64" "4.24.4" - "@rollup/rollup-darwin-arm64" "4.24.4" - "@rollup/rollup-darwin-x64" "4.24.4" - "@rollup/rollup-freebsd-arm64" "4.24.4" - "@rollup/rollup-freebsd-x64" "4.24.4" - "@rollup/rollup-linux-arm-gnueabihf" "4.24.4" - "@rollup/rollup-linux-arm-musleabihf" "4.24.4" - "@rollup/rollup-linux-arm64-gnu" "4.24.4" - "@rollup/rollup-linux-arm64-musl" "4.24.4" - "@rollup/rollup-linux-powerpc64le-gnu" "4.24.4" - "@rollup/rollup-linux-riscv64-gnu" "4.24.4" - "@rollup/rollup-linux-s390x-gnu" "4.24.4" - "@rollup/rollup-linux-x64-gnu" "4.24.4" - "@rollup/rollup-linux-x64-musl" "4.24.4" - "@rollup/rollup-win32-arm64-msvc" "4.24.4" - "@rollup/rollup-win32-ia32-msvc" "4.24.4" - "@rollup/rollup-win32-x64-msvc" "4.24.4" - fsevents "~2.3.2" - rrweb-cssom@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"