fix(dependencies): fix #689, #688

This commit is contained in:
Alexander Zhukov 2017-02-08 13:12:48 +03:00
parent 2b25258565
commit d34e6e92c0
3 changed files with 5419 additions and 17 deletions

View file

@ -5,6 +5,12 @@ language: node_js
node_js: node_js:
- "6" - "6"
cache:
directories:
- node_modules
- $HOME/.npm
- $HOME/.cache/yarn
addons: addons:
apt: apt:
sources: sources:
@ -12,15 +18,19 @@ addons:
packages: packages:
- g++-4.8 - g++-4.8
install: before_install:
- npm config set spin false - curl -o- -L https://yarnpkg.com/install.sh | bash
- npm install -g npm@latest - export PATH=$HOME/.yarn/bin:$PATH
- npm install - npm config set spin false
- npm i -g npm@latest
install:
- yarn
script: script:
- npm run build:prod - yarn run build:prod
- npm run build:aot - yarn run build:aot
notifications: notifications:
slack: akveo:q559HckfZMSyZRb803aiLcjH slack: akveo:q559HckfZMSyZRb803aiLcjH

View file

@ -42,7 +42,8 @@
"lodash": "^4.12.0", "lodash": "^4.12.0",
"ng2-bootstrap": "^1.3.0", "ng2-bootstrap": "^1.3.0",
"ng2-ckeditor": "1.1.5", "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", "ng2-tree": "^2.0.0-alpha.0",
"ngx-uploader": "^2.0.24", "ngx-uploader": "^2.0.24",
"normalize.css": "^4.1.1", "normalize.css": "^4.1.1",
@ -63,14 +64,14 @@
"@types/source-map": "^0.1.27", "@types/source-map": "^0.1.27",
"@types/uglify-js": "^2.0.27", "@types/uglify-js": "^2.0.27",
"@types/webpack": "^2.0.0", "@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", "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", "awesome-typescript-loader": "~3.0.0-beta.18",
"bootstrap-loader": "2.0.0-beta.18", "bootstrap-loader": "2.0.0-beta.18",
"codelyzer": "~2.0.0-beta.4", "codelyzer": "~2.0.0-beta.4",
"compression-webpack-plugin": "^0.3.1", "compression-webpack-plugin": "0.3.1",
"copy-webpack-plugin": "^4.0.1", "copy-webpack-plugin": "4.0.1",
"css-loader": "^0.26.1", "css-loader": "^0.26.1",
"electron": "^1.4.0", "electron": "^1.4.0",
"es6-promise": "^3.1.2", "es6-promise": "^3.1.2",
@ -78,15 +79,15 @@
"es7-reflect-metadata": "^1.6.0", "es7-reflect-metadata": "^1.6.0",
"exports-loader": "^0.6.3", "exports-loader": "^0.6.3",
"expose-loader": "^0.7.1", "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", "file-loader": "^0.9.0",
"find-root": "^1.0.0", "find-root": "^1.0.0",
"gh-pages": "^0.11.0", "gh-pages": "^0.11.0",
"html-webpack-plugin": "^2.26.0", "html-webpack-plugin": "2.26.0",
"imports-loader": "^0.7.0", "imports-loader": "^0.7.0",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"ng-router-loader": "^2.1.0", "ng-router-loader": "^2.1.0",
"ngc-webpack": "^1.1.3", "ngc-webpack": "1.1.3",
"node-sass": "^4.3.0", "node-sass": "^4.3.0",
"npm-run-all": "^4.0.0", "npm-run-all": "^4.0.0",
"optimize-js-plugin": "0.0.4", "optimize-js-plugin": "0.0.4",
@ -96,7 +97,7 @@
"resolve-url-loader": "^1.4.3", "resolve-url-loader": "^1.4.3",
"rimraf": "~2.5.4", "rimraf": "~2.5.4",
"sass-loader": "^4.1.1", "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", "source-map-loader": "^0.1.6",
"string-replace-loader": "1.0.5", "string-replace-loader": "1.0.5",
"style-loader": "^0.13.1", "style-loader": "^0.13.1",
@ -111,7 +112,7 @@
"webpack-dashboard": "0.2.1", "webpack-dashboard": "0.2.1",
"webpack-dev-middleware": "1.9.0", "webpack-dev-middleware": "1.9.0",
"webpack-dev-server": "2.2.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" "webpack-merge": "2.6.0"
}, },
"scripts": { "scripts": {
@ -139,7 +140,7 @@
"prebuild:prod": "npm run clean:dist", "prebuild:prod": "npm run clean:dist",
"build:prod": "npm run clean:dist && webpack --config config/webpack.prod.js --progress --profile", "build:prod": "npm run clean:dist && webpack --config config/webpack.prod.js --progress --profile",
"server": "npm run server:dev", "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:dev:hmr": "npm run server:dev -- --inline --hot",
"server:prod": "http-server dist -c-1 --cors", "server:prod": "http-server dist -c-1 --cors",
"server:test": "http-server dist-demo -c-1 --cors", "server:test": "http-server dist-demo -c-1 --cors",

5391
yarn.lock Normal file

File diff suppressed because it is too large Load diff