diff options
| author |  Matthew Phillips <matthew@skypack.dev>
| 2024-06-14 16:29:53 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-06-14 16:29:53 -0400 |
| commit | f5f8ed275b76adfb11b7c3c1e800753a25416498 (patch) | |
| tree | f96ecc96f35af19202d45ef0f1b80d45ed74b366 | |
| parent | 9b030239cb4db4e51a8a1da638743b60837f7e1a (diff) | |
| download | astro-f5f8ed275b76adfb11b7c3c1e800753a25416498.tar.gz astro-f5f8ed275b76adfb11b7c3c1e800753a25416498.tar.zst astro-f5f8ed275b76adfb11b7c3c1e800753a25416498.zip | |
Fix backwards compat with Astro <= 4.9 (#11261)
| -rw-r--r-- | .changeset/serious-humans-obey.md | 6 | ||||
| -rw-r--r-- | packages/integrations/node/src/server.ts | 7 | ||||
| -rw-r--r-- | packages/integrations/vercel/src/serverless/entrypoint.ts | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/.changeset/serious-humans-obey.md b/.changeset/serious-humans-obey.md new file mode 100644 index 000000000..4cd6e4d69 --- /dev/null +++ b/.changeset/serious-humans-obey.md @@ -0,0 +1,6 @@ +--- +'@astrojs/vercel': patch +'@astrojs/node': patch +--- + +Fix backwards compat with Astro <= 4.9 diff --git a/packages/integrations/node/src/server.ts b/packages/integrations/node/src/server.ts index e5b503292..e79c0761a 100644 --- a/packages/integrations/node/src/server.ts +++ b/packages/integrations/node/src/server.ts @@ -5,10 +5,13 @@ import { createStandaloneHandler } from './standalone.js'; import startServer from './standalone.js'; import type { Options } from './types.js'; +type EnvSetupModule = typeof import('astro/env/setup'); + // Won't throw if the virtual module is not available because it's not supported in // the users's astro version or if astro:env is not enabled in the project -await import('astro/env/setup') - .then((mod) => mod.setGetEnv((key) => process.env[key])) +const setupModule = 'astro/env/setup'; +await import(/* @vite-ignore */setupModule) + .then((mod: EnvSetupModule) => mod.setGetEnv((key) => process.env[key])) .catch(() => {}); applyPolyfills(); diff --git a/packages/integrations/vercel/src/serverless/entrypoint.ts b/packages/integrations/vercel/src/serverless/entrypoint.ts index 11d3c3a91..ee1e1bc99 100644 --- a/packages/integrations/vercel/src/serverless/entrypoint.ts +++ b/packages/integrations/vercel/src/serverless/entrypoint.ts @@ -8,10 +8,13 @@ import { ASTRO_PATH_PARAM, } from './adapter.js'; +type EnvSetupModule = typeof import('astro/env/setup'); + // Won't throw if the virtual module is not available because it's not supported in // the users's astro version or if astro:env is not enabled in the project -await import('astro/env/setup') - .then((mod) => mod.setGetEnv((key) => process.env[key])) +const setupModule = 'astro/env/setup'; +await import(/* @vite-ignore */setupModule) + .then((mod: EnvSetupModule) => mod.setGetEnv((key) => process.env[key])) .catch(() => {}); applyPolyfills(); |