diff options
author | 2022-07-25 00:18:02 -0400 | |
---|---|---|
committer | 2022-07-25 00:18:02 -0400 | |
commit | 6fd161d7691cbf9d3ffa4646e46059dfd0940010 (patch) | |
tree | ce2d0ce18f42a0cb0de026cbf50a0be1a57c07d0 /packages/integrations/netlify | |
parent | 8859655f15b718a1fc89bf87d352aa98841b88ad (diff) | |
download | astro-6fd161d7691cbf9d3ffa4646e46059dfd0940010.tar.gz astro-6fd161d7691cbf9d3ffa4646e46059dfd0940010.tar.zst astro-6fd161d7691cbf9d3ffa4646e46059dfd0940010.zip |
Add the `output` option (#4015)
* Start of work on astroConfig.mode === 'server'
* Add tests and more
* adapter -> deploy in some places
* Add fallback for `adapter` config
* Update more tests
* Update image tests
* Fix clientAddress test
* Updates based on PR review
* Add a changeset
* Update integrations tests + readme
* Oops
* Remove old option
* Rename `mode` to `output`
* Update Node adapter test
* Update test
* fred pass
* fred pass
* fred pass
* fix test
Co-authored-by: Fred K. Schott <fkschott@gmail.com>
Diffstat (limited to 'packages/integrations/netlify')
9 files changed, 19 insertions, 18 deletions
diff --git a/packages/integrations/netlify/README.md b/packages/integrations/netlify/README.md index 5f6b61fa2..0dc6f3db8 100644 --- a/packages/integrations/netlify/README.md +++ b/packages/integrations/netlify/README.md @@ -37,6 +37,7 @@ import { defineConfig } from 'astro/config'; import netlify from '@astrojs/netlify/functions'; export default defineConfig({ + output: 'server', adapter: netlify(), }); ``` @@ -51,6 +52,7 @@ import { defineConfig } from 'astro/config'; + import netlify from '@astrojs/netlify/edge-functions'; export default defineConfig({ + output: 'server', adapter: netlify(), }); ``` @@ -83,6 +85,7 @@ import { defineConfig } from 'astro/config'; import netlify from '@astrojs/netlify/functions'; export default defineConfig({ + output: 'server', adapter: netlify({ dist: new URL('./dist/', import.meta.url) }) diff --git a/packages/integrations/netlify/src/integration-edge-functions.ts b/packages/integrations/netlify/src/integration-edge-functions.ts index b3f27997d..0556317d7 100644 --- a/packages/integrations/netlify/src/integration-edge-functions.ts +++ b/packages/integrations/netlify/src/integration-edge-functions.ts @@ -135,6 +135,11 @@ export function netlifyEdgeFunctions({ dist }: NetlifyEdgeFunctionsOptions = {}) 'astro:config:done': ({ config, setAdapter }) => { setAdapter(getAdapter()); _config = config; + + if(config.output === 'static') { + console.warn(`[@astrojs/netlify] \`output: "server"\` is required to use this adapter.`); + console.warn(`[@astrojs/netlify] Otherwise, this adapter is not required to deploy a static site to Netlify.`); + } }, 'astro:build:start': async ({ buildConfig }) => { _buildConfig = buildConfig; diff --git a/packages/integrations/netlify/src/integration-functions.ts b/packages/integrations/netlify/src/integration-functions.ts index e9b4aae33..d0b327f87 100644 --- a/packages/integrations/netlify/src/integration-functions.ts +++ b/packages/integrations/netlify/src/integration-functions.ts @@ -35,6 +35,11 @@ function netlifyFunctions({ 'astro:config:done': ({ config, setAdapter }) => { setAdapter(getAdapter({ binaryMediaTypes })); _config = config; + + if(config.output === 'static') { + console.warn(`[@astrojs/netlify] \`output: "server"\` is required to use this adapter.`); + console.warn(`[@astrojs/netlify] Otherwise, this adapter is not required to deploy a static site to Netlify.`); + } }, 'astro:build:start': async ({ buildConfig }) => { entryFile = buildConfig.serverEntry.replace(/\.m?js/, ''); diff --git a/packages/integrations/netlify/test/edge-functions/fixtures/dynimport/astro.config.mjs b/packages/integrations/netlify/test/edge-functions/fixtures/dynimport/astro.config.mjs index c55135e43..cd758352b 100644 --- a/packages/integrations/netlify/test/edge-functions/fixtures/dynimport/astro.config.mjs +++ b/packages/integrations/netlify/test/edge-functions/fixtures/dynimport/astro.config.mjs @@ -5,7 +5,5 @@ export default defineConfig({ adapter: netlifyEdgeFunctions({ dist: new URL('./dist/', import.meta.url), }), - experimental: { - ssr: true - } + output: 'server', }) diff --git a/packages/integrations/netlify/test/edge-functions/fixtures/edge-basic/astro.config.mjs b/packages/integrations/netlify/test/edge-functions/fixtures/edge-basic/astro.config.mjs index d7c899264..a08e8e89d 100644 --- a/packages/integrations/netlify/test/edge-functions/fixtures/edge-basic/astro.config.mjs +++ b/packages/integrations/netlify/test/edge-functions/fixtures/edge-basic/astro.config.mjs @@ -7,7 +7,5 @@ export default defineConfig({ dist: new URL('./dist/', import.meta.url), }), integrations: [react()], - experimental: { - ssr: true - } + output: 'server', }) diff --git a/packages/integrations/netlify/test/edge-functions/fixtures/root-dynamic/astro.config.mjs b/packages/integrations/netlify/test/edge-functions/fixtures/root-dynamic/astro.config.mjs index c55135e43..cd758352b 100644 --- a/packages/integrations/netlify/test/edge-functions/fixtures/root-dynamic/astro.config.mjs +++ b/packages/integrations/netlify/test/edge-functions/fixtures/root-dynamic/astro.config.mjs @@ -5,7 +5,5 @@ export default defineConfig({ adapter: netlifyEdgeFunctions({ dist: new URL('./dist/', import.meta.url), }), - experimental: { - ssr: true - } + output: 'server', }) diff --git a/packages/integrations/netlify/test/functions/base64-response.test.js b/packages/integrations/netlify/test/functions/base64-response.test.js index 064cff154..6e59bd192 100644 --- a/packages/integrations/netlify/test/functions/base64-response.test.js +++ b/packages/integrations/netlify/test/functions/base64-response.test.js @@ -9,9 +9,7 @@ describe('Base64 Responses', () => { before(async () => { fixture = await loadFixture({ root: new URL('./fixtures/base64-response/', import.meta.url).toString(), - experimental: { - ssr: true, - }, + output: 'server', adapter: netlifyAdapter({ dist: new URL('./fixtures/base64-response/dist/', import.meta.url), binaryMediaTypes: ['font/otf'], diff --git a/packages/integrations/netlify/test/functions/cookies.test.js b/packages/integrations/netlify/test/functions/cookies.test.js index e9121b429..bc1771512 100644 --- a/packages/integrations/netlify/test/functions/cookies.test.js +++ b/packages/integrations/netlify/test/functions/cookies.test.js @@ -11,9 +11,7 @@ describe('Cookies', () => { before(async () => { fixture = await loadFixture({ root: new URL('./fixtures/cookies/', import.meta.url).toString(), - experimental: { - ssr: true, - }, + output: 'server', adapter: netlifyAdapter({ dist: new URL('./fixtures/cookies/dist/', import.meta.url), }), diff --git a/packages/integrations/netlify/test/functions/dynamic-route.test.js b/packages/integrations/netlify/test/functions/dynamic-route.test.js index 8c8977f7e..0cfb5359b 100644 --- a/packages/integrations/netlify/test/functions/dynamic-route.test.js +++ b/packages/integrations/netlify/test/functions/dynamic-route.test.js @@ -9,9 +9,7 @@ describe('Dynamic pages', () => { before(async () => { fixture = await loadFixture({ root: new URL('./fixtures/dynamic-route/', import.meta.url).toString(), - experimental: { - ssr: true, - }, + output: 'server', adapter: netlifyAdapter({ dist: new URL('./fixtures/dynamic-route/dist/', import.meta.url), }), |