Skip to content

fix: use Vite root config setting instead of current working directory#15469

Merged
teemingc merged 31 commits into
version-3from
fix-vite-workspaces
Mar 5, 2026
Merged

fix: use Vite root config setting instead of current working directory#15469
teemingc merged 31 commits into
version-3from
fix-vite-workspaces

Conversation

@teemingc

@teemingc teemingc commented Mar 2, 2026

Copy link
Copy Markdown
Member

closes #11356
closes #12140
closes #15188

This PR standardises the use of process.cwd() to prefer the Vite config root setting when available similar to VPS. This helps us resolve paths correctly before reading files or generating tsconfig paths. It eases lots of monorepo tooling usage, particularly Vitest workspaces. This also allows us to use the Vitest IDE extension to run unit tests (which didn't work before because of the aforementioned issues).

We could backport these changes to v2 but it's a bit easier to base it on v3 which already makes use of import.meta.dirname in many places thanks to #15434

I've only made changes to kit itself for now, so other packages still default to process.cwd() but those are probably less problematic since they won't run for Vitest tests


Please don't delete this checklist! Before submitting the PR, please make sure you do the following:

  • It's really useful if your PR references an issue where it is discussed ahead of time. In many cases, features are absent for a reason. For large changes, please create an RFC: https://github.com/sveltejs/rfcs
  • This message body should clearly illustrate what problems it solves.
  • Ideally, include a test that fails without this PR but passes with it.

Tests

  • Run the tests with pnpm test and lint the project with pnpm lint and pnpm check

Changesets

  • If your PR makes a change that should be noted in one or more packages' changelogs, generate a changeset by running pnpm changeset and following the prompts. Changesets that add features should be minor and those that fix bugs should be patch. Please prefix changeset messages with feat:, fix:, or chore:.

Edits

  • Please ensure that 'Allow edits from maintainers' is checked. PRs without this option may be closed.

@changeset-bot

changeset-bot Bot commented Mar 2, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 4728f85

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@sveltejs/kit Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@teemingc teemingc changed the base branch from main to version-3 March 2, 2026 21:01
@svelte-docs-bot

Copy link
Copy Markdown

*/
export function get_page_options(filepath) {
export function get_page_options(filepath, root) {
const input = read(path.resolve(root, filepath));

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Moved this out of the try...catch to avoid silent errors for files it can't find when calling read. The real issue was that the route filepaths weren't being resolved correctly. That's not an issue anymore now that we resolve against the root.

id: '/blog.json',
pattern: '/^/blog.json/?$/',
endpoint: { file: 'samples/basic/blog.json/+server.js', page_options: null }
endpoint: { file: 'samples/basic/blog.json/+server.js', page_options: {} }

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This fixes the test results to match the change from https://github.com/sveltejs/kit/pull/15469/changes#diff-8701fabc771d319105f7401163b7bc28189c5a11e30706215a62fb303385797a . Previously, the page options were incorrectly computed as null (unable to statically analyse). However, the correct value is {} (which means no page options exported).

@teemingc teemingc marked this pull request as ready for review March 4, 2026 13:22

fs.writeFileSync(
'./src/version.js',
path.join(import.meta.dirname, '..', 'src', 'version.js'),

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Helps the version generation test run from the Vitest extension by avoiding resolving to the wrong path

const process = await import('node:process');

relative = (file) => path.relative(process.cwd(), file);
relative = (file) => path.relative('.', file);

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Apparently '.' is equivalent to process.cwd() so that helps simplify things here

Comment on lines +10 to +20
it('should be the exact version from package.json', async () => {
const { VERSION } = await import(join(import.meta.dirname, 'version.js'));
const pkg = JSON.parse(
readFileSync(fileURLToPath(new URL('../package.json', import.meta.url)), 'utf-8')
);
assert.equal(
VERSION,
pkg.version,
'VERSION export in src/version.js does not equal version in package.json'
);
});

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Had to put the test logic inside of it so Vitest would stop skipping it from the IDE extension


typescript: {
config: (config) => {
config.include.push('../unit-test');

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Avoids a typescript error from displaying in the unit test file

Comment thread packages/kit/src/core/utils.js Outdated

@benmccann benmccann left a comment

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.

needs a changeset, but besides that it looks good to me. will this result in any changes that users of vite can see or only vitest? it might be good to call this a feat:/minor so that it's more prominent in the changelog as I imagine it will be a semi-impactful change for a subset of users

Comment thread packages/adapter-auto/vitest.config.js Outdated
@teemingc teemingc requested a review from benmccann March 5, 2026 19:37
Comment thread .changeset/nasty-impalas-wear.md Outdated
Co-authored-by: Tee Ming <chewteeming01@gmail.com>
@teemingc teemingc merged commit 8af47eb into version-3 Mar 5, 2026
18 of 19 checks passed
@teemingc teemingc deleted the fix-vite-workspaces branch March 5, 2026 20:16
Rich-Harris pushed a commit that referenced this pull request Jun 5, 2026
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to version-3, this PR
will be updated.

⚠️⚠️⚠️⚠️⚠️⚠️

`version-3` is currently in **pre mode** so this branch has prereleases
rather than normal releases. If you want to exit prereleases, run
`changeset pre exit` on `version-3`.

⚠️⚠️⚠️⚠️⚠️⚠️

# Releases
## @sveltejs/adapter-auto@8.0.0-next.0

### Major Changes


- breaking: require SvelteKit 3
([#15506](#15506))


### Patch Changes

- Updated dependencies
[[`fa335bd`](fa335bd),
[`3031d89`](3031d89),
[`cb9d416`](cb9d416),
[`caf3a18`](caf3a18),
[`4777827`](4777827),
[`a2792e2`](a2792e2),
[`ba36148`](ba36148),
[`48e8710`](48e8710),
[`e2f3075`](e2f3075),
[`047d6a0`](047d6a0),
[`87603d1`](87603d1),
[`096962c`](096962c),
[`d545970`](d545970),
[`e2f3075`](e2f3075),
[`d06affc`](d06affc),
[`8af47eb`](8af47eb),
[`e2f3075`](e2f3075),
[`5c4d130`](5c4d130),
[`3f11f35`](3f11f35),
[`caf3a18`](caf3a18),
[`8823037`](8823037),
[`1d76212`](1d76212),
[`0dc0548`](0dc0548),
[`00d81fa`](00d81fa)]:
  - @sveltejs/kit@3.0.0-next.0
## @sveltejs/adapter-cloudflare@8.0.0-next.0

### Major Changes


- breaking: upgrade `@cloudflare/workers-types` to 4.20260219.0
([#15347](#15347))


- breaking: upgrade minimum `wrangler` version to ^4.67.0
([#15347](#15347))


- breaking: remove `platform.context` in favour of `platform.ctx`
([#15347](#15347))


- breaking: require SvelteKit 3
([#15506](#15506))


### Patch Changes


- chore: check the `WORKERS_CI` environment variable to determine if
we're building for Cloudflare Workers
([#13733](#13733))

- Updated dependencies
[[`fa335bd`](fa335bd),
[`3031d89`](3031d89),
[`cb9d416`](cb9d416),
[`caf3a18`](caf3a18),
[`4777827`](4777827),
[`a2792e2`](a2792e2),
[`ba36148`](ba36148),
[`48e8710`](48e8710),
[`e2f3075`](e2f3075),
[`047d6a0`](047d6a0),
[`87603d1`](87603d1),
[`096962c`](096962c),
[`d545970`](d545970),
[`e2f3075`](e2f3075),
[`d06affc`](d06affc),
[`8af47eb`](8af47eb),
[`e2f3075`](e2f3075),
[`5c4d130`](5c4d130),
[`3f11f35`](3f11f35),
[`caf3a18`](caf3a18),
[`8823037`](8823037),
[`1d76212`](1d76212),
[`0dc0548`](0dc0548),
[`00d81fa`](00d81fa)]:
  - @sveltejs/kit@3.0.0-next.0
## @sveltejs/adapter-netlify@7.0.0-next.0

### Major Changes


- chore: use `rolldown` for edge function bundling
([#15432](#15432))


- breaking: write output that conforms to the stable [Netlify Frameworks
API](https://docs.netlify.com/build/frameworks/frameworks-api/).
([#15294](#15294))
  
Deploying and previewing with Netlify CLI now requires
[v17.31.0](https://github.com/netlify/cli/releases/tag/v17.31.0) or
later. Run `npm i -g netlify-cli@latest` to upgrade.

- breaking: require SvelteKit 3
([#15506](#15506))


- breaking: edge function build target is now `es2022`
([#15432](#15432))


### Patch Changes

- Updated dependencies
[[`fa335bd`](fa335bd),
[`3031d89`](3031d89),
[`cb9d416`](cb9d416),
[`caf3a18`](caf3a18),
[`4777827`](4777827),
[`a2792e2`](a2792e2),
[`ba36148`](ba36148),
[`48e8710`](48e8710),
[`e2f3075`](e2f3075),
[`047d6a0`](047d6a0),
[`87603d1`](87603d1),
[`096962c`](096962c),
[`d545970`](d545970),
[`e2f3075`](e2f3075),
[`d06affc`](d06affc),
[`8af47eb`](8af47eb),
[`e2f3075`](e2f3075),
[`5c4d130`](5c4d130),
[`3f11f35`](3f11f35),
[`caf3a18`](caf3a18),
[`8823037`](8823037),
[`1d76212`](1d76212),
[`0dc0548`](0dc0548),
[`00d81fa`](00d81fa)]:
  - @sveltejs/kit@3.0.0-next.0
## @sveltejs/adapter-node@6.0.0-next.0

### Major Changes


- chore: migrate from rollup to rolldown
([#15297](#15297))


- breaking: require SvelteKit 3
([#15506](#15506))


### Patch Changes

- Updated dependencies
[[`fa335bd`](fa335bd),
[`3031d89`](3031d89),
[`cb9d416`](cb9d416),
[`caf3a18`](caf3a18),
[`4777827`](4777827),
[`a2792e2`](a2792e2),
[`ba36148`](ba36148),
[`48e8710`](48e8710),
[`e2f3075`](e2f3075),
[`047d6a0`](047d6a0),
[`87603d1`](87603d1),
[`096962c`](096962c),
[`d545970`](d545970),
[`e2f3075`](e2f3075),
[`d06affc`](d06affc),
[`8af47eb`](8af47eb),
[`e2f3075`](e2f3075),
[`5c4d130`](5c4d130),
[`3f11f35`](3f11f35),
[`caf3a18`](caf3a18),
[`8823037`](8823037),
[`1d76212`](1d76212),
[`0dc0548`](0dc0548),
[`00d81fa`](00d81fa)]:
  - @sveltejs/kit@3.0.0-next.0
## @sveltejs/adapter-static@4.0.0-next.0

### Major Changes


- breaking: require SvelteKit 3
([#15506](#15506))


### Patch Changes

- Updated dependencies
[[`fa335bd`](fa335bd),
[`3031d89`](3031d89),
[`cb9d416`](cb9d416),
[`caf3a18`](caf3a18),
[`4777827`](4777827),
[`a2792e2`](a2792e2),
[`ba36148`](ba36148),
[`48e8710`](48e8710),
[`e2f3075`](e2f3075),
[`047d6a0`](047d6a0),
[`87603d1`](87603d1),
[`096962c`](096962c),
[`d545970`](d545970),
[`e2f3075`](e2f3075),
[`d06affc`](d06affc),
[`8af47eb`](8af47eb),
[`e2f3075`](e2f3075),
[`5c4d130`](5c4d130),
[`3f11f35`](3f11f35),
[`caf3a18`](caf3a18),
[`8823037`](8823037),
[`1d76212`](1d76212),
[`0dc0548`](0dc0548),
[`00d81fa`](00d81fa)]:
  - @sveltejs/kit@3.0.0-next.0
## @sveltejs/adapter-vercel@7.0.0-next.0

### Major Changes


- chore: use `rolldown` for edge function bundling
([#15432](#15432))


- breaking: edge function build target is now `es2022`
([#15432](#15432))


### Patch Changes

- Updated dependencies
[[`fa335bd`](fa335bd),
[`3031d89`](3031d89),
[`cb9d416`](cb9d416),
[`caf3a18`](caf3a18),
[`4777827`](4777827),
[`a2792e2`](a2792e2),
[`ba36148`](ba36148),
[`48e8710`](48e8710),
[`e2f3075`](e2f3075),
[`047d6a0`](047d6a0),
[`87603d1`](87603d1),
[`096962c`](096962c),
[`d545970`](d545970),
[`e2f3075`](e2f3075),
[`d06affc`](d06affc),
[`8af47eb`](8af47eb),
[`e2f3075`](e2f3075),
[`5c4d130`](5c4d130),
[`3f11f35`](3f11f35),
[`caf3a18`](caf3a18),
[`8823037`](8823037),
[`1d76212`](1d76212),
[`0dc0548`](0dc0548),
[`00d81fa`](00d81fa)]:
  - @sveltejs/kit@3.0.0-next.0
## @sveltejs/enhanced-img@1.0.0-next.0

### Major Changes


- breaking: require Node 22 or newer
([#12548](#12548))


### Minor Changes


- breaking: require Vite 8 and `vite-plugin-svelte` 7
([#15542](#15542))
## @sveltejs/kit@3.0.0-next.0

### Major Changes


- breaking: TypeScript 6 is now the minimum required version
([#15930](#15930))


- breaking: upgrade to cookie v1. Cookie names must now contain only
ASCII characters ([#13386](#13386))


- breaking: require Node 22 or newer
([#12548](#12548))


- breaking: remove the `preloadStrategy` option. `modulepreload` will
always be used ([#15256](#15256))


- breaking: default the cookie `path` option to `'/'`
([#15398](#15398))


- breaking: remove `@sveltejs/kit/node/polyfills`
([#15430](#15430))


- breaking: add `config.kit.output.linkHeaderPreload` to preload using
the `Link` header ([#15939](#15939))


- breaking: require `@sveltejs/vite-plugin-svelte` v7
([#15371](#15371))


- breaking: remove `createEntries` from the `Builder` object passed to
adapter functions ([#15509](#15509))


- breaking: remove the deprecated CSRF `checkOrigin` option in favor of
`trustedOrigins` ([#15437](#15437))


- breaking: the `delta` property now only exists for `popstate`
navigation events ([#15522](#15522))


- breaking: remove deprecated `pragma` header in version polling for
improved CORS support
([#15428](#15428))


- breaking: require Svelte 5.48.0 or newer
([#15371](#15371))


- chore: change `error`, `isHttpError`, `redirect`, and `isRedirect` to
refer to public type instead of internal class
([#15250](#15250))


- breaking: require Vite 8. Provides new functionality even for existing
Vite 8 users such as faster builds with Vite hook filters and more
powerful SvelteKit adapters with the Vite environment API
([#15371](#15371))


- breaking: remove `data-sveltekit-*` option `'off'` in favour of
`false` ([#15907](#15907))


### Minor Changes


- feat: resolve paths using the Vite config `root` option instead of
`process.cwd()` to better support monorepo configurations such as Vitest
workspaces ([#15469](#15469))


- chore: deprecate `Response` helpers in favor of platform-provided
alternatives ([#15448](#15448))


- feat: explicit env vars
([#15934](#15934))


### Patch Changes


- fix: remove check for svelte.config.js before running `sync`
([#15946](#15946))


- fix: generate a placeholder tsconfig.json to squelch sync-time
warnings ([#15948](#15948))


- chore: remove dependency on kleur
([#12548](#12548))


- chore: remove dependency on `set-cookie-parser`
([#15384](#15384))


- fix: allow use of `$app/env/public` in service workers
([#15950](#15950))
## @sveltejs/package@3.0.0-next.0

### Major Changes


- breaking: require Node 22 or newer
([#12548](#12548))


### Patch Changes


- chore: remove dependency on kleur
([#12548](#12548))

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Volatile paths in generated tsconfig.json in monorepo Sveltekit plugin breaks vitest workspaces

3 participants