Skip to content

chore: remove define merging #16819

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.

Sign up for GitHub

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

Draft
Rich-Harris wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

chore: remove define merging #16819

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d6c85d
use an alias instead of a resolveId hook
Rich-Harris Aug 15, 2026
395bea7
Fix: `uses_env_dynamic_public` detection uses the old generated-env m…
vercel[bot] Aug 15, 2026
bf63fd2
replace payload in service worker
Rich-Harris Aug 15, 2026
47599cb
format
Rich-Harris Aug 15, 2026
934d927
use a define
Rich-Harris Aug 15, 2026
2514975
remove define merging
Rich-Harris Aug 15, 2026
4c24254
Merge branch 'version-3' into generated-alias-remove-define-merging
teemingc Aug 18, 2026
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
6 changes: 0 additions & 6 deletions packages/kit/src/exports/vite/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1975,12 +1975,6 @@ function kit({ svelte_config }) {
if (service_worker_entry_file) {
log.info('Building service worker');

// mirror client settings that we couldn't set per environment in the config hook
builder.environments.serviceWorker.config.define = {
...builder.environments.client.config.define,
...builder.environments.serviceWorker.config.define
};

builder.environments.serviceWorker.config.resolve.alias = [
...get_config_aliases(kit, vite_config.root)
];
Comment on lines 1978 to 1980

@teemingc teemingc Aug 18, 2026

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.

Suggested change
builder.environments.serviceWorker.config.resolve.alias = [
...get_config_aliases(kit, vite_config.root)
];

We ought to get rid of this too. It was only there to avoid resolving the __SERVER__ alias but we now use this setting for much more than that. Ideally, we'd still remove __SERVER__ somehow but maybe it doesn't matter?

@teemingc teemingc Aug 18, 2026 •
edited
Loading

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.

Here's what the service worker allows resolving to if not overridden:

[
  {
    find: '__SERVER__',
  },
  {
    find: '$app',
  },
  {
    find: '$env',
  },
  {
    find: '<sveltekit:generated>',
  },
  {
    find: '__sveltekit/server',
  },
  {
    find: /^\/?@vite\/env/,
  },
  {
    find: /^\/?@vite\/client/,
  }
]

Expand Down
Loading