diff --git a/.eslintignore b/.eslintignore
index 59050f2c014a..9de130ebe002 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -22,7 +22,6 @@ libtextsecure/test/test.js
test/test.js
# Third-party files
-js/jquery.js
js/Mp3LameEncoder.min.js
js/WebAudioRecorderMp3.js
diff --git a/.prettierignore b/.prettierignore
index 91afe1a0a170..56ff6fa6928e 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -19,7 +19,6 @@ stylesheets/manifest.css
# Third-party files
components/**
-js/jquery.js
js/Mp3LameEncoder.min.js
js/WebAudioRecorderMp3.js
libtextsecure/libsignal-protocol.js
diff --git a/Gruntfile.js b/Gruntfile.js
index 922b9016abb2..c682b75c0e09 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,15 +7,12 @@ module.exports = function(grunt) {
var bower = grunt.file.readJSON('bower.json');
var components = [];
for (var i in bower.concat.app) {
- components.push('components/' + bower.concat.app[i] + '/**/*.js');
+ components.push(bower.concat.app[i]);
}
- components.push('components/' + 'webaudiorecorder/lib/WebAudioRecorder.js');
var libtextsecurecomponents = [];
for (i in bower.concat.libtextsecure) {
- libtextsecurecomponents.push(
- 'components/' + bower.concat.libtextsecure[i] + '/**/*.js'
- );
+ libtextsecurecomponents.push(bower.concat.libtextsecure[i]);
}
var importOnce = require('node-sass-import-once');
@@ -34,8 +31,8 @@ module.exports = function(grunt) {
},
test: {
src: [
- 'components/mocha/mocha.js',
- 'components/chai/chai.js',
+ 'node_modules/mocha/mocha.js',
+ 'node_modules/chai/chai.js',
'test/_test.js',
],
dest: 'test/test.js',
@@ -75,10 +72,10 @@ module.exports = function(grunt) {
},
libtextsecuretest: {
src: [
- 'components/jquery/dist/jquery.js',
+ 'node_modules/jquery/dist/jquery.js',
'components/mock-socket/dist/mock-socket.js',
- 'components/mocha/mocha.js',
- 'components/chai/chai.js',
+ 'node_modules/mocha/mocha.js',
+ 'node_modules/chai/chai.js',
'libtextsecure/test/_test.js',
],
dest: 'libtextsecure/test/test.js',
@@ -103,7 +100,6 @@ module.exports = function(grunt) {
'!js/backup.js',
'!js/components.js',
'!js/database.js',
- '!js/jquery.js',
'!js/libsignal-protocol-worker.js',
'!js/libtextsecure.js',
'!js/logging.js',
@@ -147,10 +143,6 @@ module.exports = function(grunt) {
src: 'components/webaudiorecorder/lib/WebAudioRecorderMp3.js',
dest: 'js/WebAudioRecorderMp3.js',
},
- {
- src: 'components/jquery/dist/jquery.js',
- dest: 'js/jquery.js',
- },
],
},
res: {
@@ -326,6 +318,7 @@ module.exports = function(grunt) {
env: {
NODE_ENV: environment,
},
+ requireName: 'unused',
});
function getMochaResults() {
@@ -468,6 +461,7 @@ module.exports = function(grunt) {
var app = new Application({
path: [dir, config.exe].join('/'),
+ requireName: 'unused',
});
app
diff --git a/about.html b/about.html
index 29a7c27f28c7..86217894101a 100644
--- a/about.html
+++ b/about.html
@@ -48,7 +48,7 @@ a {
signal.org
-
+