From 46a1f7fba14ed7e733cff26d66581b2248f0d08b Mon Sep 17 00:00:00 2001 From: Tieu-Philippe KHIM Date: Tue, 13 Feb 2018 17:39:10 +0100 Subject: [PATCH] remove bower and use webpack --- glances/outputs/static/bower.json | 17 ----------------- glances/outputs/static/package.json | 23 ++++++++++++++++++----- 2 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 glances/outputs/static/bower.json diff --git a/glances/outputs/static/bower.json b/glances/outputs/static/bower.json deleted file mode 100644 index 451aa73f..00000000 --- a/glances/outputs/static/bower.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "glances", - "private": true, - "dependencies": { - "angular": "^1.5.8", - "lodash": "^4.13.1", - "favico.js": "^0.3.10", - "angular-hotkeys": "chieffancypants/angular-hotkeys#^1.7.0" - }, - "overrides": { - "angular-hotkeys": { - "main": [ - "build/hotkeys.js" - ] - } - } -} diff --git a/glances/outputs/static/package.json b/glances/outputs/static/package.json index 94e890a8..b5ba0b8d 100644 --- a/glances/outputs/static/package.json +++ b/glances/outputs/static/package.json @@ -1,19 +1,32 @@ { "private": true, - "dependencies": {}, + "dependencies": { + "angular": "^1.5.8", + "angular-hotkeys": "^1.7.0", + "bootstrap": "^3.3.5", + "favico.js": "^0.3.10", + "lodash": "^4.13.1" + }, "devDependencies": { "bower": "^1.8.0", + "copy-webpack-plugin": "^4.4.1", + "css-loader": "^0.28.9", "del": "^2.2.1", + "exports-loader": "^0.7.0", + "file-loader": "^1.1.6", "gulp": "^3.9.1", "gulp-angular-templatecache": "^2.0.0", "gulp-concat": "^2.6.0", "gulp-ng-annotate": "^2.0.0", "gulp-rename": "^1.2.2", - "main-bower-files": "^2.13.1" + "html-loader": "^0.5.5", + "ngtemplate-loader": "^2.0.1", + "style-loader": "^0.20.1", + "url-loader": "^0.6.2", + "webpack": "^3.11.0" }, "scripts": { - "build": "gulp build", - "watch": "gulp watch", - "postinstall": "bower install" + "build": "webpack --bail --progress --profile", + "watch": "webpack --bail --progress --profile --watch" } }