diff options
28 files changed, 91 insertions, 148 deletions
diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md index ed830f8de..481dcb7cc 100644 --- a/packages/integrations/node/CHANGELOG.md +++ b/packages/integrations/node/CHANGELOG.md @@ -1,5 +1,35 @@ # @astrojs/node +## 9.0.0-alpha.1 + +### Major Changes + +- [#11679](https://github.com/withastro/astro/pull/11679) [`ea71b90`](https://github.com/withastro/astro/commit/ea71b90c9c08ddd1d3397c78e2e273fb799f7dbd) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Adds stable support for `astro:env` + +- [#11770](https://github.com/withastro/astro/pull/11770) [`cfa6a47`](https://github.com/withastro/astro/commit/cfa6a47ac7a541f99fdad46a68d0cca6e5816cd5) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Removed support for the Squoosh image service. As the underlying library `libsquoosh` is no longer maintained, and the image service sees very little usage we have decided to remove it from Astro. + + Our recommendation is to use the base Sharp image service, which is more powerful, faster, and more actively maintained. + + ```diff + - import { squooshImageService } from "astro/config"; + import { defineConfig } from "astro/config"; + + export default defineConfig({ + - image: { + - service: squooshImageService() + - } + }); + ``` + + If you are using this service, and cannot migrate to the base Sharp image service, a third-party extraction of the previous service is available here: https://github.com/Princesseuh/astro-image-service-squoosh + +## 9.0.0-alpha.0 + +### Patch Changes + +- Updated dependencies [[`b6fbdaa`](https://github.com/withastro/astro/commit/b6fbdaa94a9ecec706a99e1938fbf5cd028c72e0), [`89bab1e`](https://github.com/withastro/astro/commit/89bab1e70786123fbe933a9d7a1b80c9334dcc5f), [`d74617c`](https://github.com/withastro/astro/commit/d74617cbd3278feba05909ec83db2d73d57a153e), [`e90f559`](https://github.com/withastro/astro/commit/e90f5593d23043579611452a84b9e18ad2407ef9), [`2df49a6`](https://github.com/withastro/astro/commit/2df49a6fb4f6d92fe45f7429430abe63defeacd6), [`8a53517`](https://github.com/withastro/astro/commit/8a5351737d6a14fc55f1dafad8f3b04079e81af6)]: + - astro@5.0.0-alpha.0 + ## 8.3.3 ### Patch Changes diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 7a7375ddc..e2f171038 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/node", "description": "Deploy your site to a Node.js server", - "version": "8.3.3", + "version": "9.0.0-alpha.1", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -11,7 +11,10 @@ "url": "https://github.com/withastro/adapters.git", "directory": "packages/node" }, - "keywords": ["withastro", "astro-adapter"], + "keywords": [ + "withastro", + "astro-adapter" + ], "bugs": "https://github.com/withastro/adapters/issues", "homepage": "https://docs.astro.build/en/guides/integrations-guide/node/", "exports": { @@ -20,7 +23,9 @@ "./preview.js": "./dist/preview.js", "./package.json": "./package.json" }, - "files": ["dist"], + "files": [ + "dist" + ], "scripts": { "build": "tsc", "test": "astro-scripts test \"test/**/*.test.js\"" @@ -30,14 +35,14 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "^4.2.0" + "astro": "^5.0.0-alpha.8" }, "devDependencies": { "@astrojs/test-utils": "workspace:*", "@types/node": "^18.19.50", "@types/send": "^0.17.4", "@types/server-destroy": "^1.0.4", - "astro": "^4.15.4", + "astro": "^5.0.0-alpha.8", "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 eb3c98a9b..e91ed171b 100644 --- a/packages/integrations/node/src/index.ts +++ b/packages/integrations/node/src/index.ts @@ -9,31 +9,21 @@ 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', serverOutput: 'stable', - assets: { - supportKind: 'stable', - isSharpCompatible: true, - isSquooshCompatible: true, - }, + sharpImageService: 'stable', i18nDomains: 'experimental', - envGetSecret: 'experimental', + envGetSecret: 'stable', }, }; } -// TODO: remove once we don't use a TLA anymore -async function shouldExternalizeAstroEnvSetup() { - try { - await import('astro/env/setup'); - return false; - } catch { - return true; - } -} - export default function createIntegration(userOptions: UserOptions): AstroIntegration { if (!userOptions?.mode) { throw new AstroError(`Setting the 'mode' option is required.`); @@ -51,16 +41,11 @@ export default function createIntegration(userOptions: UserOptions): AstroIntegr vite: { ssr: { noExternal: ['@astrojs/node'], - ...((await shouldExternalizeAstroEnvSetup()) - ? { - external: ['astro/env/setup'], - } - : {}), }, }, }); }, - 'astro:config:done': ({ setAdapter, config, logger }) => { + 'astro:config:done': ({ setAdapter, config }) => { _options = { ...userOptions, client: config.build.client?.toString(), @@ -70,12 +55,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/src/middleware.ts b/packages/integrations/node/src/middleware.ts index 5bb104914..aeee6cf2e 100644 --- a/packages/integrations/node/src/middleware.ts +++ b/packages/integrations/node/src/middleware.ts @@ -25,6 +25,7 @@ export default function createMiddleware(app: NodeApp): RequestHandler { return next(error); // biome-ignore lint/style/noUselessElse: <explanation> } else { + // biome-ignore lint/complexity/useArrowFunction: <explanation> throw error; } } diff --git a/packages/integrations/node/src/polyfill.ts b/packages/integrations/node/src/polyfill.ts new file mode 100644 index 000000000..dc00f45d7 --- /dev/null +++ b/packages/integrations/node/src/polyfill.ts @@ -0,0 +1,3 @@ +import { applyPolyfills } from 'astro/app/node'; + +applyPolyfills(); diff --git a/packages/integrations/node/src/preview.ts b/packages/integrations/node/src/preview.ts index 7e9415df8..0517e2c0b 100644 --- a/packages/integrations/node/src/preview.ts +++ b/packages/integrations/node/src/preview.ts @@ -18,6 +18,7 @@ const createPreviewServer: CreatePreviewServer = async (preview) => { ssrHandler = ssrModule.handler; // biome-ignore lint/style/noNonNullAssertion: <explanation> options = ssrModule.options!; + // biome-ignore lint/complexity/useArrowFunction: <explanation> } else { throw new AstroError( `The server entrypoint doesn't have a handler. Are you sure this is the right file?` diff --git a/packages/integrations/node/src/server.ts b/packages/integrations/node/src/server.ts index 1bb27e002..cef262b47 100644 --- a/packages/integrations/node/src/server.ts +++ b/packages/integrations/node/src/server.ts @@ -1,17 +1,15 @@ +// Keep at the top +import './polyfill.js'; + import type { SSRManifest } from 'astro'; -import { NodeApp, applyPolyfills } from 'astro/app/node'; +import { NodeApp } from 'astro/app/node'; +import { setGetEnv } from 'astro/env/setup'; import createMiddleware from './middleware.js'; import { createStandaloneHandler } from './standalone.js'; import startServer from './standalone.js'; import type { Options } from './types.js'; -// This needs to run first because some internals depend on `crypto` -applyPolyfills(); -// 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])) - .catch(() => {}); +setGetEnv((key) => process.env[key]); export function createExports(manifest: SSRManifest, options: Options) { const app = new NodeApp(manifest); diff --git a/packages/integrations/node/test/api-route.test.js b/packages/integrations/node/test/api-route.test.js index 5eca5c530..05cdcd637 100644 --- a/packages/integrations/node/test/api-route.test.js +++ b/packages/integrations/node/test/api-route.test.js @@ -7,7 +7,7 @@ import { createRequestAndResponse, loadFixture } from './test-utils.js'; describe('API routes', () => { /** @type {import('./test-utils').Fixture} */ let fixture; - /** @type {import('astro/src/@types/astro.js').PreviewServer} */ + /** @type {import('../../../astro/src/types/public/preview.js').PreviewServer} */ let previewServer; /** @type {URL} */ let baseUri; diff --git a/packages/integrations/node/test/fixtures/api-route/package.json b/packages/integrations/node/test/fixtures/api-route/package.json index bdf2e1867..637f39faa 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@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 18bed8b5d..5e3b876f7 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/encoded/package.json b/packages/integrations/node/test/fixtures/encoded/package.json index 365249e01..d7f7b5d46 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/errors/package.json b/packages/integrations/node/test/fixtures/errors/package.json index fea24d80f..4d3bc7e6d 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/headers/package.json b/packages/integrations/node/test/fixtures/headers/package.json index 575cbc915..15c27a535 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/image/package.json b/packages/integrations/node/test/fixtures/image/package.json index 4b7c67bee..3ec204280 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@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 c4688a79c..6d98bd314 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@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 0c80e7a89..d2b924c80 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@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 63fad4b85..c1dc8b45d 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/prerender/package.json b/packages/integrations/node/test/fixtures/prerender/package.json index d159914c3..e6eb79d06 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/prerender/src/middleware.ts b/packages/integrations/node/test/fixtures/prerender/src/middleware.ts index 13d619d78..3083acd24 100644 --- a/packages/integrations/node/test/fixtures/prerender/src/middleware.ts +++ b/packages/integrations/node/test/fixtures/prerender/src/middleware.ts @@ -1,7 +1,5 @@ import { shared } from './shared'; export const onRequest = (ctx, next) => { - ctx.locals = { - name: shared, - }; + ctx.locals.name = shared; return next(); }; 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 017f6173e..a7e64b2c6 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@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 e3af97d14..9bea24872 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@astrojs/node": "workspace:*" } } diff --git a/packages/integrations/node/test/fixtures/url/package.json b/packages/integrations/node/test/fixtures/url/package.json index 52c66780b..d2c038baf 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@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 8cb908221..f1fe33157 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": "^4.15.4", + "astro": "^5.0.0-alpha.8", "@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 86226c500..a7e968f0c 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(); @@ -42,8 +38,7 @@ describe('Prerender 404', () => { after(async () => { await server.stop(); await fixture.clean(); - // biome-ignore lint/performance/noDelete: <explanation> - delete process.env.PRERENDER; + process.env.PRERENDER = undefined; }); it('Can render SSR route', async () => { @@ -117,10 +112,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(); @@ -133,8 +124,7 @@ describe('Prerender 404', () => { after(async () => { await server.stop(); await fixture.clean(); - // biome-ignore lint/performance/noDelete: <explanation> - delete process.env.PRERENDER; + process.env.PRERENDER = undefined; }); it('Can render SSR route', async () => { @@ -185,12 +175,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(); @@ -203,8 +189,7 @@ describe('Hybrid 404', () => { after(async () => { await server.stop(); await fixture.clean(); - // biome-ignore lint/performance/noDelete: <explanation> - delete process.env.PRERENDER; + process.env.PRERENDER = undefined; }); it('Can render SSR route', async () => { @@ -248,12 +233,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(); @@ -266,8 +247,7 @@ describe('Hybrid 404', () => { after(async () => { await server.stop(); await fixture.clean(); - // biome-ignore lint/performance/noDelete: <explanation> - delete process.env.PRERENDER; + process.env.PRERENDER = undefined; }); it('Can render SSR route', async () => { diff --git a/packages/integrations/node/test/prerender.test.js b/packages/integrations/node/test/prerender.test.js index 0684ff63a..71137b76a 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(); @@ -98,10 +94,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(); @@ -163,10 +155,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: [ { @@ -225,10 +213,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(); @@ -273,12 +257,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(); @@ -347,12 +327,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(); @@ -413,12 +389,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 6f6a2a3ba..2a73efa75 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(); @@ -93,13 +89,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(); @@ -168,13 +160,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(); @@ -233,13 +221,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(); @@ -301,13 +285,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(); @@ -384,13 +364,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(); |