Skip to content

Commit 72e5882

Browse files
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>
1 parent a8261f8 commit 72e5882

9 files changed

Lines changed: 19 additions & 18 deletions

File tree

packages/integrations/netlify/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { defineConfig } from 'astro/config';
3737
import netlify from '@astrojs/netlify/functions';
3838

3939
export default defineConfig({
40+
output: 'server',
4041
adapter: netlify(),
4142
});
4243
```
@@ -51,6 +52,7 @@ import { defineConfig } from 'astro/config';
5152
+ import netlify from '@astrojs/netlify/edge-functions';
5253

5354
export default defineConfig({
55+
output: 'server',
5456
adapter: netlify(),
5557
});
5658
```
@@ -83,6 +85,7 @@ import { defineConfig } from 'astro/config';
8385
import netlify from '@astrojs/netlify/functions';
8486

8587
export default defineConfig({
88+
output: 'server',
8689
adapter: netlify({
8790
dist: new URL('./dist/', import.meta.url)
8891
})

packages/integrations/netlify/src/integration-edge-functions.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@ export function netlifyEdgeFunctions({ dist }: NetlifyEdgeFunctionsOptions = {})
135135
'astro:config:done': ({ config, setAdapter }) => {
136136
setAdapter(getAdapter());
137137
_config = config;
138+
139+
if(config.output === 'static') {
140+
console.warn(`[@astrojs/netlify] \`output: "server"\` is required to use this adapter.`);
141+
console.warn(`[@astrojs/netlify] Otherwise, this adapter is not required to deploy a static site to Netlify.`);
142+
}
138143
},
139144
'astro:build:start': async ({ buildConfig }) => {
140145
_buildConfig = buildConfig;

packages/integrations/netlify/src/integration-functions.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ function netlifyFunctions({
3535
'astro:config:done': ({ config, setAdapter }) => {
3636
setAdapter(getAdapter({ binaryMediaTypes }));
3737
_config = config;
38+
39+
if(config.output === 'static') {
40+
console.warn(`[@astrojs/netlify] \`output: "server"\` is required to use this adapter.`);
41+
console.warn(`[@astrojs/netlify] Otherwise, this adapter is not required to deploy a static site to Netlify.`);
42+
}
3843
},
3944
'astro:build:start': async ({ buildConfig }) => {
4045
entryFile = buildConfig.serverEntry.replace(/\.m?js/, '');

packages/integrations/netlify/test/edge-functions/fixtures/dynimport/astro.config.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ export default defineConfig({
55
adapter: netlifyEdgeFunctions({
66
dist: new URL('./dist/', import.meta.url),
77
}),
8-
experimental: {
9-
ssr: true
10-
}
8+
output: 'server',
119
})

packages/integrations/netlify/test/edge-functions/fixtures/edge-basic/astro.config.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ export default defineConfig({
77
dist: new URL('./dist/', import.meta.url),
88
}),
99
integrations: [react()],
10-
experimental: {
11-
ssr: true
12-
}
10+
output: 'server',
1311
})

packages/integrations/netlify/test/edge-functions/fixtures/root-dynamic/astro.config.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ export default defineConfig({
55
adapter: netlifyEdgeFunctions({
66
dist: new URL('./dist/', import.meta.url),
77
}),
8-
experimental: {
9-
ssr: true
10-
}
8+
output: 'server',
119
})

packages/integrations/netlify/test/functions/base64-response.test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ describe('Base64 Responses', () => {
99
before(async () => {
1010
fixture = await loadFixture({
1111
root: new URL('./fixtures/base64-response/', import.meta.url).toString(),
12-
experimental: {
13-
ssr: true,
14-
},
12+
output: 'server',
1513
adapter: netlifyAdapter({
1614
dist: new URL('./fixtures/base64-response/dist/', import.meta.url),
1715
binaryMediaTypes: ['font/otf'],

packages/integrations/netlify/test/functions/cookies.test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ describe('Cookies', () => {
1111
before(async () => {
1212
fixture = await loadFixture({
1313
root: new URL('./fixtures/cookies/', import.meta.url).toString(),
14-
experimental: {
15-
ssr: true,
16-
},
14+
output: 'server',
1715
adapter: netlifyAdapter({
1816
dist: new URL('./fixtures/cookies/dist/', import.meta.url),
1917
}),

packages/integrations/netlify/test/functions/dynamic-route.test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ describe('Dynamic pages', () => {
99
before(async () => {
1010
fixture = await loadFixture({
1111
root: new URL('./fixtures/dynamic-route/', import.meta.url).toString(),
12-
experimental: {
13-
ssr: true,
14-
},
12+
output: 'server',
1513
adapter: netlifyAdapter({
1614
dist: new URL('./fixtures/dynamic-route/dist/', import.meta.url),
1715
}),

0 commit comments

Comments
 (0)