From 9c2ceacfde6fee6fa44871011a3b26bca2f594bf Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 1 Nov 2015 01:07:08 -0800 Subject: [PATCH 1/5] Not used since 0def797cf92349814f07a1175c02d893c88c7271. --- Gruntfile.coffee | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 0e9f0cb62..1daa1bb1a 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -299,8 +299,6 @@ module.exports = (grunt) -> '-W093': true globals: Notification: true - webkitNotifications: true - HTMLDocument: true MediaError: true Set: true GM_getValue: true From 4756015a889521ef8fa8287b219146f6b38259f4 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 1 Nov 2015 01:23:48 -0800 Subject: [PATCH 2/5] Deduplicate list of GM functions used. --- Gruntfile.coffee | 27 ++++++++++++--------------- package.json | 9 +++++++++ src/General/meta/metadata.js | 12 +++++------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 1daa1bb1a..665c468b6 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -297,21 +297,18 @@ module.exports = (grunt) -> '-W084': true '-W083': true '-W093': true - globals: - Notification: true - MediaError: true - Set: true - GM_getValue: true - GM_setValue: true - GM_deleteValue: true - GM_listValues: true - GM_addValueChangeListener: true - GM_openInTab: true - GM_xmlhttpRequest: true - GM_info: true - cloneInto: true - unsafeWindow: true - chrome: true + globals: do -> + globals = + Notification: true + MediaError: true + Set: true + GM_info: true + cloneInto: true + unsafeWindow: true + chrome: true + pkg = grunt.file.readJSON 'package.json' + globals[v] = true for v in pkg.meta.grants + globals script: 'tmp-<%= pkg.type %>/*.js' require('load-grunt-tasks') grunt diff --git a/package.json b/package.json index 34e816b5b..13c3b760e 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,15 @@ "https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*", "*://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*" ], + "grants": [ + "GM_getValue", + "GM_setValue", + "GM_deleteValue", + "GM_listValues", + "GM_addValueChangeListener", + "GM_openInTab", + "GM_xmlhttpRequest" + ], "suffix": { "stable": "", "beta": "-beta", diff --git a/src/General/meta/metadata.js b/src/General/meta/metadata.js index b75a582d4..f7d407810 100755 --- a/src/General/meta/metadata.js +++ b/src/General/meta/metadata.js @@ -18,13 +18,11 @@ } }).join('\n') %> -// @grant GM_getValue -// @grant GM_setValue -// @grant GM_deleteValue -// @grant GM_listValues -// @grant GM_addValueChangeListener -// @grant GM_openInTab -// @grant GM_xmlhttpRequest +<%= + meta.grants.map(function(grant) { + return '// @grant ' + grant; + }).join('\n') +%> // @run-at document-start <% if (channel !== 'dev') { %>// @updateURL <%= (channel !== 'noupdate') ? (meta.downloads + name + meta.suffix[channel] + '.meta.js') : 'https://noupdate.invalid/' %> // @downloadURL <%= (channel !== 'noupdate') ? (meta.downloads + name + meta.suffix[channel] + '.user.js') : 'https://noupdate.invalid/' %> From 44ff1a16886330afabf1cdcece50c5ffe8e17b71 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 1 Nov 2015 01:29:18 -0800 Subject: [PATCH 3/5] Notification is now in jsHint browser globals. --- Gruntfile.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 665c468b6..df205712e 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -299,7 +299,6 @@ module.exports = (grunt) -> '-W093': true globals: do -> globals = - Notification: true MediaError: true Set: true GM_info: true From c81997e1ba2a254660fc9707d7b666653602f840 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 1 Nov 2015 01:37:53 -0800 Subject: [PATCH 4/5] Update devDependencies. --- npm-shrinkwrap.json | 54 ++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 6d6a58b4d..4f6eb0f27 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,7 +1,7 @@ { "name": "4chan-X", "npm-shrinkwrap-version": "5.4.1", - "node-version": "v4.1.1", + "node-version": "v4.2.1", "dependencies": { "crx": { "version": "3.0.3", @@ -450,12 +450,12 @@ } }, "grunt-concurrent": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/grunt-concurrent/-/grunt-concurrent-2.0.3.tgz", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/grunt-concurrent/-/grunt-concurrent-2.0.4.tgz", "dependencies": { "async": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz" }, "indent-string": { "version": "2.1.0", @@ -480,12 +480,12 @@ } }, "pad-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pad-stream/-/pad-stream-1.1.0.tgz", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pad-stream/-/pad-stream-1.2.0.tgz", "dependencies": { "meow": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.4.2.tgz", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.5.0.tgz", "dependencies": { "camelcase-keys": { "version": "1.0.0", @@ -536,12 +536,12 @@ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", "dependencies": { "spdx-correct": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", "dependencies": { "spdx-license-ids": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz" } } }, @@ -554,8 +554,8 @@ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz" }, "spdx-license-ids": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz" } } } @@ -614,8 +614,8 @@ } }, "pify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" }, "pinkie-promise": { "version": "1.0.0", @@ -648,8 +648,8 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz" }, "pify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" }, "pinkie-promise": { "version": "1.0.0", @@ -714,8 +714,8 @@ } }, "readable-stream": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", @@ -746,8 +746,8 @@ } }, "pump": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.0.tgz", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz", "dependencies": { "end-of-stream": { "version": "1.1.0", @@ -768,8 +768,8 @@ } }, "repeating": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz", "dependencies": { "is-finite": { "version": "1.0.1", @@ -792,8 +792,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz", "dependencies": { "readable-stream": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", diff --git a/package.json b/package.json index 13c3b760e..53f908e55 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "crx": "^3.0.3", "font-awesome": "^4.4.0", "grunt": "^0.4.5", - "grunt-concurrent": "^2.0.3", + "grunt-concurrent": "^2.0.4", "grunt-contrib-clean": "^0.6.0", "grunt-contrib-coffee": "^0.13.0", "grunt-contrib-concat": "^0.5.1", From 4c20d85e13fb8a8de461c301292c869723338e16 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 1 Nov 2015 02:00:31 -0800 Subject: [PATCH 5/5] Move version number to separate file to reduce merge conflicts. --- Gruntfile.coffee | 21 ++++++++++++++------- package.json | 2 -- version.json | 4 ++++ 3 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 version.json diff --git a/Gruntfile.coffee b/Gruntfile.coffee index df205712e..623ffb992 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -67,9 +67,15 @@ module.exports = (grunt) -> return '' unless grunt.config('pkg').tests_enabled "throw new Error 'Assertion failed: ' + #{json statement} unless #{statement}" + loadPkg = -> + pkg = grunt.file.readJSON 'package.json' + version = grunt.file.readJSON 'version.json' + pkg.meta[key] = val for key, val of version + pkg + # Project configuration. grunt.initConfig - pkg: grunt.file.readJSON 'package.json' + pkg: loadPkg() concat: options: process: Object.create(null, data: @@ -258,6 +264,7 @@ module.exports = (grunt) -> files: [ 'Gruntfile.coffee' 'package.json' + 'version.json' 'src/**/*' ] tasks: 'build' @@ -468,13 +475,13 @@ module.exports = (grunt) -> grunt.task.run 'shell:captchas' grunt.registerTask 'setversion', 'Set the version number', (version) -> - pkg = grunt.file.readJSON 'package.json' - oldversion = pkg.meta.version - pkg.meta.version = version - pkg.meta.date = new Date() - grunt.config 'pkg', pkg - grunt.file.write 'package.json', JSON.stringify(pkg, null, 2) + '\n' + data = grunt.file.readJSON 'version.json' + oldversion = data.version + data.version = version + data.date = new Date() + grunt.file.write 'version.json', JSON.stringify(data, null, 2) + '\n' grunt.log.ok "Version updated from v#{oldversion} to v#{version}." + grunt.config 'pkg', loadPkg() grunt.registerTask 'updcl', 'Update the changelog', -> {meta, name} = grunt.config('pkg') diff --git a/package.json b/package.json index 53f908e55..d8382e9e1 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,6 @@ "meta": { "name": "4chan X", "fork": "ccd0", - "version": "1.11.14.12", - "date": "2015-11-01T00:02:41.314Z", "page": "https://www.4chan-x.net/", "downloads": "https://www.4chan-x.net/builds/", "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/", diff --git a/version.json b/version.json new file mode 100644 index 000000000..0570761d6 --- /dev/null +++ b/version.json @@ -0,0 +1,4 @@ +{ + "version": "1.11.14.12", + "date": "2015-11-01T00:02:41.314Z" +}