Merge pull request #148 from sveltejs/gh-1

Server-side rendering
sveltejs · Dec 7, 2016 · 6d890f1 · 6d890f1
2 parents 83e9ed9 + 48106e8
commit 6d890f1
Show file tree

Hide file tree

Showing 328 changed files with 8,178 additions and 42 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -37,5 +37,8 @@
     "parserOptions": {
         "ecmaVersion": 6,
         "sourceType": "module"
+    },
+    "settings": {
+        "import/core-modules": [ "svelte" ]
     }
 }
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 .DS_Store
 node_modules
-dist
+compiler
+ssr
+!test/compiler
+!test/ssr
 .nyc_output
 coverage
 coverage.lcov

diff --git a/compiler/svelte.js b/compiler/svelte.js
diff --git a/compiler/svelte.js.map b/compiler/svelte.js.map
diff --git a/package.json b/package.json
@@ -2,9 +2,10 @@
   "name": "svelte",
   "version": "1.1.3",
   "description": "The magical disappearing UI framework",
-  "main": "dist/svelte.js",
+  "main": "compiler/svelte.js",
   "files": [
-    "dist",
+    "compiler",
+    "ssr",
     "README.md"
   ],
   "scripts": {
@@ -13,8 +14,10 @@
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov",
     "codecov": "codecov",
     "precodecov": "npm run coverage",
-    "lint": "eslint compiler",
-    "build": "rollup -c",
+    "lint": "eslint src",
+    "build": "npm run build:main && npm run build:ssr",
+    "build:main": "rollup -c rollup.config.main.js",
+    "build:ssr": "rollup -c rollup.config.ssr.js",
     "pretest": "npm run build",
     "prepublish": "npm run lint && npm run build"
   },
@@ -34,6 +37,9 @@
     "url": "https://github.com/sveltejs/svelte/issues"
   },
   "homepage": "https://github.com/sveltejs/svelte#README",
+  "dependencies": {
+    "magic-string": "^0.19.0"
+  },
   "devDependencies": {
     "acorn": "^4.0.3",
     "babel-plugin-istanbul": "^3.0.0",
@@ -47,7 +53,6 @@
     "fuzzyset.js": "0.0.1",
     "jsdom": "^9.8.3",
     "locate-character": "^2.0.0",
-    "magic-string": "^0.19.0",
     "mocha": "^3.1.2",
     "node-resolve": "^1.3.3",
     "nyc": "^9.0.1",

diff --git a/rollup.config.js → rollup.config.main.js b/rollup.config.js → rollup.config.main.js
@@ -2,14 +2,15 @@ import nodeResolve from 'rollup-plugin-node-resolve';
 import commonjs from 'rollup-plugin-commonjs';
 
 export default {
-	entry: 'compiler/index.js',
+	entry: 'src/index.js',
 	moduleName: 'svelte',
 	targets: [
-		{ dest: 'dist/svelte.js', format: 'umd' }
+		{ dest: 'compiler/svelte.js', format: 'umd' }
 	],
 	plugins: [
 		nodeResolve({ jsnext: true, module: true }),
 		commonjs()
 	],
+	external: [ 'magic-string' ],
 	sourceMap: true
 };
diff --git a/rollup.config.ssr.js b/rollup.config.ssr.js
@@ -0,0 +1,19 @@
+import nodeResolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+
+export default {
+	entry: 'src/server-side-rendering/register.js',
+	moduleName: 'svelte',
+	targets: [
+		{ dest: 'ssr/register.js', format: 'cjs' }
+	],
+	plugins: [
+		nodeResolve({ jsnext: true, module: true }),
+		commonjs()
+	],
+	external: [ 'svelte', 'magic-string' ],
+	paths: {
+		svelte: '../compiler/svelte.js'
+	},
+	sourceMap: true
+};
diff --git a/compiler/generate/css/process.js → src/generate/css/process.js b/compiler/generate/css/process.js → src/generate/css/process.js
@@ -1,4 +1,4 @@
-import deindent from '../utils/deindent.js';
+import deindent from '../../utils/deindent.js';
 import spaces from '../../utils/spaces.js';
 import transform from './transform.js';
 

diff --git a/compiler/generate/css/transform.js → src/generate/css/transform.js b/compiler/generate/css/transform.js → src/generate/css/transform.js
diff --git a/compiler/generate/index.js → src/generate/index.js b/compiler/generate/index.js → src/generate/index.js
@@ -1,9 +1,9 @@
 import MagicString, { Bundle } from 'magic-string';
 import { walk } from 'estree-walker';
-import deindent from './utils/deindent.js';
-import isReference from './utils/isReference.js';
+import deindent from '../utils/deindent.js';
+import isReference from '../utils/isReference.js';
 import counter from './utils/counter.js';
-import flattenReference from './utils/flattenReference.js';
+import flattenReference from '../utils/flattenReference.js';
 import getIntro from './utils/getIntro.js';
 import getOutro from './utils/getOutro.js';
 import visitors from './visitors/index.js';

diff --git a/compiler/generate/utils/counter.js → src/generate/utils/counter.js b/compiler/generate/utils/counter.js → src/generate/utils/counter.js
diff --git a/compiler/generate/utils/getGlobals.js → src/generate/utils/getGlobals.js b/compiler/generate/utils/getGlobals.js → src/generate/utils/getGlobals.js
diff --git a/compiler/generate/utils/getIntro.js → src/generate/utils/getIntro.js b/compiler/generate/utils/getIntro.js → src/generate/utils/getIntro.js
@@ -1,4 +1,4 @@
-import deindent from './deindent.js';
+import deindent from '../../utils/deindent.js';
 import getGlobals from './getGlobals.js';
 
 export default function getIntro ( format, options, imports ) {

diff --git a/compiler/generate/utils/getOutro.js → src/generate/utils/getOutro.js b/compiler/generate/utils/getOutro.js → src/generate/utils/getOutro.js
diff --git a/compiler/generate/utils/walkHtml.js → src/generate/utils/walkHtml.js b/compiler/generate/utils/walkHtml.js → src/generate/utils/walkHtml.js
diff --git a/compiler/generate/visitors/Comment.js → src/generate/visitors/Comment.js b/compiler/generate/visitors/Comment.js → src/generate/visitors/Comment.js
diff --git a/compiler/generate/visitors/Component.js → src/generate/visitors/Component.js b/compiler/generate/visitors/Component.js → src/generate/visitors/Component.js
@@ -1,4 +1,4 @@
-import deindent from '../utils/deindent.js';
+import deindent from '../../utils/deindent.js';
 import addComponentAttributes from './attributes/addComponentAttributes.js';
 
 export default {

diff --git a/compiler/generate/visitors/EachBlock.js → src/generate/visitors/EachBlock.js b/compiler/generate/visitors/EachBlock.js → src/generate/visitors/EachBlock.js
@@ -1,4 +1,4 @@
-import deindent from '../utils/deindent.js';
+import deindent from '../../utils/deindent.js';
 
 export default {
 	enter ( generator, node ) {

diff --git a/compiler/generate/visitors/Element.js → src/generate/visitors/Element.js b/compiler/generate/visitors/Element.js → src/generate/visitors/Element.js
@@ -1,4 +1,4 @@
-import deindent from '../utils/deindent.js';
+import deindent from '../../utils/deindent.js';
 import addElementAttributes from './attributes/addElementAttributes.js';
 import Component from './Component.js';
 

diff --git a/compiler/generate/visitors/IfBlock.js → src/generate/visitors/IfBlock.js b/compiler/generate/visitors/IfBlock.js → src/generate/visitors/IfBlock.js
@@ -1,4 +1,4 @@
-import deindent from '../utils/deindent.js';
+import deindent from '../../utils/deindent.js';
 
 function getConditionsAndBlocks ( generator, node, _name, i = 0 ) {
 	generator.addSourcemapLocations( node.expression );

diff --git a/compiler/generate/visitors/MustacheTag.js → src/generate/visitors/MustacheTag.js b/compiler/generate/visitors/MustacheTag.js → src/generate/visitors/MustacheTag.js
@@ -1,4 +1,4 @@
-import deindent from '../utils/deindent.js';
+import deindent from '../../utils/deindent.js';
 
 export default {
 	enter ( generator, node ) {

diff --git a/compiler/generate/visitors/RawMustacheTag.js → src/generate/visitors/RawMustacheTag.js b/compiler/generate/visitors/RawMustacheTag.js → src/generate/visitors/RawMustacheTag.js
@@ -1,4 +1,4 @@
-import deindent from '../utils/deindent.js';
+import deindent from '../../utils/deindent.js';
 
 export default {
 	enter ( generator, node ) {

diff --git a/compiler/generate/visitors/Text.js → src/generate/visitors/Text.js b/compiler/generate/visitors/Text.js → src/generate/visitors/Text.js
diff --git a/compiler/generate/visitors/YieldTag.js → src/generate/visitors/YieldTag.js b/compiler/generate/visitors/YieldTag.js → src/generate/visitors/YieldTag.js
diff --git a/...tors/attributes/addComponentAttributes.js → ...tors/attributes/addComponentAttributes.js b/...tors/attributes/addComponentAttributes.js → ...tors/attributes/addComponentAttributes.js
@@ -1,5 +1,5 @@
 import createBinding from './binding/index.js';
-import deindent from '../../utils/deindent.js';
+import deindent from '../../../utils/deindent.js';
 
 export default function addComponentAttributes ( generator, node, local ) {
 	local.staticAttributes = [];

diff --git a/...sitors/attributes/addElementAttributes.js → ...sitors/attributes/addElementAttributes.js b/...sitors/attributes/addElementAttributes.js → ...sitors/attributes/addElementAttributes.js
@@ -1,6 +1,6 @@
 import attributeLookup from './lookup.js';
 import createBinding from './binding/index.js';
-import deindent from '../../utils/deindent.js';
+import deindent from '../../../utils/deindent.js';
 
 export default function addElementAttributes ( generator, node, local ) {
 	node.attributes.forEach( attribute => {

diff --git a/...rate/visitors/attributes/binding/index.js → ...rate/visitors/attributes/binding/index.js b/...rate/visitors/attributes/binding/index.js → ...rate/visitors/attributes/binding/index.js
@@ -1,6 +1,6 @@
-import deindent from '../../../utils/deindent.js';
-import isReference from '../../../utils/isReference.js';
-import flattenReference from '../../../utils/flattenReference.js';
+import deindent from '../../../../utils/deindent.js';
+import isReference from '../../../../utils/isReference.js';
+import flattenReference from '../../../../utils/flattenReference.js';
 
 export default function createBinding ( generator, node, attribute, current, local ) {
 	const parts = attribute.value.split( '.' );

diff --git a/...er/generate/visitors/attributes/lookup.js → src/generate/visitors/attributes/lookup.js b/...er/generate/visitors/attributes/lookup.js → src/generate/visitors/attributes/lookup.js
diff --git a/compiler/generate/visitors/index.js → src/generate/visitors/index.js b/compiler/generate/visitors/index.js → src/generate/visitors/index.js
diff --git a/compiler/index.js → src/index.js b/compiler/index.js → src/index.js
diff --git a/compiler/parse/index.js → src/parse/index.js b/compiler/parse/index.js → src/parse/index.js
diff --git a/compiler/parse/patterns.js → src/parse/patterns.js b/compiler/parse/patterns.js → src/parse/patterns.js
diff --git a/compiler/parse/read/directives.js → src/parse/read/directives.js b/compiler/parse/read/directives.js → src/parse/read/directives.js
diff --git a/compiler/parse/read/expression.js → src/parse/read/expression.js b/compiler/parse/read/expression.js → src/parse/read/expression.js
diff --git a/compiler/parse/read/script.js → src/parse/read/script.js b/compiler/parse/read/script.js → src/parse/read/script.js
diff --git a/compiler/parse/read/style.js → src/parse/read/style.js b/compiler/parse/read/style.js → src/parse/read/style.js
diff --git a/compiler/parse/state/fragment.js → src/parse/state/fragment.js b/compiler/parse/state/fragment.js → src/parse/state/fragment.js
diff --git a/compiler/parse/state/mustache.js → src/parse/state/mustache.js b/compiler/parse/state/mustache.js → src/parse/state/mustache.js
diff --git a/compiler/parse/state/tag.js → src/parse/state/tag.js b/compiler/parse/state/tag.js → src/parse/state/tag.js
diff --git a/compiler/parse/state/text.js → src/parse/state/text.js b/compiler/parse/state/text.js → src/parse/state/text.js
diff --git a/compiler/parse/utils/hash.js → src/parse/utils/hash.js b/compiler/parse/utils/hash.js → src/parse/utils/hash.js
diff --git a/compiler/parse/utils/html.js → src/parse/utils/html.js b/compiler/parse/utils/html.js → src/parse/utils/html.js
diff --git a/compiler/parse/utils/trim.js → src/parse/utils/trim.js b/compiler/parse/utils/trim.js → src/parse/utils/trim.js