michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use .mjs extension when building for netlify edge and vercel serverless (#6317)

Browse source
This commit is contained in:
Bjorn Lu 2023-02-21 22:14:47 +08:00 • committed by GitHub
parent 2a6d09e5d2
commit 2eb73cb9d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 119 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.changeset/eighty-rockets-crash.md Normal file
View file

@ -0,0 +1,6 @@
---
'@astrojs/netlify': patch
'@astrojs/vercel': patch
---
Use .mjs extension when building to support CJS environments

2
packages/integrations/netlify/package.json
View file

@ -30,7 +30,7 @@
"build:ci": "astro-scripts build \"src/**/*.ts\"", "build:ci": "astro-scripts build \"src/**/*.ts\"",
"dev": "astro-scripts dev \"src/**/*.ts\"", "dev": "astro-scripts dev \"src/**/*.ts\"",
"test-fn": "mocha --exit --timeout 20000 test/functions/", "test-fn": "mocha --exit --timeout 20000 test/functions/",
"test-edge": "deno test --allow-run --allow-read --allow-net ./test/edge-functions/", "test-edge": "deno test --allow-run --allow-read --allow-net --allow-env ./test/edge-functions/",
"test": "npm run test-fn" "test": "npm run test-fn"
}, },
"dependencies": { "dependencies": {

2
packages/integrations/netlify/src/integration-edge-functions.ts
View file

@ -122,7 +122,7 @@ export function netlifyEdgeFunctions({ dist }: NetlifyEdgeFunctionsOptions = {})
build: { build: {
client: outDir, client: outDir,
server: new URL('./.netlify/edge-functions/', config.root), server: new URL('./.netlify/edge-functions/', config.root),
serverEntry: 'entry.js', serverEntry: 'entry.mjs',
}, },
}); });
}, },

9
packages/integrations/netlify/test/edge-functions/fixtures/prerender/astro.config.mjs Normal file
View file

@ -0,0 +1,9 @@
import { defineConfig } from 'astro/config';
import { netlifyEdgeFunctions } from '@astrojs/netlify';
export default defineConfig({
adapter: netlifyEdgeFunctions({
dist: new URL('./dist/', import.meta.url),
}),
output: 'server',
})

9
packages/integrations/netlify/test/edge-functions/fixtures/prerender/package.json Normal file
View file

@ -0,0 +1,9 @@
{
"name": "@test/astro-netlify-prerender",
"version": "0.0.0",
"private": true,
"dependencies": {
"@astrojs/netlify": "workspace:*",
"astro": "workspace:*"
}
}

12
packages/integrations/netlify/test/edge-functions/fixtures/prerender/src/pages/index.astro Normal file
View file

@ -0,0 +1,12 @@
---
export const prerender = true
---
<html>
<head>
<title>testing</title>
</head>
<body>
<h1>testing</h1>
</body>
</html>

18
packages/integrations/netlify/test/edge-functions/prerender.test.ts Normal file
View file

@ -0,0 +1,18 @@
// @ts-ignore
import { runBuild } from './test-utils.ts';
// @ts-ignore
import { assertEquals } from './deps.ts';
// @ts-ignore
Deno.test({
name: 'Prerender',
async fn() {
let close = await runBuild('./fixtures/prerender/');
const { default: handler } = await import(
'./fixtures/prerender/.netlify/edge-functions/entry.mjs'
);
const response = await handler(new Request('http://example.com/index.html'));
assertEquals(response, undefined, 'No response because this is an asset');
await close();
},
});

2
packages/integrations/vercel/src/serverless/adapter.ts
View file

@ -43,7 +43,7 @@ export default function vercelServerless({
updateConfig({ updateConfig({
outDir, outDir,
build: { build: {
serverEntry: 'entry.js', serverEntry: 'entry.mjs',
client: new URL('./static/', outDir), client: new URL('./static/', outDir),
server: new URL('./dist/', config.root), server: new URL('./dist/', config.root),
}, },

7
packages/integrations/vercel/test/fixtures/serverless-prerender/astro.config.mjs vendored Normal file
View file

@ -0,0 +1,7 @@
import { defineConfig } from 'astro/config';
import vercel from '@astrojs/vercel/serverless';
export default defineConfig({
adapter: vercel(),
output: 'server'
});

9
packages/integrations/vercel/test/fixtures/serverless-prerender/package.json vendored Normal file
View file

@ -0,0 +1,9 @@
{
"name": "@test/astro-vercel-serverless-prerender",
"version": "0.0.0",
"private": true,
"dependencies": {
"@astrojs/vercel": "workspace:*",
"astro": "workspace:*"
}
}

12
packages/integrations/vercel/test/fixtures/serverless-prerender/src/pages/index.astro vendored Normal file
View file

@ -0,0 +1,12 @@
---
export const prerender = true
---
<html>
<head>
<title>testing</title>
</head>
<body>
<h1>testing</h1>
</body>
</html>

18
packages/integrations/vercel/test/serverless-prerender.test.js Normal file
View file

@ -0,0 +1,18 @@
import { loadFixture } from './test-utils.js';
import { expect } from 'chai';
describe('Serverless prerender', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
before(async () => {
fixture = await loadFixture({
root: './fixtures/serverless-prerender/',
});
});
it('build successful', async () => {
await fixture.build();
expect(fixture.readFile('/static/index.html')).to.be.ok;
});
});

16
pnpm-lock.yaml generated
View file

@ -3096,6 +3096,14 @@ importers:
react: 18.2.0 react: 18.2.0
react-dom: 18.2.0_react@18.2.0 react-dom: 18.2.0_react@18.2.0
packages/integrations/netlify/test/edge-functions/fixtures/prerender:
specifiers:
'@astrojs/netlify': workspace:*
astro: workspace:*
dependencies:
'@astrojs/netlify': link:../../../..
astro: link:../../../../../../astro
packages/integrations/netlify/test/edge-functions/fixtures/root-dynamic: packages/integrations/netlify/test/edge-functions/fixtures/root-dynamic:
specifiers: specifiers:
'@astrojs/netlify': workspace:* '@astrojs/netlify': workspace:*
@ -3399,6 +3407,14 @@ importers:
'@astrojs/vercel': link:../../.. '@astrojs/vercel': link:../../..
astro: link:../../../../../astro astro: link:../../../../../astro
packages/integrations/vercel/test/fixtures/serverless-prerender:
specifiers:
'@astrojs/vercel': workspace:*
astro: workspace:*
dependencies:
'@astrojs/vercel': link:../../..
astro: link:../../../../../astro
packages/integrations/vue: packages/integrations/vue:
specifiers: specifiers:
'@types/chai': ^4.3.3 '@types/chai': ^4.3.3