diff options
21 files changed, 34 insertions, 104 deletions
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 90027f681..b9aa4ea3a 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -30,14 +30,14 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "^5.0.0-alpha.0" + "astro": "^5.0.0-alpha.6" }, "devDependencies": { "@astrojs/test-utils": "workspace:*", "@types/node": "^18.17.8", "@types/send": "^0.17.4", "@types/server-destroy": "^1.0.4", - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "astro-scripts": "workspace:*", "cheerio": "1.0.0", "express": "^4.19.2", diff --git a/packages/integrations/node/src/index.ts b/packages/integrations/node/src/index.ts index ec7a2ae3f..dbd39e6ea 100644 --- a/packages/integrations/node/src/index.ts +++ b/packages/integrations/node/src/index.ts @@ -9,6 +9,10 @@ export function getAdapter(options: Options): AstroAdapter { previewEntrypoint: '@astrojs/node/preview.js', exports: ['handler', 'startServer', 'options'], args: options, + adapterFeatures: { + buildOutput: 'server', + edgeMiddleware: false, + }, supportedAstroFeatures: { hybridOutput: 'stable', staticOutput: 'stable', @@ -59,7 +63,7 @@ export default function createIntegration(userOptions: UserOptions): AstroIntegr }, }); }, - 'astro:config:done': ({ setAdapter, config, logger }) => { + 'astro:config:done': ({ setAdapter, config }) => { _options = { ...userOptions, client: config.build.client?.toString(), @@ -69,12 +73,6 @@ export default function createIntegration(userOptions: UserOptions): AstroIntegr assets: config.build.assets, }; setAdapter(getAdapter(_options)); - - if (config.output === 'static') { - logger.warn( - `\`output: "server"\` or \`output: "hybrid"\` is required to use this adapter.` - ); - } }, }, }; diff --git a/packages/integrations/node/test/fixtures/api-route/package.json b/packages/integrations/node/test/fixtures/api-route/package.json index 00f611ee7..160b7e469 100644 --- a/packages/integrations/node/test/fixtures/api-route/package.json +++ b/packages/integrations/node/test/fixtures/api-route/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/bad-urls/package.json b/packages/integrations/node/test/fixtures/bad-urls/package.json index 994059623..d844ccea2 100644 --- a/packages/integrations/node/test/fixtures/bad-urls/package.json +++ b/packages/integrations/node/test/fixtures/bad-urls/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/encoded/package.json b/packages/integrations/node/test/fixtures/encoded/package.json index c09b8ffdb..3882bc4a1 100644 --- a/packages/integrations/node/test/fixtures/encoded/package.json +++ b/packages/integrations/node/test/fixtures/encoded/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/errors/package.json b/packages/integrations/node/test/fixtures/errors/package.json index d2ba94d58..b17a2a91a 100644 --- a/packages/integrations/node/test/fixtures/errors/package.json +++ b/packages/integrations/node/test/fixtures/errors/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/headers/package.json b/packages/integrations/node/test/fixtures/headers/package.json index 62279c2f4..af673c6d5 100644 --- a/packages/integrations/node/test/fixtures/headers/package.json +++ b/packages/integrations/node/test/fixtures/headers/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/image/package.json b/packages/integrations/node/test/fixtures/image/package.json index 189696f9a..b5b05238d 100644 --- a/packages/integrations/node/test/fixtures/image/package.json +++ b/packages/integrations/node/test/fixtures/image/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" }, "scripts": { diff --git a/packages/integrations/node/test/fixtures/locals/package.json b/packages/integrations/node/test/fixtures/locals/package.json index 936fa6d10..136c488b1 100644 --- a/packages/integrations/node/test/fixtures/locals/package.json +++ b/packages/integrations/node/test/fixtures/locals/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/node-middleware/package.json b/packages/integrations/node/test/fixtures/node-middleware/package.json index c40b6d780..23ff56efb 100644 --- a/packages/integrations/node/test/fixtures/node-middleware/package.json +++ b/packages/integrations/node/test/fixtures/node-middleware/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/prerender-404-500/package.json b/packages/integrations/node/test/fixtures/prerender-404-500/package.json index e85b7c94c..9f5e107c7 100644 --- a/packages/integrations/node/test/fixtures/prerender-404-500/package.json +++ b/packages/integrations/node/test/fixtures/prerender-404-500/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/prerender/package.json b/packages/integrations/node/test/fixtures/prerender/package.json index a457db530..69395eba2 100644 --- a/packages/integrations/node/test/fixtures/prerender/package.json +++ b/packages/integrations/node/test/fixtures/prerender/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/prerender/src/pages/two.astro b/packages/integrations/node/test/fixtures/prerender/src/pages/two.astro index c0e5d07aa..beb6e8d78 100644 --- a/packages/integrations/node/test/fixtures/prerender/src/pages/two.astro +++ b/packages/integrations/node/test/fixtures/prerender/src/pages/two.astro @@ -1,5 +1,5 @@ --- -export const prerender = import.meta.env.PRERENDER; +export const prerender = true; --- <html> <head> diff --git a/packages/integrations/node/test/fixtures/preview-headers/package.json b/packages/integrations/node/test/fixtures/preview-headers/package.json index 08c35bdf6..63556d024 100644 --- a/packages/integrations/node/test/fixtures/preview-headers/package.json +++ b/packages/integrations/node/test/fixtures/preview-headers/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/trailing-slash/astro.config.mjs b/packages/integrations/node/test/fixtures/trailing-slash/astro.config.mjs index 7ee28f213..acf78132b 100644 --- a/packages/integrations/node/test/fixtures/trailing-slash/astro.config.mjs +++ b/packages/integrations/node/test/fixtures/trailing-slash/astro.config.mjs @@ -2,7 +2,7 @@ import node from '@astrojs/node' export default { base: '/some-base', - output: 'hybrid', + output: 'static', trailingSlash: 'never', adapter: node({ mode: 'standalone' }) }; diff --git a/packages/integrations/node/test/fixtures/trailing-slash/package.json b/packages/integrations/node/test/fixtures/trailing-slash/package.json index 8bc0f20da..ff64fa458 100644 --- a/packages/integrations/node/test/fixtures/trailing-slash/package.json +++ b/packages/integrations/node/test/fixtures/trailing-slash/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/url/package.json b/packages/integrations/node/test/fixtures/url/package.json index 42609de2e..20cc9ae57 100644 --- a/packages/integrations/node/test/fixtures/url/package.json +++ b/packages/integrations/node/test/fixtures/url/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/well-known-locations/package.json b/packages/integrations/node/test/fixtures/well-known-locations/package.json index 29d13cc45..13ae4d63d 100644 --- a/packages/integrations/node/test/fixtures/well-known-locations/package.json +++ b/packages/integrations/node/test/fixtures/well-known-locations/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "astro": "^5.0.0-alpha.0", + "astro": "^5.0.0-alpha.6", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/prerender-404-500.test.js b/packages/integrations/node/test/prerender-404-500.test.js index 0cc669c45..1c8a28cdb 100644 --- a/packages/integrations/node/test/prerender-404-500.test.js +++ b/packages/integrations/node/test/prerender-404-500.test.js @@ -26,10 +26,6 @@ describe('Prerender 404', () => { root: './fixtures/prerender-404-500/', output: 'server', outDir: './dist/server-with-base', - build: { - client: './dist/server-with-base/client', - server: './dist/server-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -117,10 +113,6 @@ describe('Prerender 404', () => { root: './fixtures/prerender-404-500/', output: 'server', outDir: './dist/server-without-base', - build: { - client: './dist/server-without-base/client', - server: './dist/server-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -185,12 +177,8 @@ describe('Hybrid 404', () => { site: 'https://test.com/', base: '/some-base', root: './fixtures/prerender-404-500/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-with-base', - build: { - client: './dist/hybrid-with-base/client', - server: './dist/hybrid-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -248,12 +236,8 @@ describe('Hybrid 404', () => { // from being reused site: 'https://test.net/', root: './fixtures/prerender-404-500/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-without-base', - build: { - client: './dist/hybrid-without-base/client', - server: './dist/hybrid-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); diff --git a/packages/integrations/node/test/prerender.test.js b/packages/integrations/node/test/prerender.test.js index e4d8cbb4a..311b18bd9 100644 --- a/packages/integrations/node/test/prerender.test.js +++ b/packages/integrations/node/test/prerender.test.js @@ -22,10 +22,6 @@ describe('Prerendering', () => { root: './fixtures/prerender/', output: 'server', outDir: './dist/with-base', - build: { - client: './dist/with-base/client', - server: './dist/with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -99,10 +95,6 @@ describe('Prerendering', () => { root: './fixtures/prerender/', output: 'server', outDir: './dist/without-base', - build: { - client: './dist/without-base/client', - server: './dist/without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -165,10 +157,6 @@ describe('Prerendering', () => { root: './fixtures/prerender/', output: 'server', outDir: './dist/via-integration', - build: { - client: './dist/via-integration/client', - server: './dist/via-integration/server', - }, adapter: nodejs({ mode: 'standalone' }), integrations: [ { @@ -228,10 +216,6 @@ describe('Prerendering', () => { root: './fixtures/prerender/', output: 'server', outDir: './dist/dev', - build: { - client: './dist/dev/client', - server: './dist/dev/server', - }, adapter: nodejs({ mode: 'standalone' }), }); devServer = await fixture.startDevServer(); @@ -276,12 +260,8 @@ describe('Hybrid rendering', () => { fixture = await loadFixture({ base: '/some-base', root: './fixtures/prerender/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-with-base', - build: { - client: './dist/hybrid-with-base/client', - server: './dist/hybrid-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -351,12 +331,8 @@ describe('Hybrid rendering', () => { process.env.PRERENDER = false; fixture = await loadFixture({ root: './fixtures/prerender/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-without-base', - build: { - client: './dist/hybrid-without-base/client', - server: './dist/hybrid-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -418,12 +394,8 @@ describe('Hybrid rendering', () => { fixture = await loadFixture({ root: './fixtures/prerender/', - output: 'hybrid', + output: 'static', outDir: './dist/hybrid-shared-modules', - build: { - client: './dist/hybrid-shared-modules/client', - server: './dist/hybrid-shared-modules/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); diff --git a/packages/integrations/node/test/trailing-slash.test.js b/packages/integrations/node/test/trailing-slash.test.js index 95c6661f5..0ed46e9aa 100644 --- a/packages/integrations/node/test/trailing-slash.test.js +++ b/packages/integrations/node/test/trailing-slash.test.js @@ -21,13 +21,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', base: '/some-base', - output: 'hybrid', + output: 'static', trailingSlash: 'always', outDir: './dist/always-with-base', - build: { - client: './dist/always-with-base/client', - server: './dist/always-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -94,13 +90,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', - output: 'hybrid', + output: 'static', trailingSlash: 'always', outDir: './dist/always-without-base', - build: { - client: './dist/always-without-base/client', - server: './dist/always-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -170,13 +162,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', base: '/some-base', - output: 'hybrid', + output: 'static', trailingSlash: 'never', outDir: './dist/never-with-base', - build: { - client: './dist/never-with-base/client', - server: './dist/never-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -236,13 +224,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', - output: 'hybrid', + output: 'static', trailingSlash: 'never', outDir: './dist/never-without-base', - build: { - client: './dist/never-without-base/client', - server: './dist/never-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -305,13 +289,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', base: '/some-base', - output: 'hybrid', + output: 'static', trailingSlash: 'ignore', outDir: './dist/ignore-with-base', - build: { - client: './dist/ignore-with-base/client', - server: './dist/ignore-with-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -389,13 +369,9 @@ describe('Trailing slash', () => { fixture = await loadFixture({ root: './fixtures/trailing-slash/', - output: 'hybrid', + output: 'static', trailingSlash: 'ignore', outDir: './dist/ignore-without-base', - build: { - client: './dist/ignore-without-base/client', - server: './dist/ignore-without-base/server', - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); |