Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions packages/sveltekit/src/vite/detectAdapter.ts
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,63 @@
import type { Package } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
import type { BackwardsForwardsCompatibleSvelteConfig } from './svelteConfig';

/**
* Supported @sveltejs/adapters-[adapter] SvelteKit adapters
*/
export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'cloudflare' | 'other';

/** Maps adapter.name from svelte.config.js to our SupportedSvelteKitAdapters */
const ADAPTER_NAME_MAP: Record<string, SupportedSvelteKitAdapters> = {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also netflify and static – do we need these? https://svelte.dev/docs/kit/adapters

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not supported at the moment, so I'd rather avoid it (for now)

'@sveltejs/adapter-vercel': 'vercel',
'@sveltejs/adapter-node': 'node',
'@sveltejs/adapter-cloudflare': 'cloudflare',
// adapter-auto is intentionally the last entry here because it's installed by default
// many users don't remove it when installing a new adapter, so we need to make sure
// it's detected last when doing the package.json based detection.
'@sveltejs/adapter-auto': 'auto',
};

/**
* Tries to detect the used adapter for SvelteKit by looking at the dependencies.
* returns the name of the adapter or 'other' if no supported adapter was found.
* Tries to detect the used adapter for SvelteKit.
* 1. If svelteConfig is provided and has kit.adapter.name, uses that (source of truth from svelte.config.js).
* 2. Otherwise falls back to inferring from package.json dependencies.
* Returns the name of the adapter or 'other' if no supported adapter was found.
*
* @param svelteConfig - Loaded svelte config (e.g. from loadSvelteConfig()). Pass `undefined` to skip config-based detection.
* @param debug - Whether to log detection result. Pass `undefined` for false.
*/
export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKitAdapters> {
const pkgJson = await loadPackageJson();
export async function detectAdapter(
svelteConfig: BackwardsForwardsCompatibleSvelteConfig | undefined,
debug: boolean | undefined,
): Promise<SupportedSvelteKitAdapters> {
const adapterName = svelteConfig?.kit?.adapter?.name;
if (adapterName && typeof adapterName === 'string') {
const mapped = ADAPTER_NAME_MAP[adapterName];
if (mapped) {
if (debug) {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${mapped} adapter from \`svelte.config.js\``);
}
return mapped;
}
// We found an adapter name but it's not in our supported list -> return 'other'
// svelte.config.js is the source of truth, so we don't need to fall back to package.json.
if (debug) {
// eslint-disable-next-line no-console
console.warn(
`[Sentry SvelteKit Plugin] Detected unsupported adapter name ${adapterName} in \`svelte.config.js\`. Please set the 'adapter' option manually`,
);
}
return 'other';
}

const pkgJson = await loadPackageJson();
const allDependencies = pkgJson ? { ...pkgJson.dependencies, ...pkgJson.devDependencies } : {};

let adapter: SupportedSvelteKitAdapters = 'other';
if (allDependencies['@sveltejs/adapter-vercel']) {
adapter = 'vercel';
} else if (allDependencies['@sveltejs/adapter-node']) {
adapter = 'node';
} else if (allDependencies['@sveltejs/adapter-cloudflare']) {
adapter = 'cloudflare';
} else if (allDependencies['@sveltejs/adapter-auto']) {
adapter = 'auto';
}
const adapterPackage = Object.keys(ADAPTER_NAME_MAP).find(key => allDependencies[key]);
const adapter = (adapterPackage && ADAPTER_NAME_MAP[adapterPackage]) || 'other';

if (debug) {
if (adapter === 'other') {
Expand All@@ -35,7 +67,7 @@ export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKit
);
} else {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter`);
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter from \`package.json\``);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/sveltekit/src/vite/sentryVitePlugins.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,14 @@ const DEFAULT_PLUGIN_OPTIONS: SentrySvelteKitPluginOptions = {
* Make sure, it is registered before the SvelteKit plugin.
*/
export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}): Promise<Plugin[]> {
const svelteConfig = await loadSvelteConfig();

const mergedOptions = {
...DEFAULT_PLUGIN_OPTIONS,
...options,
adapter: options.adapter || (await detectAdapter(options.debug)),
adapter: options.adapter || (await detectAdapter(svelteConfig, options.debug)),
};

const svelteConfig = await loadSvelteConfig();

const sentryPlugins: Plugin[] = [];

if (mergedOptions.autoInstrument) {
Expand Down
142 changes: 96 additions & 46 deletions packages/sveltekit/test/vite/detectAdapter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,14 @@ import { detectAdapter } from '../../src/vite/detectAdapter';
let existsFile = true;
const pkgJson = {
dependencies: {} as Record<string, string>,
devDependencies: {} as Record<string, string>,
};
describe('detectAdapter', () => {
beforeEach(() => {
existsFile = true;
vi.clearAllMocks();
pkgJson.dependencies = {};
pkgJson.devDependencies = {};
});

vi.mock('fs', () => {
Expand All@@ -26,57 +28,105 @@ describe('detectAdapter', () => {
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});

it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
});
describe('svelte.config.js (source of truth)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns adapter from kit.adapter.name when provided (adapter %s)',
async adapter => {
const svelteConfig = { kit: { adapter: { name: `@sveltejs/adapter-${adapter}` } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual(adapter);
},
);

it('prefers svelte.config.js over package.json when both are present', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-node' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('node');
});

it('returns "other" when found adapter name in svelte.config.js is unsupported', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
it('logs a warning if in debug mode and an unsupported adapter name is found in svelte.config.js', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
await detectAdapter(svelteConfig, true);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Detected unsupported adapter name'));
});

it('logs "from svelte.config.js" in debug when adapter comes from config', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-vercel' } } };
await detectAdapter(svelteConfig, true);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('from `svelte.config.js`'));
});
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
describe('package.json detection (fallback)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from dependencies and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from devDependencies and logs it to the console',
async adapter => {
pkgJson.devDependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
const detectedAdapter2 = await detectAdapter();
expect(detectedAdapter2).toEqual('node');
delete pkgJson.dependencies['@sveltejs/adapter-node'];
const detectedAdapter3 = await detectAdapter();
expect(detectedAdapter3).toEqual('cloudflare');
it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

expect(await detectAdapter(undefined, undefined)).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
expect(await detectAdapter(undefined, undefined)).toEqual('node');

delete pkgJson.dependencies['@sveltejs/adapter-node'];
expect(await detectAdapter(undefined, undefined)).toEqual('cloudflare');
});
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions packages/sveltekit/src/vite/detectAdapter.ts
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,63 @@
import type { Package } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
import type { BackwardsForwardsCompatibleSvelteConfig } from './svelteConfig';

/**
* Supported @sveltejs/adapters-[adapter] SvelteKit adapters
*/
export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'cloudflare' | 'other';

/** Maps adapter.name from svelte.config.js to our SupportedSvelteKitAdapters */
const ADAPTER_NAME_MAP: Record<string, SupportedSvelteKitAdapters> = {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also netflify and static – do we need these? https://svelte.dev/docs/kit/adapters

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not supported at the moment, so I'd rather avoid it (for now)

'@sveltejs/adapter-vercel': 'vercel',
'@sveltejs/adapter-node': 'node',
'@sveltejs/adapter-cloudflare': 'cloudflare',
// adapter-auto is intentionally the last entry here because it's installed by default
// many users don't remove it when installing a new adapter, so we need to make sure
// it's detected last when doing the package.json based detection.
'@sveltejs/adapter-auto': 'auto',
};

/**
* Tries to detect the used adapter for SvelteKit by looking at the dependencies.
* returns the name of the adapter or 'other' if no supported adapter was found.
* Tries to detect the used adapter for SvelteKit.
* 1. If svelteConfig is provided and has kit.adapter.name, uses that (source of truth from svelte.config.js).
* 2. Otherwise falls back to inferring from package.json dependencies.
* Returns the name of the adapter or 'other' if no supported adapter was found.
*
* @param svelteConfig - Loaded svelte config (e.g. from loadSvelteConfig()). Pass `undefined` to skip config-based detection.
* @param debug - Whether to log detection result. Pass `undefined` for false.
*/
export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKitAdapters> {
const pkgJson = await loadPackageJson();
export async function detectAdapter(
svelteConfig: BackwardsForwardsCompatibleSvelteConfig | undefined,
debug: boolean | undefined,
): Promise<SupportedSvelteKitAdapters> {
const adapterName = svelteConfig?.kit?.adapter?.name;
if (adapterName && typeof adapterName === 'string') {
const mapped = ADAPTER_NAME_MAP[adapterName];
if (mapped) {
if (debug) {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${mapped} adapter from \`svelte.config.js\``);
}
return mapped;
}
// We found an adapter name but it's not in our supported list -> return 'other'
// svelte.config.js is the source of truth, so we don't need to fall back to package.json.
if (debug) {
// eslint-disable-next-line no-console
console.warn(
`[Sentry SvelteKit Plugin] Detected unsupported adapter name ${adapterName} in \`svelte.config.js\`. Please set the 'adapter' option manually`,
);
}
return 'other';
}

const pkgJson = await loadPackageJson();
const allDependencies = pkgJson ? { ...pkgJson.dependencies, ...pkgJson.devDependencies } : {};

let adapter: SupportedSvelteKitAdapters = 'other';
if (allDependencies['@sveltejs/adapter-vercel']) {
adapter = 'vercel';
} else if (allDependencies['@sveltejs/adapter-node']) {
adapter = 'node';
} else if (allDependencies['@sveltejs/adapter-cloudflare']) {
adapter = 'cloudflare';
} else if (allDependencies['@sveltejs/adapter-auto']) {
adapter = 'auto';
}
const adapterPackage = Object.keys(ADAPTER_NAME_MAP).find(key => allDependencies[key]);
const adapter = (adapterPackage && ADAPTER_NAME_MAP[adapterPackage]) || 'other';

if (debug) {
if (adapter === 'other') {
Expand All@@ -35,7 +67,7 @@ export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKit
);
} else {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter`);
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter from \`package.json\``);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/sveltekit/src/vite/sentryVitePlugins.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,14 @@ const DEFAULT_PLUGIN_OPTIONS: SentrySvelteKitPluginOptions = {
* Make sure, it is registered before the SvelteKit plugin.
*/
export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}): Promise<Plugin[]> {
const svelteConfig = await loadSvelteConfig();

const mergedOptions = {
...DEFAULT_PLUGIN_OPTIONS,
...options,
adapter: options.adapter || (await detectAdapter(options.debug)),
adapter: options.adapter || (await detectAdapter(svelteConfig, options.debug)),
};

const svelteConfig = await loadSvelteConfig();

const sentryPlugins: Plugin[] = [];

if (mergedOptions.autoInstrument) {
Expand Down
142 changes: 96 additions & 46 deletions packages/sveltekit/test/vite/detectAdapter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,14 @@ import { detectAdapter } from '../../src/vite/detectAdapter';
let existsFile = true;
const pkgJson = {
dependencies: {} as Record<string, string>,
devDependencies: {} as Record<string, string>,
};
describe('detectAdapter', () => {
beforeEach(() => {
existsFile = true;
vi.clearAllMocks();
pkgJson.dependencies = {};
pkgJson.devDependencies = {};
});

vi.mock('fs', () => {
Expand All@@ -26,57 +28,105 @@ describe('detectAdapter', () => {
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});

it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
});
describe('svelte.config.js (source of truth)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns adapter from kit.adapter.name when provided (adapter %s)',
async adapter => {
const svelteConfig = { kit: { adapter: { name: `@sveltejs/adapter-${adapter}` } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual(adapter);
},
);

it('prefers svelte.config.js over package.json when both are present', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-node' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('node');
});

it('returns "other" when found adapter name in svelte.config.js is unsupported', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
it('logs a warning if in debug mode and an unsupported adapter name is found in svelte.config.js', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
await detectAdapter(svelteConfig, true);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Detected unsupported adapter name'));
});

it('logs "from svelte.config.js" in debug when adapter comes from config', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-vercel' } } };
await detectAdapter(svelteConfig, true);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('from `svelte.config.js`'));
});
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
describe('package.json detection (fallback)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from dependencies and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from devDependencies and logs it to the console',
async adapter => {
pkgJson.devDependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
const detectedAdapter2 = await detectAdapter();
expect(detectedAdapter2).toEqual('node');
delete pkgJson.dependencies['@sveltejs/adapter-node'];
const detectedAdapter3 = await detectAdapter();
expect(detectedAdapter3).toEqual('cloudflare');
it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

expect(await detectAdapter(undefined, undefined)).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
expect(await detectAdapter(undefined, undefined)).toEqual('node');

delete pkgJson.dependencies['@sveltejs/adapter-node'];
expect(await detectAdapter(undefined, undefined)).toEqual('cloudflare');
});
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions packages/sveltekit/src/vite/detectAdapter.ts
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,63 @@
import type { Package } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
import type { BackwardsForwardsCompatibleSvelteConfig } from './svelteConfig';

/**
* Supported @sveltejs/adapters-[adapter] SvelteKit adapters
*/
export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'cloudflare' | 'other';

/** Maps adapter.name from svelte.config.js to our SupportedSvelteKitAdapters */
const ADAPTER_NAME_MAP: Record<string, SupportedSvelteKitAdapters> = {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also netflify and static – do we need these? https://svelte.dev/docs/kit/adapters

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not supported at the moment, so I'd rather avoid it (for now)

'@sveltejs/adapter-vercel': 'vercel',
'@sveltejs/adapter-node': 'node',
'@sveltejs/adapter-cloudflare': 'cloudflare',
// adapter-auto is intentionally the last entry here because it's installed by default
// many users don't remove it when installing a new adapter, so we need to make sure
// it's detected last when doing the package.json based detection.
'@sveltejs/adapter-auto': 'auto',
};

/**
* Tries to detect the used adapter for SvelteKit by looking at the dependencies.
* returns the name of the adapter or 'other' if no supported adapter was found.
* Tries to detect the used adapter for SvelteKit.
* 1. If svelteConfig is provided and has kit.adapter.name, uses that (source of truth from svelte.config.js).
* 2. Otherwise falls back to inferring from package.json dependencies.
* Returns the name of the adapter or 'other' if no supported adapter was found.
*
* @param svelteConfig - Loaded svelte config (e.g. from loadSvelteConfig()). Pass `undefined` to skip config-based detection.
* @param debug - Whether to log detection result. Pass `undefined` for false.
*/
export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKitAdapters> {
const pkgJson = await loadPackageJson();
export async function detectAdapter(
svelteConfig: BackwardsForwardsCompatibleSvelteConfig | undefined,
debug: boolean | undefined,
): Promise<SupportedSvelteKitAdapters> {
const adapterName = svelteConfig?.kit?.adapter?.name;
if (adapterName && typeof adapterName === 'string') {
const mapped = ADAPTER_NAME_MAP[adapterName];
if (mapped) {
if (debug) {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${mapped} adapter from \`svelte.config.js\``);
}
return mapped;
}
// We found an adapter name but it's not in our supported list -> return 'other'
// svelte.config.js is the source of truth, so we don't need to fall back to package.json.
if (debug) {
// eslint-disable-next-line no-console
console.warn(
`[Sentry SvelteKit Plugin] Detected unsupported adapter name ${adapterName} in \`svelte.config.js\`. Please set the 'adapter' option manually`,
);
}
return 'other';
}

const pkgJson = await loadPackageJson();
const allDependencies = pkgJson ? { ...pkgJson.dependencies, ...pkgJson.devDependencies } : {};

let adapter: SupportedSvelteKitAdapters = 'other';
if (allDependencies['@sveltejs/adapter-vercel']) {
adapter = 'vercel';
} else if (allDependencies['@sveltejs/adapter-node']) {
adapter = 'node';
} else if (allDependencies['@sveltejs/adapter-cloudflare']) {
adapter = 'cloudflare';
} else if (allDependencies['@sveltejs/adapter-auto']) {
adapter = 'auto';
}
const adapterPackage = Object.keys(ADAPTER_NAME_MAP).find(key => allDependencies[key]);
const adapter = (adapterPackage && ADAPTER_NAME_MAP[adapterPackage]) || 'other';

if (debug) {
if (adapter === 'other') {
Expand All@@ -35,7 +67,7 @@ export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKit
);
} else {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter`);
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter from \`package.json\``);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/sveltekit/src/vite/sentryVitePlugins.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,14 @@ const DEFAULT_PLUGIN_OPTIONS: SentrySvelteKitPluginOptions = {
* Make sure, it is registered before the SvelteKit plugin.
*/
export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}): Promise<Plugin[]> {
const svelteConfig = await loadSvelteConfig();

const mergedOptions = {
...DEFAULT_PLUGIN_OPTIONS,
...options,
adapter: options.adapter || (await detectAdapter(options.debug)),
adapter: options.adapter || (await detectAdapter(svelteConfig, options.debug)),
};

const svelteConfig = await loadSvelteConfig();

const sentryPlugins: Plugin[] = [];

if (mergedOptions.autoInstrument) {
Expand Down
142 changes: 96 additions & 46 deletions packages/sveltekit/test/vite/detectAdapter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,14 @@ import { detectAdapter } from '../../src/vite/detectAdapter';
let existsFile = true;
const pkgJson = {
dependencies: {} as Record<string, string>,
devDependencies: {} as Record<string, string>,
};
describe('detectAdapter', () => {
beforeEach(() => {
existsFile = true;
vi.clearAllMocks();
pkgJson.dependencies = {};
pkgJson.devDependencies = {};
});

vi.mock('fs', () => {
Expand All@@ -26,57 +28,105 @@ describe('detectAdapter', () => {
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});

it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
});
describe('svelte.config.js (source of truth)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns adapter from kit.adapter.name when provided (adapter %s)',
async adapter => {
const svelteConfig = { kit: { adapter: { name: `@sveltejs/adapter-${adapter}` } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual(adapter);
},
);

it('prefers svelte.config.js over package.json when both are present', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-node' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('node');
});

it('returns "other" when found adapter name in svelte.config.js is unsupported', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
it('logs a warning if in debug mode and an unsupported adapter name is found in svelte.config.js', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
await detectAdapter(svelteConfig, true);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Detected unsupported adapter name'));
});

it('logs "from svelte.config.js" in debug when adapter comes from config', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-vercel' } } };
await detectAdapter(svelteConfig, true);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('from `svelte.config.js`'));
});
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
describe('package.json detection (fallback)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from dependencies and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from devDependencies and logs it to the console',
async adapter => {
pkgJson.devDependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
const detectedAdapter2 = await detectAdapter();
expect(detectedAdapter2).toEqual('node');
delete pkgJson.dependencies['@sveltejs/adapter-node'];
const detectedAdapter3 = await detectAdapter();
expect(detectedAdapter3).toEqual('cloudflare');
it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

expect(await detectAdapter(undefined, undefined)).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
expect(await detectAdapter(undefined, undefined)).toEqual('node');

delete pkgJson.dependencies['@sveltejs/adapter-node'];
expect(await detectAdapter(undefined, undefined)).toEqual('cloudflare');
});
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions packages/sveltekit/src/vite/detectAdapter.ts
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,63 @@
import type { Package } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
import type { BackwardsForwardsCompatibleSvelteConfig } from './svelteConfig';

/**
* Supported @sveltejs/adapters-[adapter] SvelteKit adapters
*/
export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'cloudflare' | 'other';

/** Maps adapter.name from svelte.config.js to our SupportedSvelteKitAdapters */
const ADAPTER_NAME_MAP: Record<string, SupportedSvelteKitAdapters> = {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also netflify and static – do we need these? https://svelte.dev/docs/kit/adapters

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not supported at the moment, so I'd rather avoid it (for now)

'@sveltejs/adapter-vercel': 'vercel',
'@sveltejs/adapter-node': 'node',
'@sveltejs/adapter-cloudflare': 'cloudflare',
// adapter-auto is intentionally the last entry here because it's installed by default
// many users don't remove it when installing a new adapter, so we need to make sure
// it's detected last when doing the package.json based detection.
'@sveltejs/adapter-auto': 'auto',
};

/**
* Tries to detect the used adapter for SvelteKit by looking at the dependencies.
* returns the name of the adapter or 'other' if no supported adapter was found.
* Tries to detect the used adapter for SvelteKit.
* 1. If svelteConfig is provided and has kit.adapter.name, uses that (source of truth from svelte.config.js).
* 2. Otherwise falls back to inferring from package.json dependencies.
* Returns the name of the adapter or 'other' if no supported adapter was found.
*
* @param svelteConfig - Loaded svelte config (e.g. from loadSvelteConfig()). Pass `undefined` to skip config-based detection.
* @param debug - Whether to log detection result. Pass `undefined` for false.
*/
export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKitAdapters> {
const pkgJson = await loadPackageJson();
export async function detectAdapter(
svelteConfig: BackwardsForwardsCompatibleSvelteConfig | undefined,
debug: boolean | undefined,
): Promise<SupportedSvelteKitAdapters> {
const adapterName = svelteConfig?.kit?.adapter?.name;
if (adapterName && typeof adapterName === 'string') {
const mapped = ADAPTER_NAME_MAP[adapterName];
if (mapped) {
if (debug) {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${mapped} adapter from \`svelte.config.js\``);
}
return mapped;
}
// We found an adapter name but it's not in our supported list -> return 'other'
// svelte.config.js is the source of truth, so we don't need to fall back to package.json.
if (debug) {
// eslint-disable-next-line no-console
console.warn(
`[Sentry SvelteKit Plugin] Detected unsupported adapter name ${adapterName} in \`svelte.config.js\`. Please set the 'adapter' option manually`,
);
}
return 'other';
}

const pkgJson = await loadPackageJson();
const allDependencies = pkgJson ? { ...pkgJson.dependencies, ...pkgJson.devDependencies } : {};

let adapter: SupportedSvelteKitAdapters = 'other';
if (allDependencies['@sveltejs/adapter-vercel']) {
adapter = 'vercel';
} else if (allDependencies['@sveltejs/adapter-node']) {
adapter = 'node';
} else if (allDependencies['@sveltejs/adapter-cloudflare']) {
adapter = 'cloudflare';
} else if (allDependencies['@sveltejs/adapter-auto']) {
adapter = 'auto';
}
const adapterPackage = Object.keys(ADAPTER_NAME_MAP).find(key => allDependencies[key]);
const adapter = (adapterPackage && ADAPTER_NAME_MAP[adapterPackage]) || 'other';

if (debug) {
if (adapter === 'other') {
Expand All@@ -35,7 +67,7 @@ export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKit
);
} else {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter`);
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter from \`package.json\``);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/sveltekit/src/vite/sentryVitePlugins.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,14 @@ const DEFAULT_PLUGIN_OPTIONS: SentrySvelteKitPluginOptions = {
* Make sure, it is registered before the SvelteKit plugin.
*/
export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}): Promise<Plugin[]> {
const svelteConfig = await loadSvelteConfig();

const mergedOptions = {
...DEFAULT_PLUGIN_OPTIONS,
...options,
adapter: options.adapter || (await detectAdapter(options.debug)),
adapter: options.adapter || (await detectAdapter(svelteConfig, options.debug)),
};

const svelteConfig = await loadSvelteConfig();

const sentryPlugins: Plugin[] = [];

if (mergedOptions.autoInstrument) {
Expand Down
142 changes: 96 additions & 46 deletions packages/sveltekit/test/vite/detectAdapter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,14 @@ import { detectAdapter } from '../../src/vite/detectAdapter';
let existsFile = true;
const pkgJson = {
dependencies: {} as Record<string, string>,
devDependencies: {} as Record<string, string>,
};
describe('detectAdapter', () => {
beforeEach(() => {
existsFile = true;
vi.clearAllMocks();
pkgJson.dependencies = {};
pkgJson.devDependencies = {};
});

vi.mock('fs', () => {
Expand All@@ -26,57 +28,105 @@ describe('detectAdapter', () => {
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});

it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
});
describe('svelte.config.js (source of truth)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns adapter from kit.adapter.name when provided (adapter %s)',
async adapter => {
const svelteConfig = { kit: { adapter: { name: `@sveltejs/adapter-${adapter}` } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual(adapter);
},
);

it('prefers svelte.config.js over package.json when both are present', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-node' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('node');
});

it('returns "other" when found adapter name in svelte.config.js is unsupported', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
it('logs a warning if in debug mode and an unsupported adapter name is found in svelte.config.js', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
await detectAdapter(svelteConfig, true);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Detected unsupported adapter name'));
});

it('logs "from svelte.config.js" in debug when adapter comes from config', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-vercel' } } };
await detectAdapter(svelteConfig, true);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('from `svelte.config.js`'));
});
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
describe('package.json detection (fallback)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from dependencies and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from devDependencies and logs it to the console',
async adapter => {
pkgJson.devDependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
const detectedAdapter2 = await detectAdapter();
expect(detectedAdapter2).toEqual('node');
delete pkgJson.dependencies['@sveltejs/adapter-node'];
const detectedAdapter3 = await detectAdapter();
expect(detectedAdapter3).toEqual('cloudflare');
it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

expect(await detectAdapter(undefined, undefined)).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
expect(await detectAdapter(undefined, undefined)).toEqual('node');

delete pkgJson.dependencies['@sveltejs/adapter-node'];
expect(await detectAdapter(undefined, undefined)).toEqual('cloudflare');
});
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions packages/sveltekit/src/vite/detectAdapter.ts
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,63 @@
import type { Package } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
import type { BackwardsForwardsCompatibleSvelteConfig } from './svelteConfig';

/**
* Supported @sveltejs/adapters-[adapter] SvelteKit adapters
*/
export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'cloudflare' | 'other';

/** Maps adapter.name from svelte.config.js to our SupportedSvelteKitAdapters */
const ADAPTER_NAME_MAP: Record<string, SupportedSvelteKitAdapters> = {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also netflify and static – do we need these? https://svelte.dev/docs/kit/adapters

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not supported at the moment, so I'd rather avoid it (for now)

'@sveltejs/adapter-vercel': 'vercel',
'@sveltejs/adapter-node': 'node',
'@sveltejs/adapter-cloudflare': 'cloudflare',
// adapter-auto is intentionally the last entry here because it's installed by default
// many users don't remove it when installing a new adapter, so we need to make sure
// it's detected last when doing the package.json based detection.
'@sveltejs/adapter-auto': 'auto',
};

/**
* Tries to detect the used adapter for SvelteKit by looking at the dependencies.
* returns the name of the adapter or 'other' if no supported adapter was found.
* Tries to detect the used adapter for SvelteKit.
* 1. If svelteConfig is provided and has kit.adapter.name, uses that (source of truth from svelte.config.js).
* 2. Otherwise falls back to inferring from package.json dependencies.
* Returns the name of the adapter or 'other' if no supported adapter was found.
*
* @param svelteConfig - Loaded svelte config (e.g. from loadSvelteConfig()). Pass `undefined` to skip config-based detection.
* @param debug - Whether to log detection result. Pass `undefined` for false.
*/
export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKitAdapters> {
const pkgJson = await loadPackageJson();
export async function detectAdapter(
svelteConfig: BackwardsForwardsCompatibleSvelteConfig | undefined,
debug: boolean | undefined,
): Promise<SupportedSvelteKitAdapters> {
const adapterName = svelteConfig?.kit?.adapter?.name;
if (adapterName && typeof adapterName === 'string') {
const mapped = ADAPTER_NAME_MAP[adapterName];
if (mapped) {
if (debug) {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${mapped} adapter from \`svelte.config.js\``);
}
return mapped;
}
// We found an adapter name but it's not in our supported list -> return 'other'
// svelte.config.js is the source of truth, so we don't need to fall back to package.json.
if (debug) {
// eslint-disable-next-line no-console
console.warn(
`[Sentry SvelteKit Plugin] Detected unsupported adapter name ${adapterName} in \`svelte.config.js\`. Please set the 'adapter' option manually`,
);
}
return 'other';
}

const pkgJson = await loadPackageJson();
const allDependencies = pkgJson ? { ...pkgJson.dependencies, ...pkgJson.devDependencies } : {};

let adapter: SupportedSvelteKitAdapters = 'other';
if (allDependencies['@sveltejs/adapter-vercel']) {
adapter = 'vercel';
} else if (allDependencies['@sveltejs/adapter-node']) {
adapter = 'node';
} else if (allDependencies['@sveltejs/adapter-cloudflare']) {
adapter = 'cloudflare';
} else if (allDependencies['@sveltejs/adapter-auto']) {
adapter = 'auto';
}
const adapterPackage = Object.keys(ADAPTER_NAME_MAP).find(key => allDependencies[key]);
const adapter = (adapterPackage && ADAPTER_NAME_MAP[adapterPackage]) || 'other';

if (debug) {
if (adapter === 'other') {
Expand All@@ -35,7 +67,7 @@ export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKit
);
} else {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter`);
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter from \`package.json\``);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/sveltekit/src/vite/sentryVitePlugins.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,14 @@ const DEFAULT_PLUGIN_OPTIONS: SentrySvelteKitPluginOptions = {
* Make sure, it is registered before the SvelteKit plugin.
*/
export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}): Promise<Plugin[]> {
const svelteConfig = await loadSvelteConfig();

const mergedOptions = {
...DEFAULT_PLUGIN_OPTIONS,
...options,
adapter: options.adapter || (await detectAdapter(options.debug)),
adapter: options.adapter || (await detectAdapter(svelteConfig, options.debug)),
};

const svelteConfig = await loadSvelteConfig();

const sentryPlugins: Plugin[] = [];

if (mergedOptions.autoInstrument) {
Expand Down
142 changes: 96 additions & 46 deletions packages/sveltekit/test/vite/detectAdapter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,14 @@ import { detectAdapter } from '../../src/vite/detectAdapter';
let existsFile = true;
const pkgJson = {
dependencies: {} as Record<string, string>,
devDependencies: {} as Record<string, string>,
};
describe('detectAdapter', () => {
beforeEach(() => {
existsFile = true;
vi.clearAllMocks();
pkgJson.dependencies = {};
pkgJson.devDependencies = {};
});

vi.mock('fs', () => {
Expand All@@ -26,57 +28,105 @@ describe('detectAdapter', () => {
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});

it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
});
describe('svelte.config.js (source of truth)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns adapter from kit.adapter.name when provided (adapter %s)',
async adapter => {
const svelteConfig = { kit: { adapter: { name: `@sveltejs/adapter-${adapter}` } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual(adapter);
},
);

it('prefers svelte.config.js over package.json when both are present', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-node' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('node');
});

it('returns "other" when found adapter name in svelte.config.js is unsupported', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
it('logs a warning if in debug mode and an unsupported adapter name is found in svelte.config.js', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
await detectAdapter(svelteConfig, true);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Detected unsupported adapter name'));
});

it('logs "from svelte.config.js" in debug when adapter comes from config', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-vercel' } } };
await detectAdapter(svelteConfig, true);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('from `svelte.config.js`'));
});
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
describe('package.json detection (fallback)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from dependencies and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from devDependencies and logs it to the console',
async adapter => {
pkgJson.devDependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
const detectedAdapter2 = await detectAdapter();
expect(detectedAdapter2).toEqual('node');
delete pkgJson.dependencies['@sveltejs/adapter-node'];
const detectedAdapter3 = await detectAdapter();
expect(detectedAdapter3).toEqual('cloudflare');
it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

expect(await detectAdapter(undefined, undefined)).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
expect(await detectAdapter(undefined, undefined)).toEqual('node');

delete pkgJson.dependencies['@sveltejs/adapter-node'];
expect(await detectAdapter(undefined, undefined)).toEqual('cloudflare');
});
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions packages/sveltekit/src/vite/detectAdapter.ts
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,63 @@
import type { Package } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
import type { BackwardsForwardsCompatibleSvelteConfig } from './svelteConfig';

/**
* Supported @sveltejs/adapters-[adapter] SvelteKit adapters
*/
export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'cloudflare' | 'other';

/** Maps adapter.name from svelte.config.js to our SupportedSvelteKitAdapters */
const ADAPTER_NAME_MAP: Record<string, SupportedSvelteKitAdapters> = {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also netflify and static – do we need these? https://svelte.dev/docs/kit/adapters

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not supported at the moment, so I'd rather avoid it (for now)

'@sveltejs/adapter-vercel': 'vercel',
'@sveltejs/adapter-node': 'node',
'@sveltejs/adapter-cloudflare': 'cloudflare',
// adapter-auto is intentionally the last entry here because it's installed by default
// many users don't remove it when installing a new adapter, so we need to make sure
// it's detected last when doing the package.json based detection.
'@sveltejs/adapter-auto': 'auto',
};

/**
* Tries to detect the used adapter for SvelteKit by looking at the dependencies.
* returns the name of the adapter or 'other' if no supported adapter was found.
* Tries to detect the used adapter for SvelteKit.
* 1. If svelteConfig is provided and has kit.adapter.name, uses that (source of truth from svelte.config.js).
* 2. Otherwise falls back to inferring from package.json dependencies.
* Returns the name of the adapter or 'other' if no supported adapter was found.
*
* @param svelteConfig - Loaded svelte config (e.g. from loadSvelteConfig()). Pass `undefined` to skip config-based detection.
* @param debug - Whether to log detection result. Pass `undefined` for false.
*/
export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKitAdapters> {
const pkgJson = await loadPackageJson();
export async function detectAdapter(
svelteConfig: BackwardsForwardsCompatibleSvelteConfig | undefined,
debug: boolean | undefined,
): Promise<SupportedSvelteKitAdapters> {
const adapterName = svelteConfig?.kit?.adapter?.name;
if (adapterName && typeof adapterName === 'string') {
const mapped = ADAPTER_NAME_MAP[adapterName];
if (mapped) {
if (debug) {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${mapped} adapter from \`svelte.config.js\``);
}
return mapped;
}
// We found an adapter name but it's not in our supported list -> return 'other'
// svelte.config.js is the source of truth, so we don't need to fall back to package.json.
if (debug) {
// eslint-disable-next-line no-console
console.warn(
`[Sentry SvelteKit Plugin] Detected unsupported adapter name ${adapterName} in \`svelte.config.js\`. Please set the 'adapter' option manually`,
);
}
return 'other';
}

const pkgJson = await loadPackageJson();
const allDependencies = pkgJson ? { ...pkgJson.dependencies, ...pkgJson.devDependencies } : {};

let adapter: SupportedSvelteKitAdapters = 'other';
if (allDependencies['@sveltejs/adapter-vercel']) {
adapter = 'vercel';
} else if (allDependencies['@sveltejs/adapter-node']) {
adapter = 'node';
} else if (allDependencies['@sveltejs/adapter-cloudflare']) {
adapter = 'cloudflare';
} else if (allDependencies['@sveltejs/adapter-auto']) {
adapter = 'auto';
}
const adapterPackage = Object.keys(ADAPTER_NAME_MAP).find(key => allDependencies[key]);
const adapter = (adapterPackage && ADAPTER_NAME_MAP[adapterPackage]) || 'other';

if (debug) {
if (adapter === 'other') {
Expand All@@ -35,7 +67,7 @@ export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKit
);
} else {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter`);
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter from \`package.json\``);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/sveltekit/src/vite/sentryVitePlugins.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,14 @@ const DEFAULT_PLUGIN_OPTIONS: SentrySvelteKitPluginOptions = {
* Make sure, it is registered before the SvelteKit plugin.
*/
export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}): Promise<Plugin[]> {
const svelteConfig = await loadSvelteConfig();

const mergedOptions = {
...DEFAULT_PLUGIN_OPTIONS,
...options,
adapter: options.adapter || (await detectAdapter(options.debug)),
adapter: options.adapter || (await detectAdapter(svelteConfig, options.debug)),
};

const svelteConfig = await loadSvelteConfig();

const sentryPlugins: Plugin[] = [];

if (mergedOptions.autoInstrument) {
Expand Down
142 changes: 96 additions & 46 deletions packages/sveltekit/test/vite/detectAdapter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,14 @@ import { detectAdapter } from '../../src/vite/detectAdapter';
let existsFile = true;
const pkgJson = {
dependencies: {} as Record<string, string>,
devDependencies: {} as Record<string, string>,
};
describe('detectAdapter', () => {
beforeEach(() => {
existsFile = true;
vi.clearAllMocks();
pkgJson.dependencies = {};
pkgJson.devDependencies = {};
});

vi.mock('fs', () => {
Expand All@@ -26,57 +28,105 @@ describe('detectAdapter', () => {
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});

it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
});
describe('svelte.config.js (source of truth)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns adapter from kit.adapter.name when provided (adapter %s)',
async adapter => {
const svelteConfig = { kit: { adapter: { name: `@sveltejs/adapter-${adapter}` } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual(adapter);
},
);

it('prefers svelte.config.js over package.json when both are present', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-node' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('node');
});

it('returns "other" when found adapter name in svelte.config.js is unsupported', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
it('logs a warning if in debug mode and an unsupported adapter name is found in svelte.config.js', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
await detectAdapter(svelteConfig, true);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Detected unsupported adapter name'));
});

it('logs "from svelte.config.js" in debug when adapter comes from config', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-vercel' } } };
await detectAdapter(svelteConfig, true);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('from `svelte.config.js`'));
});
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
describe('package.json detection (fallback)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from dependencies and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from devDependencies and logs it to the console',
async adapter => {
pkgJson.devDependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
const detectedAdapter2 = await detectAdapter();
expect(detectedAdapter2).toEqual('node');
delete pkgJson.dependencies['@sveltejs/adapter-node'];
const detectedAdapter3 = await detectAdapter();
expect(detectedAdapter3).toEqual('cloudflare');
it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

expect(await detectAdapter(undefined, undefined)).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
expect(await detectAdapter(undefined, undefined)).toEqual('node');

delete pkgJson.dependencies['@sveltejs/adapter-node'];
expect(await detectAdapter(undefined, undefined)).toEqual('cloudflare');
});
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions packages/sveltekit/src/vite/detectAdapter.ts
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,63 @@
import type { Package } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
import type { BackwardsForwardsCompatibleSvelteConfig } from './svelteConfig';

/**
* Supported @sveltejs/adapters-[adapter] SvelteKit adapters
*/
export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'cloudflare' | 'other';

/** Maps adapter.name from svelte.config.js to our SupportedSvelteKitAdapters */
const ADAPTER_NAME_MAP: Record<string, SupportedSvelteKitAdapters> = {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also netflify and static – do we need these? https://svelte.dev/docs/kit/adapters

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not supported at the moment, so I'd rather avoid it (for now)

'@sveltejs/adapter-vercel': 'vercel',
'@sveltejs/adapter-node': 'node',
'@sveltejs/adapter-cloudflare': 'cloudflare',
// adapter-auto is intentionally the last entry here because it's installed by default
// many users don't remove it when installing a new adapter, so we need to make sure
// it's detected last when doing the package.json based detection.
'@sveltejs/adapter-auto': 'auto',
};

/**
* Tries to detect the used adapter for SvelteKit by looking at the dependencies.
* returns the name of the adapter or 'other' if no supported adapter was found.
* Tries to detect the used adapter for SvelteKit.
* 1. If svelteConfig is provided and has kit.adapter.name, uses that (source of truth from svelte.config.js).
* 2. Otherwise falls back to inferring from package.json dependencies.
* Returns the name of the adapter or 'other' if no supported adapter was found.
*
* @param svelteConfig - Loaded svelte config (e.g. from loadSvelteConfig()). Pass `undefined` to skip config-based detection.
* @param debug - Whether to log detection result. Pass `undefined` for false.
*/
export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKitAdapters> {
const pkgJson = await loadPackageJson();
export async function detectAdapter(
svelteConfig: BackwardsForwardsCompatibleSvelteConfig | undefined,
debug: boolean | undefined,
): Promise<SupportedSvelteKitAdapters> {
const adapterName = svelteConfig?.kit?.adapter?.name;
if (adapterName && typeof adapterName === 'string') {
const mapped = ADAPTER_NAME_MAP[adapterName];
if (mapped) {
if (debug) {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${mapped} adapter from \`svelte.config.js\``);
}
return mapped;
}
// We found an adapter name but it's not in our supported list -> return 'other'
// svelte.config.js is the source of truth, so we don't need to fall back to package.json.
if (debug) {
// eslint-disable-next-line no-console
console.warn(
`[Sentry SvelteKit Plugin] Detected unsupported adapter name ${adapterName} in \`svelte.config.js\`. Please set the 'adapter' option manually`,
);
}
return 'other';
}

const pkgJson = await loadPackageJson();
const allDependencies = pkgJson ? { ...pkgJson.dependencies, ...pkgJson.devDependencies } : {};

let adapter: SupportedSvelteKitAdapters = 'other';
if (allDependencies['@sveltejs/adapter-vercel']) {
adapter = 'vercel';
} else if (allDependencies['@sveltejs/adapter-node']) {
adapter = 'node';
} else if (allDependencies['@sveltejs/adapter-cloudflare']) {
adapter = 'cloudflare';
} else if (allDependencies['@sveltejs/adapter-auto']) {
adapter = 'auto';
}
const adapterPackage = Object.keys(ADAPTER_NAME_MAP).find(key => allDependencies[key]);
const adapter = (adapterPackage && ADAPTER_NAME_MAP[adapterPackage]) || 'other';

if (debug) {
if (adapter === 'other') {
Expand All@@ -35,7 +67,7 @@ export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKit
);
} else {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter`);
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter from \`package.json\``);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/sveltekit/src/vite/sentryVitePlugins.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,14 @@ const DEFAULT_PLUGIN_OPTIONS: SentrySvelteKitPluginOptions = {
* Make sure, it is registered before the SvelteKit plugin.
*/
export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}): Promise<Plugin[]> {
const svelteConfig = await loadSvelteConfig();

const mergedOptions = {
...DEFAULT_PLUGIN_OPTIONS,
...options,
adapter: options.adapter || (await detectAdapter(options.debug)),
adapter: options.adapter || (await detectAdapter(svelteConfig, options.debug)),
};

const svelteConfig = await loadSvelteConfig();

const sentryPlugins: Plugin[] = [];

if (mergedOptions.autoInstrument) {
Expand Down
142 changes: 96 additions & 46 deletions packages/sveltekit/test/vite/detectAdapter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,14 @@ import { detectAdapter } from '../../src/vite/detectAdapter';
let existsFile = true;
const pkgJson = {
dependencies: {} as Record<string, string>,
devDependencies: {} as Record<string, string>,
};
describe('detectAdapter', () => {
beforeEach(() => {
existsFile = true;
vi.clearAllMocks();
pkgJson.dependencies = {};
pkgJson.devDependencies = {};
});

vi.mock('fs', () => {
Expand All@@ -26,57 +28,105 @@ describe('detectAdapter', () => {
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});

it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
});
describe('svelte.config.js (source of truth)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns adapter from kit.adapter.name when provided (adapter %s)',
async adapter => {
const svelteConfig = { kit: { adapter: { name: `@sveltejs/adapter-${adapter}` } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual(adapter);
},
);

it('prefers svelte.config.js over package.json when both are present', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-node' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('node');
});

it('returns "other" when found adapter name in svelte.config.js is unsupported', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
it('logs a warning if in debug mode and an unsupported adapter name is found in svelte.config.js', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
await detectAdapter(svelteConfig, true);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Detected unsupported adapter name'));
});

it('logs "from svelte.config.js" in debug when adapter comes from config', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-vercel' } } };
await detectAdapter(svelteConfig, true);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('from `svelte.config.js`'));
});
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
describe('package.json detection (fallback)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from dependencies and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from devDependencies and logs it to the console',
async adapter => {
pkgJson.devDependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
const detectedAdapter2 = await detectAdapter();
expect(detectedAdapter2).toEqual('node');
delete pkgJson.dependencies['@sveltejs/adapter-node'];
const detectedAdapter3 = await detectAdapter();
expect(detectedAdapter3).toEqual('cloudflare');
it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

expect(await detectAdapter(undefined, undefined)).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
expect(await detectAdapter(undefined, undefined)).toEqual('node');

delete pkgJson.dependencies['@sveltejs/adapter-node'];
expect(await detectAdapter(undefined, undefined)).toEqual('cloudflare');
});
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions packages/sveltekit/src/vite/detectAdapter.ts
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,63 @@
import type { Package } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
import type { BackwardsForwardsCompatibleSvelteConfig } from './svelteConfig';

/**
* Supported @sveltejs/adapters-[adapter] SvelteKit adapters
*/
export type SupportedSvelteKitAdapters = 'node' | 'auto' | 'vercel' | 'cloudflare' | 'other';

/** Maps adapter.name from svelte.config.js to our SupportedSvelteKitAdapters */
const ADAPTER_NAME_MAP: Record<string, SupportedSvelteKitAdapters> = {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also netflify and static – do we need these? https://svelte.dev/docs/kit/adapters

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not supported at the moment, so I'd rather avoid it (for now)

'@sveltejs/adapter-vercel': 'vercel',
'@sveltejs/adapter-node': 'node',
'@sveltejs/adapter-cloudflare': 'cloudflare',
// adapter-auto is intentionally the last entry here because it's installed by default
// many users don't remove it when installing a new adapter, so we need to make sure
// it's detected last when doing the package.json based detection.
'@sveltejs/adapter-auto': 'auto',
};

/**
* Tries to detect the used adapter for SvelteKit by looking at the dependencies.
* returns the name of the adapter or 'other' if no supported adapter was found.
* Tries to detect the used adapter for SvelteKit.
* 1. If svelteConfig is provided and has kit.adapter.name, uses that (source of truth from svelte.config.js).
* 2. Otherwise falls back to inferring from package.json dependencies.
* Returns the name of the adapter or 'other' if no supported adapter was found.
*
* @param svelteConfig - Loaded svelte config (e.g. from loadSvelteConfig()). Pass `undefined` to skip config-based detection.
* @param debug - Whether to log detection result. Pass `undefined` for false.
*/
export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKitAdapters> {
const pkgJson = await loadPackageJson();
export async function detectAdapter(
svelteConfig: BackwardsForwardsCompatibleSvelteConfig | undefined,
debug: boolean | undefined,
): Promise<SupportedSvelteKitAdapters> {
const adapterName = svelteConfig?.kit?.adapter?.name;
if (adapterName && typeof adapterName === 'string') {
const mapped = ADAPTER_NAME_MAP[adapterName];
if (mapped) {
if (debug) {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${mapped} adapter from \`svelte.config.js\``);
}
return mapped;
}
// We found an adapter name but it's not in our supported list -> return 'other'
// svelte.config.js is the source of truth, so we don't need to fall back to package.json.
if (debug) {
// eslint-disable-next-line no-console
console.warn(
`[Sentry SvelteKit Plugin] Detected unsupported adapter name ${adapterName} in \`svelte.config.js\`. Please set the 'adapter' option manually`,
);
}
return 'other';
}

const pkgJson = await loadPackageJson();
const allDependencies = pkgJson ? { ...pkgJson.dependencies, ...pkgJson.devDependencies } : {};

let adapter: SupportedSvelteKitAdapters = 'other';
if (allDependencies['@sveltejs/adapter-vercel']) {
adapter = 'vercel';
} else if (allDependencies['@sveltejs/adapter-node']) {
adapter = 'node';
} else if (allDependencies['@sveltejs/adapter-cloudflare']) {
adapter = 'cloudflare';
} else if (allDependencies['@sveltejs/adapter-auto']) {
adapter = 'auto';
}
const adapterPackage = Object.keys(ADAPTER_NAME_MAP).find(key => allDependencies[key]);
const adapter = (adapterPackage && ADAPTER_NAME_MAP[adapterPackage]) || 'other';

if (debug) {
if (adapter === 'other') {
Expand All@@ -35,7 +67,7 @@ export async function detectAdapter(debug?: boolean): Promise<SupportedSvelteKit
);
} else {
// eslint-disable-next-line no-console
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter`);
console.log(`[Sentry SvelteKit Plugin] Detected SvelteKit ${adapter} adapter from \`package.json\``);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/sveltekit/src/vite/sentryVitePlugins.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,14 @@ const DEFAULT_PLUGIN_OPTIONS: SentrySvelteKitPluginOptions = {
* Make sure, it is registered before the SvelteKit plugin.
*/
export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}): Promise<Plugin[]> {
const svelteConfig = await loadSvelteConfig();

const mergedOptions = {
...DEFAULT_PLUGIN_OPTIONS,
...options,
adapter: options.adapter || (await detectAdapter(options.debug)),
adapter: options.adapter || (await detectAdapter(svelteConfig, options.debug)),
};

const svelteConfig = await loadSvelteConfig();

const sentryPlugins: Plugin[] = [];

if (mergedOptions.autoInstrument) {
Expand Down
142 changes: 96 additions & 46 deletions packages/sveltekit/test/vite/detectAdapter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,14 @@ import { detectAdapter } from '../../src/vite/detectAdapter';
let existsFile = true;
const pkgJson = {
dependencies: {} as Record<string, string>,
devDependencies: {} as Record<string, string>,
};
describe('detectAdapter', () => {
beforeEach(() => {
existsFile = true;
vi.clearAllMocks();
pkgJson.dependencies = {};
pkgJson.devDependencies = {};
});

vi.mock('fs', () => {
Expand All@@ -26,57 +28,105 @@ describe('detectAdapter', () => {
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});

it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
});
describe('svelte.config.js (source of truth)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns adapter from kit.adapter.name when provided (adapter %s)',
async adapter => {
const svelteConfig = { kit: { adapter: { name: `@sveltejs/adapter-${adapter}` } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual(adapter);
},
);

it('prefers svelte.config.js over package.json when both are present', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-node' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('node');
});

it('returns "other" when found adapter name in svelte.config.js is unsupported', async () => {
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
const detectedAdapter = await detectAdapter(svelteConfig, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
it('logs a warning if in debug mode and an unsupported adapter name is found in svelte.config.js', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-netlify' } } };
await detectAdapter(svelteConfig, true);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Detected unsupported adapter name'));
});

it('logs "from svelte.config.js" in debug when adapter comes from config', async () => {
const svelteConfig = { kit: { adapter: { name: '@sveltejs/adapter-vercel' } } };
await detectAdapter(svelteConfig, true);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('from `svelte.config.js`'));
});
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('other');
describe('package.json detection (fallback)', () => {
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from dependencies and logs it to the console',
async adapter => {
pkgJson.dependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
it.each(['auto', 'vercel', 'node', 'cloudflare'])(
'returns the adapter name (adapter %s) from devDependencies and logs it to the console',
async adapter => {
pkgJson.devDependencies[`@sveltejs/adapter-${adapter}`] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual(adapter);
expect(consoleLogSpy).toHaveBeenCalledTimes(1);
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(`Detected SvelteKit ${adapter} adapter`));
},
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

const detectedAdapter = await detectAdapter();
expect(detectedAdapter).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
const detectedAdapter2 = await detectAdapter();
expect(detectedAdapter2).toEqual('node');
delete pkgJson.dependencies['@sveltejs/adapter-node'];
const detectedAdapter3 = await detectAdapter();
expect(detectedAdapter3).toEqual('cloudflare');
it('returns "other" if no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');
});

it('logs a warning if in debug mode and no supported adapter was found', async () => {
pkgJson.dependencies['@sveltejs/adapter-netlify'] = '1.0.0';
const detectedAdapter = await detectAdapter(undefined, true);
expect(detectedAdapter).toEqual('other');
expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining("Couldn't detect SvelteKit adapter"));
});

it('returns "other" if package.json isnt available and emits a warning log', async () => {
existsFile = false;
const detectedAdapter = await detectAdapter(undefined, undefined);
expect(detectedAdapter).toEqual('other');

expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
expect(consoleWarnSpy).toHaveBeenCalledWith(
expect.stringContaining("Couldn't load package.json"),
expect.any(Error),
);
});

it('prefers all other adapters over adapter auto', async () => {
pkgJson.dependencies['@sveltejs/adapter-auto'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-vercel'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-node'] = '1.0.0';
pkgJson.dependencies['@sveltejs/adapter-cloudflare'] = '1.0.0';

expect(await detectAdapter(undefined, undefined)).toEqual('vercel');

delete pkgJson.dependencies['@sveltejs/adapter-vercel'];
expect(await detectAdapter(undefined, undefined)).toEqual('node');

delete pkgJson.dependencies['@sveltejs/adapter-node'];
expect(await detectAdapter(undefined, undefined)).toEqual('cloudflare');
});
});
});
Loading