diff options
| author |  Matthew Phillips <matthew@skypack.dev>
| 2022-06-02 14:21:10 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-06-02 13:21:10 -0500 |
| commit | 4a23b5aaedd69043635711dfdd60dd0d69dd69a8 (patch) | |
| tree | e620ff32741df697fb8b8b289b19cac38d9a17f3 | |
| parent | c6e7355468c832d6ca843be29ce9bef33d859ba2 (diff) | |
| download | astro-4a23b5aaedd69043635711dfdd60dd0d69dd69a8.tar.gz astro-4a23b5aaedd69043635711dfdd60dd0d69dd69a8.tar.zst astro-4a23b5aaedd69043635711dfdd60dd0d69dd69a8.zip | |
provide import.meta.env.SITE when there are private envs (#3498)
* provide import.meta.env.SITE when there are private envs
* Adds a changeset
* Handle destructing of import.meta.env.SITE
| -rw-r--r-- | .changeset/nice-cougars-hear.md | 5 | ||||
| -rw-r--r-- | packages/astro/src/vite-plugin-env/index.ts | 1 | ||||
| -rw-r--r-- | packages/astro/test/astro-envs.test.js | 6 | ||||
| -rw-r--r-- | packages/astro/test/fixtures/astro-envs/src/pages/destructured.astro | 3 |
4 files changed, 14 insertions, 1 deletions
diff --git a/.changeset/nice-cougars-hear.md b/.changeset/nice-cougars-hear.md new file mode 100644 index 000000000..6d14608db --- /dev/null +++ b/.changeset/nice-cougars-hear.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fixes use of import.meta.env.SITE diff --git a/packages/astro/src/vite-plugin-env/index.ts b/packages/astro/src/vite-plugin-env/index.ts index 672fe5a0f..71c086865 100644 --- a/packages/astro/src/vite-plugin-env/index.ts +++ b/packages/astro/src/vite-plugin-env/index.ts @@ -78,6 +78,7 @@ export default function envVitePlugin({ if (typeof privateEnv === 'undefined') { privateEnv = getPrivateEnv(config, astroConfig); if (privateEnv) { + privateEnv.SITE = astroConfig.site ? `'${astroConfig.site}'` : 'undefined'; const entries = Object.entries(privateEnv).map(([key, value]) => [ `import.meta.env.${key}`, value, diff --git a/packages/astro/test/astro-envs.test.js b/packages/astro/test/astro-envs.test.js index da2332c9e..5c5f410c4 100644 --- a/packages/astro/test/astro-envs.test.js +++ b/packages/astro/test/astro-envs.test.js @@ -35,6 +35,12 @@ describe('Environment Variables', () => { expect(indexHtml).to.include('http://example.com'); }); + it('does render destructured builtin SITE env', async () => { + let indexHtml = await fixture.readFile('/destructured/index.html'); + + expect(indexHtml).to.include('http://example.com'); + }); + it('includes public env in client-side JS', async () => { let dirs = await fixture.readdir('/'); let found = false; diff --git a/packages/astro/test/fixtures/astro-envs/src/pages/destructured.astro b/packages/astro/test/fixtures/astro-envs/src/pages/destructured.astro index 25fb95954..e85b9bf81 100644 --- a/packages/astro/test/fixtures/astro-envs/src/pages/destructured.astro +++ b/packages/astro/test/fixtures/astro-envs/src/pages/destructured.astro @@ -1,5 +1,6 @@ --- -const { PUBLIC_PLACE, SECRET_PLACE } = import.meta.env; +const { PUBLIC_PLACE, SECRET_PLACE, SITE } = import.meta.env; --- <environment-variable>{PUBLIC_PLACE}</environment-variable> <environment-variable>{SECRET_PLACE}</environment-variable> +<environment-variable>{SITE}</environment-variable> |