-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert more adapter files to TypeScript (#138)
- Loading branch information
Showing
15 changed files
with
287 additions
and
237 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
.DS_Store | ||
node_modules | ||
render.js | ||
render.js | ||
render.d.ts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
.DS_Store | ||
node_modules | ||
server.js | ||
index.js | ||
index.d.ts | ||
server.js | ||
server.d.ts |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,72 +1,49 @@ | ||
import * as fs from 'fs'; | ||
import * as http from 'http'; | ||
import { parse, URLSearchParams } from 'url'; | ||
import sirv from 'sirv'; | ||
import { render } from '@sveltejs/app-utils/renderer'; | ||
import { get_body } from '@sveltejs/app-utils/http'; | ||
import type { PageComponentManifest, EndpointManifest, Method } from '@sveltejs/app-utils'; | ||
|
||
const manifest = require('./manifest.js'); | ||
const client = require('./client.json'); | ||
|
||
const { PORT = 3000 } = process.env; | ||
|
||
const mutable = (dir: string) => sirv(dir, { | ||
etag: true, | ||
maxAge: 0 | ||
}); | ||
|
||
const static_handler = mutable('static'); | ||
const prerendered_handler = fs.existsSync('build/prerendered') | ||
? mutable('build/prerendered') | ||
: (_req: http.IncomingMessage, _res: http.ServerResponse, next: () => void) => next(); | ||
|
||
const assets_handler = sirv('build/assets', { | ||
maxAge: 31536000, | ||
immutable: true | ||
}); | ||
|
||
const root = require('./root.js'); | ||
const setup = require('./setup.js'); | ||
const template = fs.readFileSync('build/app.html', 'utf-8'); | ||
|
||
const server = http.createServer((req, res) => { | ||
assets_handler(req, res, () => { | ||
static_handler(req, res, () => { | ||
prerendered_handler(req, res, async () => { | ||
const parsed = parse(req.url || ''); | ||
|
||
const rendered = await render({ | ||
host: null, // TODO | ||
method: req.method as Method, | ||
headers: req.headers as Record<string, string>, // TODO: what about repeated headers, i.e. string[] | ||
path: parsed.pathname as string, | ||
body: await get_body(req), | ||
query: new URLSearchParams(parsed.query || '') | ||
}, { | ||
static_dir: 'static', | ||
template, | ||
manifest, | ||
client, | ||
root, | ||
setup, | ||
load: (route: PageComponentManifest | EndpointManifest) => require(`./routes/${route.name}.js`), | ||
dev: false, | ||
only_prerender: false | ||
}); | ||
|
||
if (rendered) { | ||
res.writeHead(rendered.status, rendered.headers); | ||
res.end(rendered.body); | ||
} else { | ||
res.statusCode = 404; | ||
res.end('Not found'); | ||
} | ||
}); | ||
}); | ||
import fs from 'fs'; | ||
import { RouteManifest } from '@sveltejs/app-utils'; | ||
import { copy } from '@sveltejs/app-utils/files'; | ||
import { prerender } from '@sveltejs/app-utils/renderer'; | ||
import { Logger } from '@sveltejs/app-utils/renderer/prerender'; | ||
|
||
module.exports = async function adapter({ | ||
dir, | ||
manifest, | ||
log | ||
}: { | ||
dir: string, | ||
manifest: RouteManifest, | ||
log: Logger | ||
}) { | ||
const out = 'build'; // TODO implement adapter options | ||
|
||
copy(`${dir}/client`, `${out}/assets/_app`, file => !!file && file[0] !== '.'); | ||
copy(`${dir}/server`, out); | ||
copy(`${__dirname}/server.js`, `${out}/index.js`); | ||
copy(`${dir}/client.json`, `${out}/client.json`); | ||
copy('src/app.html', `${out}/app.html`); | ||
|
||
log.info('Prerendering static pages...'); | ||
|
||
await prerender({ | ||
force: true, | ||
dir, | ||
out: `${out}/prerendered`, | ||
assets: `${out}/assets`, | ||
manifest, | ||
log | ||
}); | ||
}); | ||
|
||
server.listen(PORT, () => { | ||
console.log(`Listening on port ${PORT}`); | ||
}); | ||
// generate manifest | ||
const written_manifest = `module.exports = { | ||
layout: ${JSON.stringify(manifest.layout)}, | ||
error: ${JSON.stringify(manifest.error)}, | ||
components: ${JSON.stringify(manifest.components)}, | ||
pages: [ | ||
${manifest.pages.map(page => `{ pattern: ${page.pattern}, parts: ${JSON.stringify(page.parts)} }`).join(',\n\t\t\t')} | ||
], | ||
endpoints: [ | ||
${manifest.endpoints.map(route => `{ name: '${route.name}', pattern: ${route.pattern}, file: '${route.file}', params: ${JSON.stringify(route.params)} }`).join(',\n\t\t\t')} | ||
] | ||
};`.replace(/^\t/gm, ''); | ||
|
||
fs.writeFileSync(`${out}/manifest.js`, written_manifest); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
import * as fs from 'fs'; | ||
import * as http from 'http'; | ||
import { parse, URLSearchParams } from 'url'; | ||
import sirv from 'sirv'; | ||
import { render } from '@sveltejs/app-utils/renderer'; | ||
import { get_body } from '@sveltejs/app-utils/http'; | ||
import type { PageComponentManifest, EndpointManifest, Method } from '@sveltejs/app-utils'; | ||
|
||
const manifest = require('./manifest.js'); | ||
const client = require('./client.json'); | ||
|
||
const { PORT = 3000 } = process.env; | ||
|
||
const mutable = (dir: string) => sirv(dir, { | ||
etag: true, | ||
maxAge: 0 | ||
}); | ||
|
||
const static_handler = mutable('static'); | ||
const prerendered_handler = fs.existsSync('build/prerendered') | ||
? mutable('build/prerendered') | ||
: (_req: http.IncomingMessage, _res: http.ServerResponse, next: () => void) => next(); | ||
|
||
const assets_handler = sirv('build/assets', { | ||
maxAge: 31536000, | ||
immutable: true | ||
}); | ||
|
||
const root = require('./root.js'); | ||
const setup = require('./setup.js'); | ||
const template = fs.readFileSync('build/app.html', 'utf-8'); | ||
|
||
const server = http.createServer((req, res) => { | ||
assets_handler(req, res, () => { | ||
static_handler(req, res, () => { | ||
prerendered_handler(req, res, async () => { | ||
const parsed = parse(req.url || ''); | ||
|
||
const rendered = await render({ | ||
host: null, // TODO | ||
method: req.method as Method, | ||
headers: req.headers as Record<string, string>, // TODO: what about repeated headers, i.e. string[] | ||
path: parsed.pathname as string, | ||
body: await get_body(req), | ||
query: new URLSearchParams(parsed.query || '') | ||
}, { | ||
static_dir: 'static', | ||
template, | ||
manifest, | ||
client, | ||
root, | ||
setup, | ||
load: (route: PageComponentManifest | EndpointManifest) => require(`./routes/${route.name}.js`), | ||
dev: false, | ||
only_prerender: false | ||
}); | ||
|
||
if (rendered) { | ||
res.writeHead(rendered.status, rendered.headers); | ||
res.end(rendered.body); | ||
} else { | ||
res.statusCode = 404; | ||
res.end('Not found'); | ||
} | ||
}); | ||
}); | ||
}); | ||
}); | ||
|
||
server.listen(PORT, () => { | ||
console.log(`Listening on port ${PORT}`); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
.DS_Store | ||
node_modules | ||
server.js | ||
index.js | ||
index.d.ts | ||
server.js | ||
server.d.ts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
.DS_Store | ||
node_modules | ||
node_modules | ||
index.js | ||
index.d.ts | ||
server.js | ||
server.d.ts |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.