diff options
4 files changed, 97 insertions, 42 deletions
diff --git a/packages/integrations/node/test/node-middleware.test.js b/packages/integrations/node/test/node-middleware.test.js index fa496e871..d1b016a51 100644 --- a/packages/integrations/node/test/node-middleware.test.js +++ b/packages/integrations/node/test/node-middleware.test.js @@ -9,13 +9,6 @@ import { loadFixture, waitServerListen } from './test-utils.js'; * @typedef {import('../../../astro/test/test-utils').Fixture} Fixture */ -async function load() { - const mod = await import( - `./fixtures/node-middleware/dist/server/entry.mjs?dropcache=${Date.now()}` - ); - return mod; -} - describe('behavior from middleware, standalone', () => { /** @type {import('./test-utils').Fixture} */ let fixture; @@ -29,7 +22,7 @@ describe('behavior from middleware, standalone', () => { adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -69,7 +62,7 @@ describe('behavior from middleware, middleware', () => { adapter: nodejs({ mode: 'middleware' }), }); await fixture.build(); - const { handler } = await load(); + const { handler } = await fixture.loadAdapterEntryModule(); const app = express(); app.use(handler); server = app.listen(8888); diff --git a/packages/integrations/node/test/prerender-404-500.test.js b/packages/integrations/node/test/prerender-404-500.test.js index afa23a151..2535fcb35 100644 --- a/packages/integrations/node/test/prerender-404-500.test.js +++ b/packages/integrations/node/test/prerender-404-500.test.js @@ -8,13 +8,6 @@ import { loadFixture, waitServerListen } from './test-utils.js'; * @typedef {import('../../../astro/test/test-utils').Fixture} Fixture */ -async function load() { - const mod = await import( - `./fixtures/prerender-404-500/dist/server/entry.mjs?dropcache=${Date.now()}` - ); - return mod; -} - describe('Prerender 404', () => { /** @type {import('./test-utils').Fixture} */ let fixture; @@ -32,10 +25,15 @@ describe('Prerender 404', () => { base: '/some-base', 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -117,10 +115,15 @@ describe('Prerender 404', () => { site: 'https://test.info/', 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -181,10 +184,15 @@ describe('Hybrid 404', () => { base: '/some-base', root: './fixtures/prerender-404-500/', output: 'hybrid', + 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -238,10 +246,15 @@ describe('Hybrid 404', () => { site: 'https://test.net/', root: './fixtures/prerender-404-500/', output: 'hybrid', + 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); diff --git a/packages/integrations/node/test/prerender.test.js b/packages/integrations/node/test/prerender.test.js index 29080981a..d856d9d3e 100644 --- a/packages/integrations/node/test/prerender.test.js +++ b/packages/integrations/node/test/prerender.test.js @@ -8,10 +8,6 @@ import { loadFixture, waitServerListen } from './test-utils.js'; * @typedef {import('../../../astro/test/test-utils').Fixture} Fixture */ -async function load() { - const mod = await import(`./fixtures/prerender/dist/server/entry.mjs?dropcache=${Date.now()}`); - return mod; -} describe('Prerendering', () => { /** @type {import('./test-utils').Fixture} */ let fixture; @@ -25,10 +21,15 @@ describe('Prerendering', () => { base: '/some-base', 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -94,10 +95,15 @@ describe('Prerendering', () => { fixture = await loadFixture({ 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(); - const { startServer } = await await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -155,6 +161,11 @@ describe('Prerendering', () => { fixture = await loadFixture({ 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(); @@ -197,10 +208,15 @@ describe('Hybrid rendering', () => { base: '/some-base', root: './fixtures/prerender/', output: 'hybrid', + 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -264,10 +280,15 @@ describe('Hybrid rendering', () => { fixture = await loadFixture({ root: './fixtures/prerender/', output: 'hybrid', + 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -323,10 +344,15 @@ describe('Hybrid rendering', () => { fixture = await loadFixture({ root: './fixtures/prerender/', output: 'hybrid', + 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); diff --git a/packages/integrations/node/test/trailing-slash.test.js b/packages/integrations/node/test/trailing-slash.test.js index ad91a2759..9ea8fcddd 100644 --- a/packages/integrations/node/test/trailing-slash.test.js +++ b/packages/integrations/node/test/trailing-slash.test.js @@ -8,13 +8,6 @@ import { loadFixture, waitServerListen } from './test-utils.js'; * @typedef {import('../../../astro/test/test-utils').Fixture} Fixture */ -async function load() { - const mod = await import( - `./fixtures/trailing-slash/dist/server/entry.mjs?dropcache=${Date.now()}` - ); - return mod; -} - describe('Trailing slash', () => { /** @type {import('./test-utils').Fixture} */ let fixture; @@ -30,10 +23,15 @@ describe('Trailing slash', () => { base: '/some-base', output: 'hybrid', 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -96,10 +94,15 @@ describe('Trailing slash', () => { root: './fixtures/trailing-slash/', output: 'hybrid', 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -165,10 +168,15 @@ describe('Trailing slash', () => { base: '/some-base', output: 'hybrid', 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -224,10 +232,15 @@ describe('Trailing slash', () => { root: './fixtures/trailing-slash/', output: 'hybrid', 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -286,10 +299,15 @@ describe('Trailing slash', () => { base: '/some-base', output: 'hybrid', 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); @@ -363,10 +381,15 @@ describe('Trailing slash', () => { root: './fixtures/trailing-slash/', output: 'hybrid', 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(); - const { startServer } = await load(); + const { startServer } = await fixture.loadAdapterEntryModule(); let res = startServer(); server = res.server; await waitServerListen(server.server); |