Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use peer dependencies rather than dev dependencies #11433

Merged
merged 3 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/smart-timers-promise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

chore: use peer dependencies when linked
1 change: 1 addition & 0 deletions packages/kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@types/sade": "^1.7.8",
"@types/set-cookie-parser": "^2.4.7",
"dts-buddy": "^0.4.3",
"import-meta-resolve": "^4.0.0",
Rich-Harris marked this conversation as resolved.
Show resolved Hide resolved
"rollup": "^4.8.0",
"svelte": "^4.2.8",
"svelte-preprocess": "^5.1.2",
Expand Down
24 changes: 19 additions & 5 deletions packages/kit/src/exports/vite/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import fs from 'node:fs';
import path from 'node:path';

import { svelte } from '@sveltejs/vite-plugin-svelte';
import * as imr from 'import-meta-resolve';
import colors from 'kleur';
import * as vite from 'vite';

import { copy, mkdirp, posixify, read, resolve_entry, rimraf } from '../../utils/filesystem.js';
import { create_static_module, create_dynamic_module } from '../../core/env.js';
Expand Down Expand Up @@ -34,6 +33,7 @@ import {
sveltekit_environment,
sveltekit_paths
} from './module_ids.js';
import { pathToFileURL } from 'node:url';

const cwd = process.cwd();

Expand Down Expand Up @@ -122,6 +122,16 @@ const warning_preprocessor = {
}
};

/**
* Resolve a dependency relative to the current working directory,
* rather than relative to this package
* @param {string} dependency
*/
async function resolve_peer_dependency(dependency) {
const resolved = await imr.resolve(dependency, pathToFileURL(process.cwd() + '/dummy.js'));
return import(resolved);
}

/**
* Returns the SvelteKit Vite plugins.
* @returns {Promise<import('vite').Plugin[]>}
Expand Down Expand Up @@ -153,7 +163,9 @@ export async function sveltekit() {
...svelte_config.vitePlugin
};

return [...svelte(vite_plugin_svelte_options), ...kit({ svelte_config })];
const { svelte } = await resolve_peer_dependency('@sveltejs/vite-plugin-svelte');

return [...svelte(vite_plugin_svelte_options), ...(await kit({ svelte_config }))];
}

// These variables live outside the `kit()` function because it is re-invoked by each Vite build
Expand All @@ -174,9 +186,11 @@ let manifest_data;
* - https://rollupjs.org/guide/en/#output-generation-hooks
*
* @param {{ svelte_config: import('types').ValidatedConfig }} options
* @return {import('vite').Plugin[]}
* @return {Promise<import('vite').Plugin[]>}
*/
function kit({ svelte_config }) {
async function kit({ svelte_config }) {
const vite = await resolve_peer_dependency('vite');

const { kit } = svelte_config;
const out = `${kit.outDir}/output`;

Expand Down
4 changes: 3 additions & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.