Merge branch 'develop' into develop-xmr-travis-all

.eslintignore

@@ -1,5 +1,5 @@
 /.git/
+/cdn/
 /coverage/
 /node_modules/
 /public/assets/js/vendor/
-/cdn/

.eslintrc.json

@@ -4,9 +4,6 @@
         "node": true,
         "es6": true
     },
-    "parserOptions": {
-        "sourceType": "module"
-    },
     "extends": "eslint:recommended",
     "rules": {
         "array-bracket-spacing": [

app.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const path    = require('path');
 const express = require('express');
 const uuidv4  = require('uuid/v4');

bin/www.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const http = require('http');
 const app = require('../app.js');
 const config = require('../config');

config/helmet-csp.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const CSP = {
     defaultSrc: ['\'none\''],
     baseUri: ['\'self\''],

config/index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
 const yaml = require('js-yaml');

lib/helpers.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const fs = require('fs');
 const semver = require('semver');
 const sri = require('sri-toolbox');

package.json

@@ -46,7 +46,7 @@
     "jstransformer-clean-css": "^2.1.0",
     "morgan": "^1.9.1",
     "pug": "^2.0.3",
-    "rollbar": "^2.5.0",
+    "rollbar": "^2.5.1",
     "semver": "^5.6.0",
     "serve-favicon": "^2.5.0",
     "sri-toolbox": "^0.2.0",
@@ -65,7 +65,7 @@
     "htmlencode": "^0.0.4",
     "mocha": "^5.2.0",
     "mockdate": "^2.0.2",
-    "nodemon": "^1.18.6",
+    "nodemon": "^1.18.7",
     "nyc": "^13.1.0",
     "pug-lint": "^2.5.0",
     "pug-lint-config-clock": "^2.0.0",

public/assets/js/.eslintrc.json

@@ -5,9 +5,6 @@
         "es6": false,
         "node": false
     },
-    "parserOptions": {
-        "sourceType": "script"
-    },
     "rules": {
         "no-var": "off",
         "object-shorthand": "off",

routes/404.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/about.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/appendLocals.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const path = require('path');
 const url = require('url');
 const helpers = require('../lib/helpers.js');

routes/books.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/bootlint.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/bootswatch.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/bootswatch4.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/data.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const helpers = require('../lib/helpers.js');
 

routes/fontawesome.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/home.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // This file just holds all route requires
 const notFoundRoute = require('./404.js');
 const aboutRoute = require('./about.js');

routes/integrations.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/jobs.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/legacy.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/privacyPolicy.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/redirectToRoot.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/showcase.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

routes/themes.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const express = require('express');
 const appendLocals = require('./appendLocals.js');
 

scripts/integrity.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 const fs         = require('fs');
 const path       = require('path');
 const yaml       = require('js-yaml');

scripts/sri.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const path    = require('path');
 
 const helpers = require(path.resolve(__dirname, '../lib/helpers.js'));

scripts/update_bootlint.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
 const uglifyjs = require('uglify-js');

scripts/update_bootstrap.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
 const fse = require('fs-extra');

scripts/update_bootswatch.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
 const fse = require('fs-extra');

scripts/wp-plugin.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
 const helpers = require('../lib/helpers.js');

test/404_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');
 

test/about_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const helpers = require('./test_helpers.js');
 
 describe('About', () => {

test/books_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const path = require('path');
 const { htmlEncode } = require('htmlencode');

test/bootlint_legacy_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');
 

test/bootlint_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');
 

test/bootstrap_legacy_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');
 

test/bootswatch4_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');
 

test/bootswatch_legacy_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');
 

test/data_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const libHelpers = require('../lib/helpers.js');
 const helpers = require('./test_helpers.js');

test/fontawesome_legacy_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');
 

test/fontawesome_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');
 

test/functional_test.js

@@ -1,5 +1,7 @@
 /* eslint no-undefined: 0 */
 
+'use strict';
+
 const ENV = process.env;
 
 // We use BCDN_HEADERS to distinguish between production and debug CDN headers

test/index_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');
 

test/integrations_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const path = require('path');
 const { htmlEncode } = require('htmlencode');

test/jobs_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const helpers = require('./test_helpers.js');
 
 describe('jobs', () => {

test/privacy_policy_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const helpers = require('./test_helpers.js');
 
 describe('privacy-policy', () => {

test/redirects_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert').strict;
 const helpers = require('./test_helpers.js');