sveltejs · Rich-Harris · May 28, 2019 · May 27, 2019 · May 27, 2019 · May 27, 2019
diff --git a/.gitignore b/.gitignore
@@ -3,15 +3,15 @@
 .nyc_output
 node_modules
 *.map
-/src/compile/internal-exports.ts
+/src/compiler/compile/internal-exports.ts
 /compiler.*js
-/index.*js
-/internal.*js
-/store.*js
-/easing.*js
-/motion.*js
-/transition.*js
-/animate.*js
+/index
+/internal
+/store
+/easing
+/motion
+/transition
+/animate
 /scratch/
 /coverage/
 /coverage.lcov/

diff --git a/animate.d.ts b/animate.d.ts
diff --git a/easing.d.ts b/easing.d.ts
diff --git a/index.d.ts b/index.d.ts
diff --git a/index.js b/index.js
@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var internal = require('./internal');
+
+
+
+exports.onMount = internal.onMount;
+exports.onDestroy = internal.onDestroy;
+exports.beforeUpdate = internal.beforeUpdate;
+exports.afterUpdate = internal.afterUpdate;
+exports.setContext = internal.setContext;
+exports.getContext = internal.getContext;
+exports.tick = internal.tick;
+exports.createEventDispatcher = internal.createEventDispatcher;
diff --git a/index.mjs b/index.mjs
@@ -0,0 +1 @@
+export { onMount, onDestroy, beforeUpdate, afterUpdate, setContext, getContext, tick, createEventDispatcher } from './internal';
diff --git a/internal.d.ts b/internal.d.ts
diff --git a/motion.d.ts b/motion.d.ts
diff --git a/package.json b/package.json
@@ -9,15 +9,16 @@
     "compiler.js",
     "register.js",
     "index.*",
-    "internal.*",
-    "store.*",
-    "animate.*",
-    "transition.*",
-    "easing.*",
-    "motion.*",
+    "internal",
+    "store",
+    "animate",
+    "transition",
+    "easing",
+    "motion",
     "svelte",
     "README.md"
   ],
+  "types": "types/runtime",
   "scripts": {
     "test": "mocha --opts mocha.opts",
     "test:unit": "mocha --require sucrase/register --recursive ./**/__test__.ts",
@@ -30,8 +31,9 @@
     "prepare": "npm run build && npm run tsd",
     "dev": "rollup -cw",
     "pretest": "npm run build",
-    "posttest": "agadoo internal.mjs",
-    "prepublishOnly": "export PUBLISH=true && npm test",
+    "posttest": "agadoo internal/index.mjs",
+    "prepublishOnly": "export PUBLISH=true && npm test && npm run create-stubs",
+    "create-stubs": "node scripts/create-stubs.js",
     "tsd": "tsc -p . --emitDeclarationOnly",
     "typecheck": "tsc -p . --noEmit"
   },

diff --git a/rollup.config.js b/rollup.config.js
@@ -9,7 +9,7 @@ import pkg from './package.json';
 
 const is_publish = !!process.env.PUBLISH;
 
-const tsPlugin = is_publish
+const ts_plugin = is_publish
 	? typescript({
 		include: 'src/**',
 		typescript: require('typescript')
@@ -18,39 +18,61 @@ const tsPlugin = is_publish
 		transforms: ['typescript']
 	});
 
+const external = id => id.startsWith('svelte/');
+
 export default [
-	/* internal.[m]js */
+	/* runtime */
 	{
-		input: `src/internal/index.ts`,
+		input: `src/runtime/index.ts`,
 		output: [
 			{
-				file: `internal.mjs`,
+				file: `index.mjs`,
 				format: 'esm',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
+				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}`
 			},
 			{
-				file: `internal.js`,
+				file: `index.js`,
 				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
+				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}`
 			}
 		],
-		external: id => id.startsWith('svelte/'),
+		external,
+		plugins: [ts_plugin]
+	},
 
-		plugins: [
-			tsPlugin,
-			{
-				generateBundle(options, bundle) {
-					const mod = bundle['internal.mjs'];
-					if (mod) {
-						fs.writeFileSync('src/compile/internal-exports.ts', `// This file is automatically generated\nexport default new Set(${JSON.stringify(mod.exports)});`);
+	...fs.readdirSync('src/runtime')
+		.filter(dir => fs.statSync(`src/runtime/${dir}`).isDirectory())
+		.map(dir => ({
+			input: `src/runtime/${dir}/index.ts`,
+			output: [
+				{
+					file: `${dir}/index.mjs`,
+					format: 'esm',
+					paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '..')}`
+				},
+				{
+					file: `${dir}/index.js`,
+					format: 'cjs',
+					paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '..')}`
+				}
+			],
+			external,
+			plugins: [
+				ts_plugin,
+				dir === 'internal' && {
+					generateBundle(options, bundle) {
+						const mod = bundle['index.mjs'];
+						if (mod) {
+							fs.writeFileSync('src/compiler/compile/internal-exports.ts', `// This file is automatically generated\nexport default new Set(${JSON.stringify(mod.exports)});`);
+						}
 					}
 				}
-			}]
-	},
+			]
+		})),
 
 	/* compiler.js */
 	{
-		input: 'src/compiler.ts',
+		input: 'src/compiler/index.ts',
 		plugins: [
 			replace({
 				__VERSION__: pkg.version
@@ -60,7 +82,7 @@ export default [
 				include: ['node_modules/**']
 			}),
 			json(),
-			tsPlugin
+			ts_plugin
 		],
 		output: {
 			file: 'compiler.js',
@@ -71,47 +93,5 @@ export default [
 		external: is_publish
 			? []
 			: id => id === 'acorn' || id === 'magic-string' || id.startsWith('css-tree')
-	},
-
-	/* motion.mjs */
-	{
-		input: `src/motion/index.ts`,
-		output: [
-			{
-				file: `motion.mjs`,
-				format: 'esm',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			},
-			{
-				file: `motion.js`,
-				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			}
-		],
-		plugins: [
-			tsPlugin
-		],
-		external: id => id.startsWith('svelte/')
-	},
-
-	// everything else
-	...['index', 'easing', 'transition', 'animate', 'store'].map(name => ({
-		input: `src/${name}.ts`,
-		output: [
-			{
-				file: `${name}.mjs`,
-				format: 'esm',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			},
-			{
-				file: `${name}.js`,
-				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			}
-		],
-		plugins: [
-			tsPlugin
-		],
-		external: id => id.startsWith('svelte/')
-	}))
+	}
 ];
diff --git a/scripts/create-stubs.js b/scripts/create-stubs.js
@@ -0,0 +1,12 @@
+const fs = require('fs');
+
+fs.readdirSync('src/runtime')
+	.filter(dir => fs.statSync(`src/runtime/${dir}`).isDirectory())
+	.forEach(dir => {
+		fs.writeFileSync(`${dir}/package.json`, JSON.stringify({
+			main: './index.js',
+			module: './index.mjs'
+		}, null, '  '));
+
+		fs.writeFileSync(`${dir}/index.d.ts`, `export * from '../types/runtime/${dir}/index.d.ts';`);
+	});
diff --git a/src/Stats.ts → src/compiler/Stats.ts b/src/Stats.ts → src/compiler/Stats.ts
diff --git a/src/compile/Component.ts → src/compiler/compile/Component.ts b/src/compile/Component.ts → src/compiler/compile/Component.ts
diff --git a/src/compile/create_module.ts → src/compiler/compile/create_module.ts b/src/compile/create_module.ts → src/compiler/compile/create_module.ts
diff --git a/src/compile/css/Selector.ts → src/compiler/compile/css/Selector.ts b/src/compile/css/Selector.ts → src/compiler/compile/css/Selector.ts
diff --git a/src/compile/css/Stylesheet.ts → src/compiler/compile/css/Stylesheet.ts b/src/compile/css/Stylesheet.ts → src/compiler/compile/css/Stylesheet.ts
diff --git a/src/compile/css/gather_possible_values.ts → ...ler/compile/css/gather_possible_values.ts b/src/compile/css/gather_possible_values.ts → ...ler/compile/css/gather_possible_values.ts
diff --git a/src/compile/index.ts → src/compiler/compile/index.ts b/src/compile/index.ts → src/compiler/compile/index.ts
@@ -1,4 +1,4 @@
-import { assign } from '../internal/index';
+import { assign } from '../../runtime/internal/index';
 import Stats from '../Stats';
 import parse from '../parse/index';
 import render_dom from './render-dom/index';

diff --git a/src/compile/nodes/Action.ts → src/compiler/compile/nodes/Action.ts b/src/compile/nodes/Action.ts → src/compiler/compile/nodes/Action.ts
diff --git a/src/compile/nodes/Animation.ts → src/compiler/compile/nodes/Animation.ts b/src/compile/nodes/Animation.ts → src/compiler/compile/nodes/Animation.ts
diff --git a/src/compile/nodes/Attribute.ts → src/compiler/compile/nodes/Attribute.ts b/src/compile/nodes/Attribute.ts → src/compiler/compile/nodes/Attribute.ts
diff --git a/src/compile/nodes/AwaitBlock.ts → src/compiler/compile/nodes/AwaitBlock.ts b/src/compile/nodes/AwaitBlock.ts → src/compiler/compile/nodes/AwaitBlock.ts
diff --git a/src/compile/nodes/Binding.ts → src/compiler/compile/nodes/Binding.ts b/src/compile/nodes/Binding.ts → src/compiler/compile/nodes/Binding.ts
diff --git a/src/compile/nodes/Body.ts → src/compiler/compile/nodes/Body.ts b/src/compile/nodes/Body.ts → src/compiler/compile/nodes/Body.ts
diff --git a/src/compile/nodes/CatchBlock.ts → src/compiler/compile/nodes/CatchBlock.ts b/src/compile/nodes/CatchBlock.ts → src/compiler/compile/nodes/CatchBlock.ts
diff --git a/src/compile/nodes/Class.ts → src/compiler/compile/nodes/Class.ts b/src/compile/nodes/Class.ts → src/compiler/compile/nodes/Class.ts
diff --git a/src/compile/nodes/Comment.ts → src/compiler/compile/nodes/Comment.ts b/src/compile/nodes/Comment.ts → src/compiler/compile/nodes/Comment.ts
diff --git a/src/compile/nodes/DebugTag.ts → src/compiler/compile/nodes/DebugTag.ts b/src/compile/nodes/DebugTag.ts → src/compiler/compile/nodes/DebugTag.ts
diff --git a/src/compile/nodes/EachBlock.ts → src/compiler/compile/nodes/EachBlock.ts b/src/compile/nodes/EachBlock.ts → src/compiler/compile/nodes/EachBlock.ts
diff --git a/src/compile/nodes/Element.ts → src/compiler/compile/nodes/Element.ts b/src/compile/nodes/Element.ts → src/compiler/compile/nodes/Element.ts
diff --git a/src/compile/nodes/ElseBlock.ts → src/compiler/compile/nodes/ElseBlock.ts b/src/compile/nodes/ElseBlock.ts → src/compiler/compile/nodes/ElseBlock.ts
diff --git a/src/compile/nodes/EventHandler.ts → src/compiler/compile/nodes/EventHandler.ts b/src/compile/nodes/EventHandler.ts → src/compiler/compile/nodes/EventHandler.ts
diff --git a/src/compile/nodes/Fragment.ts → src/compiler/compile/nodes/Fragment.ts b/src/compile/nodes/Fragment.ts → src/compiler/compile/nodes/Fragment.ts
diff --git a/src/compile/nodes/Head.ts → src/compiler/compile/nodes/Head.ts b/src/compile/nodes/Head.ts → src/compiler/compile/nodes/Head.ts
diff --git a/src/compile/nodes/IfBlock.ts → src/compiler/compile/nodes/IfBlock.ts b/src/compile/nodes/IfBlock.ts → src/compiler/compile/nodes/IfBlock.ts
diff --git a/src/compile/nodes/InlineComponent.ts → ...compiler/compile/nodes/InlineComponent.ts b/src/compile/nodes/InlineComponent.ts → ...compiler/compile/nodes/InlineComponent.ts
diff --git a/src/compile/nodes/Let.ts → src/compiler/compile/nodes/Let.ts b/src/compile/nodes/Let.ts → src/compiler/compile/nodes/Let.ts
diff --git a/src/compile/nodes/MustacheTag.ts → src/compiler/compile/nodes/MustacheTag.ts b/src/compile/nodes/MustacheTag.ts → src/compiler/compile/nodes/MustacheTag.ts
diff --git a/src/compile/nodes/Options.ts → src/compiler/compile/nodes/Options.ts b/src/compile/nodes/Options.ts → src/compiler/compile/nodes/Options.ts
diff --git a/src/compile/nodes/PendingBlock.ts → src/compiler/compile/nodes/PendingBlock.ts b/src/compile/nodes/PendingBlock.ts → src/compiler/compile/nodes/PendingBlock.ts
diff --git a/src/compile/nodes/RawMustacheTag.ts → src/compiler/compile/nodes/RawMustacheTag.ts b/src/compile/nodes/RawMustacheTag.ts → src/compiler/compile/nodes/RawMustacheTag.ts
diff --git a/src/compile/nodes/Slot.ts → src/compiler/compile/nodes/Slot.ts b/src/compile/nodes/Slot.ts → src/compiler/compile/nodes/Slot.ts
diff --git a/src/compile/nodes/Text.ts → src/compiler/compile/nodes/Text.ts b/src/compile/nodes/Text.ts → src/compiler/compile/nodes/Text.ts
diff --git a/src/compile/nodes/ThenBlock.ts → src/compiler/compile/nodes/ThenBlock.ts b/src/compile/nodes/ThenBlock.ts → src/compiler/compile/nodes/ThenBlock.ts
diff --git a/src/compile/nodes/Title.ts → src/compiler/compile/nodes/Title.ts b/src/compile/nodes/Title.ts → src/compiler/compile/nodes/Title.ts
diff --git a/src/compile/nodes/Transition.ts → src/compiler/compile/nodes/Transition.ts b/src/compile/nodes/Transition.ts → src/compiler/compile/nodes/Transition.ts
diff --git a/src/compile/nodes/Window.ts → src/compiler/compile/nodes/Window.ts b/src/compile/nodes/Window.ts → src/compiler/compile/nodes/Window.ts
diff --git a/src/compile/nodes/interfaces.ts → src/compiler/compile/nodes/interfaces.ts b/src/compile/nodes/interfaces.ts → src/compiler/compile/nodes/interfaces.ts
diff --git a/src/compile/nodes/shared/AbstractBlock.ts → ...ler/compile/nodes/shared/AbstractBlock.ts b/src/compile/nodes/shared/AbstractBlock.ts → ...ler/compile/nodes/shared/AbstractBlock.ts
@@ -1,5 +1,5 @@
 import Block from '../../render-dom/Block';
-import Component from './../../Component';
+import Component from '../../Component';
 import Node from './Node';
 import { INode } from '../interfaces';
 

diff --git a/src/compile/nodes/shared/Expression.ts → ...mpiler/compile/nodes/shared/Expression.ts b/src/compile/nodes/shared/Expression.ts → ...mpiler/compile/nodes/shared/Expression.ts
diff --git a/src/compile/nodes/shared/Node.ts → src/compiler/compile/nodes/shared/Node.ts b/src/compile/nodes/shared/Node.ts → src/compiler/compile/nodes/shared/Node.ts
@@ -1,5 +1,5 @@
-import Attribute from './../Attribute';
-import Component from './../../Component';
+import Attribute from '../Attribute';
+import Component from '../../Component';
 import { INode } from '../interfaces';
 import Text from '../Text';
 

diff --git a/src/compile/nodes/shared/Tag.ts → src/compiler/compile/nodes/shared/Tag.ts b/src/compile/nodes/shared/Tag.ts → src/compiler/compile/nodes/shared/Tag.ts
diff --git a/src/compile/nodes/shared/TemplateScope.ts → ...ler/compile/nodes/shared/TemplateScope.ts b/src/compile/nodes/shared/TemplateScope.ts → ...ler/compile/nodes/shared/TemplateScope.ts
diff --git a/src/compile/nodes/shared/map_children.ts → ...iler/compile/nodes/shared/map_children.ts b/src/compile/nodes/shared/map_children.ts → ...iler/compile/nodes/shared/map_children.ts
diff --git a/src/compile/render-dom/Block.ts → src/compiler/compile/render-dom/Block.ts b/src/compile/render-dom/Block.ts → src/compiler/compile/render-dom/Block.ts
diff --git a/src/compile/render-dom/Renderer.ts → src/compiler/compile/render-dom/Renderer.ts b/src/compile/render-dom/Renderer.ts → src/compiler/compile/render-dom/Renderer.ts
diff --git a/src/compile/render-dom/index.ts → src/compiler/compile/render-dom/index.ts b/src/compile/render-dom/index.ts → src/compiler/compile/render-dom/index.ts
diff --git a/...compile/render-dom/wrappers/AwaitBlock.ts → ...compile/render-dom/wrappers/AwaitBlock.ts b/...compile/render-dom/wrappers/AwaitBlock.ts → ...compile/render-dom/wrappers/AwaitBlock.ts
diff --git a/src/compile/render-dom/wrappers/Body.ts → ...piler/compile/render-dom/wrappers/Body.ts b/src/compile/render-dom/wrappers/Body.ts → ...piler/compile/render-dom/wrappers/Body.ts
diff --git a/src/compile/render-dom/wrappers/DebugTag.ts → ...r/compile/render-dom/wrappers/DebugTag.ts b/src/compile/render-dom/wrappers/DebugTag.ts → ...r/compile/render-dom/wrappers/DebugTag.ts
diff --git a/src/compile/render-dom/wrappers/EachBlock.ts → .../compile/render-dom/wrappers/EachBlock.ts b/src/compile/render-dom/wrappers/EachBlock.ts → .../compile/render-dom/wrappers/EachBlock.ts
diff --git a/.../render-dom/wrappers/Element/Attribute.ts → .../render-dom/wrappers/Element/Attribute.ts b/.../render-dom/wrappers/Element/Attribute.ts → .../render-dom/wrappers/Element/Attribute.ts
diff --git a/...le/render-dom/wrappers/Element/Binding.ts → ...le/render-dom/wrappers/Element/Binding.ts b/...le/render-dom/wrappers/Element/Binding.ts → ...le/render-dom/wrappers/Element/Binding.ts
@@ -1,5 +1,5 @@
 import Binding from '../../../nodes/Binding';
-import ElementWrapper from '.';
+import ElementWrapper from '../Element';
 import { dimensions } from '../../../../utils/patterns';
 import get_object from '../../../utils/get_object';
 import Block from '../../Block';

diff --git a/...er-dom/wrappers/Element/StyleAttribute.ts → ...er-dom/wrappers/Element/StyleAttribute.ts b/...er-dom/wrappers/Element/StyleAttribute.ts → ...er-dom/wrappers/Element/StyleAttribute.ts
@@ -1,7 +1,7 @@
 import Attribute from '../../../nodes/Attribute';
 import Block from '../../Block';
 import AttributeWrapper from './Attribute';
-import ElementWrapper from '.';
+import ElementWrapper from '../Element';
 import { stringify } from '../../../utils/stringify';
 import add_to_set from '../../../utils/add_to_set';
 import Expression from '../../../nodes/shared/Expression';

diff --git a/.../wrappers/Element/fix_attribute_casing.ts → .../wrappers/Element/fix_attribute_casing.ts b/.../wrappers/Element/fix_attribute_casing.ts → .../wrappers/Element/fix_attribute_casing.ts
diff --git a/...pile/render-dom/wrappers/Element/index.ts → ...pile/render-dom/wrappers/Element/index.ts b/...pile/render-dom/wrappers/Element/index.ts → ...pile/render-dom/wrappers/Element/index.ts
diff --git a/src/compile/render-dom/wrappers/Fragment.ts → ...r/compile/render-dom/wrappers/Fragment.ts b/src/compile/render-dom/wrappers/Fragment.ts → ...r/compile/render-dom/wrappers/Fragment.ts
diff --git a/src/compile/render-dom/wrappers/Head.ts → ...piler/compile/render-dom/wrappers/Head.ts b/src/compile/render-dom/wrappers/Head.ts → ...piler/compile/render-dom/wrappers/Head.ts
diff --git a/src/compile/render-dom/wrappers/IfBlock.ts → ...er/compile/render-dom/wrappers/IfBlock.ts b/src/compile/render-dom/wrappers/IfBlock.ts → ...er/compile/render-dom/wrappers/IfBlock.ts
diff --git a/...der-dom/wrappers/InlineComponent/index.ts → ...der-dom/wrappers/InlineComponent/index.ts b/...der-dom/wrappers/InlineComponent/index.ts → ...der-dom/wrappers/InlineComponent/index.ts
diff --git a/...ompile/render-dom/wrappers/MustacheTag.ts → ...ompile/render-dom/wrappers/MustacheTag.ts b/...ompile/render-dom/wrappers/MustacheTag.ts → ...ompile/render-dom/wrappers/MustacheTag.ts
diff --git a/...ile/render-dom/wrappers/RawMustacheTag.ts → ...ile/render-dom/wrappers/RawMustacheTag.ts b/...ile/render-dom/wrappers/RawMustacheTag.ts → ...ile/render-dom/wrappers/RawMustacheTag.ts
diff --git a/src/compile/render-dom/wrappers/Slot.ts → ...piler/compile/render-dom/wrappers/Slot.ts b/src/compile/render-dom/wrappers/Slot.ts → ...piler/compile/render-dom/wrappers/Slot.ts
diff --git a/src/compile/render-dom/wrappers/Text.ts → ...piler/compile/render-dom/wrappers/Text.ts b/src/compile/render-dom/wrappers/Text.ts → ...piler/compile/render-dom/wrappers/Text.ts
diff --git a/src/compile/render-dom/wrappers/Title.ts → ...iler/compile/render-dom/wrappers/Title.ts b/src/compile/render-dom/wrappers/Title.ts → ...iler/compile/render-dom/wrappers/Title.ts
diff --git a/src/compile/render-dom/wrappers/Window.ts → ...ler/compile/render-dom/wrappers/Window.ts b/src/compile/render-dom/wrappers/Window.ts → ...ler/compile/render-dom/wrappers/Window.ts
diff --git a/...compile/render-dom/wrappers/shared/Tag.ts → ...compile/render-dom/wrappers/shared/Tag.ts b/...compile/render-dom/wrappers/shared/Tag.ts → ...compile/render-dom/wrappers/shared/Tag.ts
diff --git a/...ile/render-dom/wrappers/shared/Wrapper.ts → ...ile/render-dom/wrappers/shared/Wrapper.ts b/...ile/render-dom/wrappers/shared/Wrapper.ts → ...ile/render-dom/wrappers/shared/Wrapper.ts
diff --git a/...render-dom/wrappers/shared/add_actions.ts → ...render-dom/wrappers/shared/add_actions.ts b/...render-dom/wrappers/shared/add_actions.ts → ...render-dom/wrappers/shared/add_actions.ts
diff --git a/...dom/wrappers/shared/add_event_handlers.ts → ...dom/wrappers/shared/add_event_handlers.ts b/...dom/wrappers/shared/add_event_handlers.ts → ...dom/wrappers/shared/add_event_handlers.ts
diff --git a/...appers/shared/create_debugging_comment.ts → ...appers/shared/create_debugging_comment.ts b/...appers/shared/create_debugging_comment.ts → ...appers/shared/create_debugging_comment.ts
diff --git a/...dom/wrappers/shared/get_context_merger.ts → ...dom/wrappers/shared/get_context_merger.ts b/...dom/wrappers/shared/get_context_merger.ts → ...dom/wrappers/shared/get_context_merger.ts
diff --git a/src/compile/render-ssr/Renderer.ts → src/compiler/compile/render-ssr/Renderer.ts b/src/compile/render-ssr/Renderer.ts → src/compiler/compile/render-ssr/Renderer.ts
diff --git a/...compile/render-ssr/handlers/AwaitBlock.ts → ...compile/render-ssr/handlers/AwaitBlock.ts b/...compile/render-ssr/handlers/AwaitBlock.ts → ...compile/render-ssr/handlers/AwaitBlock.ts
diff --git a/src/compile/render-ssr/handlers/Comment.ts → ...er/compile/render-ssr/handlers/Comment.ts b/src/compile/render-ssr/handlers/Comment.ts → ...er/compile/render-ssr/handlers/Comment.ts
diff --git a/src/compile/render-ssr/handlers/DebugTag.ts → ...r/compile/render-ssr/handlers/DebugTag.ts b/src/compile/render-ssr/handlers/DebugTag.ts → ...r/compile/render-ssr/handlers/DebugTag.ts
diff --git a/src/compile/render-ssr/handlers/EachBlock.ts → .../compile/render-ssr/handlers/EachBlock.ts b/src/compile/render-ssr/handlers/EachBlock.ts → .../compile/render-ssr/handlers/EachBlock.ts
diff --git a/src/compile/render-ssr/handlers/Element.ts → ...er/compile/render-ssr/handlers/Element.ts b/src/compile/render-ssr/handlers/Element.ts → ...er/compile/render-ssr/handlers/Element.ts
diff --git a/src/compile/render-ssr/handlers/Head.ts → ...piler/compile/render-ssr/handlers/Head.ts b/src/compile/render-ssr/handlers/Head.ts → ...piler/compile/render-ssr/handlers/Head.ts
diff --git a/src/compile/render-ssr/handlers/HtmlTag.ts → ...er/compile/render-ssr/handlers/HtmlTag.ts b/src/compile/render-ssr/handlers/HtmlTag.ts → ...er/compile/render-ssr/handlers/HtmlTag.ts
diff --git a/src/compile/render-ssr/handlers/IfBlock.ts → ...er/compile/render-ssr/handlers/IfBlock.ts b/src/compile/render-ssr/handlers/IfBlock.ts → ...er/compile/render-ssr/handlers/IfBlock.ts
diff --git a/...le/render-ssr/handlers/InlineComponent.ts → ...le/render-ssr/handlers/InlineComponent.ts b/...le/render-ssr/handlers/InlineComponent.ts → ...le/render-ssr/handlers/InlineComponent.ts
diff --git a/src/compile/render-ssr/handlers/Slot.ts → ...piler/compile/render-ssr/handlers/Slot.ts b/src/compile/render-ssr/handlers/Slot.ts → ...piler/compile/render-ssr/handlers/Slot.ts
diff --git a/src/compile/render-ssr/handlers/Tag.ts → ...mpiler/compile/render-ssr/handlers/Tag.ts b/src/compile/render-ssr/handlers/Tag.ts → ...mpiler/compile/render-ssr/handlers/Tag.ts
diff --git a/src/compile/render-ssr/handlers/Text.ts → ...piler/compile/render-ssr/handlers/Text.ts b/src/compile/render-ssr/handlers/Text.ts → ...piler/compile/render-ssr/handlers/Text.ts
diff --git a/src/compile/render-ssr/handlers/Title.ts → ...iler/compile/render-ssr/handlers/Title.ts b/src/compile/render-ssr/handlers/Title.ts → ...iler/compile/render-ssr/handlers/Title.ts
diff --git a/...der-ssr/handlers/shared/get_slot_scope.ts → ...der-ssr/handlers/shared/get_slot_scope.ts b/...der-ssr/handlers/shared/get_slot_scope.ts → ...der-ssr/handlers/shared/get_slot_scope.ts
diff --git a/src/compile/render-ssr/index.ts → src/compiler/compile/render-ssr/index.ts b/src/compile/render-ssr/index.ts → src/compiler/compile/render-ssr/index.ts
diff --git a/src/compile/utils/CodeBuilder.ts → src/compiler/compile/utils/CodeBuilder.ts b/src/compile/utils/CodeBuilder.ts → src/compiler/compile/utils/CodeBuilder.ts
diff --git a/src/compile/utils/__test__.ts → src/compiler/compile/utils/__test__.ts b/src/compile/utils/__test__.ts → src/compiler/compile/utils/__test__.ts
diff --git a/src/compile/utils/add_to_set.ts → src/compiler/compile/utils/add_to_set.ts b/src/compile/utils/add_to_set.ts → src/compiler/compile/utils/add_to_set.ts
diff --git a/src/compile/utils/deindent.ts → src/compiler/compile/utils/deindent.ts b/src/compile/utils/deindent.ts → src/compiler/compile/utils/deindent.ts
diff --git a/src/compile/utils/flatten_reference.ts → ...mpiler/compile/utils/flatten_reference.ts b/src/compile/utils/flatten_reference.ts → ...mpiler/compile/utils/flatten_reference.ts
diff --git a/src/compile/utils/get_object.ts → src/compiler/compile/utils/get_object.ts b/src/compile/utils/get_object.ts → src/compiler/compile/utils/get_object.ts
diff --git a/src/compile/utils/get_slot_data.ts → src/compiler/compile/utils/get_slot_data.ts b/src/compile/utils/get_slot_data.ts → src/compiler/compile/utils/get_slot_data.ts
diff --git a/src/compile/utils/scope.ts → src/compiler/compile/utils/scope.ts b/src/compile/utils/scope.ts → src/compiler/compile/utils/scope.ts
diff --git a/src/compile/utils/snip.ts → src/compiler/compile/utils/snip.ts b/src/compile/utils/snip.ts → src/compiler/compile/utils/snip.ts
diff --git a/src/compile/utils/stringify.ts → src/compiler/compile/utils/stringify.ts b/src/compile/utils/stringify.ts → src/compiler/compile/utils/stringify.ts
diff --git a/src/compile/utils/stringify_attribute.ts → ...iler/compile/utils/stringify_attribute.ts b/src/compile/utils/stringify_attribute.ts → ...iler/compile/utils/stringify_attribute.ts
diff --git a/src/compile/utils/stringify_props.ts → ...compiler/compile/utils/stringify_props.ts b/src/compile/utils/stringify_props.ts → ...compiler/compile/utils/stringify_props.ts
diff --git a/src/compile/utils/tail.ts → src/compiler/compile/utils/tail.ts b/src/compile/utils/tail.ts → src/compiler/compile/utils/tail.ts
diff --git a/src/compile/utils/unwrap_parens.ts → src/compiler/compile/utils/unwrap_parens.ts b/src/compile/utils/unwrap_parens.ts → src/compiler/compile/utils/unwrap_parens.ts
diff --git a/src/config.ts → src/compiler/config.ts b/src/config.ts → src/compiler/config.ts
diff --git a/src/compiler.ts → src/compiler/index.ts b/src/compiler.ts → src/compiler/index.ts
diff --git a/src/interfaces.ts → src/compiler/interfaces.ts b/src/interfaces.ts → src/compiler/interfaces.ts
diff --git a/src/parse/acorn.ts → src/compiler/parse/acorn.ts b/src/parse/acorn.ts → src/compiler/parse/acorn.ts
diff --git a/src/parse/index.ts → src/compiler/parse/index.ts b/src/parse/index.ts → src/compiler/parse/index.ts
diff --git a/src/parse/read/context.ts → src/compiler/parse/read/context.ts b/src/parse/read/context.ts → src/compiler/parse/read/context.ts
diff --git a/src/parse/read/expression.ts → src/compiler/parse/read/expression.ts b/src/parse/read/expression.ts → src/compiler/parse/read/expression.ts
diff --git a/src/parse/read/script.ts → src/compiler/parse/read/script.ts b/src/parse/read/script.ts → src/compiler/parse/read/script.ts
diff --git a/src/parse/read/style.ts → src/compiler/parse/read/style.ts b/src/parse/read/style.ts → src/compiler/parse/read/style.ts
diff --git a/src/parse/state/fragment.ts → src/compiler/parse/state/fragment.ts b/src/parse/state/fragment.ts → src/compiler/parse/state/fragment.ts
diff --git a/src/parse/state/mustache.ts → src/compiler/parse/state/mustache.ts b/src/parse/state/mustache.ts → src/compiler/parse/state/mustache.ts
diff --git a/src/parse/state/tag.ts → src/compiler/parse/state/tag.ts b/src/parse/state/tag.ts → src/compiler/parse/state/tag.ts
diff --git a/src/parse/state/text.ts → src/compiler/parse/state/text.ts b/src/parse/state/text.ts → src/compiler/parse/state/text.ts
diff --git a/src/parse/utils/entities.ts → src/compiler/parse/utils/entities.ts b/src/parse/utils/entities.ts → src/compiler/parse/utils/entities.ts
diff --git a/src/parse/utils/html.ts → src/compiler/parse/utils/html.ts b/src/parse/utils/html.ts → src/compiler/parse/utils/html.ts
diff --git a/src/preprocess/index.ts → src/compiler/preprocess/index.ts b/src/preprocess/index.ts → src/compiler/preprocess/index.ts
diff --git a/src/utils/error.ts → src/compiler/utils/error.ts b/src/utils/error.ts → src/compiler/utils/error.ts
@@ -1,5 +1,5 @@
 import { locate } from 'locate-character';
-import get_code_frame from '../utils/get_code_frame';
+import get_code_frame from './get_code_frame';
 
 class CompileError extends Error {
 	code: string;

diff --git a/src/utils/full_char_code_at.ts → src/compiler/utils/full_char_code_at.ts b/src/utils/full_char_code_at.ts → src/compiler/utils/full_char_code_at.ts
diff --git a/src/utils/fuzzymatch.ts → src/compiler/utils/fuzzymatch.ts b/src/utils/fuzzymatch.ts → src/compiler/utils/fuzzymatch.ts
diff --git a/src/utils/get_code_frame.ts → src/compiler/utils/get_code_frame.ts b/src/utils/get_code_frame.ts → src/compiler/utils/get_code_frame.ts
diff --git a/src/utils/indentation.ts → src/compiler/utils/indentation.ts b/src/utils/indentation.ts → src/compiler/utils/indentation.ts
diff --git a/src/utils/list.ts → src/compiler/utils/list.ts b/src/utils/list.ts → src/compiler/utils/list.ts
diff --git a/src/utils/names.ts → src/compiler/utils/names.ts b/src/utils/names.ts → src/compiler/utils/names.ts
diff --git a/src/utils/namespaces.ts → src/compiler/utils/namespaces.ts b/src/utils/namespaces.ts → src/compiler/utils/namespaces.ts
diff --git a/src/utils/nodes_match.ts → src/compiler/utils/nodes_match.ts b/src/utils/nodes_match.ts → src/compiler/utils/nodes_match.ts
diff --git a/src/utils/patterns.ts → src/compiler/utils/patterns.ts b/src/utils/patterns.ts → src/compiler/utils/patterns.ts
diff --git a/src/utils/repeat.ts → src/compiler/utils/repeat.ts b/src/utils/repeat.ts → src/compiler/utils/repeat.ts
diff --git a/src/utils/trim.ts → src/compiler/utils/trim.ts b/src/utils/trim.ts → src/compiler/utils/trim.ts
diff --git a/src/animate.ts → src/runtime/animate/index.ts b/src/animate.ts → src/runtime/animate/index.ts
diff --git a/src/easing.ts → src/runtime/easing/index.ts b/src/easing.ts → src/runtime/easing/index.ts
diff --git a/src/index.ts → src/runtime/index.ts b/src/index.ts → src/runtime/index.ts
diff --git a/src/internal/Component.ts → src/runtime/internal/Component.ts b/src/internal/Component.ts → src/runtime/internal/Component.ts
diff --git a/src/internal/animations.ts → src/runtime/internal/animations.ts b/src/internal/animations.ts → src/runtime/internal/animations.ts
diff --git a/src/internal/await-block.ts → src/runtime/internal/await-block.ts b/src/internal/await-block.ts → src/runtime/internal/await-block.ts
diff --git a/src/internal/dom.ts → src/runtime/internal/dom.ts b/src/internal/dom.ts → src/runtime/internal/dom.ts
diff --git a/src/internal/index.ts → src/runtime/internal/index.ts b/src/internal/index.ts → src/runtime/internal/index.ts
diff --git a/src/internal/keyed-each.ts → src/runtime/internal/keyed-each.ts b/src/internal/keyed-each.ts → src/runtime/internal/keyed-each.ts
diff --git a/src/internal/lifecycle.ts → src/runtime/internal/lifecycle.ts b/src/internal/lifecycle.ts → src/runtime/internal/lifecycle.ts
diff --git a/src/internal/loop.ts → src/runtime/internal/loop.ts b/src/internal/loop.ts → src/runtime/internal/loop.ts
diff --git a/src/internal/scheduler.ts → src/runtime/internal/scheduler.ts b/src/internal/scheduler.ts → src/runtime/internal/scheduler.ts
diff --git a/src/internal/spread.ts → src/runtime/internal/spread.ts b/src/internal/spread.ts → src/runtime/internal/spread.ts
diff --git a/src/internal/ssr.ts → src/runtime/internal/ssr.ts b/src/internal/ssr.ts → src/runtime/internal/ssr.ts
diff --git a/src/internal/style_manager.ts → src/runtime/internal/style_manager.ts b/src/internal/style_manager.ts → src/runtime/internal/style_manager.ts
diff --git a/src/internal/transitions.ts → src/runtime/internal/transitions.ts b/src/internal/transitions.ts → src/runtime/internal/transitions.ts
diff --git a/src/internal/utils.ts → src/runtime/internal/utils.ts b/src/internal/utils.ts → src/runtime/internal/utils.ts
diff --git a/src/motion/index.ts → src/runtime/motion/index.ts b/src/motion/index.ts → src/runtime/motion/index.ts
diff --git a/src/motion/spring.ts → src/runtime/motion/spring.ts b/src/motion/spring.ts → src/runtime/motion/spring.ts
diff --git a/src/motion/tweened.ts → src/runtime/motion/tweened.ts b/src/motion/tweened.ts → src/runtime/motion/tweened.ts
diff --git a/src/motion/utils.ts → src/runtime/motion/utils.ts b/src/motion/utils.ts → src/runtime/motion/utils.ts
diff --git a/src/store.ts → src/runtime/store/index.ts b/src/store.ts → src/runtime/store/index.ts
diff --git a/src/transition.ts → src/runtime/transition/index.ts b/src/transition.ts → src/runtime/transition/index.ts
diff --git a/store.d.ts b/store.d.ts
diff --git a/test/custom-elements/index.js b/test/custom-elements/index.js
@@ -58,7 +58,7 @@ describe('custom-elements', function() {
 
 		const solo = /\.solo$/.test(dir);
 		const skip = /\.skip$/.test(dir);
-		const internal = path.resolve('internal.mjs');
+		const internal = path.resolve('internal/index.mjs');
 		const index = path.resolve('index.mjs');
 		const warnings = [];
 
@@ -71,7 +71,7 @@ describe('custom-elements', function() {
 				plugins: [
 					{
 						resolveId(importee) {
-							if (importee === 'svelte/internal') {
+							if (importee === 'svelte/internal' || importee === './internal') {
 								return internal;
 							}
 

diff --git a/test/runtime/index.js b/test/runtime/index.js
@@ -3,7 +3,7 @@ import * as path from "path";
 import * as fs from "fs";
 import { rollup } from 'rollup';
 import * as virtual from 'rollup-plugin-virtual';
-import { clear_loops, set_now, set_raf } from "../../internal.js";
+import { clear_loops, set_now, set_raf } from "../../internal";
 
 import {
 	showOutput,
@@ -20,7 +20,7 @@ let compileOptions = null;
 let compile = null;
 
 const sveltePath = process.cwd().split('\\').join('/');
-const internal = `${sveltePath}/internal.js`;
+const internal = `${sveltePath}/internal`;
 
 describe("runtime", () => {
 	before(() => {
@@ -223,7 +223,7 @@ describe("runtime", () => {
 				{
 					resolveId: (importee, importer) => {
 						if (importee.startsWith('svelte/')) {
-							return importee.replace('svelte', process.cwd()) + '.mjs';
+							return importee.replace('svelte', process.cwd()) + '/index.mjs';
 						}
 					}
 				}

diff --git a/test/runtime/samples/prop-subscribable/_config.js b/test/runtime/samples/prop-subscribable/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {

diff --git a/test/runtime/samples/store-assignment-updates-reactive/_config.js b/test/runtime/samples/store-assignment-updates-reactive/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 const c = writable(0);
 

diff --git a/test/runtime/samples/store-assignment-updates-reactive/main.svelte b/test/runtime/samples/store-assignment-updates-reactive/main.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { writable } from '../../../../store.js';
+	import { writable } from '../../../../store';
 
 	const a = writable();
 	const b = writable();

diff --git a/test/runtime/samples/store-assignment-updates/_config.js b/test/runtime/samples/store-assignment-updates/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {

diff --git a/test/runtime/samples/store-auto-subscribe-implicit/_config.js b/test/runtime/samples/store-auto-subscribe-implicit/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {

diff --git a/test/runtime/samples/store-auto-subscribe-in-each/_config.js b/test/runtime/samples/store-auto-subscribe-in-each/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	skip: true,

diff --git a/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js b/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {

diff --git a/test/runtime/samples/store-auto-subscribe-in-script/_config.js b/test/runtime/samples/store-auto-subscribe-in-script/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 const count = writable(0);
 

diff --git a/test/runtime/samples/store-auto-subscribe/_config.js b/test/runtime/samples/store-auto-subscribe/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {

diff --git a/test/runtime/samples/store-contextual/_config.js b/test/runtime/samples/store-contextual/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 const todos = [
 	writable({ done: false, text: 'write docs' }),