From 0637882a4beede900ecb70fd66472ddfcf75d10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sun, 18 Mar 2018 10:15:09 +0100 Subject: [PATCH 1/5] Remove unnecessary semicolon --- js/localstorage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/localstorage.js b/js/localstorage.js index d1d29f1..05075b3 100644 --- a/js/localstorage.js +++ b/js/localstorage.js @@ -12,7 +12,7 @@ function StoragePolyfil() { return this.keyIndex.length; } }); -}; +} StoragePolyfil.prototype.key = function(idx) { return this.keyIndex[idx]; }; From 316b290adc11481766a8f30987c96ca583c8fcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sun, 18 Mar 2018 10:07:26 +0100 Subject: [PATCH 2/5] Update travis' node version --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 65e08bb..b84837b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js node_js: - - "0.10" + - "8" +dist: trusty install: "npm install" script: "sh -e run_tests.sh" notifications: From 30e034310419c328535d80bed426d7b9b6a27482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sun, 18 Mar 2018 10:39:16 +0100 Subject: [PATCH 3/5] Update npm dependencies (for tests and building electron) --- package.json | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 9cbbe3e..5741afa 100644 --- a/package.json +++ b/package.json @@ -7,19 +7,18 @@ "main": "electron-main.js", "license": "GPLv3", "devDependencies": { - "bower": "^1.3.1", + "bower": "^1.8", "electron-packager": "^7.0.0", - "http-server": "^0.6.1", - "jasmine-core": "^2.4.1", - "jshint": "^2.5.2", - "karma": "~0.13", - "karma-jasmine": "^0.3.6", - "karma-junit-reporter": "^0.2.2", + "http-server": "^0.11", + "jasmine-core": "^3.1", + "jshint": "^2.9", + "karma": "~1.7", + "karma-jasmine": "~1.1", + "karma-junit-reporter": "^1.2", "karma-phantomjs-launcher": "^1.0.0", - "phantomjs-prebuilt": "^2.1.1", - "protractor": "~0.20.1", - "shelljs": "^0.2.6", - "uglify-js": "^2.4" + "protractor": "^5.0.0", + "shelljs": "^0.8.0", + "uglify-js": "^3" }, "scripts": { "postinstall": "bower install", From d168d432615e0c84393c82280fb72b6d2e5a455d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sun, 18 Mar 2018 10:40:02 +0100 Subject: [PATCH 4/5] Split bower dependencies into those needed for tests and full offline mode "production" dependencies is the minimal set to run the tests "dev" dependencies contain the rest This speeds up travis builds enormously and saves a lot of time and disk space if you only want to run the tests --- bower.json | 6 ++++-- package.json | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 3a7d402..a740408 100644 --- a/bower.json +++ b/bower.json @@ -12,9 +12,11 @@ "angular-touch": "1.6.x", "angular-loader": "1.6.x", "angular-mocks": "1.6.x", - "html5-boilerplate": "~4.3.0", - "underscore": "~1.8", + "underscore": "~1.8" + }, + "devDependencies": { "bootstrap": "~3.3", + "html5-boilerplate": "~4.3.0", "emojione": "~2.2" }, "keywords": [ diff --git a/package.json b/package.json index 5741afa..0245e8d 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "uglify-js": "^3" }, "scripts": { - "postinstall": "bower install", + "postinstall": "bower install -p", "minify": " uglifyjs js/localstorage.js js/weechat.js js/irc-utils.js js/glowingbear.js js/settings.js js/utils.js js/notifications.js js/filters.js js/handlers.js js/connection.js js/file-change.js js/imgur-drop-directive.js js/whenscrolled-directive.js js/inputbar.js js/plugin-directive.js js/websockets.js js/models.js js/bufferResume.js js/plugins.js js/imgur.js -c -m --screw-ie8 -o min.js --source-map min.map", "prestart": "npm install", "start": "http-server -a localhost -p 8000", @@ -32,6 +32,7 @@ "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 build-electron-windows", "build-electron-darwin": "make -f electron.makefile build-electron-darwin", From 022d1d1c1fd00e6fd6f2198a4aeeed9643119caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sun, 18 Mar 2018 11:44:36 +0100 Subject: [PATCH 5/5] Fix uglifyjs command options --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0245e8d..0d0608d 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "scripts": { "postinstall": "bower install -p", - "minify": " uglifyjs js/localstorage.js js/weechat.js js/irc-utils.js js/glowingbear.js js/settings.js js/utils.js js/notifications.js js/filters.js js/handlers.js js/connection.js js/file-change.js js/imgur-drop-directive.js js/whenscrolled-directive.js js/inputbar.js js/plugin-directive.js js/websockets.js js/models.js js/bufferResume.js js/plugins.js js/imgur.js -c -m --screw-ie8 -o min.js --source-map min.map", + "minify": " uglifyjs js/localstorage.js js/weechat.js js/irc-utils.js js/glowingbear.js js/settings.js js/utils.js js/notifications.js js/filters.js js/handlers.js js/connection.js js/file-change.js js/imgur-drop-directive.js js/whenscrolled-directive.js js/inputbar.js js/plugin-directive.js js/websockets.js js/models.js js/bufferResume.js js/plugins.js js/imgur.js -c -m --screw-ie8 -o min.js --source-map url='min.js.map'", "prestart": "npm install", "start": "http-server -a localhost -p 8000", "pretest": "npm install",