Skip to content

Commit

Permalink
Remove default throw behavior in astro:env (#12480)
Browse files Browse the repository at this point in the history
Co-authored-by: Emanuele Stoppa <[email protected]>
  • Loading branch information
matthewp and ematipico authored Nov 20, 2024
1 parent 46f6b38 commit c3b7e7c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 20 deletions.
5 changes: 5 additions & 0 deletions .changeset/early-scissors-beg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Removes the default throw behavior in `astro:env`
1 change: 0 additions & 1 deletion packages/astro/src/core/app/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ export class AppPipeline extends Pipeline {
undefined,
undefined,
undefined,
false,
defaultRoutes,
);
pipeline.#manifestData = manifestData;
Expand Down
8 changes: 0 additions & 8 deletions packages/astro/src/core/base-pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ export abstract class Pipeline {
* Used for `Astro.site`.
*/
readonly site = manifest.site ? new URL(manifest.site) : undefined,
readonly callSetGetEnv = true,
/**
* Array of built-in, internal, routes.
* Used to find the route module
Expand All @@ -71,13 +70,6 @@ export abstract class Pipeline {
createI18nMiddleware(i18n, manifest.base, manifest.trailingSlash, manifest.buildFormat),
);
}
// In SSR, getSecret should fail by default. Setting it here will run before the
// adapter override.
if (callSetGetEnv && manifest.experimentalEnvGetSecretEnabled) {
setGetEnv(() => {
throw new AstroError(AstroErrorData.EnvUnsupportedGetSecret);
}, true);
}
}

abstract headElements(routeData: RouteData): Promise<HeadElements> | HeadElements;
Expand Down
11 changes: 0 additions & 11 deletions packages/astro/src/core/errors/errors-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1174,17 +1174,6 @@ export const EnvInvalidVariables = {
`The following environment variables defined in \`experimental.env.schema\` are invalid:\n\n${errors.map((err) => `- ${err}`).join('\n')}\n`,
} satisfies ErrorData;

/**
* @docs
* @description
* The `astro:env/server` exported function `getSecret()` is not supported by your adapter.
*/
export const EnvUnsupportedGetSecret = {
name: 'EnvUnsupportedGetSecret',
title: 'Unsupported astro:env getSecret',
message: '`astro:env/server` exported function `getSecret` is not supported by your adapter.',
} satisfies ErrorData;

/**
* @docs
* @description
Expand Down

0 comments on commit c3b7e7c

Please sign in to comment.