[WIP] Support Svelte 3

.gitignore

@@ -12,4 +12,5 @@ sapper
 runtime.js
 dist
 !rollup.config.js
-templates/*.js
+/runtime/app.mjs
+/runtime/server.mjs

mocha.opts

@@ -1,5 +1,4 @@
 --require source-map-support/register
---require ts-node/register
+--require sucrase/register
 --recursive
-test/unit/*/*.ts
 test/apps/*/test.ts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.25.0",
+  "version": "0.26.0-alpha.4",
   "description": "Military-grade apps, engineered by Svelte",
   "bin": {
     "sapper": "./sapper"
@@ -11,69 +11,72 @@
     "config",
     "sapper",
     "dist/*.js",
-    "templates/*.js"
+    "runtime/*.mjs",
+    "runtime/internal"
   ],
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "html-minifier": "^3.5.20",
-    "shimport": "0.0.11",
-    "source-map-support": "^0.5.9",
-    "sourcemap-codec": "^1.4.3",
+    "html-minifier": "^3.5.21",
+    "shimport": "0.0.14",
+    "source-map-support": "^0.5.10",
+    "sourcemap-codec": "^1.4.4",
     "string-hash": "^1.1.3",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.0",
-    "@types/puppeteer": "^1.9.0",
+    "@types/node": "^10.12.21",
+    "@types/puppeteer": "^1.11.3",
     "@types/rimraf": "^2.0.2",
     "agadoo": "^1.0.1",
-    "cheap-watch": "^1.0.0",
+    "cheap-watch": "^1.0.2",
     "cookie": "^0.3.1",
-    "devalue": "^1.0.4",
-    "eslint": "^5.7.0",
-    "eslint-plugin-import": "^2.14.0",
-    "kleur": "^2.0.2",
+    "devalue": "^1.1.0",
+    "eslint": "^5.12.1",
+    "eslint-plugin-import": "^2.16.0",
+    "kleur": "^3.0.1",
     "mkdirp": "^0.5.1",
     "mocha": "^5.2.0",
-    "node-fetch": "^2.2.0",
+    "node-fetch": "^2.3.0",
     "npm-run-all": "^4.1.5",
     "polka": "^0.5.1",
     "port-authority": "^1.0.5",
     "pretty-bytes": "^5.1.0",
-    "puppeteer": "^1.9.0",
+    "puppeteer": "^1.12.0",
     "require-relative": "^0.8.7",
-    "rimraf": "^2.6.2",
-    "rollup": "^0.66.6",
+    "rimraf": "^2.6.3",
+    "rollup": "^1.1.2",
     "rollup-plugin-commonjs": "^9.2.0",
     "rollup-plugin-json": "^3.1.0",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup-plugin-node-resolve": "^4.0.0",
     "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-string": "^2.0.2",
-    "rollup-plugin-svelte": "^4.3.2",
-    "rollup-plugin-typescript": "^1.0.0",
-    "sade": "^1.4.1",
+    "rollup-plugin-sucrase": "^2.1.0",
+    "rollup-plugin-svelte": "^5.0.1",
+    "sade": "^1.4.2",
     "sander": "^0.6.0",
     "sirv": "^0.2.2",
-    "svelte": "^2.13.5",
-    "svelte-loader": "^2.11.0",
-    "ts-node": "^7.0.1",
-    "typescript": "^3.1.3",
-    "webpack": "^4.20.2",
-    "webpack-format-messages": "^2.0.3",
+    "sucrase": "^3.9.5",
+    "svelte": "^3.0.0-alpha27",
+    "svelte-loader": "^2.12.0",
+    "webpack": "^4.29.0",
+    "webpack-format-messages": "^2.0.5",
     "yootils": "0.0.14"
   },
+  "peerDependencies": {
+    "svelte": "^3.0.0"
+  },
   "scripts": {
     "test": "mocha --opts mocha.opts",
     "pretest": "npm run build",
     "build": "rm -rf dist && rollup -c",
     "prepare": "npm run build",
     "dev": "rollup -cw",
     "prepublishOnly": "npm test",
-    "update_mime_types": "curl http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types | grep -e \"^[^#]\" > templates/src/server/middleware/mime-types.md"
+    "update_mime_types": "curl http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types | grep -e \"^[^#]\" > runtime/src/server/middleware/mime-types.md"
   },
   "repository": "https://github.com/sveltejs/sapper",
   "keywords": [

rollup.config.js

@@ -1,4 +1,4 @@
-import typescript from 'rollup-plugin-typescript';
+import sucrase from 'rollup-plugin-sucrase';
 import string from 'rollup-plugin-string';
 import json from 'rollup-plugin-json';
 import resolve from 'rollup-plugin-node-resolve';
@@ -12,31 +12,33 @@ const external = [].concat(
 	'sapper/core.js'
 );
 
-function template(kind, external, target) {
+function template(kind, external) {
 	return {
-		input: `templates/src/${kind}/index.ts`,
+		input: `runtime/src/${kind}/index.ts`,
 		output: {
-			file: `templates/${kind}.js`,
-			format: 'es'
+			file: `runtime/${kind}.mjs`,
+			format: 'es',
+			paths: id => id.replace('@sapper', '.')
 		},
 		external,
 		plugins: [
-			resolve(),
+			resolve({
+				extensions: ['.mjs', '.js', '.ts']
+			}),
 			commonjs(),
 			string({
 				include: '**/*.md'
 			}),
-			typescript({
-				typescript: require('typescript'),
-				target
+			sucrase({
+				transforms: ['typescript']
 			})
 		]
 	};
 }
 
 export default [
-	template('client', ['__ROOT__', '__ERROR__'], 'ES2017'),
-	template('server', builtinModules, 'ES2015'),
+	template('app', id => /^(svelte\/?|@sapper\/)/.test(id)),
+	template('server', id => builtinModules.includes(id)),
 
 	{
 		input: [
@@ -54,12 +56,13 @@ export default [
 		external,
 		plugins: [
 			json(),
-			resolve(),
+			resolve({
+				extensions: ['.mjs', '.js', '.ts']
+			}),
 			commonjs(),
-			typescript({
-				typescript: require('typescript')
+			sucrase({
+				transforms: ['typescript']
 			})
-		],
-		experimentalCodeSplitting: true
+		]
 	}
 ];

runtime/internal/Sapper.html

@@ -0,0 +1,12 @@
+<script>
+	import { setContext } from 'svelte';
+	import { CONTEXT_KEY } from './shared';
+
+	export let Root;
+	export let props;
+	export let session;
+
+	setContext(CONTEXT_KEY, session);
+</script>
+
+<Root {...props}/>

runtime/internal/layout.html

@@ -0,0 +1 @@
+<svelte:component this={child.component} {...child.props}/>

runtime/internal/shared.mjs

@@ -0,0 +1,10 @@
+import { writable } from 'svelte/store';
+
+export const stores = {
+	preloading: writable(false),
+	page: writable(null)
+};
+
+export const CONTEXT_KEY = {};
+
+export const preload = () => ({});