diff --git a/client/gatsby-config.js b/client/gatsby-config.js index 81684315cd..0617a5de8d 100644 --- a/client/gatsby-config.js +++ b/client/gatsby-config.js @@ -128,6 +128,8 @@ module.exports = { fonts: ['Lato:400,400i,500'] } }, - 'gatsby-plugin-sitemap' + 'gatsby-plugin-sitemap', + 'gatsby-plugin-remove-fingerprints', + 'gatsby-plugin-remove-serviceworker' ] }; diff --git a/client/gatsby-node.js b/client/gatsby-node.js index 647c7abbd2..16a05cf06c 100644 --- a/client/gatsby-node.js +++ b/client/gatsby-node.js @@ -135,7 +135,6 @@ exports.createPages = function createPages({ graphql, actions }) { }); }; -const RmServiceWorkerPlugin = require('webpack-remove-serviceworker-plugin'); const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin'); exports.onCreateWebpackConfig = ({ stage, rules, plugins, actions }) => { @@ -168,8 +167,7 @@ exports.onCreateWebpackConfig = ({ stage, rules, plugins, actions }) => { ROLLBAR_CLIENT_ID: JSON.stringify(process.env.ROLLBAR_CLIENT_ID || ''), ENVIRONMENT: JSON.stringify(process.env.NODE_ENV || 'development'), PAYPAL_SUPPORTERS: JSON.stringify(process.env.PAYPAL_SUPPORTERS || 404) - }), - new RmServiceWorkerPlugin() + }) ] }); if (stage !== 'build-html') { diff --git a/client/package-lock.json b/client/package-lock.json index 48d4dda8d4..27e8eb2d20 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -8361,6 +8361,47 @@ } } }, + "gatsby-page-utils": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.0.5.tgz", + "integrity": "sha512-yHL4OKgVEOWOuTUCO2ZPPmWyA1bAtSUPrf+W5w3p24pUwqMkz2Yu2hii/PhgQs+2ap6BkpSwBjBSYS2YLRmTNg==", + "requires": { + "@babel/runtime": "^7.0.0", + "bluebird": "^3.5.0", + "chokidar": "2.1.2", + "fs-exists-cached": "^1.0.0", + "glob": "^7.1.1", + "lodash": "^4.17.14", + "micromatch": "^3.1.10", + "slash": "^1.0.0" + }, + "dependencies": { + "chokidar": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz", + "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==", + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.0" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + } + } + }, "gatsby-plugin-create-client-paths": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/gatsby-plugin-create-client-paths/-/gatsby-plugin-create-client-paths-2.1.0.tgz", @@ -8392,44 +8433,17 @@ } }, "gatsby-plugin-page-creator": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.0.tgz", - "integrity": "sha512-CBor9MlQMNFzOY+Mq2hcc6gznN4u8z/lSevo7Te3x54dI7A9O8c0zmLBslPQuSm4OXKqrXqSe4KjuEC6V6Uj/g==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.5.tgz", + "integrity": "sha512-nUcsaJAaMy9UQS66QY0Dys6Xx+2CGG2EVyvDQ4NQ713la62jicOU764Bmi5G7sE2QGgpNoBtUQCW+aE6UMGpLQ==", "requires": { "@babel/runtime": "^7.0.0", "bluebird": "^3.5.0", - "chokidar": "2.1.2", "fs-exists-cached": "^1.0.0", + "gatsby-page-utils": "^0.0.5", "glob": "^7.1.1", - "lodash": "^4.17.10", - "micromatch": "^3.1.10", - "slash": "^1.0.0" - }, - "dependencies": { - "chokidar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz", - "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==", - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.0" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - } + "lodash": "^4.17.14", + "micromatch": "^3.1.10" } }, "gatsby-plugin-react-helmet": { @@ -8440,6 +8454,16 @@ "@babel/runtime": "^7.0.0" } }, + "gatsby-plugin-remove-fingerprints": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/gatsby-plugin-remove-fingerprints/-/gatsby-plugin-remove-fingerprints-0.0.2.tgz", + "integrity": "sha512-af1zbr0+cr3fcjEAVAbUia/On6GJbrxoLVNZf7TxLqKzPMfMlDNXf6hDXAJy0dzxE6qrqD2oyGZpk1rOdgUQ0Q==" + }, + "gatsby-plugin-remove-serviceworker": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gatsby-plugin-remove-serviceworker/-/gatsby-plugin-remove-serviceworker-1.0.0.tgz", + "integrity": "sha1-n7QzvIvXZuFOHTcRxKxvBR4d/3w=" + }, "gatsby-plugin-sitemap": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/gatsby-plugin-sitemap/-/gatsby-plugin-sitemap-2.2.0.tgz", @@ -12088,9 +12112,9 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" }, "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==" + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", + "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==" }, "lodash.snakecase": { "version": "4.1.1", @@ -12592,9 +12616,9 @@ "integrity": "sha512-mUDCnVNsAi+eD6qA0HkRkwYczbLHJ49z17BGe2PYRhZL4wpZUFZGJHU7/5tmvohoma+Hdn0Vh/oJTiPEmgSruA==" }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -16460,9 +16484,9 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -18132,35 +18156,14 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "uniq": { @@ -19271,11 +19274,6 @@ "lodash": "^4.17.5" } }, - "webpack-remove-serviceworker-plugin": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/webpack-remove-serviceworker-plugin/-/webpack-remove-serviceworker-plugin-1.0.0.tgz", - "integrity": "sha1-Y6dgTamn/Zuuj57vh9J0okcNyqc=" - }, "webpack-sources": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz", diff --git a/client/package.json b/client/package.json index fa9db0fb14..2d07dd5e0b 100644 --- a/client/package.json +++ b/client/package.json @@ -31,6 +31,8 @@ "gatsby-plugin-google-fonts": "^1.0.1", "gatsby-plugin-manifest": "^2.2.0", "gatsby-plugin-react-helmet": "^3.1.0", + "gatsby-plugin-remove-fingerprints": "0.0.2", + "gatsby-plugin-remove-serviceworker": "^1.0.0", "gatsby-plugin-sitemap": "^2.2.0", "gatsby-remark-prismjs": "^3.3.0", "gatsby-source-filesystem": "^2.1.0", @@ -68,8 +70,7 @@ "sanitize-html": "^1.20.0", "sass.js": "^0.11.0", "store": "^2.0.12", - "validator": "^10.11.0", - "webpack-remove-serviceworker-plugin": "^1.0.0" + "validator": "^10.11.0" }, "keywords": [ "gatsby"