From ae82c0ee808c1606a8da966bbc4cb701c896a09c Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 25 Nov 2019 14:26:34 +0100 Subject: [PATCH 1/7] add loadable to code component of minimal blog --- themes/gatsby-theme-minimal-blog/package.json | 1 + .../src/components/code.tsx | 40 +++-- .../gatsby-theme-minimal-blog/src/index.d.ts | 3 +- .../gatsby-theme-minimal-blog/src/types.d.ts | 149 ++++++++++++++++++ yarn.lock | 8 + 5 files changed, 187 insertions(+), 14 deletions(-) create mode 100644 themes/gatsby-theme-minimal-blog/src/types.d.ts diff --git a/themes/gatsby-theme-minimal-blog/package.json b/themes/gatsby-theme-minimal-blog/package.json index d11dab3c9..e1efd23d4 100644 --- a/themes/gatsby-theme-minimal-blog/package.json +++ b/themes/gatsby-theme-minimal-blog/package.json @@ -22,6 +22,7 @@ "dependencies": { "@emotion/core": "^10.0.22", "@lekoarts/gatsby-theme-minimal-blog-core": "^1.0.1", + "@loadable/component": "^5.10.3", "@mdx-js/react": "^1.1.5", "@theme-ui/color": "^0.2.49", "@theme-ui/components": "^0.2.49", diff --git a/themes/gatsby-theme-minimal-blog/src/components/code.tsx b/themes/gatsby-theme-minimal-blog/src/components/code.tsx index 17aa409d1..007c56519 100644 --- a/themes/gatsby-theme-minimal-blog/src/components/code.tsx +++ b/themes/gatsby-theme-minimal-blog/src/components/code.tsx @@ -1,9 +1,8 @@ /* eslint react/destructuring-assignment: 0 */ import React from "react" -import Highlight, { defaultProps, Language } from "prism-react-renderer" -import theme from "prism-react-renderer/themes/nightOwl" -import { LiveProvider, LiveEditor, LiveError, LivePreview } from "react-live" +import loadable from "@loadable/component" import useSiteMetadata from "../hooks/use-site-metadata" +import { HighlightInnerProps, Language } from "../types" type CodeProps = { codeString: string @@ -13,6 +12,27 @@ type CodeProps = { [key: string]: any } +const LazyHighlight = loadable(async () => { + const Module = await import(`prism-react-renderer`) + const Highlight = Module.default + const { defaultProps } = Module + return (props: any) => +}) + +const LazyLiveProvider = loadable(async () => { + const Module = await import(`react-live`) + const { LiveProvider, LiveEditor, LiveError, LivePreview } = Module + return (props: any) => ( + + + + + + ) +}) + +const theme = loadable(() => import(`prism-react-renderer/themes/nightOwl`)) + function getParams(className = ``) { const [lang = ``, params = ``] = className.split(`:`) @@ -67,17 +87,11 @@ const Code = ({ const hasLineNumbers = !noLineNumbers && language !== `noLineNumbers` && showLineNumbers if (props[`react-live`]) { - return ( - - - - - - ) + return } return ( - - {({ className, style, tokens, getLineProps, getTokenProps }) => ( + + {({ className, style, tokens, getLineProps, getTokenProps }: HighlightInnerProps) => ( {title && (
@@ -106,7 +120,7 @@ const Code = ({
)} -
+ ) } diff --git a/themes/gatsby-theme-minimal-blog/src/index.d.ts b/themes/gatsby-theme-minimal-blog/src/index.d.ts index e23de2d9d..759edae00 100644 --- a/themes/gatsby-theme-minimal-blog/src/index.d.ts +++ b/themes/gatsby-theme-minimal-blog/src/index.d.ts @@ -1,3 +1,4 @@ declare module "@theme-ui/components" declare module "@theme-ui/color" -declare module "lodash.kebabcase" \ No newline at end of file +declare module "lodash.kebabcase" +declare module "@loadable/component" \ No newline at end of file diff --git a/themes/gatsby-theme-minimal-blog/src/types.d.ts b/themes/gatsby-theme-minimal-blog/src/types.d.ts new file mode 100644 index 000000000..31960f46d --- /dev/null +++ b/themes/gatsby-theme-minimal-blog/src/types.d.ts @@ -0,0 +1,149 @@ +import * as React from "react" + +export type Language = + | "markup" + | "bash" + | "clike" + | "c" + | "cpp" + | "css" + | "javascript" + | "jsx" + | "coffeescript" + | "actionscript" + | "css-extr" + | "diff" + | "git" + | "go" + | "graphql" + | "handlebars" + | "json" + | "less" + | "makefile" + | "markdown" + | "objectivec" + | "ocaml" + | "python" + | "reason" + | "sass" + | "scss" + | "sql" + | "stylus" + | "tsx" + | "typescript" + | "wasm" + | "yaml" + +type Token = { + types: string[] + content: string + empty?: boolean +} + +type PrismGrammar = { + [key: string]: any +} + +type LanguageDict = { [lang in Language]: PrismGrammar } + +type PrismLib = { + languages: LanguageDict + tokenize: (code: string, grammar: PrismGrammar, language: Language) => PrismToken[] | string[] + highlight: (code: string, grammar: PrismGrammar, language: Language) => string +} + +type PrismThemeEntry = { + color?: string + backgroundColor?: string + fontStyle?: "normal" | "italic" + fontWeight?: "normal" | "bold" | "100" | "200" | "300" | "400" | "500" | "600" | "700" | "800" | "900" + textDecorationLine?: "none" | "underline" | "line-through" | "underline line-through" + opacity?: number + [styleKey: string]: string | number | void +} + +type PrismTheme = { + plain: PrismThemeEntry + styles: Array<{ + types: string[] + style: PrismThemeEntry + languages?: Language[] + }> +} + +type ThemeDict = { + root: StyleObj + plain: StyleObj + [type: string]: StyleObj +} + +type PrismToken = { + type: string + content: Array | string +} + +type StyleObj = { + [key: string]: string | number | null +} + +type LineInputProps = { + key?: React.Key + style?: StyleObj + className?: string + line: Token[] + [otherProp: string]: any +} + +type LineOutputProps = { + key?: React.Key + style?: StyleObj + className: string + [otherProps: string]: any +} + +type TokenInputProps = { + key?: React.Key + style?: StyleObj + className?: string + token: Token + [otherProp: string]: any +} + +type TokenOutputProps = { + key?: React.Key + style?: StyleObj + className: string + children: string + [otherProp: string]: any +} + +type RenderProps = { + tokens: Token[][] + className: string + style: StyleObj + getLineProps: (input: LineInputProps) => LineOutputProps + getTokenProps: (input: TokenInputProps) => TokenOutputProps +} + +type DefaultProps = { + Prism: PrismLib + theme: PrismTheme +} + +interface HighlightProps { + Prism: PrismLib + theme?: PrismTheme + language: Language + code: string + children: (props: RenderProps) => React.ReactNode +} + +export interface HighlightInnerProps { + className: string + style: StyleObj + tokens: Token[][] + themeDict: ThemeDict + getLineProps: (lineInputProps: LineInputProps) => LineOutputProps + getStyleForToken: (token: Token) => { [inlineStyle: string]: string } + getTokenProps: (tokenInputPropsL: TokenInputProps) => TokenOutputProps +} diff --git a/yarn.lock b/yarn.lock index 2905482a0..46142d17e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2308,6 +2308,14 @@ npmlog "^4.1.2" write-file-atomic "^2.3.0" +"@loadable/component@^5.10.3": + version "5.10.3" + resolved "https://registry.yarnpkg.com/@loadable/component/-/component-5.10.3.tgz#e1ad811ac4834a6ed187605d8464351d0c52896f" + integrity sha512-/aSO+tXw4vFMwZ6fgLaNQgLuEa7bgTpoBE4PxNzf08/ewAjymrCS3J7v3SbGE7IjGmmKL6vVwkpb7S3cYrk+ag== + dependencies: + "@babel/runtime" "^7.6.0" + hoist-non-react-statics "^3.3.0" + "@mdx-js/mdx@^1.3.1", "@mdx-js/mdx@^1.5.1": version "1.5.1" resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.5.1.tgz#470ce07e01cef4f7b1d5051640e5235d5e75aebb" From 8f70f2a7b5cc98700993e8dc890c5f6c25277da7 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 25 Nov 2019 14:31:30 +0100 Subject: [PATCH 2/7] add bundle analyser to example --- examples/minimal-blog/gatsby-config.js | 1 + examples/minimal-blog/package.json | 3 +- yarn.lock | 85 ++++++++++++++++++++++++-- 3 files changed, 83 insertions(+), 6 deletions(-) diff --git a/examples/minimal-blog/gatsby-config.js b/examples/minimal-blog/gatsby-config.js index 561d028e4..724bf4f9e 100644 --- a/examples/minimal-blog/gatsby-config.js +++ b/examples/minimal-blog/gatsby-config.js @@ -54,5 +54,6 @@ module.exports = { }, `gatsby-plugin-offline`, `gatsby-plugin-netlify`, + // `gatsby-plugin-webpack-bundle-analyser-v2`, ], } diff --git a/examples/minimal-blog/package.json b/examples/minimal-blog/package.json index 76ae21095..a09e29ca6 100644 --- a/examples/minimal-blog/package.json +++ b/examples/minimal-blog/package.json @@ -27,6 +27,7 @@ "react-dom": "^16.9.0" }, "devDependencies": { - "cross-env": "^5.2.0" + "cross-env": "^5.2.0", + "gatsby-plugin-webpack-bundle-analyser-v2": "^1.1.8" } } diff --git a/yarn.lock b/yarn.lock index 46142d17e..60c659c65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3386,7 +3386,7 @@ acorn-jsx@^5.1.0: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== -acorn-walk@^6.0.1: +acorn-walk@^6.0.1, acorn-walk@^6.1.1: version "6.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== @@ -3396,7 +3396,7 @@ acorn@^5.5.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -acorn@^6.0.1, acorn@^6.2.1: +acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1: version "6.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== @@ -4243,6 +4243,16 @@ better-queue@^3.8.10: node-eta "^0.9.0" uuid "^3.0.0" +bfj@^6.1.1: + version "6.1.2" + resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f" + integrity sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw== + dependencies: + bluebird "^3.5.5" + check-types "^8.0.3" + hoopy "^0.1.4" + tryer "^1.0.1" + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -4955,6 +4965,11 @@ check-more-types@2.24.0: resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600" integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA= +check-types@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" + integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ== + cheerio@^0.22.0: version "0.22.0" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" @@ -5333,7 +5348,7 @@ commander@2.15.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== -commander@^2.11.0, commander@^2.20.0, commander@~2.20.3: +commander@^2.11.0, commander@^2.18.0, commander@^2.20.0, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -6929,6 +6944,11 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= +ejs@^2.6.1: + version "2.7.4" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" + integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== + electron-to-chromium@^1.3.306, electron-to-chromium@^1.3.47: version "1.3.309" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.309.tgz#9e1e5e23c73d04f0364e524afaafd6659289ae1b" @@ -7634,7 +7654,7 @@ express-graphql@^0.9.0: http-errors "^1.7.3" raw-body "^2.4.1" -express@^4.17.1: +express@^4.16.3, express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== @@ -7985,6 +8005,11 @@ filesize@3.5.11: resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee" integrity sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g== +filesize@^3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" + integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -8611,6 +8636,14 @@ gatsby-plugin-typescript@^2.1.15, gatsby-plugin-typescript@^2.1.16, gatsby-plugi "@babel/runtime" "^7.7.2" babel-plugin-remove-graphql-queries "^2.7.16" +gatsby-plugin-webpack-bundle-analyser-v2@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/gatsby-plugin-webpack-bundle-analyser-v2/-/gatsby-plugin-webpack-bundle-analyser-v2-1.1.8.tgz#2fd3e44c71b0fa74b6cf574f447e699a8e187e0a" + integrity sha512-xVC6JYP1n1CaLml9VTBqdrmBEkCUgcAk5jW8hpJVH9gAn3dVQYyOgUxAavi88ZBLN7Ff6M7uZ80COMRWtdlpbA== + dependencies: + "@babel/runtime" "^7.7.2" + webpack-bundle-analyzer "^3.6.0" + gatsby-react-router-scroll@^2.1.16: version "2.1.16" resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.1.16.tgz#7e1ac76ceda23d049fe1453bed3cb0c3664a94de" @@ -9349,6 +9382,14 @@ gzip-size@3.0.0: dependencies: duplexer "^0.1.1" +gzip-size@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" + integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== + dependencies: + duplexer "^0.1.1" + pify "^4.0.1" + handle-thing@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" @@ -9610,6 +9651,11 @@ homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" +hoopy@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" + integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== + hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: version "2.8.5" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" @@ -13556,6 +13602,11 @@ opencollective-postinstall@^2.0.2: resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== +opener@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" + integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA== + opentracing@^0.14.4: version "0.14.4" resolved "https://registry.yarnpkg.com/opentracing/-/opentracing-0.14.4.tgz#a113408ea740da3a90fde5b3b0011a375c2e4268" @@ -17851,6 +17902,11 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf" integrity sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q== +tryer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" + integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== + ts-jest@^24.1.0: version "24.1.0" resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.1.0.tgz#2eaa813271a2987b7e6c3fefbda196301c131734" @@ -18646,6 +18702,25 @@ webpack-assets-manifest@^3.1.1: tapable "^1.0.0" webpack-sources "^1.0.0" +webpack-bundle-analyzer@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz#39b3a8f829ca044682bc6f9e011c95deb554aefd" + integrity sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g== + dependencies: + acorn "^6.0.7" + acorn-walk "^6.1.1" + bfj "^6.1.1" + chalk "^2.4.1" + commander "^2.18.0" + ejs "^2.6.1" + express "^4.16.3" + filesize "^3.6.1" + gzip-size "^5.0.0" + lodash "^4.17.15" + mkdirp "^0.5.1" + opener "^1.5.1" + ws "^6.0.0" + webpack-dev-middleware@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3" @@ -19251,7 +19326,7 @@ ws@^5.2.0: dependencies: async-limiter "~1.0.0" -ws@^6.2.1: +ws@^6.0.0, ws@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== From 3901178ce14aee8bb5a28103b3284ab9961574f2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 01:05:36 +0000 Subject: [PATCH 3/7] chore(deps): update dependency @types/theme-ui to ^0.2.5 (#161) --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 093ada9c7..1a2b4c4a4 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@types/react-dom": "^16.9.4", "@types/react-helmet": "^5.0.14", "@types/testing-library__cypress": "^5.0.1", - "@types/theme-ui": "^0.2.4", + "@types/theme-ui": "^0.2.5", "@typescript-eslint/eslint-plugin": "^2.7.0", "@typescript-eslint/parser": "^2.7.0", "concurrently": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index 60c659c65..4da52a105 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3076,7 +3076,7 @@ "@types/react-dom" "*" "@types/testing-library__dom" "*" -"@types/theme-ui@^0.2.4": +"@types/theme-ui@^0.2.5": version "0.2.5" resolved "https://registry.yarnpkg.com/@types/theme-ui/-/theme-ui-0.2.5.tgz#811b6df12c1b067f7cb20136e81e7c3974d3548a" integrity sha512-EuOhttbeNs3uxvFC1tOsLzgbkN4Nv9hOOPTb77v/qp5jaNONxB7HARtbtYJiJgfBPW4b370J9Y3nZMeHifwR1A== From dd3833c7fd9de1726ad24ff8a314fbc69c785817 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 03:36:11 +0000 Subject: [PATCH 4/7] chore(deps): update dependency lerna to ^3.19.0 (#163) --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1a2b4c4a4..b7c042de1 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "husky": "^3.1.0", "jest": "^24.9.0", "jest-junit": "^9.0.0", - "lerna": "^3.18.4", + "lerna": "^3.19.0", "lint-staged": "^9.4.3", "plop": "^2.5.3", "prettier": "^1.19.1", diff --git a/yarn.lock b/yarn.lock index 4da52a105..a0cd6cffa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11573,7 +11573,7 @@ left-pad@^1.3.0: resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== -lerna@^3.18.4: +lerna@^3.19.0: version "3.19.0" resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.19.0.tgz#6d53b613eca7da426ab1e97c01ce6fb39754da6c" integrity sha512-YtMmwEqzWHQCh7Ynk7BvjrZri3EkSeVqTAcwZIqWlv9V/dCfvFPyRqp+2NIjPB5nj1FWXLRH6F05VT/qvzuuOA== From 9e84d4eb58c755666b5589e278614e35536cdf8d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 04:40:39 +0000 Subject: [PATCH 5/7] chore(deps): update dependency ts-jest to ^24.2.0 (#164) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b7c042de1..2c06b3cd8 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "plop": "^2.5.3", "prettier": "^1.19.1", "start-server-and-test": "^1.10.6", - "ts-jest": "^24.1.0", + "ts-jest": "^24.2.0", "typescript": "^3.7.2" } } diff --git a/yarn.lock b/yarn.lock index a0cd6cffa..d4c7980a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17907,10 +17907,10 @@ tryer@^1.0.1: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== -ts-jest@^24.1.0: - version "24.1.0" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.1.0.tgz#2eaa813271a2987b7e6c3fefbda196301c131734" - integrity sha512-HEGfrIEAZKfu1pkaxB9au17b1d9b56YZSqz5eCVE8mX68+5reOvlM93xGOzzCREIov9mdH7JBG+s0UyNAqr0tQ== +ts-jest@^24.2.0: + version "24.2.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.2.0.tgz#7abca28c2b4b0a1fdd715cd667d65d047ea4e768" + integrity sha512-Yc+HLyldlIC9iIK8xEN7tV960Or56N49MDP7hubCZUeI7EbIOTsas6rXCMB4kQjLACJ7eDOF4xWEO5qumpKsag== dependencies: bs-logger "0.x" buffer-from "1.x" From 0b7c824c01ee1533d745474ed34335b1481cfcd7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 06:00:17 +0000 Subject: [PATCH 6/7] chore(deps): update linting & formatting + typescript (#165) --- package.json | 12 +++---- yarn.lock | 92 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 92 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 2c06b3cd8..448caf807 100644 --- a/package.json +++ b/package.json @@ -39,20 +39,20 @@ "@testing-library/react": "^9.3.2", "@types/chroma-js": "^1.4.3", "@types/jest": "^24.0.23", - "@types/node": "^12.12.8", - "@types/react": "^16.9.11", + "@types/node": "^12.12.12", + "@types/react": "^16.9.13", "@types/react-dom": "^16.9.4", "@types/react-helmet": "^5.0.14", "@types/testing-library__cypress": "^5.0.1", "@types/theme-ui": "^0.2.5", - "@typescript-eslint/eslint-plugin": "^2.7.0", - "@typescript-eslint/parser": "^2.7.0", + "@typescript-eslint/eslint-plugin": "^2.8.0", + "@typescript-eslint/parser": "^2.8.0", "concurrently": "^5.0.0", "cross-env": "^6.0.3", "cypress": "3.6.0", - "eslint": "^6.6.0", + "eslint": "^6.7.1", "eslint-config-airbnb": "^18.0.1", - "eslint-config-prettier": "^6.6.0", + "eslint-config-prettier": "^6.7.0", "eslint-plugin-import": "^2.18.2", "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-prettier": "^3.1.1", diff --git a/yarn.lock b/yarn.lock index d4c7980a4..d2c557cdf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2961,11 +2961,16 @@ resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.3.29.tgz#7f2ad7ec55f914482fc9b1ec4bb1ae6028d46066" integrity sha1-fyrX7FX5FEgvybHsS7GuYCjUYGY= -"@types/node@*", "@types/node@>= 8", "@types/node@^12.12.8": +"@types/node@*", "@types/node@>= 8": version "12.12.11" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.11.tgz#bec2961975888d964196bf0016a2f984d793d3ce" integrity sha512-O+x6uIpa6oMNTkPuHDa9MhMMehlxLAd5QcOvKRjAFsBVpeFWTOPnXbDvILvFgFFZfQ1xh1EZi1FbXxUix+zpsQ== +"@types/node@^12.12.12": + version "12.12.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.12.tgz#529bc3e73dbb35dd9e90b0a1c83606a9d3264bdb" + integrity sha512-MGuvYJrPU0HUwqF7LqvIj50RZUX23Z+m583KBygKYUZLlZ88n6w28XRNJRJgsHukLEnLz6w6SvxZoLgbr5wLqQ== + "@types/node@^7.0.11": version "7.10.9" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.10.9.tgz#4343e3b009f8cf5e1ed685e36097b74b4101e880" @@ -3013,7 +3018,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.8.12", "@types/react@^16.8.6", "@types/react@^16.9.11": +"@types/react@*", "@types/react@^16.8.12", "@types/react@^16.8.6": version "16.9.11" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.11.tgz#70e0b7ad79058a7842f25ccf2999807076ada120" integrity sha512-UBT4GZ3PokTXSWmdgC/GeCGEJXE5ofWyibCcecRLUVN2ZBpXQGVgQGtG2foS7CrTKFKlQVVswLvf7Js6XA/CVQ== @@ -3021,6 +3026,14 @@ "@types/prop-types" "*" csstype "^2.2.0" +"@types/react@^16.9.13": + version "16.9.13" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.13.tgz#b3ea5dd443f4a680599e2abba8cc66f5e1ce0059" + integrity sha512-LikzRslbiufJYHyzbHSW0GrAiff8QYLMBFeZmSxzCYGXKxi8m/1PHX+rsVOwhr7mJNq+VIu2Dhf7U6mjFERK6w== + dependencies: + "@types/prop-types" "*" + csstype "^2.2.0" + "@types/sizzle@*", "@types/sizzle@2.3.2": version "2.3.2" resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47" @@ -3131,7 +3144,7 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^2.7.0": +"@typescript-eslint/eslint-plugin@^2.7.0", "@typescript-eslint/eslint-plugin@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.8.0.tgz#eca584d46094ebebc3cb3e9fb625bfbc904a534d" integrity sha512-ohqul5s6XEB0AzPWZCuJF5Fd6qC0b4+l5BGEnrlpmvXxvyymb8yw8Bs4YMF8usNAeuCJK87eFIHy8g8GFvOtGA== @@ -3151,7 +3164,7 @@ "@typescript-eslint/typescript-estree" "2.8.0" eslint-scope "^5.0.0" -"@typescript-eslint/parser@^2.7.0": +"@typescript-eslint/parser@^2.7.0", "@typescript-eslint/parser@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.8.0.tgz#e10f7c40c8cf2fb19920c879311e6c46ad17bacb" integrity sha512-NseXWzhkucq+JM2HgqAAoKEzGQMb5LuTRjFPLQzGIdLthXMNUfuiskbl7QSykvWW6mvzCtYbw1fYWGa2EIaekw== @@ -7198,7 +7211,7 @@ eslint-config-airbnb@^18.0.1: object.assign "^4.1.0" object.entries "^1.1.0" -eslint-config-prettier@^6.6.0: +eslint-config-prettier@^6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.7.0.tgz#9a876952e12df2b284adbd3440994bf1f39dfbb9" integrity sha512-FamQVKM3jjUVwhG4hEMnbtsq7xOIDm+SY5iBPfR8gKsJoAB2IQnNF+bk1+8Fy44Nq7PPJaLvkRxILYdJWoguKQ== @@ -7389,6 +7402,49 @@ eslint@^6.6.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" +eslint@^6.7.1: + version "6.7.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.1.tgz#269ccccec3ef60ab32358a44d147ac209154b919" + integrity sha512-UWzBS79pNcsDSxgxbdjkmzn/B6BhsXMfUaOHnNwyE8nD+Q6pyT96ow2MccVayUTV4yMid4qLhMiQaywctRkBLA== + dependencies: + "@babel/code-frame" "^7.0.0" + ajv "^6.10.0" + chalk "^2.1.0" + cross-spawn "^6.0.5" + debug "^4.0.1" + doctrine "^3.0.0" + eslint-scope "^5.0.0" + eslint-utils "^1.4.3" + eslint-visitor-keys "^1.1.0" + espree "^6.1.2" + esquery "^1.0.1" + esutils "^2.0.2" + file-entry-cache "^5.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.0.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + inquirer "^7.0.0" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.14" + minimatch "^3.0.4" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.3" + progress "^2.0.0" + regexpp "^2.0.1" + semver "^6.1.2" + strip-ansi "^5.2.0" + strip-json-comments "^3.0.1" + table "^5.2.3" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + espree@^6.1.2: version "6.1.2" resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d" @@ -7815,7 +7871,7 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= -fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4: +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -9168,6 +9224,13 @@ globals@^11.1.0, globals@^11.7.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== +globals@^12.1.0: + version "12.3.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13" + integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw== + dependencies: + type-fest "^0.8.1" + globby@*, globby@^10.0.1: version "10.0.1" resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22" @@ -13654,6 +13717,18 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" +optionator@^0.8.3: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + ora@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4" @@ -18961,6 +19036,11 @@ with-open-file@^0.1.6: p-try "^2.1.0" pify "^4.0.1" +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" From 96c5ec758644957b2b9d9019c8ac3db908664b98 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 08:53:18 +0000 Subject: [PATCH 7/7] fix(deps): update gatsby (#166) --- themes/gatsby-theme-cara/package.json | 10 ++--- themes/gatsby-theme-emilia-core/package.json | 10 ++--- themes/gatsby-theme-emilia/package.json | 10 ++--- themes/gatsby-theme-emma-core/package.json | 12 +++--- themes/gatsby-theme-emma/package.json | 10 ++--- .../package.json | 8 ++-- .../package.json | 12 +++--- themes/gatsby-theme-minimal-blog/package.json | 6 +-- themes/gatsby-theme-specimens/package.json | 2 +- .../package.json | 2 +- yarn.lock | 42 +++++++++++-------- 11 files changed, 65 insertions(+), 59 deletions(-) diff --git a/themes/gatsby-theme-cara/package.json b/themes/gatsby-theme-cara/package.json index b13e6b9e6..a20882a11 100644 --- a/themes/gatsby-theme-cara/package.json +++ b/themes/gatsby-theme-cara/package.json @@ -25,12 +25,12 @@ "@mdx-js/mdx": "^1.5.1", "@mdx-js/react": "^1.5.1", "@theme-ui/presets": "^0.2.44", - "gatsby-plugin-emotion": "^4.1.14", - "gatsby-plugin-mdx": "^1.0.56", - "gatsby-plugin-react-helmet": "^3.1.14", + "gatsby-plugin-emotion": "^4.1.15", + "gatsby-plugin-mdx": "^1.0.57", + "gatsby-plugin-react-helmet": "^3.1.15", "gatsby-plugin-theme-ui": "^0.2.43", - "gatsby-plugin-typescript": "^2.1.16", - "gatsby-source-filesystem": "^2.1.36", + "gatsby-plugin-typescript": "^2.1.19", + "gatsby-source-filesystem": "^2.1.38", "react-helmet": "^5.2.1", "react-spring": "^8.0.27", "theme-ui": "^0.2.49" diff --git a/themes/gatsby-theme-emilia-core/package.json b/themes/gatsby-theme-emilia-core/package.json index 76cc7c816..856c2010e 100644 --- a/themes/gatsby-theme-emilia-core/package.json +++ b/themes/gatsby-theme-emilia-core/package.json @@ -23,11 +23,11 @@ "dependencies": { "@mdx-js/mdx": "^1.5.1", "@mdx-js/react": "^1.5.1", - "gatsby-plugin-mdx": "^1.0.56", - "gatsby-plugin-sharp": "^2.2.37", - "gatsby-plugin-typescript": "^2.1.16", - "gatsby-source-filesystem": "^2.1.36", - "gatsby-transformer-sharp": "^2.3.3", + "gatsby-plugin-mdx": "^1.0.57", + "gatsby-plugin-sharp": "^2.3.3", + "gatsby-plugin-typescript": "^2.1.19", + "gatsby-source-filesystem": "^2.1.38", + "gatsby-transformer-sharp": "^2.3.5", "lodash.kebabcase": "^4.1.1" }, "keywords": [ diff --git a/themes/gatsby-theme-emilia/package.json b/themes/gatsby-theme-emilia/package.json index c4501a955..048642061 100644 --- a/themes/gatsby-theme-emilia/package.json +++ b/themes/gatsby-theme-emilia/package.json @@ -25,12 +25,12 @@ "@mdx-js/react": "^1.5.1", "@theme-ui/presets": "^0.2.44", "colorthief": "^2.3.0", - "gatsby-core-utils": "^1.0.18", - "gatsby-image": "^2.2.31", - "gatsby-plugin-emotion": "^4.1.14", - "gatsby-plugin-react-helmet": "^3.1.14", + "gatsby-core-utils": "^1.0.20", + "gatsby-image": "^2.2.33", + "gatsby-plugin-emotion": "^4.1.15", + "gatsby-plugin-react-helmet": "^3.1.15", "gatsby-plugin-theme-ui": "^0.2.43", - "gatsby-plugin-typescript": "^2.1.16", + "gatsby-plugin-typescript": "^2.1.19", "react-helmet": "^5.2.1", "react-spring": "^8.0.27", "theme-ui": "^0.2.49" diff --git a/themes/gatsby-theme-emma-core/package.json b/themes/gatsby-theme-emma-core/package.json index f1776fac3..f01143e21 100644 --- a/themes/gatsby-theme-emma-core/package.json +++ b/themes/gatsby-theme-emma-core/package.json @@ -23,12 +23,12 @@ "dependencies": { "@mdx-js/mdx": "^1.5.1", "@mdx-js/react": "^1.5.1", - "gatsby-plugin-mdx": "^1.0.56", - "gatsby-plugin-sharp": "^2.2.37", - "gatsby-plugin-typescript": "^2.1.16", - "gatsby-remark-images": "^3.1.30", - "gatsby-source-filesystem": "^2.1.36", - "gatsby-transformer-sharp": "^2.3.3", + "gatsby-plugin-mdx": "^1.0.57", + "gatsby-plugin-sharp": "^2.3.3", + "gatsby-plugin-typescript": "^2.1.19", + "gatsby-remark-images": "^3.1.33", + "gatsby-source-filesystem": "^2.1.38", + "gatsby-transformer-sharp": "^2.3.5", "lodash.kebabcase": "^4.1.1" }, "keywords": [ diff --git a/themes/gatsby-theme-emma/package.json b/themes/gatsby-theme-emma/package.json index 67d9a5549..16b64312a 100644 --- a/themes/gatsby-theme-emma/package.json +++ b/themes/gatsby-theme-emma/package.json @@ -25,12 +25,12 @@ "@mdx-js/mdx": "^1.5.1", "@mdx-js/react": "^1.5.1", "@theme-ui/presets": "^0.2.44", - "gatsby-image": "^2.2.31", - "gatsby-plugin-catch-links": "^2.1.16", - "gatsby-plugin-emotion": "^4.1.14", - "gatsby-plugin-react-helmet": "^3.1.14", + "gatsby-image": "^2.2.33", + "gatsby-plugin-catch-links": "^2.1.17", + "gatsby-plugin-emotion": "^4.1.15", + "gatsby-plugin-react-helmet": "^3.1.15", "gatsby-plugin-theme-ui": "^0.2.43", - "gatsby-plugin-typescript": "^2.1.16", + "gatsby-plugin-typescript": "^2.1.19", "polished": "^3.4.2", "react-helmet": "^5.2.1", "react-spring": "^8.0.27", diff --git a/themes/gatsby-theme-graphql-playground/package.json b/themes/gatsby-theme-graphql-playground/package.json index 6d7699284..0f0d04621 100644 --- a/themes/gatsby-theme-graphql-playground/package.json +++ b/themes/gatsby-theme-graphql-playground/package.json @@ -26,11 +26,11 @@ "@theme-ui/presets": "^0.2.44", "@theme-ui/prism": "^0.2.46", "@theme-ui/sidenav": "^0.2.49", - "gatsby-plugin-mdx": "^1.0.56", - "gatsby-plugin-react-helmet": "^3.1.14", + "gatsby-plugin-mdx": "^1.0.57", + "gatsby-plugin-react-helmet": "^3.1.15", "gatsby-plugin-theme-ui": "^0.2.43", - "gatsby-plugin-typescript": "^2.1.16", - "gatsby-source-filesystem": "^2.1.36", + "gatsby-plugin-typescript": "^2.1.19", + "gatsby-source-filesystem": "^2.1.38", "is-absolute-url": "^3.0.3", "re-resizable": "^6.1.0", "react-helmet": "^5.2.1", diff --git a/themes/gatsby-theme-minimal-blog-core/package.json b/themes/gatsby-theme-minimal-blog-core/package.json index 755bf37d7..5864519b1 100644 --- a/themes/gatsby-theme-minimal-blog-core/package.json +++ b/themes/gatsby-theme-minimal-blog-core/package.json @@ -23,12 +23,12 @@ "dependencies": { "@mdx-js/mdx": "^1.5.1", "@mdx-js/react": "^1.5.1", - "gatsby-plugin-mdx": "^1.0.55", - "gatsby-plugin-sharp": "^2.2.36", - "gatsby-plugin-typescript": "^2.1.15", - "gatsby-remark-images": "^3.1.29", - "gatsby-source-filesystem": "^2.1.35", - "gatsby-transformer-sharp": "^2.3.2", + "gatsby-plugin-mdx": "^1.0.57", + "gatsby-plugin-sharp": "^2.3.3", + "gatsby-plugin-typescript": "^2.1.19", + "gatsby-remark-images": "^3.1.33", + "gatsby-source-filesystem": "^2.1.38", + "gatsby-transformer-sharp": "^2.3.5", "lodash.kebabcase": "^4.1.1" }, "keywords": [ diff --git a/themes/gatsby-theme-minimal-blog/package.json b/themes/gatsby-theme-minimal-blog/package.json index e1efd23d4..1734eb855 100644 --- a/themes/gatsby-theme-minimal-blog/package.json +++ b/themes/gatsby-theme-minimal-blog/package.json @@ -27,11 +27,11 @@ "@theme-ui/color": "^0.2.49", "@theme-ui/components": "^0.2.49", "@theme-ui/presets": "^0.2.44", - "gatsby-plugin-catch-links": "^2.1.15", + "gatsby-plugin-catch-links": "^2.1.17", "gatsby-plugin-feed": "^2.3.21", - "gatsby-plugin-react-helmet": "^3.1.13", + "gatsby-plugin-react-helmet": "^3.1.15", "gatsby-plugin-theme-ui": "^0.2.43", - "gatsby-plugin-typescript": "^2.1.2", + "gatsby-plugin-typescript": "^2.1.19", "lodash.kebabcase": "^4.1.1", "mdx-utils": "^0.2.0", "prism-react-renderer": "^1.0.2", diff --git a/themes/gatsby-theme-specimens/package.json b/themes/gatsby-theme-specimens/package.json index 31cf089dc..203ffe92a 100644 --- a/themes/gatsby-theme-specimens/package.json +++ b/themes/gatsby-theme-specimens/package.json @@ -26,7 +26,7 @@ "@theme-ui/presets": "^0.2.44", "chroma-js": "^2.1.0", "gatsby-plugin-theme-ui": "^0.2.43", - "gatsby-plugin-typescript": "^2.1.16", + "gatsby-plugin-typescript": "^2.1.19", "polished": "^3.4.2", "theme-ui": "^0.2.49" }, diff --git a/themes/gatsby-theme-status-dashboard/package.json b/themes/gatsby-theme-status-dashboard/package.json index 98f19d2fe..43c013d6d 100644 --- a/themes/gatsby-theme-status-dashboard/package.json +++ b/themes/gatsby-theme-status-dashboard/package.json @@ -24,7 +24,7 @@ "@mdx-js/react": "^1.5.1", "@theme-ui/presets": "^0.2.44", "gatsby-plugin-theme-ui": "^0.2.43", - "gatsby-plugin-typescript": "^2.1.16", + "gatsby-plugin-typescript": "^2.1.19", "gatsby-source-circleci": "^1.0.3", "gatsby-source-netlify": "^1.0.4", "theme-ui": "^0.2.49" diff --git a/yarn.lock b/yarn.lock index d2c557cdf..02246c073 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8446,7 +8446,7 @@ gatsby-cli@^2.8.13: ink "^2.5.0" ink-spinner "^3.0.1" -gatsby-core-utils@^1.0.18, gatsby-core-utils@^1.0.19, gatsby-core-utils@^1.0.20: +gatsby-core-utils@^1.0.20: version "1.0.20" resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-1.0.20.tgz#f4788c2591fa7165c87f0ee5e8edf664c91978ea" integrity sha512-vdOy/+8UjY3taUEf85s/P8a5qfw4OUTRfvrmwJ8OOBfWkpcJRLEgW2EYfkYfGp3u9l8KKQv4VsdG3XRVQb36KQ== @@ -8467,7 +8467,7 @@ gatsby-graphiql-explorer@^0.2.28: dependencies: "@babel/runtime" "^7.7.2" -gatsby-image@^2.2.31: +gatsby-image@^2.2.33: version "2.2.33" resolved "https://registry.yarnpkg.com/gatsby-image/-/gatsby-image-2.2.33.tgz#130f0dec89780bd8b367b7eebfe296eb2222286e" integrity sha512-Mt8l7DXeXuqIwiYefcvOK1awzs4ofE5y3qW1Pmk/IA8AFTNqwDBsu2ZqxxCfbGoyUXVuXNvDArq1QGMJel7eqQ== @@ -8499,7 +8499,7 @@ gatsby-page-utils@^0.0.31: lodash "^4.17.15" micromatch "^3.1.10" -gatsby-plugin-catch-links@^2.1.15, gatsby-plugin-catch-links@^2.1.16, gatsby-plugin-catch-links@^2.1.4: +gatsby-plugin-catch-links@^2.1.17, gatsby-plugin-catch-links@^2.1.4: version "2.1.17" resolved "https://registry.yarnpkg.com/gatsby-plugin-catch-links/-/gatsby-plugin-catch-links-2.1.17.tgz#5568d9bb71c675711fd9dcb6c93da44e877e9099" integrity sha512-UxsKeALrGW5QTEIRQwO2BFEcc8CjQFvK9e0vhc5BzF1Cj1hgF3MVQYy/JH76rIGuBjKqLLeCiC8RMbc20WxfEA== @@ -8507,7 +8507,7 @@ gatsby-plugin-catch-links@^2.1.15, gatsby-plugin-catch-links@^2.1.16, gatsby-plu "@babel/runtime" "^7.7.2" escape-string-regexp "^1.0.5" -gatsby-plugin-emotion@^4.1.14, gatsby-plugin-emotion@^4.1.3: +gatsby-plugin-emotion@^4.1.15, gatsby-plugin-emotion@^4.1.3: version "4.1.15" resolved "https://registry.yarnpkg.com/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.1.15.tgz#5e6481577250617f1729e781d1dfeb913587560b" integrity sha512-lQyLt4t1AU7+pEGbwlqR6llYROW6wflc1KTr938dD+5G96ysxcpWDCTEDn4OTbjpF7/FqTuLCqkoKhaHXpQ5NA== @@ -8543,7 +8543,7 @@ gatsby-plugin-manifest@^2.2.13, gatsby-plugin-manifest@^2.2.3, gatsby-plugin-man semver "^5.7.1" sharp "^0.23.2" -gatsby-plugin-mdx@^1.0.25, gatsby-plugin-mdx@^1.0.55, gatsby-plugin-mdx@^1.0.56: +gatsby-plugin-mdx@^1.0.25, gatsby-plugin-mdx@^1.0.57: version "1.0.57" resolved "https://registry.yarnpkg.com/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.0.57.tgz#e32a5c05ba2210c571988c6d6a19e1e886769107" integrity sha512-s4gucJ+nVg01hNLymHQsONKTmwFlur7sKh4t5+a1ydZtOsurpZKgpXSmUYUa1XigRHRR383HnNPOcTH+vhojHw== @@ -8633,23 +8633,23 @@ gatsby-plugin-page-creator@^2.1.31: lodash "^4.17.15" micromatch "^3.1.10" -gatsby-plugin-react-helmet@^3.1.13, gatsby-plugin-react-helmet@^3.1.14, gatsby-plugin-react-helmet@^3.1.4: +gatsby-plugin-react-helmet@^3.1.15, gatsby-plugin-react-helmet@^3.1.4: version "3.1.15" resolved "https://registry.yarnpkg.com/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.1.15.tgz#0f81ec0106e86ac2d44cb714a79a3a928e5c40a6" integrity sha512-VrPv3rD/YrYN7lZsRX7YpFO8qj2uZj0iHvhNEeg2+iEVI2GTegK5wlRut85bnlR/ezpeuzm7v4qhCx2mgeYEKw== dependencies: "@babel/runtime" "^7.7.2" -gatsby-plugin-sharp@^2.2.36, gatsby-plugin-sharp@^2.2.37: - version "2.3.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-2.3.1.tgz#7dc85cb432d6726897dbe3a032afa433f3b5a788" - integrity sha512-sNfDa3GjmJUazCMYKGTn+6Vtu485sKoOkQMBhdgU7Wg8kMrrouEsFbh6313ExkbtHsslPL2RLuF+4XStxv+TBw== +gatsby-plugin-sharp@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-2.3.3.tgz#8c6b23f462ffd2a72f2926e6d5b74c03be9aaf04" + integrity sha512-WVR08k/K23UClk/bqcFBm974vgT9DwlI1H2wKlKesQ6949SWRqzkqrdtjUXsPdgwVF4C50dlc5aDSKYWfG6Lgg== dependencies: "@babel/runtime" "^7.7.2" async "^2.6.3" bluebird "^3.7.1" fs-extra "^8.1.0" - gatsby-core-utils "^1.0.19" + gatsby-core-utils "^1.0.20" got "^8.3.2" imagemin "^6.1.0" imagemin-mozjpeg "^8.0.0" @@ -8657,6 +8657,7 @@ gatsby-plugin-sharp@^2.2.36, gatsby-plugin-sharp@^2.2.37: imagemin-webp "^5.1.0" lodash "^4.17.15" mini-svg-data-uri "^1.1.3" + p-defer "^3.0.0" potrace "^2.1.2" probe-image-size "^4.1.1" progress "^2.0.3" @@ -8680,7 +8681,7 @@ gatsby-plugin-theme-ui@^0.2.34, gatsby-plugin-theme-ui@^0.2.43: resolved "https://registry.yarnpkg.com/gatsby-plugin-theme-ui/-/gatsby-plugin-theme-ui-0.2.43.tgz#a2baa2bdba1bd923edeb63f1ebdf48c36b5c63ef" integrity sha512-rBQ5vlTSeuUuv929s5k6VUit7k/VXqZOFxd5FlMyR9DCo87zqEJhQ0sobkLrfhAiAo80TUyQEEA0GbLZtrb6pA== -gatsby-plugin-typescript@^2.1.15, gatsby-plugin-typescript@^2.1.16, gatsby-plugin-typescript@^2.1.2: +gatsby-plugin-typescript@^2.1.19: version "2.1.19" resolved "https://registry.yarnpkg.com/gatsby-plugin-typescript/-/gatsby-plugin-typescript-2.1.19.tgz#d71905857b7a967a865a40f288870e1b6400d716" integrity sha512-SevAhAKUqmZZO+7TNXM2c2BSaHzSx79FBN84UNPCVVq4l7kK1aUdvyYaxjiwYbJzOVjqOkrjLTzjt3I2MUADNA== @@ -8709,10 +8710,10 @@ gatsby-react-router-scroll@^2.1.16: scroll-behavior "^0.9.10" warning "^3.0.0" -gatsby-remark-images@^3.1.29, gatsby-remark-images@^3.1.30: - version "3.1.32" - resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-3.1.32.tgz#62ef581b1a8778949b2248e8e5c7d49e938ddeb2" - integrity sha512-/15LOrN0ljaWfPSRTKdGJKlfv9q/n0dFh32AHFAOnA32S2xkP1cysUu7wIV9FCG50tXny4HguIYmBp6r/ddAuA== +gatsby-remark-images@^3.1.33: + version "3.1.33" + resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-3.1.33.tgz#a44aa4b70fc28fbc2a38e80c7fb0b3378546fc5f" + integrity sha512-v8u/x8FdlGiuU7zzy1wvrb1SFL6eRIy4sruWBpJglyadpJjDbro/fUcFXMpAnBNpdXEmiFS1geV2uNx4W7Ea8Q== dependencies: "@babel/runtime" "^7.7.2" chalk "^2.4.2" @@ -8733,7 +8734,7 @@ gatsby-source-circleci@^1.0.3: dependencies: circleci-api "^3.3.4" -gatsby-source-filesystem@^2.1.10, gatsby-source-filesystem@^2.1.35, gatsby-source-filesystem@^2.1.36: +gatsby-source-filesystem@^2.1.10, gatsby-source-filesystem@^2.1.38: version "2.1.38" resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-2.1.38.tgz#174fbef19826844c92e5679cb2e379eeb52acf80" integrity sha512-GMsuE2lVvvKwngGSULYiLlwErU0og5TSDaSz8B/yqgqGw0EGaZc3vdcpk4PioEzHQSIR6usDCjubfmN0t3zRYw== @@ -8785,7 +8786,7 @@ gatsby-telemetry@^1.1.39: stack-utils "1.0.2" uuid "3.3.3" -gatsby-transformer-sharp@^2.3.2, gatsby-transformer-sharp@^2.3.3: +gatsby-transformer-sharp@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/gatsby-transformer-sharp/-/gatsby-transformer-sharp-2.3.5.tgz#014f46ec464cf5c6ff57a948bf43ea7a9c3452e2" integrity sha512-fBPGK/TeBl26+E8owi83APrCWvwfM2dXTyZm/aM1mb/PjXNPg9lsO9cKPZy7hj5s3VLaLsRxVwKk5BaWA05/ew== @@ -13841,6 +13842,11 @@ p-defer@^1.0.0: resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= +p-defer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83" + integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw== + p-each-series@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"