feat(env): server/secret variables #10954

florian-lefebvre · 2024-05-05T14:30:23Z

Depends on #10881

Changes

Moves templates (stubs) and some
Add feature validation
Add getEnv to RenderContext
Rework how astro:env templates are managed
Add runtime code

Testing

Cleans a test i forgot and add one to test getSecret with the testAdapter

Docs

N/A

…public

packages/astro/test/test-adapter.js

bholmesdev

Approved since none of my comments are blocking. This API will be 4.8's secret sauce

packages/astro/src/core/app/index.ts

packages/astro/src/env/constants.ts

packages/astro/src/env/vite-plugin-env-virtual-mod.ts

packages/astro/test/test-adapter.js

ematipico · 2024-05-08T07:33:23Z

packages/astro/src/@types/astro.ts

@@ -2428,6 +2428,11 @@ export type AstroFeatureMap = {
 	 * List of features that orbit around the i18n routing
 	 */
 	i18nDomains?: SupportsKind;
+
+	/**
+	 * The adapter is able to support `astro:env`


We might want to be more specific. It's not a blocker, however the support is for getEnv, right?

Yes, it means if the adapter has a custom getEnv. It defaults to process.env, happy to change the name if you have better ideas!

envGetter? Even env is fine, as long as we're good at documenting it

Will spend some time working on jsdoc in the last pr 👍

packages/astro/src/core/app/index.ts

packages/astro/src/integrations/astroFeaturesValidation.ts

packages/astro/src/runtime/server/astro-env.ts

packages/astro/src/env/vite-plugin-env-virtual-mod.ts

ematipico · 2024-05-08T13:34:15Z

packages/astro/src/@types/astro.ts

@@ -2428,6 +2428,11 @@ export type AstroFeatureMap = {
 	 * List of features that orbit around the i18n routing
 	 */
 	i18nDomains?: SupportsKind;
+
+	/**
+	 * The adapter is able to support `astro:env`


envGetter? Even env is fine, as long as we're good at documenting it

* feat(env): add schema, types and envField (#10805) * feat(env): add validators (#10827) * feat(env): add vite plugin (#10829) * feat(env): client/public variables (#10848) Co-authored-by: Bjorn Lu <[email protected]> Co-authored-by: Emanuele Stoppa <[email protected]> * feat(env): server/public variables (#10881) Co-authored-by: Bjorn Lu <[email protected]> Co-authored-by: Emanuele Stoppa <[email protected]> * feat(env): server/secret variables (#10954) Co-authored-by: Bjorn Lu <[email protected]> Co-authored-by: Emanuele Stoppa <[email protected]> * fix: import * fix: test * feat: work on jsdoc * feat: more jsdoc * chore: remove todo * feat: fix test error and write changeset * feat: update config reference * feat: apply recommendations from review * feat: rework getEnv/setGetEnv * chore: move tests * fix: rename * fix: dev mode * chore: improve error * feat: add overrideProcessEnv helper * fix: make eslint happy * Update .changeset/poor-berries-occur.md Co-authored-by: Paul Valladares <[email protected]> * Update .changeset/poor-berries-occur.md Co-authored-by: Paul Valladares <[email protected]> * Update .changeset/poor-berries-occur.md Co-authored-by: Paul Valladares <[email protected]> * Update .changeset/poor-berries-occur.md Co-authored-by: Paul Valladares <[email protected]> * feat: fix build and address reviews * fix: container api * fix: tests * Apply suggestions from code review Co-authored-by: Sarah Rainsberger <[email protected]> * Update packages/astro/src/@types/astro.ts Co-authored-by: Sarah Rainsberger <[email protected]> * Apply suggestions from code review Co-authored-by: Sarah Rainsberger <[email protected]> * Update packages/astro/src/@types/astro.ts * chore: update changeset * feat: address reviews * feat: address Ema's reviews * Update .changeset/poor-berries-occur.md Co-authored-by: Sarah Rainsberger <[email protected]> --------- Co-authored-by: Bjorn Lu <[email protected]> Co-authored-by: Emanuele Stoppa <[email protected]> Co-authored-by: Paul Valladares <[email protected]> Co-authored-by: Sarah Rainsberger <[email protected]>

florian-lefebvre added 30 commits April 17, 2024 16:52

feat: add schema, types and envField

c7fffe0

feat: move things around

0e90c5d

feat: add validators

94d6ffc

feat: rework everything

d717361

feat: default

d9ce895

chore: space

f136b1b

Merge branch 'feat/astro-env-config' into feat/astro-env-validators

0260bbb

feat: reuse types

b84cea9

feat: work on test

3f32ea6

feat: write test

ff99f0d

feat: add test

8896fa7

Merge branch 'feat/astro-env-config' into feat/astro-env-validators

9d8d425

feat: add vite plugin

07f586e

feat: update zod custom validation

5063b1f

feat: validation logic

b23233c

feat: work on types injection

e02b722

Merge branch 'feat/astro-env' into feat/astro-env-vite-plugin

e9d99a1

fix: test

bff9024

Merge branch 'feat/astro-env-vite-plugin' into feat/astro-env-client-…

fc983d1

…public

fix: test

518fd15

fix: test

eeda833

fix: cli tests

9516c2c

feat: make things work

f23296d

feat: address todos

37ec524

Discard changes to examples/basics/astro.config.mjs

ae92463

Discard changes to examples/basics/src/env.d.ts

dc92fb6

Merge branch 'feat/astro-env' into feat/astro-env-client-public

4496bc9

fix: test

f6a993a

feat: refactor astro sync test

1384136

feat: update test to check env types

26e2b82

florian-lefebvre added 7 commits May 6, 2024 18:20

Merge branch 'feat/astro-env' into feat/astro-env-server-secret

69f99ec

chore: remove comment

8399f5d

feat: cleanup templates handling

7ff8473

feat: features validation

45b28b1

chore: add todo

5107357

fix: test

a06000c

feat: test getSecret

fef9332

florian-lefebvre marked this pull request as ready for review May 7, 2024 14:02

florian-lefebvre commented May 7, 2024

View reviewed changes

packages/astro/test/test-adapter.js Outdated Show resolved Hide resolved

ematipico and others added 3 commits May 7, 2024 15:59

chore: fix tests

c02bfe9

fix regression

3994c12

chore: remove log

97dfd64

bholmesdev reviewed May 7, 2024

View reviewed changes

bholmesdev approved these changes May 7, 2024

View reviewed changes

ematipico and others added 5 commits May 7, 2024 17:02

fix regression on client address

90f58d7

fix regression for cookie header

a1e078a

feat: improve virtual modules ids

71ce5a7

feat: improve testAdapter getEnv

f4d43b4

feat: rename generated dts

a4c8fe0

ematipico reviewed May 8, 2024

View reviewed changes

bluwy reviewed May 8, 2024

View reviewed changes

packages/astro/src/env/vite-plugin-env-virtual-mod.ts Outdated Show resolved Hide resolved

florian-lefebvre added 4 commits May 8, 2024 15:17

chore: comment

e3d48cf

feat: only set getEnv if experimental env is enabled

38a2a9c

fix: feature validation

a2e05c6

chore: remove whitespaces from module templates

7421261

ematipico approved these changes May 8, 2024

View reviewed changes

bluwy approved these changes May 8, 2024

View reviewed changes

florian-lefebvre merged commit 9edc5e5 into feat/astro-env May 8, 2024
14 checks passed

florian-lefebvre deleted the feat/astro-env-server-secret branch May 8, 2024 13:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(env): server/secret variables #10954

feat(env): server/secret variables #10954

florian-lefebvre commented May 5, 2024 •

edited

Loading

bholmesdev left a comment

ematipico May 8, 2024

florian-lefebvre May 8, 2024 •

edited

Loading

ematipico May 8, 2024

florian-lefebvre May 8, 2024 •

edited

Loading

ematipico May 8, 2024

feat(env): server/secret variables #10954

feat(env): server/secret variables #10954

Conversation

florian-lefebvre commented May 5, 2024 • edited Loading

Changes

Testing

Docs

bholmesdev left a comment

Choose a reason for hiding this comment

ematipico May 8, 2024

Choose a reason for hiding this comment

florian-lefebvre May 8, 2024 • edited Loading

Choose a reason for hiding this comment

ematipico May 8, 2024

Choose a reason for hiding this comment

florian-lefebvre May 8, 2024 • edited Loading

Choose a reason for hiding this comment

ematipico May 8, 2024

Choose a reason for hiding this comment

florian-lefebvre commented May 5, 2024 •

edited

Loading

florian-lefebvre May 8, 2024 •

edited

Loading

florian-lefebvre May 8, 2024 •

edited

Loading