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

fix: use correct environment file for rendering spa fallback page #10963

Merged
merged 3 commits into from
Nov 2, 2023
Merged

fix: use correct environment file for rendering spa fallback page #10963

merged 3 commits into from
Nov 2, 2023

Conversation

MarkusWendorf
Copy link
Contributor

fixes #10801

The adapter-static fallback page is hardcoded to use production environment variables (this is defined in kit and called from adapter-static). This PR uses the correct environment specified by vite_config.mode.

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:.

Copy link

changeset-bot bot commented Nov 1, 2023

🦋 Changeset detected

Latest commit: 670d6d8

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 Patch

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

Copy link
Member

@eltigerchino eltigerchino left a comment

Choose a reason for hiding this comment

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

Could you move the test to adapter-static/test/apps/spa? I think the fallback page test fits better there since it already has one among the other SPA tests. We can also extend the +error.svelte file to display the environment variable value then navigate to a non-existent route to see the value.

Other than that, it looks really good to me! Thank you!

packages/adapter-static/test/apps/prerendered/test/test.js Outdated Show resolved Hide resolved
Co-authored-by: Tee Ming <chewteeming01@gmail.com>
@eltigerchino
Copy link
Member

Thank you!

@eltigerchino eltigerchino merged commit 072430e into sveltejs:master Nov 2, 2023
12 of 13 checks passed
@github-actions github-actions bot mentioned this pull request Nov 2, 2023
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.

Sveltekit always writes production env variables inside index.html
2 participants