Use Vite to do all bundling

Author: benmccann

examples/hn.svelte.dev/package.json

@@ -10,6 +10,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-netlify": "workspace:*",
+		"@sveltejs/adapter-node": "workspace:*",
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.43.1"
 	}

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

@@ -1,8 +1,6 @@
-import netlify from '@sveltejs/adapter-netlify';
-
 export default {
 	kit: {
-		adapter: netlify(),
+		adapter: '@sveltejs/adapter-node',
 		target: '#svelte'
 	}
 };

packages/adapter-node/package.json

@@ -8,18 +8,7 @@
 	},
 	"homepage": "https://kit.svelte.dev",
 	"type": "module",
-	"exports": {
-		".": {
-			"import": "./index.js"
-		},
-		"./package.json": "./package.json"
-	},
-	"main": "index.js",
-	"types": "index.d.ts",
-	"files": [
-		"files",
-		"index.d.ts"
-	],
+	"main": "files/index.js",
 	"scripts": {
 		"dev": "rollup -cw",
 		"build": "rollup -c",

packages/adapter-node/rollup.config.js

@@ -21,7 +21,7 @@ export default [
 			sourcemap: true
 		},
 		plugins: [nodeResolve(), commonjs(), json()],
-		external: ['./middlewares.js', './env.js', ...require('module').builtinModules]
+		external: ['./middlewares.js', '../output/server/app.js', ...require('module').builtinModules]
 	},
 	{
 		input: 'src/shims.js',

packages/adapter-node/src/env.js

@@ -0,0 +1,3 @@
+export const path = process.env['PATH'] || false;
+export const host = process.env['HOST'] || '0.0.0.0';
+export const port = process.env['PORT'] || (!path && 3000);

packages/adapter-node/src/index.js

@@ -1,6 +1,5 @@
-// @ts-ignore
-import { path, host, port } from './env.js';
-import { assetsMiddleware, kitMiddleware, prerenderedMiddleware } from './middlewares.js';
+import { path, host, port } from './env';
+import { assetsMiddleware, kitMiddleware, prerenderedMiddleware } from './middlewares';
 import compression from 'compression';
 import polka from 'polka';
 

packages/kit/src/core/build/index.js

@@ -1,13 +1,12 @@
 import fs from 'fs';
+import { createRequire } from 'module';
 import path from 'path';
-
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import glob from 'tiny-glob/sync.js';
 import vite from 'vite';
 
 import { rimraf } from '../../utils/filesystem.js';
 import { deep_merge } from '../../utils/object.js';
-
 import { print_config_conflicts } from '../config/index.js';
 import { create_app } from '../create_app/index.js';
 import create_manifest_data from '../create_manifest_data/index.js';
@@ -17,11 +16,13 @@ import { copy_assets, posixify, resolve_entry } from '../utils.js';
 /** @param {any} value */
 const s = (value) => JSON.stringify(value);
 
-/** @typedef {Record<string, {
+/**
+ * @typedef {Record<string, {
  *   file: string;
  *   css: string[];
  *   imports: string[];
- * }>} ClientManifest */
+ * }>} ClientManifest
+ */
 
 /**
  * @param {import('types/config').ValidatedConfig} config
@@ -464,6 +465,13 @@ async function build_server(
 	// don't warn on overriding defaults
 	const [modified_vite_config] = deep_merge(default_config, vite_config);
 
+	const adapter = config.kit.adapter;
+	const require = createRequire(import.meta.url);
+	const pkg_path = require.resolve(`${adapter}/package.json`);
+	const pkg = JSON.parse(fs.readFileSync(pkg_path, 'utf8'));
+	const main = path.resolve(pkg_path.substring(0, pkg_path.lastIndexOf('/')), pkg.main);
+console.log(`main ${main}`);
+
 	/** @type {[any, string[]]} */
 	const [merged_config, conflicts] = deep_merge(modified_vite_config, {
 		configFile: false,
@@ -476,7 +484,7 @@ async function build_server(
 			polyfillDynamicImport: false,
 			rollupOptions: {
 				input: {
-					app: app_file
+					app: main
 				},
 				output: {
 					format: 'esm',

packages/kit/src/core/config/options.js

@@ -24,16 +24,16 @@ const options = object(
 
 		kit: object({
 			adapter: validate(null, (input, keypath) => {
-				if (typeof input !== 'object' || !input.adapt) {
-					let message = `${keypath} should be an object with an "adapt" method`;
+				// if (typeof input !== 'object' || !input.adapt) {
+				// 	let message = `${keypath} should be an object with an "adapt" method`;
 
-					if (Array.isArray(input) || typeof input === 'string') {
-						// for the early adapter adopters
-						message += ', rather than the name of an adapter';
-					}
+				// 	if (Array.isArray(input) || typeof input === 'string') {
+				// 		// for the early adapter adopters
+				// 		message += ', rather than the name of an adapter';
+				// 	}
 
-					throw new Error(`${message}. See https://kit.svelte.dev/docs#adapters`);
-				}
+				// 	throw new Error(`${message}. See https://kit.svelte.dev/docs#adapters`);
+				// }
 
 				return input;
 			}),