Skip to content

Commit 67ddeea

Browse files
authored
Update adapt-node to work under esm correctly. (#397)
FIXED: #390
1 parent 5e267a8 commit 67ddeea

6 files changed

Lines changed: 21 additions & 5 deletions

File tree

.changeset/fuzzy-jeans-join.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/adapter-node': minor
3+
---
4+
5+
Make adapter node work under esm

.changeset/pre.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"forty-months-prove",
3636
"friendly-rivers-argue",
3737
"fuzzy-ghosts-call",
38+
"fuzzy-jeans-join",
3839
"gorgeous-radios-tan",
3940
"gorgeous-taxis-smash",
4041
"hot-keys-walk",

packages/adapter-node/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @sveltejs/adapter-node
22

3+
## 1.0.0-next.4
4+
5+
### Minor Changes
6+
7+
- Make adapter node work under esm
8+
39
## 1.0.0-next.3
410

511
### Patch Changes

packages/adapter-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sveltejs/adapter-node",
3-
"version": "1.0.0-next.3",
3+
"version": "1.0.0-next.4",
44
"main": "index.js",
55
"type": "module",
66
"files": [

packages/adapter-node/rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ export default {
99
sourcemap: true
1010
},
1111
plugins: [nodeResolve(), commonjs()],
12-
external: require('module').builtinModules
12+
external: ['./app.js', ...require('module').builtinModules]
1313
};

packages/adapter-node/src/server.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import * as fs from 'fs';
22
import * as http from 'http';
3-
import { parse, URLSearchParams } from 'url';
3+
import { dirname, join } from 'path';
4+
import { parse, URLSearchParams, fileURLToPath } from 'url';
45
import sirv from 'sirv';
56
import { get_body } from '@sveltejs/app-utils/http';
7+
// App is a dynamic file built from the application layer.
8+
/*eslint import/no-unresolved: [2, { ignore: ['\.\/app\.js$'] }]*/
9+
import * as app from './app.js';
610

7-
const app = require('./app.js');
11+
const __dirname = dirname(fileURLToPath(import.meta.url));
812

913
const { PORT = 3000 } = process.env; // TODO configure via svelte.config.js
1014

@@ -18,7 +22,7 @@ const noop_handler = (_req, _res, next) => next();
1822

1923
const prerendered_handler = fs.existsSync('prerendered') ? mutable('prerendered') : noop_handler;
2024

21-
const assets_handler = sirv('assets', {
25+
const assets_handler = sirv(join(__dirname, '/assets'), {
2226
maxAge: 31536000,
2327
immutable: true
2428
});

0 commit comments

Comments
 (0)