From fc9d89113981fd0479a344109591185f199600af Mon Sep 17 00:00:00 2001 From: Kirill Bolotsky Date: Tue, 23 Jun 2020 13:53:22 +0500 Subject: [PATCH] replaced custom webpack configuration with gatsby-plugin-sass; moved fonts to static folder --- gatsby-config.js | 36 +++ gatsby-node.js | 132 -------- package-lock.json | 299 +++++++++++++++++- package.json | 3 + src/styles/parts/fonts.scss | 12 +- .../tt-norms-pro/tt-pro-bold-webfont.woff | Bin .../tt-norms-pro/tt-pro-bold-webfont.woff2 | Bin .../tt-norms-pro/tt-pro-medium-webfont.woff | Bin .../tt-norms-pro/tt-pro-medium-webfont.woff2 | Bin .../tt-norms-pro/tt-pro-regular-webfont.woff | Bin .../tt-norms-pro/tt-pro-regular-webfont.woff2 | Bin 11 files changed, 341 insertions(+), 141 deletions(-) rename {src/styles => static}/fonts/tt-norms-pro/tt-pro-bold-webfont.woff (100%) rename {src/styles => static}/fonts/tt-norms-pro/tt-pro-bold-webfont.woff2 (100%) rename {src/styles => static}/fonts/tt-norms-pro/tt-pro-medium-webfont.woff (100%) rename {src/styles => static}/fonts/tt-norms-pro/tt-pro-medium-webfont.woff2 (100%) rename {src/styles => static}/fonts/tt-norms-pro/tt-pro-regular-webfont.woff (100%) rename {src/styles => static}/fonts/tt-norms-pro/tt-pro-regular-webfont.woff2 (100%) diff --git a/gatsby-config.js b/gatsby-config.js index f0b490f152..5e92c10196 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -90,6 +90,42 @@ const plugins = [ fonts: ['roboto mono:300,400'], }, }, + { + resolve: 'gatsby-plugin-svgr-svgo', + options: { + inlineSvgOptions: [ + { + test: /\.inline.svg$/, + svgoConfig: { + plugins: [ + { + removeViewBox: false, + }, + ], + }, + }, + ], + urlSvgOptions: [ + { + test: /\.svg$/, + svgoConfig: { + plugins: [ + { + removeViewBox: false, + }, + ], + }, + }, + ], + }, + }, + { + resolve: 'gatsby-plugin-sass', + options: { + includePaths: ['src/styles/styles.scss'], + data: '@import "./src/styles/styles.scss";', + }, + }, { resolve: 'gatsby-plugin-sitemap', options: { diff --git a/gatsby-node.js b/gatsby-node.js index 6a7a0d9281..c6c3bebea0 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -4,138 +4,6 @@ const Path = require('path'); // auxilary flag to determine the environment (staging/prod) const isProduction = process.env.GATSBY_DEFAULT_MAIN_URL === 'https://k6.io'; -exports.onCreateWebpackConfig = ({ getConfig, actions, stage, loaders }) => { - const { replaceWebpackConfig, setWebpackConfig } = actions; - const existingConfig = getConfig(); - const PRODUCTION = stage !== 'develop'; - const isSSR = stage.includes('html'); - - const rules = existingConfig.module.rules.map((rule) => { - if ( - String(rule.test) === String(/\.(ico|svg|jpg|jpeg|png|gif|webp)(\?.*)?$/) - ) { - return { ...rule, test: /\.(ico|jpg|jpeg|png|gif|webp)(\?.*)?$/ }; - } - - return rule; - }); - - replaceWebpackConfig({ - ...existingConfig, - module: { - ...existingConfig.module, - rules, - }, - }); - - const sassLoader = { - loader: 'sass-loader', - options: { - sourceMap: !PRODUCTION, - implementation: require('sass'), - }, - }; - - const sassResourcesLoader = { - loader: 'sass-resources-loader', - options: { - resources: [ - `${__dirname}/src/styles/variables.scss`, - `${__dirname}/src/styles/mixins.scss`, - ], - }, - }; - - const sassRuleModules = { - test: /\.module\.s(a|c)ss$/, - use: [ - !isSSR && loaders.miniCssExtract({ hmr: false }), - loaders.css({ - localIdentName: '[local]_[hash:base64:5]', - modules: true, - importLoaders: 2, - }), - loaders.postcss(), - sassLoader, - sassResourcesLoader, - ].filter(Boolean), - }; - - const sassRule = { - test: /\.s(a|c)ss$/, - use: isSSR - ? [loaders.null()] - : [ - loaders.miniCssExtract(), - loaders.css({ importLoaders: 2 }), - loaders.postcss(), - sassLoader, - sassResourcesLoader, - ], - }; - - const inlineSvgRule = { - test: /\.inline.svg$/, - use: [ - { - loader: require.resolve('@svgr/webpack'), - options: { - svgoConfig: { - removeViewBox: false, - cleanupIDs: { - prefix: { - toString() { - this.counter = this.counter || 0; - return `id-${this.counter++}`; - }, - }, - }, - }, - }, - }, - ], - issuer: { - test: /\.(js|jsx|ts|tsx)$/, - }, - }; - - const svgRule = { - test: /\.svg$/, - use: [loaders.url()], - issuer: { - test: /\.(js|jsx|ts|tsx)$/, - }, - }; - - const nonJsSVGRule = { - test: /\.svg$/, - use: [loaders.url()], - issuer: { - test: /\.(?!(js|jsx|ts|tsx)$)([^.]+$)/, - }, - }; - - let configRules = []; - - switch (stage) { - case 'develop': - case 'build-javascript': - case 'build-html': - case 'develop-html': - configRules = configRules.concat([ - { oneOf: [sassRuleModules, sassRule] }, - { oneOf: [inlineSvgRule, svgRule, nonJsSVGRule] }, - ]); - break; - } - - setWebpackConfig({ - module: { - rules: configRules, - }, - }); -}; - async function createDocPages({ graphql, actions }) { /* * custom path processing rules diff --git a/package-lock.json b/package-lock.json index ac7ab6a4ee..0858c96e79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3366,8 +3366,7 @@ "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "accepts": { "version": "1.3.7", @@ -3552,6 +3551,11 @@ "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=" }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + }, "ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -3921,6 +3925,11 @@ "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" }, + "async-foreach": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", + "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=" + }, "async-limiter": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", @@ -6139,6 +6148,14 @@ "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==" }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "requires": { + "inherits": "~2.0.0" + } + }, "bluebird": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz", @@ -11328,6 +11345,17 @@ "nan": "^2.12.1" } }, + "fstream": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "requires": { + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" + } + }, "ftp": { "version": "0.3.10", "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz", @@ -15875,6 +15903,73 @@ } } }, + "gatsby-plugin-sass": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-2.3.5.tgz", + "integrity": "sha512-NxAITw41Q2UYmfM1BOuuczIEcR5E9KyPfn4JmbvuvqrzIz07oodnORgOivfL6tfuZBo2sa+poIgpIaOLn0czxQ==", + "requires": { + "@babel/runtime": "^7.10.2", + "sass-loader": "^7.3.1" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.10.3", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.3.tgz", + "integrity": "sha512-RzGO0RLSdokm9Ipe/YD+7ww8X2Ro79qiXZF3HU9ljrM+qnJmH1Vqth+hbiQZy761LnMJTMitHDuKVYTk3k4dLw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + } + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "requires": { + "isobject": "^3.0.1" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "sass-loader": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz", + "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==", + "requires": { + "clone-deep": "^4.0.1", + "loader-utils": "^1.0.1", + "neo-async": "^2.5.0", + "pify": "^4.0.1", + "semver": "^6.3.0" + } + }, + "shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "requires": { + "kind-of": "^6.0.2" + } + } + } + }, "gatsby-plugin-sharp": { "version": "2.2.29", "resolved": "https://registry.npmjs.org/gatsby-plugin-sharp/-/gatsby-plugin-sharp-2.2.29.tgz", @@ -15939,6 +16034,15 @@ } } }, + "gatsby-plugin-svgr-svgo": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/gatsby-plugin-svgr-svgo/-/gatsby-plugin-svgr-svgo-1.0.12.tgz", + "integrity": "sha512-F0JwXeCa3ch2UnApEr1Gx30g9A4R3Z/PEw9Q/K3fQ48vUt3oZVXE9JDENGaPnxlM06FyCMcxgFG0EE3dU/4NSA==", + "requires": { + "svgo": "^1.3.2", + "svgo-loader": "^2.2.1" + } + }, "gatsby-plugin-typescript": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-2.4.2.tgz", @@ -17636,6 +17740,14 @@ "wide-align": "^1.1.0" } }, + "gaze": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", + "requires": { + "globule": "^1.0.0" + } + }, "gensync": { "version": "1.0.0-beta.1", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", @@ -17986,6 +18098,16 @@ } } }, + "globule": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz", + "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", + "requires": { + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" + } + }, "good-listener": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", @@ -19282,6 +19404,11 @@ "mem": "^3.0.1" } }, + "in-publish": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==" + }, "indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -20485,6 +20612,11 @@ "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.6.tgz", "integrity": "sha512-MUj2XlMB8kpe+8DJUGH/3UJm4XpI8XEgZQ+CiHDeyrGoKPdW/8FJv6ku+3UiYm5Fz3CWaL+iXmD8Q4Ap6aC1Jw==" }, + "js-base64": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.1.tgz", + "integrity": "sha512-G5x2saUTupU9D/xBY9snJs3TxvwX8EkpLFiYlPpDt/VmMHOXprnSU1nxiTmFbijCX4BLF/cMRIfAcC5BiMYgFQ==" + }, "js-levenshtein": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", @@ -22363,6 +22495,32 @@ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==" }, + "node-gyp": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", + "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "requires": { + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" + }, + "dependencies": { + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + } + } + }, "node-libs-browser": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", @@ -22413,6 +22571,71 @@ "semver": "^6.3.0" } }, + "node-sass": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", + "requires": { + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash": "^4.17.15", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", + "sass-graph": "2.2.5", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "requires": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + }, + "true-case-path": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", + "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", + "requires": { + "glob": "^7.1.2" + } + } + } + }, "noms": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz", @@ -22454,7 +22677,6 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, "requires": { "abbrev": "1" } @@ -23085,6 +23307,11 @@ "arch": "^2.1.0" } }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, "os-locale": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", @@ -23166,6 +23393,15 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, "osx-release": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz", @@ -27010,6 +27246,17 @@ "chokidar": ">=2.0.0 <4.0.0" } }, + "sass-graph": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", + "requires": { + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^13.3.2" + } + }, "sass-loader": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz", @@ -27157,6 +27404,25 @@ "invariant": "^2.2.4" } }, + "scss-tokenizer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "requires": { + "js-base64": "^2.1.8", + "source-map": "^0.4.2" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "requires": { + "amdefine": ">=0.0.4" + } + } + } + }, "section-matter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", @@ -28496,6 +28762,14 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, + "stdout-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", + "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", + "requires": { + "readable-stream": "^2.0.1" + } + }, "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", @@ -29167,6 +29441,15 @@ } } }, + "svgo-loader": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/svgo-loader/-/svgo-loader-2.2.1.tgz", + "integrity": "sha512-9dyz/h6ae04pAVRz7QY8bLXtMbwA19NPpCPfCixgW0qXNDCOlHbDRqvtT5/2gzRxfuibWCUP6ZBQmZWF9rjWhQ==", + "requires": { + "js-yaml": "^3.13.1", + "loader-utils": "^1.0.3" + } + }, "swap-case": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz", @@ -29269,6 +29552,16 @@ "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" }, + "tar": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "requires": { + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" + } + }, "tar-fs": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", diff --git a/package.json b/package.json index 6fdf86e79b..89d3080afb 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,10 @@ "gatsby-plugin-remove-trailing-slashes": "^2.1.10", "gatsby-plugin-resolve-src": "^2.0.0", "gatsby-plugin-s3": "^0.3.3", + "gatsby-plugin-sass": "^2.3.5", "gatsby-plugin-sharp": "^2.2.29", "gatsby-plugin-sitemap": "^2.2.26", + "gatsby-plugin-svgr-svgo": "^1.0.12", "gatsby-remark-copy-linked-files": "^2.1.36", "gatsby-remark-images": "^3.1.30", "gatsby-remark-prismjs": "^3.3.18", @@ -57,6 +59,7 @@ "google-maps-react": "^2.0.2", "intersection-observer": "^0.7.0", "lodash": "^4.17.15", + "node-sass": "^4.14.1", "prismjs": "^1.17.1", "qs": "^6.9.1", "react": "^16.10.2", diff --git a/src/styles/parts/fonts.scss b/src/styles/parts/fonts.scss index 683a6f49fa..6ec28ec50a 100644 --- a/src/styles/parts/fonts.scss +++ b/src/styles/parts/fonts.scss @@ -29,22 +29,22 @@ font-family: 'TT Norms Pro'; font-style: normal; font-weight: 400; - src: url('./fonts/tt-norms-pro/tt-pro-regular-webfont.woff2') format('woff2'), - url('./fonts/tt-norms-pro/tt-pro-regular-webfont.woff') format('woff'); + src: url('/fonts/tt-norms-pro/tt-pro-regular-webfont.woff2') format('woff2'), + url('/fonts/tt-norms-pro/tt-pro-regular-webfont.woff') format('woff'); } @font-face { font-family: 'TT Norms Pro'; font-style: normal; font-weight: 500; - src: url('./fonts/tt-norms-pro/tt-pro-medium-webfont.woff2') format('woff2'), - url('./fonts/tt-norms-pro/tt-pro-medium-webfont.woff') format('woff'); + src: url('/fonts/tt-norms-pro/tt-pro-medium-webfont.woff2') format('woff2'), + url('/fonts/tt-norms-pro/tt-pro-medium-webfont.woff') format('woff'); } @font-face { font-family: 'TT Norms Pro'; font-style: normal; font-weight: 700; - src: url('./fonts/tt-norms-pro/tt-pro-bold-webfont.woff2') format('woff2'), - url('./fonts/tt-norms-pro/tt-pro-bold-webfont.woff') format('woff'); + src: url('/fonts/tt-norms-pro/tt-pro-bold-webfont.woff2') format('woff2'), + url('/fonts/tt-norms-pro/tt-pro-bold-webfont.woff') format('woff'); } diff --git a/src/styles/fonts/tt-norms-pro/tt-pro-bold-webfont.woff b/static/fonts/tt-norms-pro/tt-pro-bold-webfont.woff similarity index 100% rename from src/styles/fonts/tt-norms-pro/tt-pro-bold-webfont.woff rename to static/fonts/tt-norms-pro/tt-pro-bold-webfont.woff diff --git a/src/styles/fonts/tt-norms-pro/tt-pro-bold-webfont.woff2 b/static/fonts/tt-norms-pro/tt-pro-bold-webfont.woff2 similarity index 100% rename from src/styles/fonts/tt-norms-pro/tt-pro-bold-webfont.woff2 rename to static/fonts/tt-norms-pro/tt-pro-bold-webfont.woff2 diff --git a/src/styles/fonts/tt-norms-pro/tt-pro-medium-webfont.woff b/static/fonts/tt-norms-pro/tt-pro-medium-webfont.woff similarity index 100% rename from src/styles/fonts/tt-norms-pro/tt-pro-medium-webfont.woff rename to static/fonts/tt-norms-pro/tt-pro-medium-webfont.woff diff --git a/src/styles/fonts/tt-norms-pro/tt-pro-medium-webfont.woff2 b/static/fonts/tt-norms-pro/tt-pro-medium-webfont.woff2 similarity index 100% rename from src/styles/fonts/tt-norms-pro/tt-pro-medium-webfont.woff2 rename to static/fonts/tt-norms-pro/tt-pro-medium-webfont.woff2 diff --git a/src/styles/fonts/tt-norms-pro/tt-pro-regular-webfont.woff b/static/fonts/tt-norms-pro/tt-pro-regular-webfont.woff similarity index 100% rename from src/styles/fonts/tt-norms-pro/tt-pro-regular-webfont.woff rename to static/fonts/tt-norms-pro/tt-pro-regular-webfont.woff diff --git a/src/styles/fonts/tt-norms-pro/tt-pro-regular-webfont.woff2 b/static/fonts/tt-norms-pro/tt-pro-regular-webfont.woff2 similarity index 100% rename from src/styles/fonts/tt-norms-pro/tt-pro-regular-webfont.woff2 rename to static/fonts/tt-norms-pro/tt-pro-regular-webfont.woff2