Merge pull request #1625 from sveltejs/update-deps

update/remove deps

package.json

@@ -49,32 +49,31 @@
   "homepage": "https://github.com/sveltejs/svelte#README",
   "devDependencies": {
     "@types/mocha": "^5.2.0",
-    "@types/node": "^9.6.6",
+    "@types/node": "^10.5.5",
     "acorn": "^5.4.1",
     "acorn-dynamic-import": "^3.0.0",
     "chalk": "^2.4.0",
-    "clorox": "^1.0.3",
     "codecov": "^3.0.0",
     "console-group": "^0.3.2",
     "css-tree": "1.0.0-alpha22",
-    "eslint": "^4.19.1",
+    "eslint": "^5.3.0",
     "eslint-plugin-html": "^4.0.3",
     "eslint-plugin-import": "^2.11.0",
     "estree-walker": "^0.5.1",
     "is-reference": "^1.1.0",
     "jsdom": "^11.8.0",
+    "kleur": "^2.0.1",
     "locate-character": "^2.0.5",
-    "magic-string": "^0.24.0",
+    "magic-string": "^0.25.0",
-    "mocha": "3",
+    "mocha": "^5.2.0",
     "nightmare": "^3.0.1",
     "node-resolve": "^1.3.3",
-    "nyc": "^11.7.1",
+    "nyc": "^12.0.2",
     "prettier": "^1.12.1",
-    "reify": "^0.15.1",
+    "rollup": "^0.63.5",
-    "rollup": "^0.58.1",
     "rollup-plugin-buble": "^0.19.2",
     "rollup-plugin-commonjs": "^9.1.0",
-    "rollup-plugin-json": "^2.1.0",
+    "rollup-plugin-json": "^3.0.0",
     "rollup-plugin-node-resolve": "^3.3.0",
     "rollup-plugin-replace": "^2.0.0",
     "rollup-plugin-typescript": "^0.8.1",
@@ -86,9 +85,9 @@
     "source-map": "0.6",
     "source-map-support": "^0.5.4",
     "tiny-glob": "^0.2.1",
-    "ts-node": "^6.0.0",
+    "ts-node": "^7.0.0",
     "tslib": "^1.8.0",
-    "typescript": "^2.8.3"
+    "typescript": "^3.0.1"
   },
   "nyc": {
     "include": [

rollup.config.js

@@ -76,7 +76,6 @@ export default [
 				typescript: require('typescript')
 			})
 		],
-		experimentalDynamicImport: true,
 		experimentalCodeSplitting: true
 	},
 

src/cli/error.ts

@@ -1,16 +1,16 @@
-import clorox from 'clorox';
+import c from 'kleur';
 
 function stderr(msg) {
 	console.error(msg); // eslint-disable-line no-console
 }
 
 export default function error(err) {
-	stderr(`${clorox.red(err.message || err)}`);
+	stderr(c.red(err.message || err));
 
 	if (err.frame) {
 		stderr(err.frame);
 	} else if (err.stack) {
-		stderr(`${clorox.gray(err.stack)}`);
+		stderr(c.gray(err.stack));
 	}
 
 	process.exit(1);

src/cli/index.ts

@@ -22,7 +22,7 @@ prog
 	.example('compile -f umd MyComponent.html > MyComponent.js')
 
 	.action((input, opts) => {
-		import('./compile.js').then(({ compile }) => {
+		import('./compile').then(({ compile }) => {
 			compile(input, opts);
 		});
 	})

svelte

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./cli/index.ts.js');
+require('./cli/index.js');

test/cli/index.js

@@ -4,7 +4,7 @@ const assert = require('assert');
 const glob = require('tiny-glob/sync.js');
 const shell = require("shelljs");
 
-const cli = path.resolve(__dirname, "../../cli/index.ts.js");
+const cli = path.resolve(__dirname, "../../cli/index.js");
 
 function normalize(str) {
 	return str

test/custom-elements/index.js

@@ -17,12 +17,6 @@ const assert = fs.readFileSync('test/custom-elements/assert.js', 'utf-8');
 describe('custom-elements', function() {
 	this.timeout(10000);
 
-	const nightmare = new Nightmare({ show: false });
-
-	nightmare.on('console', (type, ...args) => {
-		console[type](...args);
-	});
-
 	let svelte;
 	let server;
 	let bundle;
@@ -84,6 +78,12 @@ describe('custom-elements', function() {
 				.then(generated => {
 					bundle = generated.code;
 
+					const nightmare = new Nightmare({ show: false });
+
+					nightmare.on('console', (type, ...args) => {
+						console[type](...args);
+					});
+
 					return nightmare
 						.goto('http://localhost:6789')
 						.evaluate(() => {
@@ -95,7 +95,8 @@ describe('custom-elements', function() {
 						.catch(message => {
 							console.log(addLineNumbers(bundle));
 							throw new Error(message);
-						});
+						})
+						.then(() => nightmare.end());
 				});
 
 

test/helpers.js

@@ -1,5 +1,4 @@
 import jsdom from 'jsdom';
-import { JSDOM } from 'jsdom';
 import assert from 'assert';
 import glob from 'tiny-glob/sync.js';
 import fs from 'fs';
@@ -47,7 +46,7 @@ export function tryToReadFile(file) {
 }
 
 export const virtualConsole = new jsdom.VirtualConsole();
-const { window } = new JSDOM('<main></main>', {virtualConsole});
+const { window } = new jsdom.JSDOM('<main></main>', {virtualConsole});
 global.document = window.document;
 
 export function env() {

test/test.js

@@ -2,10 +2,6 @@ const glob = require("tiny-glob/sync.js");
 
 require("./setup");
 
-glob("**/__test__.js", { cwd: "src" }).forEach(function(file) {
-	require("../src/" + file);
-});
-
 glob("*/index.js", { cwd: "test" }).forEach(function(file) {
 	require("./" + file);
-});
+});