From 823a327881e743bc3d2ab01fbca232ecdea8d509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yeiniel=20Su=C3=A1rez=20Sosa?= <yeiniel@gmail.com>
Date: Fri, 27 Nov 2020 23:25:35 -0500
Subject: [PATCH] remove old tools including bower

---
 bower.json        | 32 --------------------------------
 electron.makefile | 20 ++++++++------------
 package.json      |  9 ++-------
 3 files changed, 10 insertions(+), 51 deletions(-)
 delete mode 100644 bower.json

diff --git a/bower.json b/bower.json
deleted file mode 100644
index 97bb242..0000000
--- a/bower.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "glowing-bear",
-  "description": "A webclient for WeeChat",
-  "version": "0.10.0",
-  "homepage": "https://github.com/glowing-bear/glowing-bear",
-  "license": "GPLv3",
-  "private": true,
-  "dependencies": {
-    "angular": "1.8.x",
-    "angular-route": "1.8.x",
-    "angular-sanitize": "1.8.x",
-    "angular-touch": "1.8.x",
-    "angular-loader": "1.8.x",
-    "angular-mocks": "1.8.x",
-    "underscore": "~1.10",
-    "linkifyjs": "jQuery-linkify#^2.1.9"
-  },
-  "devDependencies": {
-    "bootstrap": "~3.4",
-    "html5-boilerplate": "~4.3.0",
-    "emojione": "~2.2"
-  },
-  "keywords": [
-    "weechat",
-    "irc"
-  ],
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components"
-  ]
-}
diff --git a/electron.makefile b/electron.makefile
index 515e839..8fd6510 100644
--- a/electron.makefile
+++ b/electron.makefile
@@ -4,25 +4,21 @@ ELECTRON_COMMON=./build "Glowing Bear" --overwrite --version-string.FileDescript
 build:
 	npm run build
 
-# fetch dependencies for local installation
-bower:
-	bower install
-
 # copy dependencies from bower_components to the correct place
-copylocal:
-	find bower_components \( -name "*min.js" -o -name "*min.css" \) -exec cp {} 3rdparty \;
-	cp -r bower_components/bootstrap/fonts .
+#copylocal:
+#	find bower_components \( -name "*min.js" -o -name "*min.css" \) -exec cp {} 3rdparty \;
+#	cp -r bower_components/bootstrap/fonts .
 
 # modify index.html to use local files
-uselocal: copylocal
-	sed -i.bak 's,https://cdnjs.cloudflare.com/ajax/libs/[^\"]*/,3rdparty/,g' index.html
-	sed -i.bak 's, integrity=\".*\" crossorigin=\"anonymous\",,' index.html
+#uselocal: copylocal
+#	sed -i.bak 's,https://cdnjs.cloudflare.com/ajax/libs/[^\"]*/,3rdparty/,g' index.html
+#	sed -i.bak 's, integrity=\".*\" crossorigin=\"anonymous\",,' index.html
 
 # build the electron app for various platforms
-build-electron-windows: uselocal
+build-electron-windows: build
 	electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --electron-version=9.0.5 --icon=assets/img/favicon.ico --asar=true
 
-build-electron-darwin: uselocal
+build-electron-darwin: build
 	electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --electron-version=9.0.5 --icon=assets/img/glowing-bear.icns
 
 build-electron-linux: build
diff --git a/package.json b/package.json
index e3eb1ca..5291849 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "@babel/preset-env": "^7.12.7",
     "angular-mocks": "^1.8.2",
     "babel-loader": "^8.2.2",
-    "bower": "^1.8.8",
     "copy-webpack-plugin": "^6.3.2",
     "electron-packager": "^15.0.0",
     "html-webpack-plugin": "^4.5.0",
@@ -25,8 +24,6 @@
     "karma-webpack": "^5.0.0-alpha.3.0",
     "linkifyjs": "^2.1.9",
     "protractor": "^7.0.0",
-    "shelljs": "^0.8.4",
-    "uglify-js": "^3.10.4",
     "webpack": "^5.8.0",
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^3.11.0"
@@ -36,18 +33,16 @@
     "lint": "jshint src/js/*.js test/unit/*.js",
     "prestart": "npm install",
     "start": "webpack serve",
+    "pretest": "npm install",
     "test": "karma start test/karma.conf.js",
     "test-single-run": "karma start test/karma.conf.js  --single-run",
     "preupdate-webdriver": "npm install",
     "update-webdriver": "webdriver-manager update",
     "preprotractor": "npm run update-webdriver",
     "protractor": "protractor test/protractor-conf.js",
-    "premake-local": "bower install --dev",
-    "make-local": "make -f electron.makefile uselocal",
     "build-electron-windows": "make -f electron.makefile bower build-electron-windows",
     "build-electron-darwin": "make -f electron.makefile bower build-electron-darwin",
-    "build-electron-linux": "make -f electron.makefile build-electron-linux",
-    "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\""
+    "build-electron-linux": "make -f electron.makefile build-electron-linux"
   },
   "dependencies": {
     "angular": "^1.8.2",