Merge pull request #412 from sveltejs/gh-410

Rich-Harris · web-flow · commit 0df3cf634ce6 · 2017-03-27T08:53:29.000-04:00
bundle magic-string
diff --git a/package.json b/package.json
@@ -39,9 +39,6 @@
     "url": "https://github.com/sveltejs/svelte/issues"
   },
   "homepage": "https://github.com/sveltejs/svelte#README",
-  "dependencies": {
-    "magic-string": "^0.19.0"
-  },
   "devDependencies": {
     "acorn": "^4.0.4",
     "babel": "^6.23.0",
@@ -65,6 +62,7 @@
     "glob": "^7.1.1",
     "jsdom": "^9.9.1",
     "locate-character": "^2.0.0",
+    "magic-string": "^0.19.0",
     "mocha": "^3.2.0",
     "node-resolve": "^1.3.3",
     "nyc": "^10.0.0",
diff --git a/rollup/rollup.config.main.js b/rollup/rollup.config.main.js
@@ -21,9 +21,5 @@ export default {
 			}
 		})
 	],
-	external: [ 'magic-string' ],
-	globals: {
-		'magic-string': 'MagicString'
-	},
 	sourceMap: true
 };
diff --git a/rollup/rollup.config.ssr.js b/rollup/rollup.config.ssr.js
@@ -20,7 +20,7 @@ export default {
 			}
 		})
 	],
-	external: [ path.resolve( 'src/index.js' ), 'fs', 'path', 'magic-string' ],
+	external: [ path.resolve( 'src/index.js' ), 'fs', 'path' ],
 	paths: {
 		[ path.resolve( 'src/index.js' ) ]: '../compiler/svelte.js'
 	},

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ export default {`
`20`	`20`	`}`
`21`	`21`	`})`
`22`	`22`	`],`
`23`		`- external: [ path.resolve( 'src/index.js' ), 'fs', 'path', 'magic-string' ],`
	`23`	`+ external: [ path.resolve( 'src/index.js' ), 'fs', 'path' ],`
`24`	`24`	`paths: {`
`25`	`25`	`[ path.resolve( 'src/index.js' ) ]: '../compiler/svelte.js'`
`26`	`26`	`},`