fix(dependencies): fix #689, #688

akveo · Feb 8, 2017 · d34e6e9 · d34e6e9
1 parent 2b25258
commit d34e6e9
Show file tree

Hide file tree

Showing 3 changed files with 5,418 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,22 +5,32 @@ language: node_js
 node_js:
   - "6"
 
+cache:
+  directories:
+    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache/yarn
+
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.8
 
-install:
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+
   - npm config set spin false
-  - npm install -g npm@latest
+  - npm i -g npm@latest
 
-  - npm install
+install:
+  - yarn
 
 script:
-  - npm run build:prod
-  - npm run build:aot
+  - yarn run build:prod
+  - yarn run build:aot
 
 notifications:
   slack: akveo:q559HckfZMSyZRb803aiLcjH
diff --git a/package.json b/package.json
@@ -42,7 +42,8 @@
     "lodash": "^4.12.0",
     "ng2-bootstrap": "^1.3.0",
     "ng2-ckeditor": "1.1.5",
-    "ng2-smart-table": "^0.5.1-0",
+    "ng2-completer": "^1.0.0",
+    "ng2-smart-table": "^0.5.3-0",
     "ng2-tree": "^2.0.0-alpha.0",
     "ngx-uploader": "^2.0.24",
     "normalize.css": "^4.1.1",
@@ -63,30 +64,30 @@
     "@types/source-map": "^0.1.27",
     "@types/uglify-js": "^2.0.27",
     "@types/webpack": "^2.0.0",
-    "add-asset-html-webpack-plugin": "^1.0.2",
+    "add-asset-html-webpack-plugin": "1.0.2",
     "angular2-template-loader": "0.6.0",
-    "assets-webpack-plugin": "^3.5.1",
+    "assets-webpack-plugin": "3.5.1",
     "awesome-typescript-loader": "~3.0.0-beta.18",
     "bootstrap-loader": "2.0.0-beta.18",
     "codelyzer": "~2.0.0-beta.4",
-    "compression-webpack-plugin": "^0.3.1",
-    "copy-webpack-plugin": "^4.0.1",
+    "compression-webpack-plugin": "0.3.1",
+    "copy-webpack-plugin": "4.0.1",
     "css-loader": "^0.26.1",
     "electron": "^1.4.0",
     "es6-promise": "^3.1.2",
     "es6-shim": "^0.35.0",
     "es7-reflect-metadata": "^1.6.0",
     "exports-loader": "^0.6.3",
     "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "~2.0.0-beta.5",
+    "extract-text-webpack-plugin": "2.0.0-beta.5",
     "file-loader": "^0.9.0",
     "find-root": "^1.0.0",
     "gh-pages": "^0.11.0",
-    "html-webpack-plugin": "^2.26.0",
+    "html-webpack-plugin": "2.26.0",
     "imports-loader": "^0.7.0",
     "json-loader": "^0.5.4",
     "ng-router-loader": "^2.1.0",
-    "ngc-webpack": "^1.1.3",
+    "ngc-webpack": "1.1.3",
     "node-sass": "^4.3.0",
     "npm-run-all": "^4.0.0",
     "optimize-js-plugin": "0.0.4",
@@ -96,7 +97,7 @@
     "resolve-url-loader": "^1.4.3",
     "rimraf": "~2.5.4",
     "sass-loader": "^4.1.1",
-    "script-ext-html-webpack-plugin": "^1.5.0",
+    "script-ext-html-webpack-plugin": "1.5.0",
     "source-map-loader": "^0.1.6",
     "string-replace-loader": "1.0.5",
     "style-loader": "^0.13.1",
@@ -111,7 +112,7 @@
     "webpack-dashboard": "0.2.1",
     "webpack-dev-middleware": "1.9.0",
     "webpack-dev-server": "2.2.0",
-    "webpack-dll-bundles-plugin": "^1.0.0-beta.5",
+    "webpack-dll-bundles-plugin": "1.0.0-beta.5",
     "webpack-merge": "2.6.0"
   },
   "scripts": {
@@ -139,7 +140,7 @@
     "prebuild:prod": "npm run clean:dist",
     "build:prod": "npm run clean:dist && webpack --config config/webpack.prod.js  --progress --profile",
     "server": "npm run server:dev",
-    "server:dev": "webpack-dev-server --config config/webpack.dev.js --progress --profile --watch --content-base src/",
+    "server:dev": "webpack-dev-server --config config/webpack.dev.js --open --progress --profile --watch --content-base src/",
     "server:dev:hmr": "npm run server:dev -- --inline --hot",
     "server:prod": "http-server dist -c-1 --cors",
     "server:test": "http-server dist-demo -c-1 --cors",