From a13ac6b53e86c1d1caafff7a44bdec7c6505e7c3 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Sat, 14 Oct 2023 12:13:53 -0700 Subject: [PATCH 01/41] wip --- .gitignore | 1 + content-debug/index.mdx | 8 + content-debug/page1.mdx | 5 + content/index.mdx | 1 - gatsby-node.js | 8 +- package-lock.json | 1277 ++++++++++----------- package.json | 5 +- scripts/template-oss/index.js | 1 + src/shared.js | 2 +- theme/gatsby-config.js | 14 +- theme/gatsby-node.js | 24 +- theme/package.json | 5 +- theme/src/components/blockquote.js | 2 +- theme/src/components/border-box.js | 4 + theme/src/components/clipboard-copy.js | 2 +- theme/src/components/code.js | 11 +- theme/src/components/container.js | 2 +- theme/src/components/contributors.js | 3 +- theme/src/components/dark-button.js | 5 +- theme/src/components/dark-text-input.js | 4 +- theme/src/components/description-list.js | 2 +- theme/src/components/details.js | 2 +- theme/src/components/drawer.js | 10 +- theme/src/components/flex.js | 4 + theme/src/components/header.js | 7 +- theme/src/components/heading.js | 3 +- theme/src/components/hero.js | 2 +- theme/src/components/horizontal-rule.js | 2 +- theme/src/components/image.js | 2 +- theme/src/components/index.js | 2 +- theme/src/components/inline-code.js | 2 +- theme/src/components/list.js | 2 +- theme/src/components/mobile-search.js | 10 +- theme/src/components/nav-drawer.js | 4 +- theme/src/components/nav-items.js | 4 +- theme/src/components/note.js | 2 +- theme/src/components/page-footer.js | 7 +- theme/src/components/paragraph.js | 2 +- theme/src/components/prompt.js | 3 +- theme/src/components/search-results.js | 3 +- theme/src/components/search.js | 11 +- theme/src/components/sidebar.js | 8 +- theme/src/components/skip-link.js | 2 +- theme/src/components/source-link.js | 14 - theme/src/components/status-label.js | 28 - theme/src/components/table-of-contents.js | 2 +- theme/src/components/table.js | 2 +- theme/src/hooks/use-breakpoint.js | 4 +- theme/src/hooks/use-search.js | 28 +- theme/src/layout/hero.js | 3 +- theme/src/layout/index.js | 24 +- theme/src/wrap/page-element.js | 2 +- theme/src/wrap/root-element.js | 4 +- 53 files changed, 785 insertions(+), 806 deletions(-) create mode 100644 content-debug/index.mdx create mode 100644 content-debug/page1.mdx create mode 100644 theme/src/components/border-box.js create mode 100644 theme/src/components/flex.js delete mode 100644 theme/src/components/source-link.js delete mode 100644 theme/src/components/status-label.js diff --git a/.gitignore b/.gitignore index aa927ae0804..8921d01c970 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ !/bin/ !/CHANGELOG* !/CODE_OF_CONDUCT.md +!/content-debug/ !/CONTENT-MODEL.md !/content/ !/CONTRIBUTING.md diff --git a/content-debug/index.mdx b/content-debug/index.mdx new file mode 100644 index 00000000000..4a868a9be66 --- /dev/null +++ b/content-debug/index.mdx @@ -0,0 +1,8 @@ +--- +title: npm Documentation +--- + +import HeroLayout from 'theme/src/layout/hero' +export default HeroLayout + +Index diff --git a/content-debug/page1.mdx b/content-debug/page1.mdx new file mode 100644 index 00000000000..b6457dd0967 --- /dev/null +++ b/content-debug/page1.mdx @@ -0,0 +1,5 @@ +--- +title: npm Documentation +--- + +Page 1 diff --git a/content/index.mdx b/content/index.mdx index fb8167ae7b8..19d637540f7 100644 --- a/content/index.mdx +++ b/content/index.mdx @@ -1,6 +1,5 @@ --- title: npm Documentation -github_path: src/nav.yml edit_on_github: false --- diff --git a/gatsby-node.js b/gatsby-node.js index 61f757f7582..8ab81e025a6 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -21,7 +21,7 @@ exports.onCreateNode = ({ node, actions, getNode }) => { } } -exports.onCreateWebpackConfig = ({ actions }) => { +exports.onCreateWebpackConfig = ({ stage, actions }) => { actions.setWebpackConfig({ resolve: { alias: { @@ -30,4 +30,10 @@ exports.onCreateWebpackConfig = ({ actions }) => { extensions: ['.js'], }, }) + + // if (stage === `build-javascript`) { + // actions.setWebpackConfig({ + // devtool: false, + // }) + // } } diff --git a/package-lock.json b/package-lock.json index e5cd1e16706..2c37cd388c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -148,6 +148,14 @@ "concat-map": "0.0.1" } }, + "node_modules/@ardatan/relay-compiler/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "engines": { + "node": ">=6" + } + }, "node_modules/@ardatan/relay-compiler/node_modules/cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -1135,11 +1143,14 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz", - "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", + "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" @@ -1902,20 +1913,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/plugin-syntax-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-transform-react-pure-annotations": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz", @@ -2285,20 +2282,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/preset-typescript/node_modules/@babel/plugin-syntax-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/regjsgen": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", @@ -2397,14 +2380,14 @@ } }, "node_modules/@commitlint/cli": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.7.2.tgz", - "integrity": "sha512-t3N7TZq7lOeqTOyEgfGcaltHqEJf7YDlPg75MldeVPPyz14jZq/+mbGF9tueDLFX8R6RwdymrN6D+U5XwZ8Iwg==", + "version": "17.8.0", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.8.0.tgz", + "integrity": "sha512-D3LdyZYbiRyAChfJMNlAd9f2P9vNQ7GWbI9gN2o7L5hF07QJDqj4z/pcJF3PjDbJWOaUUXla287RdDmmKqH2WQ==", "dev": true, "dependencies": { "@commitlint/format": "^17.4.4", - "@commitlint/lint": "^17.7.0", - "@commitlint/load": "^17.7.2", + "@commitlint/lint": "^17.8.0", + "@commitlint/load": "^17.8.0", "@commitlint/read": "^17.5.1", "@commitlint/types": "^17.4.4", "execa": "^5.0.0", @@ -2421,9 +2404,9 @@ } }, "node_modules/@commitlint/config-conventional": { - "version": "17.7.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.7.0.tgz", - "integrity": "sha512-iicqh2o6et+9kWaqsQiEYZzfLbtoWv9uZl8kbI8EGfnc0HeGafQBF7AJ0ylN9D/2kj6txltsdyQs8+2fTMwWEw==", + "version": "17.8.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.8.0.tgz", + "integrity": "sha512-MgiFXujmqAvi7M33C7OSMTznwrVkckrbXe/aZWQ/+KFGLLF6IE50XIcjGrW0/uiDGb/im5qbqF2dh1dCFNa+sQ==", "dev": true, "dependencies": { "conventional-changelog-conventionalcommits": "^6.1.0" @@ -2485,9 +2468,9 @@ } }, "node_modules/@commitlint/is-ignored": { - "version": "17.7.0", - "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.7.0.tgz", - "integrity": "sha512-043rA7m45tyEfW7Zv2vZHF++176MLHH9h70fnPoYlB1slKBeKl8BwNIlnPg4xBdRBVNPaCqvXxWswx2GR4c9Hw==", + "version": "17.8.0", + "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.8.0.tgz", + "integrity": "sha512-8bR6rxNcWaNprPBdE4ePIOwbxutTQGOsRPYWssX+zjGxnEljzaZSGzFUOMxapYILlf8Tts/O1wPQgG549Rdvdg==", "dev": true, "dependencies": { "@commitlint/types": "^17.4.4", @@ -2498,12 +2481,12 @@ } }, "node_modules/@commitlint/lint": { - "version": "17.7.0", - "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.7.0.tgz", - "integrity": "sha512-TCQihm7/uszA5z1Ux1vw+Nf3yHTgicus/+9HiUQk+kRSQawByxZNESeQoX9ujfVd3r4Sa+3fn0JQAguG4xvvbA==", + "version": "17.8.0", + "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.8.0.tgz", + "integrity": "sha512-4ihwnqOY4TcJN6iz5Jv1LeYavvBllONwFyGxOIWmCT5s4PNMb43cws2TUdbXTZL1Vq59etGKd5LWYDFPVbs5EA==", "dev": true, "dependencies": { - "@commitlint/is-ignored": "^17.7.0", + "@commitlint/is-ignored": "^17.8.0", "@commitlint/parse": "^17.7.0", "@commitlint/rules": "^17.7.0", "@commitlint/types": "^17.4.4" @@ -2513,9 +2496,9 @@ } }, "node_modules/@commitlint/load": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.7.2.tgz", - "integrity": "sha512-XA7WTnsjHZ4YH6ZYsrnxgLdXzriwMMq+utZUET6spbOEEIPBCDLdOQXS26P+v3TTO4hUHOEhzUquaBv3jbBixw==", + "version": "17.8.0", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.8.0.tgz", + "integrity": "sha512-9VnGXYJCP4tXmR4YrwP8n5oX6T5ZsHfPQq6WuUQOvAI+QsDQMaTGgTRXr7us+xsjz+b+mMBSagogqfUx2aixyw==", "dev": true, "dependencies": { "@commitlint/config-validator": "^17.6.7", @@ -3525,6 +3508,28 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -3590,12 +3595,6 @@ "node": ">=8" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", @@ -3710,6 +3709,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/@jest/core/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/@jest/environment": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", @@ -4025,6 +4030,15 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/@jest/types/node_modules/@types/yargs": { + "version": "17.0.28", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.28.tgz", + "integrity": "sha512-N3e3fkS86hNhtk6BEnc0rj3zcehaxx8QWhCROJkqpl5Zaoi7nAic3jH8q94jVD3zu5LGk+PUB6KAiDmimYOEQw==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -4841,6 +4855,17 @@ "url": "https://opencollective.com/babel" } }, + "node_modules/@mdx-js/mdx/node_modules/@babel/plugin-syntax-jsx": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz", + "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@mdx-js/mdx/node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", @@ -6584,15 +6609,6 @@ "@parcel/core": "^2.6.2" } }, - "node_modules/@parcel/transformer-js/node_modules/@swc/helpers": { - "version": "0.4.36", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.36.tgz", - "integrity": "sha512-5lxnyLEYFskErRPenYItLRSge5DjrJngYKdVjRSrWfza9G6KkgHEXi0vUZiyUeMU5JfXH1YnvXZzSp8ul88o2Q==", - "dependencies": { - "legacy-swc-helpers": "npm:@swc/helpers@=0.4.14", - "tslib": "^2.4.0" - } - }, "node_modules/@parcel/transformer-js/node_modules/regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", @@ -7045,106 +7061,9 @@ } }, "node_modules/@primer/behaviors": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@primer/behaviors/-/behaviors-1.3.5.tgz", - "integrity": "sha512-HWwz+6MrfK5NTWcg9GdKFpMBW/yrAV937oXiw2eDtsd88P3SRwoCt6ZO6QmKp9RP3nDU9cbqmuGZ0xBh0eIFeg==" - }, - "node_modules/@primer/components": { - "version": "23.2.1", - "resolved": "https://registry.npmjs.org/@primer/components/-/components-23.2.1.tgz", - "integrity": "sha512-W3l8kWJYUxyf7jz89NQgiV/vFrZbLEjmCgLa0CRHkB8jx02ONR+igPGBmrY4Uj9sNsDMdE2XS/fyhv2RXY/boQ==", - "deprecated": "@primer/components has been renamed @primer/react. Use @primer/react instead.", - "dependencies": { - "@primer/octicons-react": "^11.3.0", - "@primer/primitives": "0.0.0-20211167520", - "@styled-system/css": "5.1.5", - "@styled-system/prop-types": "5.1.2", - "@styled-system/props": "5.1.4", - "@styled-system/theme-get": "5.1.2", - "@types/history": "4.7.8", - "@types/styled-components": "5.1.7", - "@types/styled-system": "5.1.10", - "@types/styled-system__css": "5.0.14", - "@types/styled-system__theme-get": "5.0.1", - "classnames": "^2.2.5", - "polished": "3.5.2", - "react-is": "16.10.2", - "styled-system": "5.1.2" - }, - "peerDependencies": { - "react": "^17.0.0", - "react-dom": "^17.0.0", - "styled-components": "4.x || 5.x" - } - }, - "node_modules/@primer/components/node_modules/@primer/octicons-react": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/@primer/octicons-react/-/octicons-react-11.3.0.tgz", - "integrity": "sha512-4sVhkrBKuj3h+PFw69yOyO/l3nQB/mm95V+Kz7LRSlIrbZr6hZarZD5Ft4ewdONPROkIHQM/6KSK90+OAimxsQ==", - "engines": { - "node": ">=8" - }, - "peerDependencies": { - "react": ">=15" - } - }, - "node_modules/@primer/components/node_modules/@primer/primitives": { - "version": "0.0.0-20211167520", - "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-0.0.0-20211167520.tgz", - "integrity": "sha512-TlsLN1CEN80NqyO+oKP+NHL05cKGVHt0wUoEk9ZKjjmPfGhkJUVC8MxS+8r8+iLOLso5ujZcd31b12az4bRbIw==" - }, - "node_modules/@primer/components/node_modules/@styled-system/props": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/@styled-system/props/-/props-5.1.4.tgz", - "integrity": "sha512-ysQJ6YFhWbnbMaG11RSqXPbOePUl6vEPkcSz1WiySSu4vvh7OQl5UPdkSnYS1E35kSkomSpO5drbFtWRrA+o7Q==", - "dependencies": { - "styled-system": "^5.1.4" - } - }, - "node_modules/@primer/components/node_modules/@styled-system/props/node_modules/styled-system": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/styled-system/-/styled-system-5.1.5.tgz", - "integrity": "sha512-7VoD0o2R3RKzOzPK0jYrVnS8iJdfkKsQJNiLRDjikOpQVqQHns/DXWaPZOH4tIKkhAT7I6wIsy9FWTWh2X3q+A==", - "dependencies": { - "@styled-system/background": "^5.1.2", - "@styled-system/border": "^5.1.5", - "@styled-system/color": "^5.1.2", - "@styled-system/core": "^5.1.2", - "@styled-system/flexbox": "^5.1.2", - "@styled-system/grid": "^5.1.2", - "@styled-system/layout": "^5.1.2", - "@styled-system/position": "^5.1.2", - "@styled-system/shadow": "^5.1.2", - "@styled-system/space": "^5.1.2", - "@styled-system/typography": "^5.1.2", - "@styled-system/variant": "^5.1.5", - "object-assign": "^4.1.1" - } - }, - "node_modules/@primer/components/node_modules/react-is": { - "version": "16.10.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.10.2.tgz", - "integrity": "sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA==" - }, - "node_modules/@primer/components/node_modules/styled-system": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/styled-system/-/styled-system-5.1.2.tgz", - "integrity": "sha512-gbiohoqYYtvg9Q6nA3EagQSouHI9ylmcKUHHaUvCQrPpnPeJlUJAvj9vfyDgsJjw/oBogggfojF1X9EShfPffg==", - "dependencies": { - "@styled-system/background": "^5.1.2", - "@styled-system/border": "^5.1.2", - "@styled-system/color": "^5.1.2", - "@styled-system/core": "^5.1.2", - "@styled-system/flexbox": "^5.1.2", - "@styled-system/grid": "^5.1.2", - "@styled-system/layout": "^5.1.2", - "@styled-system/position": "^5.1.2", - "@styled-system/shadow": "^5.1.2", - "@styled-system/space": "^5.1.2", - "@styled-system/typography": "^5.1.2", - "@styled-system/variant": "^5.1.2", - "object-assign": "^4.1.1" - } + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/@primer/behaviors/-/behaviors-1.3.6.tgz", + "integrity": "sha512-gzryOl22EOzJSPT8pYbHZYHgcKEOw9KxG0L5XRL+cMaS767YGqZGoeF/YEaeJ3dEWMzqz93FPGSem3eo5PmPBA==" }, "node_modules/@primer/octicons-react": { "version": "19.8.0", @@ -7234,6 +7153,11 @@ "csstype": "^3.0.2" } }, + "node_modules/@primer/react/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + }, "node_modules/@react-aria/ssr": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.8.0.tgz", @@ -7248,6 +7172,14 @@ "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, + "node_modules/@react-aria/ssr/node_modules/@swc/helpers": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.3.tgz", + "integrity": "sha512-FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A==", + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@sheerun/mutationobserver-shim": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz", @@ -7514,17 +7446,6 @@ "@styled-system/core": "^5.1.2" } }, - "node_modules/@styled-system/prop-types": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@styled-system/prop-types/-/prop-types-5.1.2.tgz", - "integrity": "sha512-q2hnuZrOjZdCRYvSoMF5VIDRfpqPHDSgqajoMH0iy7BszPAkZZcIC7L4PzJTIcGSBrB9OJTBitWo9s7N60tgtA==", - "dependencies": { - "prop-types": "^15.7.2" - }, - "peerDependencies": { - "styled-system": "^5.0.0-8" - } - }, "node_modules/@styled-system/props": { "version": "5.1.5", "resolved": "https://registry.npmjs.org/@styled-system/props/-/props-5.1.5.tgz", @@ -7575,10 +7496,11 @@ } }, "node_modules/@swc/helpers": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.3.tgz", - "integrity": "sha512-FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A==", + "version": "0.4.36", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.36.tgz", + "integrity": "sha512-5lxnyLEYFskErRPenYItLRSge5DjrJngYKdVjRSrWfza9G6KkgHEXi0vUZiyUeMU5JfXH1YnvXZzSp8ul88o2Q==", "dependencies": { + "legacy-swc-helpers": "npm:@swc/helpers@=0.4.14", "tslib": "^2.4.0" } }, @@ -7917,11 +7839,6 @@ "@types/unist": "^2" } }, - "node_modules/@types/history": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.8.tgz", - "integrity": "sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==" - }, "node_modules/@types/hoist-non-react-statics": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.3.tgz", @@ -8176,32 +8093,6 @@ "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", "dev": true }, - "node_modules/@types/styled-components": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.7.tgz", - "integrity": "sha512-BJzPhFygYspyefAGFZTZ/8lCEY4Tk+Iqktvnko3xmJf9LrLqs3+grxPeU3O0zLl6yjbYBopD0/VikbHgXDbJtA==", - "dependencies": { - "@types/hoist-non-react-statics": "*", - "@types/react": "*", - "csstype": "^3.0.2" - } - }, - "node_modules/@types/styled-system": { - "version": "5.1.10", - "resolved": "https://registry.npmjs.org/@types/styled-system/-/styled-system-5.1.10.tgz", - "integrity": "sha512-OmVjC9OzyUckAgdavJBc+t5oCJrNXTlzWl9vo2x47leqpX1REq2qJC49SEtzbu1OnWSzcD68Uq3Aj8TeX+Kvtg==", - "dependencies": { - "csstype": "^3.0.2" - } - }, - "node_modules/@types/styled-system__css": { - "version": "5.0.14", - "resolved": "https://registry.npmjs.org/@types/styled-system__css/-/styled-system__css-5.0.14.tgz", - "integrity": "sha512-dvhSQ5upz6TqiQmWLNF0sqdoL5nTomza58vtTSklpE9lDS+5w/ew8PQ+HPSRaXMGrmPGUiL7F0vwryVdxHWfpA==", - "dependencies": { - "csstype": "^3.0.2" - } - }, "node_modules/@types/styled-system__theme-get": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/@types/styled-system__theme-get/-/styled-system__theme-get-5.0.1.tgz", @@ -8300,12 +8191,6 @@ "node": ">= 6" } }, - "node_modules/@types/testing-library__dom/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true - }, "node_modules/@types/testing-library__react": { "version": "9.1.3", "resolved": "https://registry.npmjs.org/@types/testing-library__react/-/testing-library__react-9.1.3.tgz", @@ -8353,9 +8238,9 @@ } }, "node_modules/@types/yargs": { - "version": "17.0.28", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.28.tgz", - "integrity": "sha512-N3e3fkS86hNhtk6BEnc0rj3zcehaxx8QWhCROJkqpl5Zaoi7nAic3jH8q94jVD3zu5LGk+PUB6KAiDmimYOEQw==", + "version": "16.0.6", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.6.tgz", + "integrity": "sha512-oTP7/Q13GSPrgcwEwdlnkoZSQ1Hg9THe644qq8PG6hhJzjZ3qj1JjEFPIwWV/IXVs5XGIVqtkNOS9kh63WIJ+A==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -9756,6 +9641,31 @@ "node": ">=8" } }, + "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-istanbul/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/babel-plugin-jest-hoist": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", @@ -9935,20 +9845,6 @@ "styled-components": ">= 2" } }, - "node_modules/babel-plugin-styled-components/node_modules/@babel/plugin-syntax-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/babel-plugin-syntax-trailing-function-commas": { "version": "7.0.0-beta.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz", @@ -10276,17 +10172,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/boxen/node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/bplist-parser": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", @@ -10569,11 +10454,14 @@ } }, "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "engines": { - "node": ">=6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/camelcase-css": { @@ -10601,6 +10489,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/camelcase-keys/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/camelcase-keys/node_modules/quick-lru": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", @@ -10630,9 +10527,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001547", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz", - "integrity": "sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==", + "version": "1.0.30001549", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz", + "integrity": "sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA==", "funding": [ { "type": "opencollective", @@ -10947,11 +10844,6 @@ "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", "dev": true }, - "node_modules/classnames": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" - }, "node_modules/clean-stack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", @@ -11229,15 +11121,6 @@ "node": ">=14.0.0" } }, - "node_modules/code-suggester/node_modules/@types/yargs": { - "version": "16.0.6", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.6.tgz", - "integrity": "sha512-oTP7/Q13GSPrgcwEwdlnkoZSQ1Hg9THe644qq8PG6hhJzjZ3qj1JjEFPIwWV/IXVs5XGIVqtkNOS9kh63WIJ+A==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, "node_modules/code-suggester/node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -12205,6 +12088,40 @@ "node": ">=12" } }, + "node_modules/data-urls/node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/data-urls/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/data-urls/node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "dev": true, + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/dataloader": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz", @@ -12546,9 +12463,9 @@ } }, "node_modules/define-data-property": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz", - "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", "dependencies": { "get-intrinsic": "^1.2.1", "gopd": "^1.0.1", @@ -12905,14 +12822,6 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, - "node_modules/dom-serializer/node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", @@ -12936,6 +12845,15 @@ "node": ">=12" } }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/domhandler": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", @@ -13011,6 +12929,11 @@ "react": ">=16.12.0" } }, + "node_modules/downshift/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + }, "node_modules/downshift/node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", @@ -13037,9 +12960,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.552", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.552.tgz", - "integrity": "sha512-qMPzA5TEuOAbLFmbpNvO4qkBRe2B5dAxl6H4KxqRNy9cvBeHT2EyzecX0bumBfRhHN8cQJrx6NPd0AAoCCPKQw==" + "version": "1.4.554", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.554.tgz", + "integrity": "sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ==" }, "node_modules/emittery": { "version": "0.13.1", @@ -13135,26 +13058,6 @@ "xmlhttprequest-ssl": "~2.0.0" } }, - "node_modules/engine.io-client/node_modules/ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/engine.io-parser": { "version": "5.0.7", "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz", @@ -13163,26 +13066,6 @@ "node": ">=10.0.0" } }, - "node_modules/engine.io/node_modules/ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/enhanced-resolve": { "version": "5.15.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", @@ -13207,6 +13090,14 @@ "node": ">=8.6" } }, + "node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", @@ -13455,26 +13346,88 @@ } }, "node_modules/escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", "dev": true, "dependencies": { "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2" + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", "esgenerate": "bin/esgenerate.js" }, "engines": { - "node": ">=6.0" + "node": ">=4.0" }, "optionalDependencies": { "source-map": "~0.6.1" } }, + "node_modules/escodegen/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/escodegen/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/escodegen/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escodegen/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "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" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escodegen/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/escodegen/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -13485,6 +13438,18 @@ "node": ">=0.10.0" } }, + "node_modules/escodegen/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/eslint": { "version": "8.51.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz", @@ -14240,15 +14205,16 @@ } }, "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz", + "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==", + "dev": true, "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" }, "engines": { - "node": ">=4" + "node": ">=0.4.0" } }, "node_modules/esquery": { @@ -15221,6 +15187,18 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/front-matter/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/front-matter/node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", @@ -15233,11 +15211,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/front-matter/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" - }, "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -15297,9 +15270,12 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function-loop": { "version": "2.0.1", @@ -15592,6 +15568,14 @@ "node": ">=14.15.0" } }, + "node_modules/gatsby-cli/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "engines": { + "node": ">=6" + } + }, "node_modules/gatsby-cli/node_modules/cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -16579,6 +16563,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/gatsby-telemetry/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "engines": { + "node": ">=6" + } + }, "node_modules/gatsby-telemetry/node_modules/chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", @@ -16637,6 +16629,18 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/gatsby-transformer-yaml/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/gatsby-transformer-yaml/node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", @@ -16649,11 +16653,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/gatsby-transformer-yaml/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" - }, "node_modules/gatsby-worker": { "version": "1.25.0", "resolved": "https://registry.npmjs.org/gatsby-worker/-/gatsby-worker-1.25.0.tgz", @@ -17140,6 +17139,18 @@ "node": ">=4" } }, + "node_modules/gatsby/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/gatsby/node_modules/estraverse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", @@ -17247,11 +17258,6 @@ "node": ">=0.4.0" } }, - "node_modules/gatsby/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" - }, "node_modules/gauge": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.1.tgz", @@ -17668,6 +17674,18 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/gray-matter/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/gray-matter/node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", @@ -17680,11 +17698,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/gray-matter/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" - }, "node_modules/gzip-size": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", @@ -17989,11 +18002,6 @@ "react-is": "^16.7.0" } }, - "node_modules/hoist-non-react-statics/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" - }, "node_modules/hosted-git-info": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", @@ -18048,6 +18056,24 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + }, "node_modules/http-cache-semantics": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", @@ -19150,15 +19176,14 @@ } }, "node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", "dev": true, "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", + "@babel/core": "^7.7.5", "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", + "istanbul-lib-coverage": "^3.0.0", "semver": "^6.3.0" }, "engines": { @@ -19399,6 +19424,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-circus/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/jest-cli": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", @@ -19560,6 +19591,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-config/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/jest-diff": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", @@ -19601,6 +19638,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-diff/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/jest-docblock": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", @@ -19655,6 +19698,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-each/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/jest-environment-jsdom": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz", @@ -19802,6 +19851,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-leak-detector/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/jest-matcher-utils": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", @@ -19843,6 +19898,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-matcher-utils/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/jest-message-util": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", @@ -19889,6 +19950,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-message-util/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/jest-mock": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", @@ -20009,6 +20076,25 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-runner/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jest-runner/node_modules/source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, "node_modules/jest-runner/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -20156,6 +20242,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-snapshot/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/jest-util": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", @@ -20217,18 +20309,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-validate/node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/jest-validate/node_modules/pretty-format": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", @@ -20243,6 +20323,12 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/jest-validate/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, "node_modules/jest-watcher": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", @@ -20360,6 +20446,40 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/jsdom/node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/jsdom/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/jsdom/node_modules/parse5": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", @@ -20372,6 +20492,71 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, + "node_modules/jsdom/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jsdom/node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/jsdom/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/jsdom/node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "dev": true, + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/jsdom/node_modules/ws": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -20467,19 +20652,6 @@ "underscore": "1.12.1" } }, - "node_modules/jsonpath/node_modules/esprima": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz", - "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/JSONStream": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", @@ -22445,25 +22617,6 @@ } } }, - "node_modules/node-fetch/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/node-fetch/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/node-fetch/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/node-gyp": { "version": "9.4.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz", @@ -22948,6 +23101,15 @@ "concat-map": "0.0.1" } }, + "node_modules/nyc/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/nyc/node_modules/cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -23011,21 +23173,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/nyc/node_modules/istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", - "dev": true, - "dependencies": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/nyc/node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -23089,15 +23236,6 @@ "node": ">=8" } }, - "node_modules/nyc/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/nyc/node_modules/wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -24320,14 +24458,6 @@ "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz", "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==" }, - "node_modules/polished": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/polished/-/polished-3.5.2.tgz", - "integrity": "sha512-vWoRDg3gY5RQBtUfcj9MRN10VCIf4EkdUikGxyXItg2Hnwk+eIVtdBiLajN0ldFeT3Vq4r/QNbjrQdhqBKrTug==", - "dependencies": { - "@babel/runtime": "^7.8.7" - } - }, "node_modules/popmotion": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/popmotion/-/popmotion-9.3.1.tgz", @@ -25031,12 +25161,6 @@ "node": ">=8" } }, - "node_modules/pretty-format/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true - }, "node_modules/prism-react-renderer": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-0.2.0.tgz", @@ -25152,11 +25276,6 @@ "react-is": "^16.13.1" } }, - "node_modules/prop-types/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" - }, "node_modules/proper-lockfile": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz", @@ -25600,9 +25719,9 @@ } }, "node_modules/react-is": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/react-lifecycles-compat": { "version": "3.0.4", @@ -25677,6 +25796,11 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/react-markdown/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + }, "node_modules/react-markdown/node_modules/remark-parse": { "version": "10.0.2", "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.2.tgz", @@ -26624,6 +26748,17 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/remark-mdx/node_modules/@babel/plugin-syntax-jsx": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz", + "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/remark-mdx/node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", @@ -27062,32 +27197,6 @@ "node": ">=0.10.0" } }, - "node_modules/renderkid/node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/renderkid/node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - }, "node_modules/renderkid/node_modules/strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", @@ -28025,10 +28134,9 @@ } }, "node_modules/source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -28038,7 +28146,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -28177,9 +28284,9 @@ } }, "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, "node_modules/ssri": { "version": "10.0.5", @@ -28268,98 +28375,6 @@ "escodegen": "^1.8.1" } }, - "node_modules/static-eval/node_modules/escodegen": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", - "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", - "dev": true, - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=4.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, - "node_modules/static-eval/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/static-eval/node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/static-eval/node_modules/optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "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" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/static-eval/node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/static-eval/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-eval/node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/static-site-generator-webpack-plugin": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-3.4.2.tgz", @@ -30789,25 +30804,6 @@ "inBundle": true, "license": "MIT" }, - "node_modules/tap/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/tap/node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "node_modules/tap/node_modules/stack-utils": { "version": "2.0.6", "dev": true, @@ -31398,23 +31394,6 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, - "node_modules/terser/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/terser/node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -31644,16 +31623,9 @@ } }, "node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", - "dev": true, - "dependencies": { - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=12" - } + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/treeverse": { "version": "3.0.0", @@ -32136,6 +32108,11 @@ "node": "*" } }, + "node_modules/underscore.string/node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, "node_modules/undici": { "version": "5.26.3", "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.3.tgz", @@ -32894,18 +32871,14 @@ } }, "node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true, - "engines": { - "node": ">=12" - } + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/webpack": { - "version": "5.88.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", - "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", + "version": "5.89.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", + "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.0", @@ -33088,16 +33061,12 @@ } }, "node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", - "dev": true, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dependencies": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=12" + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" } }, "node_modules/which": { @@ -33382,16 +33351,15 @@ } }, "node_modules/ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", - "dev": true, + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", "engines": { "node": ">=10.0.0" }, "peerDependencies": { "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" + "utf-8-validate": "^5.0.2" }, "peerDependenciesMeta": { "bufferutil": { @@ -33504,9 +33472,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", - "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.3.tgz", + "integrity": "sha512-zw0VAJxgeZ6+++/su5AFoqBbZbrEakwu+X0M5HmcwUiBL7AzcuPKjj5we4xfQLp78LkEMpD0cOnUhmgOVy3KdQ==", "engines": { "node": ">= 14" } @@ -33704,10 +33672,8 @@ "dependencies": { "@mdx-js/mdx": "^1.6.22", "@mdx-js/react": "^1.6.22", - "@primer/components": "^23.0.0", "@primer/octicons-react": "^19.8.0", "@primer/react": "^35.31.0", - "@styled-system/theme-get": "^5.1.2", "babel-plugin-styled-components": "^2.1.4", "copy-to-clipboard": "^3.3.3", "details-element-polyfill": "^2.4.0", @@ -33728,8 +33694,7 @@ "react-addons-text-content": "^0.0.4", "react-focus-on": "^3.9.1", "react-helmet": "^6.1.0", - "styled-components": "^5.3.11", - "styled-system": "^5.1.5" + "styled-components": "^5.3.11" }, "devDependencies": { "@github/prettier-config": "^0.0.6", diff --git a/package.json b/package.json index 6deb1cce9a0..cc13b5fa522 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,10 @@ }, "private": true, "scripts": { - "develop": "NODE_OPTIONS=--max-old-space-size=8192 gatsby develop", + "develop": "NODE_OPTIONS=--max-old-space-size=8192 gatsby develop --verbose", + "develop:debug": "GATSBY_WEBPACK_LOGGING=develop npm run develop", "build": "NODE_OPTIONS=--max-old-space-size=8192 gatsby build --verbose --log-pages", - "clean": "rm -rf .cache/ public/", + "clean": "gatsby clean", "serve": "gatsby serve", "lint": "eslint \"**/*.js\"", "postlint": "template-oss-check", diff --git a/scripts/template-oss/index.js b/scripts/template-oss/index.js index a3453e8eaa0..39f5c0204df 100644 --- a/scripts/template-oss/index.js +++ b/scripts/template-oss/index.js @@ -30,6 +30,7 @@ module.exports = { '/src/', '/static/', '/content/', + '/content-debug/', '/LICENSE*', '/*.md', '/gatsby-*.js', diff --git a/src/shared.js b/src/shared.js index 56ccee211e8..b709b0df8f9 100644 --- a/src/shared.js +++ b/src/shared.js @@ -1,5 +1,5 @@ import React from 'react' -import { Link } from '@primer/components' +import { Link } from '@primer/react' import Screenshot from '../theme/src/components/screenshot' import Note from '../theme/src/components/note' diff --git a/theme/gatsby-config.js b/theme/gatsby-config.js index 0a112c8544a..21799f062f6 100644 --- a/theme/gatsby-config.js +++ b/theme/gatsby-config.js @@ -1,8 +1,9 @@ const path = require('path') const fs = require('fs') -const {NODE_ENV, GATSBY_PARTIAL_CONTENT} = process.env -const CONTENT_DIR = path.resolve(__dirname, '..', 'content') +const {NODE_ENV, GATSBY_PARTIAL_CONTENT, GATSBY_CONTENT_DIR = 'content'} = process.env +const DEV = NODE_ENV === 'development' +const CONTENT_DIR = path.resolve(__dirname, '..', GATSBY_CONTENT_DIR) const walkDirs = dir => { const dirs = fs @@ -14,7 +15,7 @@ const walkDirs = dir => { } const getContentOptions = () => { - if (NODE_ENV !== 'development' || !GATSBY_PARTIAL_CONTENT) { + if (!DEV || !GATSBY_PARTIAL_CONTENT) { return } @@ -41,7 +42,12 @@ const getContentOptions = () => { module.exports = ({icon}) => ({ plugins: [ - 'gatsby-plugin-styled-components', + { + resolve: 'gatsby-plugin-styled-components', + // options: { + // minify: !DEV, + // }, + }, 'gatsby-plugin-react-helmet', 'gatsby-plugin-catch-links', 'gatsby-transformer-yaml', diff --git a/theme/gatsby-node.js b/theme/gatsby-node.js index 5cdf16a10ab..dac9a27d0f0 100644 --- a/theme/gatsby-node.js +++ b/theme/gatsby-node.js @@ -1,5 +1,7 @@ const path = require('path') +const DEV = process.env.NODE_ENV === 'development' + exports.createSchemaCustomization = ({actions: {createTypes}}) => { createTypes(` type Mdx implements Node { @@ -87,21 +89,23 @@ exports.createPages = async ({graphql, actions}, {repo, showContributors}) => { }, }) - for (const from of frontmatter.redirect_from ?? []) { - actions.createRedirect({ - fromPath: from, - toPath: `/${pagePath}`, - isPermanent: true, - redirectInBrowser: true, - }) - - if (pagePath.startsWith('cli/') && !from.endsWith('index')) { + if (!DEV) { + for (const from of frontmatter.redirect_from ?? []) { actions.createRedirect({ - fromPath: `${from}.html`, + fromPath: from, toPath: `/${pagePath}`, isPermanent: true, redirectInBrowser: true, }) + + if (pagePath.startsWith('cli/') && !from.endsWith('index')) { + actions.createRedirect({ + fromPath: `${from}.html`, + toPath: `/${pagePath}`, + isPermanent: true, + redirectInBrowser: true, + }) + } } } }), diff --git a/theme/package.json b/theme/package.json index 83c8228e9cd..eab2ade218b 100644 --- a/theme/package.json +++ b/theme/package.json @@ -28,10 +28,8 @@ "dependencies": { "@mdx-js/mdx": "^1.6.22", "@mdx-js/react": "^1.6.22", - "@primer/components": "^23.0.0", "@primer/octicons-react": "^19.8.0", "@primer/react": "^35.31.0", - "@styled-system/theme-get": "^5.1.2", "babel-plugin-styled-components": "^2.1.4", "copy-to-clipboard": "^3.3.3", "details-element-polyfill": "^2.4.0", @@ -52,8 +50,7 @@ "react-addons-text-content": "^0.0.4", "react-focus-on": "^3.9.1", "react-helmet": "^6.1.0", - "styled-components": "^5.3.11", - "styled-system": "^5.1.5" + "styled-components": "^5.3.11" }, "devDependencies": { "@github/prettier-config": "^0.0.6", diff --git a/theme/src/components/blockquote.js b/theme/src/components/blockquote.js index fd0c467b244..11c6f32768d 100644 --- a/theme/src/components/blockquote.js +++ b/theme/src/components/blockquote.js @@ -1,5 +1,5 @@ import styled from 'styled-components' -import {themeGet} from '@styled-system/theme-get' +import {themeGet} from '@primer/react' const Blockquote = styled.blockquote` margin: 0 0 ${themeGet('space.3')}; diff --git a/theme/src/components/border-box.js b/theme/src/components/border-box.js new file mode 100644 index 00000000000..9de152789fd --- /dev/null +++ b/theme/src/components/border-box.js @@ -0,0 +1,4 @@ +import React from 'react' +import {Box} from '@primer/react' + +export default props => diff --git a/theme/src/components/clipboard-copy.js b/theme/src/components/clipboard-copy.js index 8cfd4281a47..7e5ff4c9d9f 100644 --- a/theme/src/components/clipboard-copy.js +++ b/theme/src/components/clipboard-copy.js @@ -1,4 +1,4 @@ -import {Button, StyledOcticon, themeGet} from '@primer/components' +import {Button, StyledOcticon, themeGet} from '@primer/react' import {CheckIcon, CopyIcon} from '@primer/octicons-react' import styled from 'styled-components' import copy from 'copy-to-clipboard' diff --git a/theme/src/components/code.js b/theme/src/components/code.js index a342a951507..34b7335e9c7 100644 --- a/theme/src/components/code.js +++ b/theme/src/components/code.js @@ -1,4 +1,5 @@ -import {Absolute, BorderBox, Relative, Text} from '@primer/components' +import {Box, Text} from '@primer/react' +import BorderBox from './border-box' import Highlight, {defaultProps} from 'prism-react-renderer' import githubTheme from 'prism-react-renderer/themes/github' import React, {useState, useEffect} from 'react' @@ -44,11 +45,11 @@ function Code({className, children}) { const {scrollRef, paddingRef, size} = useScrollSize() return ( - +
- + - +
{({className, style, tokens, getLineProps, getTokenProps}) => ( @@ -65,7 +66,7 @@ function Code({className, children}) { )} - + ) } diff --git a/theme/src/components/container.js b/theme/src/components/container.js index b760afed22d..d2827713581 100644 --- a/theme/src/components/container.js +++ b/theme/src/components/container.js @@ -1,4 +1,4 @@ -import {Box} from '@primer/components' +import {Box} from '@primer/react' import React from 'react' function Container({children}) { diff --git a/theme/src/components/contributors.js b/theme/src/components/contributors.js index 689e1d10591..98ec509f2e9 100644 --- a/theme/src/components/contributors.js +++ b/theme/src/components/contributors.js @@ -1,5 +1,6 @@ -import {Avatar, Flex, Link, Text, Tooltip} from '@primer/components' +import {Avatar, Link, Text, Tooltip} from '@primer/react' import React from 'react' +import Flex from '../components/flex' const pluralize = (word, count) => `${word}${count === 1 ? '' : 's'}` diff --git a/theme/src/components/dark-button.js b/theme/src/components/dark-button.js index d2e965095c2..c590e05bc75 100644 --- a/theme/src/components/dark-button.js +++ b/theme/src/components/dark-button.js @@ -1,6 +1,9 @@ -import {ButtonOutline, themeGet} from '@primer/components' +import React from 'react' +import {Button, themeGet} from '@primer/react' import styled from 'styled-components' +const ButtonOutline = props => {isOpen ? : null} @@ -81,9 +90,9 @@ function MobileSearchWrapper(props) { return ( <> - setIsOpen(true)}> + {isOpen ? setIsOpen(false)} {...props} /> : null} diff --git a/src/components/nav-drawer.js b/src/components/nav-drawer.js index bd6e56c34bb..87c68ff5ab2 100644 --- a/src/components/nav-drawer.js +++ b/src/components/nav-drawer.js @@ -1,11 +1,9 @@ import React from 'react' -import {Box, Link} from '@primer/react' +import {Button, Box, Link} from '@primer/react' import {XIcon, ThreeBarsIcon} from '@primer/octicons-react' import {Link as GatsbyLink} from 'gatsby' -import DarkButton from './dark-button' import Drawer from './drawer' import NavItems from './nav-items' -import navItems from '../nav.yml' import headerNavItems from '../header-nav.yml' import useSiteMetadata from '../hooks/use-site-metadata' import {useIsMobile} from '../hooks/use-breakpoint' @@ -31,51 +29,60 @@ function NavDrawer() { return ( <> - + - - + + {siteMetadata.title} - + - - + + - + {headerNavItems.map((item, index) => ( {item.title} diff --git a/src/components/nav-items.js b/src/components/nav-items.js index 1cfe6af4981..e97bc41a6bd 100644 --- a/src/components/nav-items.js +++ b/src/components/nav-items.js @@ -1,6 +1,6 @@ import React from 'react' import {Link as GatsbyLink} from 'gatsby' -import {Box, StyledOcticon, Link, themeGet} from '@primer/react' +import {Box, Octicon, Link, themeGet} from '@primer/react' import {LinkExternalIcon} from '@primer/octicons-react' import styled from 'styled-components' import getNav from '../util/get-nav' @@ -18,6 +18,19 @@ const ActiveLink = ({className, children, ...props}) => ( ) +const withItems = Component => { + const WithItems = ({parent, path}) => { + if (!parent || getNav.isActiveUrl(path, parent.url)) { + const items = getNav.getHierarchy(parent, {path, hideVariants: true}) + if (items) { + return + } + } + return null + } + return WithItems +} + const NavLink = styled(ActiveLink)` color: inherit; text-decoration: none; @@ -35,6 +48,34 @@ const TopLevelLink = styled(NavLink)` color: ${themeGet('colors.gray.8')}; } ` + +const TopLevelItems = withItems(({items, path}) => ( + <> + {items.map(item => ( + + + + {item.title} + + + + + ))} + +)) + const SecondLevelLink = styled(NavLink)` display: block; font-size: ${themeGet('fontSizes.1')}; @@ -47,6 +88,28 @@ const SecondLevelLink = styled(NavLink)` } ` +const Description = styled(Box)` + & { + color: ${themeGet('colors.gray.6')}; + font-size: 0.8em; + font-weight: normal; + } +` + +const SecondLevelItems = withItems(({items, path}) => ( + + {items.map(item => ( + + + {item.title} + {item.description ? {item.description} : null} + + + + ))} + +)) + const ThirdLevelLink = styled(NavLink)` display: block; font-size: ${themeGet('fontSizes.1')}; @@ -62,108 +125,30 @@ const ThirdLevelLink = styled(NavLink)` } ` -const Description = styled(Box)` - & { - color: ${themeGet('colors.gray.6')}; - font-size: 0.8em; - font-weight: normal; - } -` - -function topLevelItems(items, path) { - if (items == null) { - return null - } - - return ( - <> - {items.map(item => { - const children = getNav.isActiveUrl(path, item.url) - ? getNav.getHierarchy(item, {path, hideVariants: true}) - : null - - return ( - - - - {item.title} - - {secondLevelItems(children, path)} - - - ) - })} - - ) -} - -function secondLevelItems(items, path) { - if (items == null) { - return null - } - - return ( - - {items.map(item => { - const children = getNav.isActiveUrl(path, item.url) - ? getNav.getHierarchy(item, {path, hideVariants: true}) - : null - return ( - - - {item.title} - {item.description != null ? {item.description} : null} - - {thirdLevelItems(children, path)} - - ) - })} - - ) -} - -function thirdLevelItems(items) { - if (items == null) { - return null - } - - return ( - - {items.map(item => ( - - - {item.title} - - - ))} - - ) -} +const ThirdLevelItems = withItems(({items}) => ( + + {items.map(item => ( + + + {item.title} + + + ))} + +)) function NavItems() { - const location = useLocation() const {repositoryUrl} = usePageContext() - const path = getNav.getLocation(location.pathname) - const items = getNav.getHierarchy(null, {path, hideVariants: true}) + const location = useLocation() return ( <> - {topLevelItems(items, path)} - + + - + GitHub - + diff --git a/src/components/npm-logo.js b/src/components/npm-logo.js deleted file mode 100644 index 88179b48f73..00000000000 --- a/src/components/npm-logo.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' - -const NpmLogo = ({size, style}) => { - return ( - - ) -} - -export default NpmLogo diff --git a/src/components/page-footer.js b/src/components/page-footer.js index e764d715af2..a7585219f5b 100644 --- a/src/components/page-footer.js +++ b/src/components/page-footer.js @@ -7,18 +7,20 @@ function PageFooter({editUrl, contributors = {}}) { const {logins = [], latestCommit} = contributors return editUrl || logins.length ? ( - - {editUrl != null ? ( + + {editUrl ? ( - + Edit this page on GitHub ) : null} diff --git a/src/components/search-results.js b/src/components/search-results.js index 040dfe88d0e..8ff0446ac48 100644 --- a/src/components/search-results.js +++ b/src/components/search-results.js @@ -3,12 +3,24 @@ import {Box, Text} from '@primer/react' import useSiteMetadata from '../hooks/use-site-metadata' import getNav from '../util/get-nav' -function SearchResults({results, getItemProps, highlightedIndex}) { +const Breadcrumbs = ({item, highlighted}) => { const siteMetadata = useSiteMetadata() + const hierarchy = getNav.getItemHierarchy(item.path) + + const text = hierarchy + ? hierarchy + .slice(0, -1) + .map(item => item.shortName || item.title) + .join(' / ') + : siteMetadata.shortName + return {text} +} + +function SearchResults({results, getItemProps, highlightedIndex}) { if (results.length === 0) { return ( - + No results ) @@ -16,36 +28,23 @@ function SearchResults({results, getItemProps, highlightedIndex}) { return results.map((item, index) => ( - - {getBreadcrumbs(siteMetadata.shortName, item.path).join(' / ')} - + {item.title} )) } -function getBreadcrumbs(siteTitle, path) { - const hierarchy = getNav.getItemHierarchy(path) - - if (hierarchy) { - hierarchy.pop() - return hierarchy.map(item => (item.shortName ? item.shortName : item.title)) - } else { - return [siteTitle] - } -} - export default SearchResults diff --git a/src/components/search.js b/src/components/search.js index 232c241b8ca..a7cbfdbd7be 100644 --- a/src/components/search.js +++ b/src/components/search.js @@ -9,11 +9,11 @@ function Search(props) { const {getInputProps, getMenuProps, isOpen, results, getItemProps, highlightedIndex} = props return ( - + @@ -27,16 +27,18 @@ function Search(props) { > {isOpen ? ( diff --git a/src/components/sidebar.js b/src/components/sidebar.js index 1e8a3521d23..00265878407 100644 --- a/src/components/sidebar.js +++ b/src/components/sidebar.js @@ -1,30 +1,33 @@ import {Box} from '@primer/react' import React from 'react' import NavItems from './nav-items' -import navItems from '../nav.yml' import {HEADER_HEIGHT} from '../constants' const Sidebar = () => ( - - + + diff --git a/src/components/table-of-contents.js b/src/components/table-of-contents.js index 5e52bf5057f..d246a82705d 100644 --- a/src/components/table-of-contents.js +++ b/src/components/table-of-contents.js @@ -1,5 +1,5 @@ import React from 'react' -import {Box, Link, Text, Octicon, Details} from '@primer/react' +import {Box, Link, Text, Octicon, Details, useDetails} from '@primer/react' import {ChevronDownIcon, ChevronRightIcon} from '@primer/octicons-react' import {usePageContext} from '../layout' import {HEADER_HEIGHT} from '../constants' @@ -9,13 +9,11 @@ const TableOfContents = ({items, depth = 0, labelId}) => ( key={items} as="ul" role="list" - m={0} - p={0} - css={{listStyle: 'none', lineHeight: '1.4em'}} + sx={{m: 0, p: 0, listStyle: 'none', lineHeight: '1.4em'}} aria-labelledby={labelId} > {items.map(item => ( - 0 ? 3 : 0}> + 0 ? 3 : 0}}> {item.title} @@ -25,48 +23,47 @@ const TableOfContents = ({items, depth = 0, labelId}) => ( ) -const withTableOfContent = Component => { - const TOC = props => { +const withTableOfContents = Component => { + const WithTableOfContents = props => { const {tableOfContents} = usePageContext() - if (!tableOfContents) { - return null - } - return + return tableOfContents ? : null } - return TOC + return WithTableOfContents } -export const Mobile = withTableOfContent(({items}) => ( - -
- {({open}) => ( - <> - - - Table of contents - - - - - - )} -
- -)) +export const Mobile = withTableOfContents(({items}) => { + const {getDetailsProps, open} = useDetails({}) + return ( + +
+ + + Table of contents + + + + +
+ + ) +}) -export const Desktop = withTableOfContent(({items}) => ( +export const Desktop = withTableOfContents(({items}) => ( - + Table of contents diff --git a/src/constants.js b/src/constants.js index 480bc4a3d2d..fd754accd5b 100644 --- a/src/constants.js +++ b/src/constants.js @@ -1,3 +1,5 @@ export const HEADER_HEIGHT = 66 export const SKIP_NAV = 'skip-nav' + +export const NPM_RED = '#cb0000' diff --git a/src/layout.js b/src/layout.js index b69214d66c8..67e34a087d4 100644 --- a/src/layout.js +++ b/src/layout.js @@ -1,10 +1,11 @@ import React from 'react' +import {Helmet} from 'react-helmet' import {Box} from '@primer/react' import Slugger from 'github-slugger' -import Head from './components/head' import Header from './components/header' import Sidebar from './components/sidebar' import {SKIP_NAV} from './constants' +import useSiteMetdata from './hooks/use-site-metadata' const SluggerContext = React.createContext(null) const PageContext = React.createContext(null) @@ -13,21 +14,41 @@ const LocationContext = React.createContext(null) export const useSlugger = () => React.useContext(SluggerContext) export const usePageContext = () => React.useContext(PageContext) export const useLocation = () => React.useContext(LocationContext) -export const useFrontmatter = () => usePageContext().frontmatter + +const Head = () => { + const {frontmatter} = usePageContext() + const siteMetadata = useSiteMetdata() + + const title = [frontmatter.title, siteMetadata.title].filter(Boolean).join(' | ') + const description = frontmatter.description || siteMetadata.description + const lang = frontmatter.lang || siteMetadata.lang + + return ( + + {title} + + + + + + + + ) +} const withLayout = Component => { const LayoutProvider = props => ( - +
- - + + - + diff --git a/src/layout/default.js b/src/layout/default.js index 6de14c458b7..021b2fc83c7 100644 --- a/src/layout/default.js +++ b/src/layout/default.js @@ -10,25 +10,30 @@ const Layout = ({children, pageContext: {frontmatter}}) => { return ( {title} {description} diff --git a/src/layout/hero.js b/src/layout/hero.js index 37285cf9d3e..f6ebc77ef34 100644 --- a/src/layout/hero.js +++ b/src/layout/hero.js @@ -5,7 +5,7 @@ import Hero from '../components/hero' import withLayout from '../layout' const HeroLayout = ({children}) => ( - + {children} diff --git a/src/mdx/code.js b/src/mdx/code.js index 5978e12b65d..a9ba861bb75 100644 --- a/src/mdx/code.js +++ b/src/mdx/code.js @@ -10,9 +10,9 @@ function Code({className: language = '', children}) { const {scrollRef, paddingRef, size} = useScrollSize() return ( - +
- +
@@ -20,16 +20,18 @@ function Code({className: language = '', children}) { {({className, style, tokens, getLineProps, getTokenProps}) => ( {/* This is the scroll handle, it is supposed to be focused with keyboard and scroll a wide codebox horizontally */} @@ -37,7 +39,7 @@ function Code({className: language = '', children}) { {tokens.map((line, i) => (
{line.map((token, key) => ( - + ))}
))} diff --git a/src/mdx/index.js b/src/mdx/index.js index 65059ec0bfd..d8fa535b4d6 100644 --- a/src/mdx/index.js +++ b/src/mdx/index.js @@ -228,14 +228,16 @@ export const Table = styled.table` export const Note = ({children}) => ( {React.Children.toArray(children).map((child, index, list) => React.cloneElement(child, { @@ -248,19 +250,17 @@ export const Note = ({children}) => ( export const Prompt = ({children}) => ( - - {children} - + {children} ) diff --git a/src/mdx/nav-hierarchy.js b/src/mdx/nav-hierarchy.js index fc2ee019998..38166e61600 100644 --- a/src/mdx/nav-hierarchy.js +++ b/src/mdx/nav-hierarchy.js @@ -12,9 +12,7 @@ const HierarchyItem = ({item, currentDepth, ...props}) => { {item.title} - {item.description != null ? ( - {item.description} - ) : null} + {item.description ? {item.description} : null} {hierarchy ? : null} ) diff --git a/src/util/get-nav.js b/src/util/get-nav.js index 85e1b9a354e..f4362a5f549 100644 --- a/src/util/get-nav.js +++ b/src/util/get-nav.js @@ -144,14 +144,11 @@ const NavHierarchy = { for (const item of items) { if (item.variants) { - const cloned = {} - Object.assign(cloned, item) - - const variant = this.getCurrentOrDefaultVariant(item, props.path) - - cloned.url = variant.url - - updated.push(cloned) + const {url} = this.getCurrentOrDefaultVariant(item, props.path) + updated.push({ + ...item, + url, + }) } else { updated.push(item) } From f5789c37469d9f248103125707e528cb773f51a0 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Sun, 15 Oct 2023 22:54:53 -0700 Subject: [PATCH 14/41] Move nav files to content dir --- .prettierIgnore => .prettierignore | 0 CONTRIBUTING.md | 2 +- {src => content}/header-nav.yml | 0 {src => content}/nav.yml | 0 src/components/header.js | 4 +-- src/components/nav-drawer.js | 2 +- src/components/variant-select.js | 11 ++++--- src/shared.js | 46 ++++++++++++++---------------- src/util/get-nav.js | 2 +- 9 files changed, 33 insertions(+), 34 deletions(-) rename .prettierIgnore => .prettierignore (100%) rename {src => content}/header-nav.yml (100%) rename {src => content}/nav.yml (100%) diff --git a/.prettierIgnore b/.prettierignore similarity index 100% rename from .prettierIgnore rename to .prettierignore diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d88d5fac1c4..44403b6b3b0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -108,7 +108,7 @@ The content pages should include [frontmatter](https://jekyllrb.com/docs/front-m ## Navigation -The site's navigation (on the left-hand sidebar of the site) is controlled by `src/nav.yml`. If you add or remove a page from the site, you'll also want to add or remove it from the navigation configuration. +The site's navigation (on the left-hand sidebar of the site) is controlled by `content/nav.yml`. If you add or remove a page from the site, you'll also want to add or remove it from the navigation configuration. ## CLI diff --git a/src/header-nav.yml b/content/header-nav.yml similarity index 100% rename from src/header-nav.yml rename to content/header-nav.yml diff --git a/src/nav.yml b/content/nav.yml similarity index 100% rename from src/nav.yml rename to content/nav.yml diff --git a/src/components/header.js b/src/components/header.js index 3b7df26e2ff..ff762ba28f7 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -6,9 +6,9 @@ import MobileSearch from './mobile-search' import NavDrawer from './nav-drawer' import Search from './search' import useSearch from '../hooks/use-search' -import useSiteMetadata from '../hooks/use-site-metadata' -import headerNavItems from '../header-nav.yml' import {HEADER_HEIGHT, NPM_RED} from '../constants' +import useSiteMetadata from '../hooks/use-site-metadata' +import headerNavItems from '../../content/header-nav.yml' const NpmHeaderBar = styled(Box)` height: 10px; diff --git a/src/components/nav-drawer.js b/src/components/nav-drawer.js index 87c68ff5ab2..36fbea8a2db 100644 --- a/src/components/nav-drawer.js +++ b/src/components/nav-drawer.js @@ -4,9 +4,9 @@ import {XIcon, ThreeBarsIcon} from '@primer/octicons-react' import {Link as GatsbyLink} from 'gatsby' import Drawer from './drawer' import NavItems from './nav-items' -import headerNavItems from '../header-nav.yml' import useSiteMetadata from '../hooks/use-site-metadata' import {useIsMobile} from '../hooks/use-breakpoint' +import headerNavItems from '../../content/header-nav.yml' const useDrawerIsOpen = () => { const isMobile = useIsMobile() diff --git a/src/components/variant-select.js b/src/components/variant-select.js index 1dfa4a0ef9e..d2f155bed7c 100644 --- a/src/components/variant-select.js +++ b/src/components/variant-select.js @@ -1,26 +1,29 @@ import React from 'react' import {ActionList, ActionMenu, Box} from '@primer/react' +import {navigate} from 'gatsby' import getNav from '../util/get-nav' import {useLocation} from '../layout' const VariantItem = ({match, active}) => { const {variant, page} = match + const navigateToPage = React.useCallback(() => navigate(`${page.url}?v=true`), [page.url]) + const handleClick = React.useCallback( event => { event.preventDefault() - window.location.href = `${page.url}?v=true` + navigateToPage() }, - [page.url], + [navigateToPage], ) const handleKey = React.useCallback( event => { if (event.key === 'Enter') { - window.location.href = `${page.url}?v=true` + navigateToPage() } }, - [page.url], + [navigateToPage], ) return ( diff --git a/src/shared.js b/src/shared.js index f4ff110a8ab..df79e76717c 100644 --- a/src/shared.js +++ b/src/shared.js @@ -84,18 +84,16 @@ const shared = { }, 'connect-to-accounts': { text: ( - <> -
    -
  • - If you have previously linked a GitHub account to your npm account, select{' '} - Connect to GitHub. This will help our support team verify your account. -
    • -
  • - If you have previously linked a Twitter account to your npm account, select{' '} - Connect to Twitter. This will help our support team verify your account. -
    • -
- +
    +
  • + If you have previously linked a GitHub account to your npm account, select Connect to GitHub. + This will help our support team verify your account. +
    • +
  • + If you have previously linked a Twitter account to your npm account, select{' '} + Connect to Twitter. This will help our support team verify your account. +
    • +
), }, 'submit-support-ticket': { @@ -380,19 +378,17 @@ const shared = { 'enterprise-migration-requirements': { text: ( - <> - Note: Using{' '} - - pneumatic-tubes - {' '} - for migration requires{' '} -
    -
  • Node 8+
    • -
  • - npm 5+ (to install or upgrade, run npm install npm@latest -g) -
    • -
- + Note: Using{' '} + + pneumatic-tubes + {' '} + for migration requires{' '} +
    +
  • Node 8+
    • +
  • + npm 5+ (to install or upgrade, run npm install npm@latest -g) +
    • +
), }, diff --git a/src/util/get-nav.js b/src/util/get-nav.js index f4362a5f549..3d09c936f98 100644 --- a/src/util/get-nav.js +++ b/src/util/get-nav.js @@ -1,5 +1,5 @@ import {withPrefix} from 'gatsby' -import navItems from '../nav.yml' +import navItems from '../../content/nav.yml' const NavHierarchy = { getLocation(path) { From 9fa29f86d3f231e36e71ed595d010688bfde4ee0 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Mon, 16 Oct 2023 09:25:07 -0700 Subject: [PATCH 15/41] Fix script for cli workspace tests --- cli/package.json | 12 +++++++++++- cli/test/index.js | 3 +-- package.json | 1 - scripts/template-oss/index.js | 6 ------ scripts/template-oss/pkg.json | 1 + 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/cli/package.json b/cli/package.json index c71f7ce46ff..775e6381722 100644 --- a/cli/package.json +++ b/cli/package.json @@ -13,7 +13,7 @@ "template-oss-apply": "template-oss-apply --force", "lintfix": "npm run lint -- --fix", "snap": "tap", - "test": "jest", + "test": "tap", "posttest": "npm run lint", "format": "prettier --write ." }, @@ -41,5 +41,15 @@ "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", "version": "4.19.0", "content": "./scripts/template-oss" + }, + "files": [ + "bin/", + "lib/" + ], + "tap": { + "nyc-arg": [ + "--exclude", + "tap-snapshots/**" + ] } } diff --git a/cli/test/index.js b/cli/test/index.js index 200e71cc96c..996186aaeeb 100644 --- a/cli/test/index.js +++ b/cli/test/index.js @@ -9,8 +9,7 @@ const navPath = resolve( __dirname, '..', '..', - 'src', - 'theme', + 'content', 'nav.yml' ) diff --git a/package.json b/package.json index 4690f00277f..d975b63c3e5 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force", "lintfix": "npm run lint -- --fix", - "snap": "tap", "test": "jest", "posttest": "npm run lint", "test-all": "npm run test -ws -iwr --if-present", diff --git a/scripts/template-oss/index.js b/scripts/template-oss/index.js index 70951748286..2c3f1352ae0 100644 --- a/scripts/template-oss/index.js +++ b/scripts/template-oss/index.js @@ -22,12 +22,6 @@ module.exports = { '.github/settings.yml': false, }, }, - workspaceModule: { - add: { - 'package.json': {file: 'pkg.json', overwrite: false}, - '.eslintrc.js': false, - }, - }, ciVersions: 'latest', latestCiVersion: 18, macCI: false, diff --git a/scripts/template-oss/pkg.json b/scripts/template-oss/pkg.json index 3254c18cd59..1a11a975e51 100644 --- a/scripts/template-oss/pkg.json +++ b/scripts/template-oss/pkg.json @@ -1,6 +1,7 @@ { "scripts": { "test": "jest", + "snap": {{{ del }}}, "format": "prettier --write ." }, "files": {{{ del }}}, From 9950e788c2c985efda3a2144bfc1298157f0cb4d Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Mon, 16 Oct 2023 09:27:26 -0700 Subject: [PATCH 16/41] Fix jest tests for CSS.supports --- jest-setup.js | 1 + 1 file changed, 1 insertion(+) diff --git a/jest-setup.js b/jest-setup.js index 2c9b6f79738..541e5def8eb 100644 --- a/jest-setup.js +++ b/jest-setup.js @@ -1 +1,2 @@ import '@testing-library/jest-dom/jest-globals' +global.CSS = {supports: () => false} From 881270063a09c909c9e0614aad7b5d9c05695a98 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Mon, 16 Oct 2023 09:40:02 -0700 Subject: [PATCH 17/41] Fix variants prop name --- .gitignore | 1 - scripts/template-oss/index.js | 1 - src/components/variant-select.js | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd37e0cd748..5b2679dce33 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ !/bin/ !/CHANGELOG* !/CODE_OF_CONDUCT.md -!/content-debug/ !/CONTENT-MODEL.md !/content/ !/CONTRIBUTING.md diff --git a/scripts/template-oss/index.js b/scripts/template-oss/index.js index 2c3f1352ae0..ca4d41a7a4c 100644 --- a/scripts/template-oss/index.js +++ b/scripts/template-oss/index.js @@ -36,7 +36,6 @@ module.exports = { '/.reuse/', '/static/', '/content/', - '/content-debug/', '/LICENSE*', '/gatsby-*.js', '/jest*.js', diff --git a/src/components/variant-select.js b/src/components/variant-select.js index d2f155bed7c..8fa0b87cc49 100644 --- a/src/components/variant-select.js +++ b/src/components/variant-select.js @@ -83,7 +83,7 @@ const VariantSelect = () => { return ( - + ) } From 07ac58360d7e9981140aef93b65ebd3bf7f29a70 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Mon, 16 Oct 2023 09:46:36 -0700 Subject: [PATCH 18/41] Fix reuse for new root files --- .prettierignore | 1 + .reuse/dep5 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index 211b3a7e6ac..bc11f8d622a 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,3 +5,4 @@ cli/ .github/ package-lock.json SECURITY.md +.reuse/ diff --git a/.reuse/dep5 b/.reuse/dep5 index 375d6563094..7f82b3864f3 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -7,6 +7,6 @@ Files: content/* static/* Copyright: 2020 GitHub License: CC-BY-4.0 -Files: scripts/* cli/* theme/* src/* .github/* *.md *.js *.json .npmrc .gitignore .nvmrc +Files: scripts/* cli/* theme/* src/* .github/* *.md *.js *.json .* Copyright: 2020 GitHub License: MIT From 08c329be1a66f979b8e437d6e88e1c465316502c Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Mon, 16 Oct 2023 09:48:14 -0700 Subject: [PATCH 19/41] Fix cli bin/build test --- cli/bin/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/bin/build.js b/cli/bin/build.js index b055ad41ec4..0a664a1197d 100644 --- a/cli/bin/build.js +++ b/cli/bin/build.js @@ -10,7 +10,7 @@ const checkOnly = process.argv.includes('--check-only') const ROOT = resolve(__dirname, '../..') const contentPath = join(ROOT, 'content/cli') -const navPath = join(ROOT, 'src/theme/nav.yml') +const navPath = join(ROOT, 'content/nav.yml') const checkContent = () => { const status = spawnSync('git', ['status', '--porcelain', contentPath], { encoding: 'utf-8' }) From 66840723c69fe85f8587b67a22c712db70a938c0 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Mon, 16 Oct 2023 09:55:21 -0700 Subject: [PATCH 20/41] chore: bump @testing-library/react@12 --- package-lock.json | 399 +++++++++++++++++++++------------------------- package.json | 2 +- 2 files changed, 182 insertions(+), 219 deletions(-) diff --git a/package-lock.json b/package-lock.json index e039afbb0cb..ebe400e14f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "@github/prettier-config": "^0.0.6", "@npmcli/template-oss": "4.19.0", "@testing-library/jest-dom": "^6.1.4", - "@testing-library/react": "^9.5.0", + "@testing-library/react": "^12.1.5", "babel-jest": "^29.7.0", "eslint": "^8.51.0", "eslint-config-react-app": "^7.0.1", @@ -2403,19 +2403,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/runtime-corejs3": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.23.2.tgz", - "integrity": "sha512-54cIh74Z1rp4oIjsHjqN+WM4fMyCBYe+LpZ9jWm51CZ1fbH3SkAzQD/3XLoNkjbJ7YEmjobLXyvQrFypRHOrXw==", - "dev": true, - "dependencies": { - "core-js-pure": "^3.30.2", - "regenerator-runtime": "^0.14.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/template": { "version": "7.22.15", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", @@ -7291,12 +7278,6 @@ "integrity": "sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA==", "dev": true }, - "node_modules/@sheerun/mutationobserver-shim": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz", - "integrity": "sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw==", - "dev": true - }, "node_modules/@sideway/address": { "version": "4.1.4", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", @@ -7627,42 +7608,33 @@ } }, "node_modules/@testing-library/dom": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-6.16.0.tgz", - "integrity": "sha512-lBD88ssxqEfz0wFL6MeUyyWZfV/2cjEZZV3YRpb2IoJRej/4f1jB0TzqIOznTpfR1r34CNesrubxwIlAQ8zgPA==", + "version": "8.20.1", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz", + "integrity": "sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==", "dev": true, "dependencies": { - "@babel/runtime": "^7.8.4", - "@sheerun/mutationobserver-shim": "^0.3.2", - "@types/testing-library__dom": "^6.12.1", - "aria-query": "^4.0.2", - "dom-accessibility-api": "^0.3.0", - "pretty-format": "^25.1.0", - "wait-for-expect": "^3.0.2" + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.1.3", + "chalk": "^4.1.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "pretty-format": "^27.0.2" }, "engines": { - "node": ">=8" + "node": ">=12" } }, "node_modules/@testing-library/dom/node_modules/aria-query": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", - "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", + "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", "dev": true, "dependencies": { - "@babel/runtime": "^7.10.2", - "@babel/runtime-corejs3": "^7.10.2" - }, - "engines": { - "node": ">=6.0" + "deep-equal": "^2.0.5" } }, - "node_modules/@testing-library/dom/node_modules/dom-accessibility-api": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.3.0.tgz", - "integrity": "sha512-PzwHEmsRP3IGY4gv/Ug+rMeaTIyTJvadCb+ujYXYeIylbHJezIyNToe8KfEgHTCEYyC+/bUghYOGg8yMGlZ6vA==", - "dev": true - }, "node_modules/@testing-library/jest-dom": { "version": "6.1.4", "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.1.4.tgz", @@ -7718,21 +7690,21 @@ } }, "node_modules/@testing-library/react": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-9.5.0.tgz", - "integrity": "sha512-di1b+D0p+rfeboHO5W7gTVeZDIK5+maEgstrZbWZSSvxDyfDRkkyBE1AJR5Psd6doNldluXlCWqXriUfqu/9Qg==", + "version": "12.1.5", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz", + "integrity": "sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg==", "dev": true, "dependencies": { - "@babel/runtime": "^7.8.4", - "@testing-library/dom": "^6.15.0", - "@types/testing-library__react": "^9.1.2" + "@babel/runtime": "^7.12.5", + "@testing-library/dom": "^8.0.0", + "@types/react-dom": "<18.0.0" }, "engines": { - "node": ">=8" + "node": ">=12" }, "peerDependencies": { - "react": "*", - "react-dom": "*" + "react": "<18.0.0", + "react-dom": "<18.0.0" } }, "node_modules/@tokenizer/token": { @@ -7816,6 +7788,12 @@ "resolved": "https://registry.npmjs.org/@turist/time/-/time-0.0.2.tgz", "integrity": "sha512-qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ==" }, + "node_modules/@types/aria-query": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.2.tgz", + "integrity": "sha512-PHKZuMN+K5qgKIWhBodXzQslTo5P+K/6LqeKXS6O/4liIDdZqaX5RXrCK++LAw+y/nptN48YmUMFiQHRSWYwtQ==", + "dev": true + }, "node_modules/@types/babel__core": { "version": "7.20.2", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", @@ -8146,12 +8124,23 @@ } }, "node_modules/@types/react-dom": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.13.tgz", - "integrity": "sha512-eJIUv7rPP+EC45uNYp/ThhSpE16k22VJUknt5OLoH9tbXoi8bMhwLf5xRuWMywamNbWzhrSmU7IBJfPup1+3fw==", + "version": "17.0.21", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.21.tgz", + "integrity": "sha512-3rQEFUNUUz2MYiRwJJj6UekcW7rFLOtmK7ajQP7qJpjNdggInl3I/xM4I3Hq1yYPdCGVMgax1gZsB7BBTtayXg==", "dev": true, "dependencies": { - "@types/react": "*" + "@types/react": "^17" + } + }, + "node_modules/@types/react-dom/node_modules/@types/react": { + "version": "17.0.68", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.68.tgz", + "integrity": "sha512-y8heXejd/Gi43S28GOqIFmr6BzhLa3anMlPojRu4rHh3MtRrrpB+BtLEcqP3XPO1urXByzBdkOLU7sodYWnpkA==", + "dev": true, + "dependencies": { + "@types/prop-types": "*", + "@types/scheduler": "*", + "csstype": "^3.0.2" } }, "node_modules/@types/react-is": { @@ -8209,110 +8198,6 @@ "resolved": "https://registry.npmjs.org/@types/styled-system__theme-get/-/styled-system__theme-get-5.0.1.tgz", "integrity": "sha512-+i4VZ5wuYKMU8oKPmUlzc9r2RhpSNOK061Khtrr7X0sOQEcIyhUtrDusuMkp5ZR3D05Xopn3zybTPyUSQkKGAA==" }, - "node_modules/@types/testing-library__dom": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.14.0.tgz", - "integrity": "sha512-sMl7OSv0AvMOqn1UJ6j1unPMIHRXen0Ita1ujnMX912rrOcawe4f7wu0Zt9GIQhBhJvH2BaibqFgQ3lP+Pj2hA==", - "dev": true, - "dependencies": { - "pretty-format": "^24.3.0" - } - }, - "node_modules/@types/testing-library__dom/node_modules/@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@types/testing-library__dom/node_modules/@types/istanbul-reports": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", - "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "*", - "@types/istanbul-lib-report": "*" - } - }, - "node_modules/@types/testing-library__dom/node_modules/@types/yargs": { - "version": "13.0.12", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz", - "integrity": "sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@types/testing-library__dom/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/@types/testing-library__dom/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@types/testing-library__dom/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@types/testing-library__dom/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@types/testing-library__dom/node_modules/pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", - "dev": true, - "dependencies": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@types/testing-library__react": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/@types/testing-library__react/-/testing-library__react-9.1.3.tgz", - "integrity": "sha512-iCdNPKU3IsYwRK9JieSYAiX0+aYDXOGAmrC/3/M7AqqSDKnWWVv07X+Zk1uFSL7cMTUYzv4lQRfohucEocn5/w==", - "dev": true, - "dependencies": { - "@types/react-dom": "*", - "@types/testing-library__dom": "*", - "pretty-format": "^25.1.0" - } - }, "node_modules/@types/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.0.33.tgz", @@ -12409,6 +12294,41 @@ } } }, + "node_modules/deep-equal": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz", + "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "es-get-iterator": "^1.1.3", + "get-intrinsic": "^1.2.1", + "is-arguments": "^1.1.1", + "is-array-buffer": "^3.0.2", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "isarray": "^2.0.5", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.0", + "side-channel": "^1.0.4", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/deep-equal/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, "node_modules/deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -13330,6 +13250,32 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-get-iterator": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "has-symbols": "^1.0.3", + "is-arguments": "^1.1.1", + "is-map": "^2.0.2", + "is-set": "^2.0.2", + "is-string": "^1.0.7", + "isarray": "^2.0.5", + "stop-iteration-iterator": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-get-iterator/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, "node_modules/es-iterator-helpers": { "version": "1.0.15", "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", @@ -19137,6 +19083,22 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/is-arguments": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-array-buffer": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", @@ -21872,6 +21834,15 @@ "es5-ext": "~0.10.2" } }, + "node_modules/lz-string": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", + "dev": true, + "bin": { + "lz-string": "bin/bin.js" + } + }, "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -24014,6 +23985,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object-is": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -25807,67 +25794,37 @@ } }, "node_modules/pretty-format": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", - "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, "dependencies": { - "@jest/types": "^25.5.0", - "ansi-regex": "^5.0.0", - "ansi-styles": "^4.0.0", - "react-is": "^16.12.0" + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" }, "engines": { - "node": ">= 8.3" + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, - "node_modules/pretty-format/node_modules/@jest/types": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", - "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^15.0.0", - "chalk": "^3.0.0" - }, "engines": { - "node": ">= 8.3" - } - }, - "node_modules/pretty-format/node_modules/@types/istanbul-reports": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", - "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "*", - "@types/istanbul-lib-report": "*" - } - }, - "node_modules/pretty-format/node_modules/@types/yargs": { - "version": "15.0.16", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.16.tgz", - "integrity": "sha512-2FeD5qezW3FvLpZ0JpfuaEWepgNLl9b2gQYiz/ce0NhoB1W/D+VZu98phITXkADYerfr/jb7JcDcVhITsc9bwg==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/pretty-format/node_modules/chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "node": ">=10" }, - "engines": { - "node": ">=8" + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/pretty-format/node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true + }, "node_modules/prism-react-renderer": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-0.2.0.tgz", @@ -29124,6 +29081,18 @@ "node": ">= 0.8" } }, + "node_modules/stop-iteration-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "dev": true, + "dependencies": { + "internal-slot": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -33526,12 +33495,6 @@ "node": ">=14" } }, - "node_modules/wait-for-expect": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-3.0.2.tgz", - "integrity": "sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==", - "dev": true - }, "node_modules/walk-up-path": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz", diff --git a/package.json b/package.json index d975b63c3e5..88eae8dc11e 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@github/prettier-config": "^0.0.6", "@npmcli/template-oss": "4.19.0", "@testing-library/jest-dom": "^6.1.4", - "@testing-library/react": "^9.5.0", + "@testing-library/react": "^12.1.5", "babel-jest": "^29.7.0", "eslint": "^8.51.0", "eslint-config-react-app": "^7.0.1", From f1c76d627105e7db4171304d3495f198076e5138 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Mon, 16 Oct 2023 10:43:10 -0700 Subject: [PATCH 21/41] Convert primer colors to use new color names --- gatsby-browser.js | 4 +- gatsby-config.js | 5 +- gatsby-ssr.js | 4 +- src/components/clipboard-copy.js | 16 +-- src/components/contributors.js | 2 +- src/components/dark-text-input.js | 21 ---- src/components/drawer.js | 2 +- src/components/header.js | 11 +- src/components/hero.js | 4 +- src/components/mobile-search.js | 36 +++--- src/components/nav-drawer.js | 29 +++-- src/components/page-footer.js | 6 +- src/components/search-results.js | 26 +++-- src/components/search.js | 22 ++-- src/components/sidebar.js | 34 +++++- src/components/table-of-contents.js | 37 +++--- src/components/text-input.js | 17 +++ src/mdx/code.js | 13 +-- src/mdx/index.js | 172 +++++++++++++++++++--------- src/{page-element.js => page.js} | 0 src/{root-element.js => root.js} | 0 21 files changed, 276 insertions(+), 185 deletions(-) delete mode 100644 src/components/dark-text-input.js create mode 100644 src/components/text-input.js rename src/{page-element.js => page.js} (100%) rename src/{root-element.js => root.js} (100%) diff --git a/gatsby-browser.js b/gatsby-browser.js index 4a5e3eea013..507b543f306 100644 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -1,2 +1,2 @@ -export {default as wrapPageElement} from './src/page-element' -export {default as wrapRootElement} from './src/root-element' +export {default as wrapPageElement} from './src/page' +export {default as wrapRootElement} from './src/root' diff --git a/gatsby-config.js b/gatsby-config.js index a5610ee8554..6f9de4f16d8 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -1,7 +1,7 @@ const path = require('path') const fs = require('fs') -const {NODE_ENV, GATSBY_PARTIAL_CONTENT, GATSBY_CONTENT_DIR = 'content'} = process.env +const {NODE_ENV, GATSBY_PARTIAL_CONTENT, GATSBY_CONTENT_IGNORE, GATSBY_CONTENT_DIR = 'content'} = process.env const DEV = NODE_ENV === 'development' const CONTENT_DIR = path.resolve(GATSBY_CONTENT_DIR) @@ -15,7 +15,7 @@ const walkDirs = dir => { } const getContentOptions = () => { - if (!DEV || !GATSBY_PARTIAL_CONTENT) { + if (!DEV || (!GATSBY_PARTIAL_CONTENT && !GATSBY_CONTENT_IGNORE)) { return } @@ -47,7 +47,6 @@ module.exports = { shortName: 'npm', description: 'Documentation for the npm registry, website, and command-line interface', lang: 'en', - // eslint-disable-next-line max-len imageUrl: 'https://user-images.githubusercontent.com/29712634/81721690-e2fb5d80-9445-11ea-8602-4b2294c964f3.png', }, plugins: [ diff --git a/gatsby-ssr.js b/gatsby-ssr.js index 4a5e3eea013..507b543f306 100644 --- a/gatsby-ssr.js +++ b/gatsby-ssr.js @@ -1,2 +1,2 @@ -export {default as wrapPageElement} from './src/page-element' -export {default as wrapRootElement} from './src/root-element' +export {default as wrapPageElement} from './src/page' +export {default as wrapRootElement} from './src/root' diff --git a/src/components/clipboard-copy.js b/src/components/clipboard-copy.js index 6625ffa4af2..e6406303196 100644 --- a/src/components/clipboard-copy.js +++ b/src/components/clipboard-copy.js @@ -1,16 +1,9 @@ import React from 'react' -import {Button, Octicon, themeGet} from '@primer/react' +import {Button, Octicon} from '@primer/react' import {CheckIcon, CopyIcon} from '@primer/octicons-react' -import styled from 'styled-components' import copy from 'copy-to-clipboard' import {announce} from '../util/aria-live' -const CopyToClipboard = styled(Button)` - &:focus { - box-shadow: 0 0 0 3px ${themeGet('colors.blue.5')}; - } -` - function ClipboardCopy({value}) { const [copied, setCopied] = React.useState(false) @@ -25,16 +18,17 @@ function ClipboardCopy({value}) { }, [copied]) return ( - { copy(value) setCopied(true) announce(`Copied to clipboard`) }} + sx={{px: 2}} > - - + + ) } diff --git a/src/components/contributors.js b/src/components/contributors.js index 799893d65e9..6e9a0a7f9ad 100644 --- a/src/components/contributors.js +++ b/src/components/contributors.js @@ -37,7 +37,7 @@ function Contributors({logins, latestCommit}) { ))} {latestCommit ? ( - + Last edited by {latestCommit.login} on{' '} {format(new Date(latestCommit.date))} diff --git a/src/components/dark-text-input.js b/src/components/dark-text-input.js deleted file mode 100644 index 356e3ad27c5..00000000000 --- a/src/components/dark-text-input.js +++ /dev/null @@ -1,21 +0,0 @@ -import {TextInput, themeGet} from '@primer/react' -import styled from 'styled-components' - -const DarkTextInput = styled(TextInput)` - /* The font-size of inputs should never be less than 16px. - * Otherwise, iOS browsers will zoom in when the input is focused. - * TODO: Update font-size of TextInput in @primer/react. - */ - font-size: ${themeGet('fontSizes.2')} !important; - color: ${themeGet('colors.white')}; - background-color: rgba(255, 255, 255, 0.07); - border: 1px solid transparent; - box-shadow: none; - - &:focus { - border: 1px solid rgba(255, 255, 255, 0.15); - outline: none; - box-shadow: none; - } -` -export default DarkTextInput diff --git a/src/components/drawer.js b/src/components/drawer.js index 8606489485d..a1ce66baf5d 100644 --- a/src/components/drawer.js +++ b/src/components/drawer.js @@ -43,8 +43,8 @@ const Drawer = ({isOpen, onDismiss, children}) => ( bottom: 0, bg: 'gray.0', width: 300, - zIndex: 1, }} + style={{zIndex: 1}} key="drawer" as={motion.div} initial={{x: '100%'}} diff --git a/src/components/header.js b/src/components/header.js index ff762ba28f7..23410229613 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -37,13 +37,16 @@ function Header() { @@ -52,8 +55,8 @@ function Header() { to="/" sx={{ mr: 4, - color: '#dddddd', - fontWeight: '600', + fontWeight: 'bold', + color: 'fg.default', display: 'flex', alignItems: 'center', }} @@ -69,7 +72,7 @@ function Header() { {headerNavItems.map((item, index) => ( - + {item.title} ))} diff --git a/src/components/hero.js b/src/components/hero.js index de2aa76c9ae..e885d51dce1 100644 --- a/src/components/hero.js +++ b/src/components/hero.js @@ -10,10 +10,10 @@ function Hero() { - + {title} - + {description} diff --git a/src/components/mobile-search.js b/src/components/mobile-search.js index 19a6ea3e56d..bafff51af0f 100644 --- a/src/components/mobile-search.js +++ b/src/components/mobile-search.js @@ -3,7 +3,7 @@ import {Button, Box} from '@primer/react' import {XIcon, SearchIcon} from '@primer/octicons-react' import {AnimatePresence, motion} from 'framer-motion' import {FocusOn} from 'react-focus-on' -import DarkTextInput from './dark-text-input' +import TextInput from './text-input' import SearchResults from './search-results' import useSiteMetadata from '../hooks/use-site-metadata' @@ -21,7 +21,7 @@ function MobileSearch({onDismiss, ...props}) { - + - @@ -66,16 +67,19 @@ function MobileSearch({onDismiss, ...props}) { {isOpen ? : null} diff --git a/src/components/nav-drawer.js b/src/components/nav-drawer.js index 36fbea8a2db..cc5a60aea1e 100644 --- a/src/components/nav-drawer.js +++ b/src/components/nav-drawer.js @@ -38,25 +38,31 @@ function NavDrawer() { display: 'flex', flexDirection: 'column', height: '100%', - bg: 'gray.0', + bg: 'canvas.default', overflow: 'auto', WebkitOverflowScrolling: 'touch', }} > - + @@ -71,17 +77,20 @@ function NavDrawer() { - + {headerNavItems.map((item, index) => ( diff --git a/src/components/page-footer.js b/src/components/page-footer.js index a7585219f5b..930b8c3052d 100644 --- a/src/components/page-footer.js +++ b/src/components/page-footer.js @@ -8,13 +8,13 @@ function PageFooter({editUrl, contributors = {}}) { return editUrl || logins.length ? ( diff --git a/src/components/search-results.js b/src/components/search-results.js index 8ff0446ac48..c125ea6f17d 100644 --- a/src/components/search-results.js +++ b/src/components/search-results.js @@ -29,17 +29,21 @@ function SearchResults({results, getItemProps, highlightedIndex}) { return results.map((item, index) => ( {item.title} diff --git a/src/components/search.js b/src/components/search.js index a7cbfdbd7be..69cf6909e12 100644 --- a/src/components/search.js +++ b/src/components/search.js @@ -1,6 +1,6 @@ import React from 'react' import {Box} from '@primer/react' -import DarkTextInput from './dark-text-input' +import TextInput from './text-input' import SearchResults from './search-results' import useSiteMetadata from '../hooks/use-site-metadata' @@ -10,7 +10,7 @@ function Search(props) { return ( - {isOpen ? ( diff --git a/src/components/sidebar.js b/src/components/sidebar.js index 00265878407..63ba112150d 100644 --- a/src/components/sidebar.js +++ b/src/components/sidebar.js @@ -3,6 +3,30 @@ import React from 'react' import NavItems from './nav-items' import {HEADER_HEIGHT} from '../constants' +function usePersistentScroll(id) { + const ref = React.useRef() + + const handleScroll = React.useCallback( + // Save scroll position in session storage on every scroll change + event => window.sessionStorage.setItem(id, event.target.scrollTop), + [id], + ) + + React.useLayoutEffect(() => { + // Restore scroll position when component mounts + const scrollPosition = window.sessionStorage.getItem(id) + if (scrollPosition && ref.current) { + ref.current.scrollTop = scrollPosition + } + }, [id]) + + // Return props to spread onto the scroll container + return { + ref, + onScroll: handleScroll, + } +} + const Sidebar = () => ( ( top: `${HEADER_HEIGHT}px`, height: `calc(100vh - ${HEADER_HEIGHT}px)`, minWidth: 260, - color: 'gray.8', - bg: 'gray.0', }} > diff --git a/src/components/table-of-contents.js b/src/components/table-of-contents.js index d246a82705d..2d9e70b908d 100644 --- a/src/components/table-of-contents.js +++ b/src/components/table-of-contents.js @@ -1,26 +1,29 @@ import React from 'react' -import {Box, Link, Text, Octicon, Details, useDetails} from '@primer/react' +import {Box, Text, Octicon, Details, useDetails} from '@primer/react' import {ChevronDownIcon, ChevronRightIcon} from '@primer/octicons-react' import {usePageContext} from '../layout' import {HEADER_HEIGHT} from '../constants' +import {NavList} from '@primer/react/drafts' -const TableOfContents = ({items, depth = 0, labelId}) => ( - +const TableOfContentsItems = ({items}) => ( + <> {items.map(item => ( - 0 ? 3 : 0}}> - - {item.title} - - {item.items ? : null} - + + {item.title} + {item.items ? ( + + + + ) : null} + ))} - + +) + +const TableOfContents = ({'aria-labelledby': ariaLabelledBy, items}) => ( + + + ) const withTableOfContents = Component => { @@ -66,6 +69,6 @@ export const Desktop = withTableOfContents(({items}) => ( Table of contents - + )) diff --git a/src/components/text-input.js b/src/components/text-input.js new file mode 100644 index 00000000000..264c1b37fbb --- /dev/null +++ b/src/components/text-input.js @@ -0,0 +1,17 @@ +import {TextInput as PrimerTextInput, themeGet} from '@primer/react' +import styled from 'styled-components' + +const TextInput = styled(PrimerTextInput)` + /* The font-size of inputs should never be less than 16px. + * Otherwise, iOS browsers will zoom in when the input is focused. + * TODO: Update font-size of TextInput in @primer/react. + */ + input { + font-size: ${themeGet('fontSizes.2')} !important; + } + + input::placeholder { + color: ${themeGet('colors.fg.muted')} !important; + } +` +export default TextInput diff --git a/src/mdx/code.js b/src/mdx/code.js index a9ba861bb75..4cfd4f7e66c 100644 --- a/src/mdx/code.js +++ b/src/mdx/code.js @@ -22,24 +22,15 @@ function Code({className: language = '', children}) { tabIndex={0} as="pre" className={className} - sx={{ - borderWidth: 1, - borderStyle: 'solid', - borderColor: 'border.default', - borderRadius: 2, - mt: 0, - mb: 3, - p: 3, - border: 0, - }} style={{...style, overflow: 'auto'}} + sx={{borderRadius: 2, mt: 0, mb: 3, p: 3, border: 0}} > {/* This is the scroll handle, it is supposed to be focused with keyboard and scroll a wide codebox horizontally */}