aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/config/webpack.dev.js5
-rw-r--r--client/package.json5
-rw-r--r--package.json4
3 files changed, 8 insertions, 6 deletions
diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js
index 1e975b261..3468dba78 100644
--- a/client/config/webpack.dev.js
+++ b/client/config/webpack.dev.js
@@ -101,7 +101,10 @@ module.exports = function (env) {
101 } 101 }
102 } 102 }
103 ], 103 ],
104 exclude: [/\.(spec|e2e)\.ts$/] 104 exclude: [
105 /\.(spec|e2e)\.ts$/,
106 /node_modules\//
107 ]
105 } 108 }
106 ] 109 ]
107 }, 110 },
diff --git a/client/package.json b/client/package.json
index aa38e076a..666a3f37d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -48,7 +48,6 @@
48 "css-loader": "^0.25.0", 48 "css-loader": "^0.25.0",
49 "css-to-string-loader": "^0.1.2", 49 "css-to-string-loader": "^0.1.2",
50 "es6-shim": "^0.35.0", 50 "es6-shim": "^0.35.0",
51 "extract-text-webpack-plugin": "^2.0.0-beta.4",
52 "file-loader": "^0.9.0", 51 "file-loader": "^0.9.0",
53 "html-webpack-plugin": "^2.19.0", 52 "html-webpack-plugin": "^2.19.0",
54 "ie-shim": "^0.1.0", 53 "ie-shim": "^0.1.0",
@@ -79,7 +78,7 @@
79 "url-loader": "^0.5.7", 78 "url-loader": "^0.5.7",
80 "video.js": "^5.11.9", 79 "video.js": "^5.11.9",
81 "videojs-dock": "^2.0.2", 80 "videojs-dock": "^2.0.2",
82 "webpack": "2.2.0-rc.3", 81 "webpack": "^2.2.0",
83 "webpack-md5-hash": "0.0.5", 82 "webpack-md5-hash": "0.0.5",
84 "webpack-merge": "~2.3.1", 83 "webpack-merge": "~2.3.1",
85 "webpack-notifier": "^1.3.0", 84 "webpack-notifier": "^1.3.0",
@@ -88,7 +87,7 @@
88 }, 87 },
89 "devDependencies": { 88 "devDependencies": {
90 "add-asset-html-webpack-plugin": "^1.0.2", 89 "add-asset-html-webpack-plugin": "^1.0.2",
91 "codelyzer": "2.0.0-beta.4", 90 "codelyzer": "^2.0.0",
92 "standard": "^8.0.0", 91 "standard": "^8.0.0",
93 "webpack-bundle-analyzer": "^2.2.1", 92 "webpack-bundle-analyzer": "^2.2.1",
94 "webpack-dll-bundles-plugin": "^1.0.0-beta.5" 93 "webpack-dll-bundles-plugin": "^1.0.0-beta.5"
diff --git a/package.json b/package.json
index 5a9e943c3..0d650ddeb 100644
--- a/package.json
+++ b/package.json
@@ -71,14 +71,14 @@
71 "scripty": "^1.5.0", 71 "scripty": "^1.5.0",
72 "sequelize": "^3.27.0", 72 "sequelize": "^3.27.0",
73 "winston": "^2.1.1", 73 "winston": "^2.1.1",
74 "ws": "^1.1.1" 74 "ws": "^2.0.0"
75 }, 75 },
76 "devDependencies": { 76 "devDependencies": {
77 "chai": "^3.3.0", 77 "chai": "^3.3.0",
78 "commander": "^2.9.0", 78 "commander": "^2.9.0",
79 "mocha": "^3.0.1", 79 "mocha": "^3.0.1",
80 "standard": "^8.0.0", 80 "standard": "^8.0.0",
81 "supertest": "^2.0.0", 81 "supertest": "^3.0.0",
82 "webtorrent": "^0.98.0" 82 "webtorrent": "^0.98.0"
83 }, 83 },
84 "standard": { 84 "standard": {