#166, but javascript

.changeset/gold-readers-sit.md

@@ -0,0 +1,12 @@
+---
+'hn.svelte.dev': patch
+'svelte-kit-demo': patch
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/adapter-node': patch
+'@sveltejs/adapter-static': patch
+'@sveltejs/app-utils': patch
+'@sveltejs/kit': patch
+'@sveltejs/snowpack-config': patch
+---
+
+Overhaul adapter API - fixes #166

examples/hn.svelte.dev/netlify.toml

@@ -0,0 +1,4 @@
+[build]
+  command = "npm run build"
+  publish = "build/"
+  functions = "functions/"

examples/hn.svelte.dev/package.json

@@ -6,7 +6,7 @@
 		"build": "svelte build"
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-node": "workspace:*",
+		"@sveltejs/adapter-netlify": "workspace:*",
 		"@sveltejs/kit": "workspace:*",
 		"@sveltejs/snowpack-config": "workspace:*",
 		"svelte": "^3.29.0"

examples/hn.svelte.dev/svelte.config.js

@@ -2,5 +2,5 @@ module.exports = {
 	// By default, `npm run build` will create a standard Node app.
 	// You can create optimized builds for different platforms by
 	// specifying a different adapter
-	adapter: '@sveltejs/adapter-node'
+	adapter: '@sveltejs/adapter-netlify'
 };

package.json

@@ -24,10 +24,13 @@
 		"@rollup/plugin-json": "^4.1.0",
 		"@rollup/plugin-node-resolve": "^9.0.0",
 		"@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.6.0",
+		"@typescript-eslint/eslint-plugin": "^4.8.2",
+		"@typescript-eslint/parser": "^4.8.2",
 		"eslint": "^7.11.0",
 		"eslint-plugin-import": "^2.22.1",
 		"eslint-plugin-svelte3": "^2.7.3",
 		"prettier": "2.1.2",
-		"rollup": "^2.32.0"
+		"rollup": "^2.32.0",
+		"typescript": "^4.1.2"
 	}
 }

packages/adapter-netlify/.gitignore

@@ -1,4 +1,2 @@
 .DS_Store
-node_modules
-/index.js
-/render.js
+node_modules

packages/adapter-netlify/files/render.js

@@ -0,0 +1,45 @@
+'use strict';
+
+const url = require('url');
+const app = require('./app.js');
+
+exports.handler = async (event) => {
+	const {
+		path,
+		httpMethod,
+		headers,
+		queryStringParameters
+		// body, // TODO pass this to renderer
+		// isBase64Encoded // TODO is this useful?
+	} = event;
+
+	const query = new url.URLSearchParams();
+	for (const k in queryStringParameters) {
+		const value = queryStringParameters[k];
+		value.split(', ').forEach((v) => {
+			query.append(k, v);
+		});
+	}
+
+	const rendered = await app.render({
+		host: null, // TODO
+		method: httpMethod,
+		headers,
+		path,
+		query
+	});
+
+	if (rendered) {
+		return {
+			isBase64Encoded: false,
+			statusCode: rendered.status,
+			headers: rendered.headers,
+			body: rendered.body
+		};
+	}
+
+	return {
+		statusCode: 404,
+		body: 'Not found'
+	};
+};

packages/adapter-netlify/index.js

@@ -0,0 +1,48 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const toml = require('toml');
+
+module.exports = async function adapter(builder) {
+	let netlify_config;
+
+	if (fs.existsSync('netlify.toml')) {
+		try {
+			netlify_config = toml.parse(fs.readFileSync('netlify.toml', 'utf-8'));
+		} catch (err) {
+			err.message = `Error parsing netlify.toml: ${err.message}`;
+			throw err;
+		}
+	} else {
+		// TODO offer to create one?
+		throw new Error(
+			'Missing a netlify.toml file. Consult https://github.com/sveltejs/kit/tree/master/packages/adapter-netlify#configuration'
+		);
+	}
+
+	if (!netlify_config.build || !netlify_config.build.publish || !netlify_config.build.functions) {
+		throw new Error(
+			'You must specify build.publish and build.functions in netlify.toml. Consult https://github.com/sveltejs/adapter-netlify#configuration'
+		);
+	}
+
+	const publish = path.resolve(netlify_config.build.publish);
+	const functions = path.resolve(netlify_config.build.functions);
+
+	builder.copy_static_files(publish);
+	builder.copy_client_files(`${publish}/_app`);
+	builder.copy_server_files(`${functions}/render`);
+
+	// copy the renderer
+	fs.copyFileSync(path.resolve(__dirname, 'files/render.js'), `${functions}/render/index.js`);
+
+	// create _redirects
+	fs.writeFileSync(`${publish}/_redirects`, '/* /.netlify/functions/render 200');
+
+	// prerender
+	builder.log.info('Prerendering static pages...');
+	await builder.prerender({
+		dest: publish
+	});
+};

packages/adapter-netlify/package.json

@@ -1,27 +1,16 @@
 {
 	"name": "@sveltejs/adapter-netlify",
 	"version": "0.0.11",
-	"devDependencies": {
-		"@sveltejs/app-utils": "workspace:*",
-		"@types/aws-lambda": "^8.10.64",
-		"devalue": "^2.0.1",
-		"rollup": "^2.32.0"
-	},
 	"main": "index.js",
 	"files": [
-		"render.js"
+		"files"
 	],
 	"scripts": {
-		"dev": "rollup -cw",
-		"build": "rollup -c",
 		"lint": "eslint --ignore-pattern node_modules/ --ignore-pattern render.js \"**/*.{ts,js,svelte}\" && npm run check-format",
 		"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
-		"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-		"prepublishOnly": "npm run build"
+		"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore"
 	},
 	"dependencies": {
-		"kleur": "^4.1.3",
-		"tiny-glob": "^0.2.8",
 		"toml": "^3.0.0"
 	}
 }

packages/adapter-node/.gitignore

@@ -1,6 +1,3 @@
 .DS_Store
 node_modules
-index.js
-index.d.ts
-server.js
-server.d.ts
+/files

packages/adapter-node/index.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const fs = require('fs');
+
+module.exports = async function adapter(builder) {
+	const out = 'build'; // TODO implement adapter options
+
+	builder.copy_server_files(out);
+	builder.copy_client_files(`${out}/assets/_app`);
+
+	fs.copyFileSync(`${__dirname}/files/server.js`, `${out}/index.js`);
+
+	builder.log.info('Prerendering static pages...');
+	await builder.prerender({
+		dest: `${out}/prerendered`
+	});
+};