From a16a5444cb48f78158e81937413c8f595b98cf22 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Sirois Date: Thu, 12 Nov 2020 05:03:35 -0500 Subject: [PATCH] chore: use fork of gatsby-plugin-prefer-google-fonts --- gatsby-config.js | 13 ++-- package-lock.json | 183 ++++++++++++++++++++++++++++++++-------------- package.json | 3 +- 3 files changed, 134 insertions(+), 65 deletions(-) diff --git a/gatsby-config.js b/gatsby-config.js index e1d1979..76684ad 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -9,7 +9,7 @@ module.exports = { `gatsby-plugin-styled-components`, `gatsby-plugin-polished`, { - resolve: `gatsby-plugin-prefetch-google-fonts`, + resolve: `@el7cosmos/gatsby-plugin-prefetch-google-fonts`, options: { fonts: [ { @@ -20,16 +20,13 @@ module.exports = { family: `Montserrat`, variants: [`400`, `700`], }, + { + family: `Oxygen Mono`, + variants: [`400`], + }, ], }, }, - { - resolve: `gatsby-plugin-google-fonts`, - options: { - fonts: [`Oxygen Mono\:400`], - display: "swap", - }, - }, `gatsby-plugin-layout`, { resolve: `gatsby-plugin-mdx`, diff --git a/package-lock.json b/package-lock.json index 1b60500..874f6f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1231,6 +1231,47 @@ "mime-types": "^2.1.12" } }, + "@el7cosmos/gatsby-plugin-prefetch-google-fonts": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@el7cosmos/gatsby-plugin-prefetch-google-fonts/-/gatsby-plugin-prefetch-google-fonts-2.0.2.tgz", + "integrity": "sha512-Jw7BkkGRdCHjHTxB+vbr6cETOKBtwozTVtVwkh+rdqT2P/rwBe32BQ7KDv+Lxc0TwmSZAK2DBcuqixS30gr/zQ==", + "requires": { + "@babel/runtime": "^7.2.0", + "clean-css": "^4.2.1", + "download": "^7.1.0", + "fs-extra": "^7.0.0", + "get-urls": "^10.0.0", + "globby": "^8.0.1", + "google-fonts-plugin": "2.0.2", + "object-hash": "^1.3.0" + }, + "dependencies": { + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "get-urls": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/get-urls/-/get-urls-10.0.0.tgz", + "integrity": "sha512-ssCMAvuD5A8PzcYCdeyodjbf1v8XF2lMuhSCQbgsvCC7Uha0S8xGwBG/5/afMWsdBR7jOry/kd8Iq5P1ML5tww==", + "requires": { + "normalize-url": "^5.1.0", + "url-regex-safe": "^1.0.2" + } + }, + "normalize-url": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-5.3.0.tgz", + "integrity": "sha512-9/nOVLYYe/dO/eJeQUNaGUF4m4Z5E7cb9oNTKabH+bNf19mqj60txTcveQxL0GlcWLXCxkOu2/LwL8oW0idIDA==" + } + } + }, "@emotion/is-prop-valid": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", @@ -4148,6 +4189,11 @@ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -8467,6 +8513,11 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz", "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==" }, + "env-paths": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", + "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==" + }, "envinfo": { "version": "7.5.1", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz", @@ -10460,11 +10511,6 @@ } } }, - "gatsby-plugin-google-fonts": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gatsby-plugin-google-fonts/-/gatsby-plugin-google-fonts-1.0.1.tgz", - "integrity": "sha512-p1NVkn27GUnDA5qHM+Z4cCcLCJIardzZXMon3640sT4xuL/AZJbsx3HEt2KY/5oZu0UXIkytkxzV2Da4rQeUIg==" - }, "gatsby-plugin-layout": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/gatsby-plugin-layout/-/gatsby-plugin-layout-1.3.2.tgz", @@ -11550,33 +11596,6 @@ "@babel/runtime": "^7.4.0" } }, - "gatsby-plugin-prefetch-google-fonts": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/gatsby-plugin-prefetch-google-fonts/-/gatsby-plugin-prefetch-google-fonts-1.4.3.tgz", - "integrity": "sha512-rrNGpdLkSEQWksM1A1cJnL/wuu9GLfAl8oPQgpn3cmpKd4jnXk+nbLyQOwKQlRYSrzpju59dY8oyf4UfSFbqPg==", - "requires": { - "@babel/runtime": "^7.2.0", - "clean-css": "^4.2.1", - "download": "^7.1.0", - "fs-extra": "^7.0.0", - "get-urls": "^8.0.0", - "globby": "^8.0.1", - "google-fonts-plugin": "2.0.2", - "object-hash": "^1.3.0" - }, - "dependencies": { - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } - } - }, "gatsby-plugin-react-helmet": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.3.2.tgz", @@ -12169,15 +12188,6 @@ "pump": "^3.0.0" } }, - "get-urls": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-urls/-/get-urls-8.0.0.tgz", - "integrity": "sha512-9c6aVD6HqnpFjqWSoRzSGNo69hNnSa8EevNFVeIRSLYqYlIJNvtHgrqiQ1sUjHwbZPBY5gO1FMlVjmElfdneqw==", - "requires": { - "normalize-url": "^3.3.0", - "url-regex": "^4.0.0" - } - }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -13925,6 +13935,11 @@ } } }, + "install-artifact-from-github": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.1.3.tgz", + "integrity": "sha512-iNuncO/pI1w0UOrebs9dwwVpXqERkszPcb7AYq2hbsJDS3X+XdZ+E5kE91EBSc98mjvCMWOoBa1Zk3hVeP1ddA==" + }, "internal-ip": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", @@ -16338,6 +16353,38 @@ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==" }, + "node-gyp": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", + "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", + "requires": { + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.3", + "nopt": "^5.0.0", + "npmlog": "^4.1.2", + "request": "^2.88.2", + "rimraf": "^3.0.2", + "semver": "^7.3.2", + "tar": "^6.0.2", + "which": "^2.0.2" + }, + "dependencies": { + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -16428,6 +16475,14 @@ "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" }, + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "requires": { + "abbrev": "1" + } + }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -18557,6 +18612,23 @@ } } }, + "re2": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/re2/-/re2-1.15.8.tgz", + "integrity": "sha512-CZm4HMuNbY+LP5LjFQvBxbQmvS7iJiVR3w23Bk3jYxZFUj6wPiYRvDikyVpqHYLioVAWcgjG6F90Pk4z7ehUSg==", + "requires": { + "install-artifact-from-github": "^1.1.3", + "nan": "^2.14.2", + "node-gyp": "^7.1.2" + }, + "dependencies": { + "nan": { + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" + } + } + }, "react": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz", @@ -21714,11 +21786,6 @@ } } }, - "tlds": { - "version": "1.207.0", - "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.207.0.tgz", - "integrity": "sha512-k7d7Q1LqjtAvhtEOs3yN14EabsNO8ZCoY6RESSJDB9lst3bTx3as/m1UuAeCKzYxiyhR1qq72ZPhpSf+qlqiwg==" - }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -22627,19 +22694,25 @@ "prepend-http": "^2.0.0" } }, - "url-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-4.1.1.tgz", - "integrity": "sha512-ViSDgDPNKkrQHI81GLCjdDN+Rsk3tAW/uLXlBOJxtcHzWZjta58Z0APXhfXzS89YszsheMnEvXeDXsWUB53wwA==", + "url-regex-safe": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/url-regex-safe/-/url-regex-safe-1.0.2.tgz", + "integrity": "sha512-t1doIKbYDBRyqXZz7A98AXH/zimKmYapxFjBZwcz3BmqjB921rUPEUokAaShKyenaX3McOM8FbkWLvFvX3Jsyw==", "requires": { - "ip-regex": "^1.0.1", - "tlds": "^1.187.0" + "ip-regex": "^4.1.0", + "re2": "^1.15.4", + "tlds": "^1.209.0" }, "dependencies": { "ip-regex": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz", - "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.2.0.tgz", + "integrity": "sha512-n5cDDeTWWRwK1EBoWwRti+8nP4NbytBBY0pldmnIkq6Z55KNFmWofh4rl9dPZpj+U/nVq7gweR3ylrvMt4YZ5A==" + }, + "tlds": { + "version": "1.212.0", + "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.212.0.tgz", + "integrity": "sha512-03rYYO1rGhOYpdYB+wlLY2d0xza6hdN/S67ol2ZpaH+CtFedMVAVhj8ft0rwxEkr90zatou8opBv7Xp6X4cK6g==" } } }, diff --git a/package.json b/package.json index be2c9c6..3da1804 100644 --- a/package.json +++ b/package.json @@ -30,17 +30,16 @@ "test": "echo \"Write tests! -> https://gatsby.dev/unit-testing\"" }, "dependencies": { + "@el7cosmos/gatsby-plugin-prefetch-google-fonts": "^2.0.2", "@mdx-js/mdx": "^1.6.6", "@mdx-js/react": "^1.6.6", "@reach/router": "^1.3.3", "classnames": "^2.2.6", "gatsby": "^2.22.11", - "gatsby-plugin-google-fonts": "^1.0.1", "gatsby-plugin-layout": "^1.3.2", "gatsby-plugin-manifest": "^2.4.9", "gatsby-plugin-mdx": "^1.2.16", "gatsby-plugin-polished": "^1.0.4", - "gatsby-plugin-prefetch-google-fonts": "^1.4.3", "gatsby-plugin-react-helmet": "^3.3.2", "gatsby-plugin-react-svg": "^3.0.0", "gatsby-plugin-sharp": "^2.6.9",