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
15 changes: 4 additions & 11 deletions packages/kit/src/exports/vite/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/** @import { EnvVarConfig } from '@sveltejs/kit/env' */
/** @import { Options } from '@sveltejs/vite-plugin-svelte' */
/** @import { PreprocessorGroup } from 'svelte/compiler' */
/** @import { ManifestData, RemoteChunk, ServerMetadata, ValidatedConfig } from 'types' */
/** @import { ManifestData, RemoteChunk, ServerMetadata, ValidatedConfig } from 'types' */
/** @import { CorsOptions, Plugin, ResolvedConfig, Rolldown, UserConfig } from 'vite' */
import fs from 'node:fs';
import path from 'node:path';
import process from 'node:process';
import { styleText } from 'node:util';
import * as vite from 'vite';

import { resolve_entry } from '../../utils/filesystem.js';
import { posixify } from '../../utils/os.js';
Expand Down Expand Up @@ -237,9 +238,6 @@ function resolve_root(vite_config) {
* @return {Plugin[]}
*/
function kit({ svelte_config }) {
/** @type {typeof import('vite')} */
let vite;

/**
* The posix-ified root of the project based on the Vite configuration.
* @type {string}
Expand Down Expand Up @@ -330,7 +328,7 @@ function kit({ svelte_config }) {
*/
config: {
order: 'pre',
async handler(config, config_env) {
handler(config, config_env) {
initial_config = config;
is_build = config_env.command === 'build';

Expand All @@ -344,8 +342,6 @@ function kit({ svelte_config }) {
service_worker_entry_file = resolve_entry(kit.files.serviceWorker);
service_worker_entry_file &&= posixify(service_worker_entry_file);

vite = await import_peer('vite', root);

normalized_aliases = get_import_aliases(root, vite.normalizePath.bind(vite));

// Add `#`-prefixed import keys to the enforced config so users are warned
Expand Down Expand Up @@ -645,10 +641,7 @@ function kit({ svelte_config }) {
plugin_remote_guard(svelte_config),
plugin_remote(
svelte_config,
() => ({
root,
vite
}),
() => ({ root, vite }),
() => build_metadata,
(metadata) => {
remote_metadata = metadata;
Expand Down
7 changes: 4 additions & 3 deletions packages/kit/src/runner.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
/** @import * as vite from 'vite' */
/** @import { ViteDevServer } from 'vite' */

/**
* @param {typeof import('vite')} vite the peer resolved vite module
* @param {typeof vite} vite the vite module that created the server
* @param {ViteDevServer} server
*/
export function get_runner(vite, server) {
export function get_runner({ isRunnableDevEnvironment }, server) {
// `isRunnableDevEnvironment` does an `instanceof` check and will fail if
// we're using different instances of Vite
if (!vite.isRunnableDevEnvironment(server.environments.ssr)) {
if (!isRunnableDevEnvironment(server.environments.ssr)) {
throw new Error('The configured Vite SSR environment must be a RunnableDevEnvironment');
}

Expand Down
2 changes: 1 addition & 1 deletion packages/kit/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@ declare module '@sveltejs/kit/params' {
declare module '@sveltejs/kit/vite' {
import type { Adapter } from '@sveltejs/kit';
import type { Options } from '@sveltejs/vite-plugin-svelte';
import type { Plugin } from 'vite';
import * as vite from 'vite';
// this indirection helps make the docs look pretty
type VitePluginSvelteOptions = Omit<Options, 'experimental'>;
type VitePluginSvelteOptionsExperimental = Options['experimental'];
Expand Down
Loading