From 8c4225bb4d8c4bdc0956cdf4cff33eb0d04bff11 Mon Sep 17 00:00:00 2001 From: Tom Thorogood Date: Fri, 19 May 2023 16:00:46 -0700 Subject: [PATCH 1/4] Add example import for Octicon example --- docs/content/Octicon.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/content/Octicon.mdx b/docs/content/Octicon.mdx index 8d5c29b16a3..ec50a67440a 100644 --- a/docs/content/Octicon.mdx +++ b/docs/content/Octicon.mdx @@ -11,6 +11,8 @@ import data from '../../src/Octicon/Octicon.docs.json' ## Example ```jsx live +import {CheckIcon, XIcon} from '@primer/octicons-react' + <> From 30ce747176b7d68fdc27621346df5accc215e3fc Mon Sep 17 00:00:00 2001 From: Tom Thorogood Date: Tue, 23 May 2023 19:12:29 +0000 Subject: [PATCH 2/4] Run format:diff --- examples/nextjs/package-lock.json | 60 ++++++++++++++++--------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/examples/nextjs/package-lock.json b/examples/nextjs/package-lock.json index e00ebb25013..d93c0ce0268 100644 --- a/examples/nextjs/package-lock.json +++ b/examples/nextjs/package-lock.json @@ -26,9 +26,9 @@ "@github/paste-markdown": "^1.4.0", "@github/relative-time-element": "^4.1.2", "@lit-labs/react": "1.1.1", - "@primer/behaviors": "1.3.3", - "@primer/octicons-react": "^18.0.0", - "@primer/primitives": "7.11.7", + "@primer/behaviors": "1.3.4", + "@primer/octicons-react": "^19.1.0", + "@primer/primitives": "7.11.10", "@react-aria/ssr": "^3.1.0", "@styled-system/css": "^5.1.5", "@styled-system/props": "^5.1.5", @@ -61,8 +61,9 @@ "@github/markdownlint-github": "^0.3.0", "@github/prettier-config": "0.0.6", "@playwright/test": "1.32.0", + "@primer/css": "^21.0.1", "@rollup/plugin-babel": "6.0.3", - "@rollup/plugin-commonjs": "24.0.1", + "@rollup/plugin-commonjs": "25.0.0", "@rollup/plugin-node-resolve": "15.0.2", "@rollup/plugin-replace": "5.0.2", "@rollup/plugin-terser": "0.4.0", @@ -87,7 +88,7 @@ "@testing-library/react": "14.0.0", "@testing-library/react-hooks": "7.0.2", "@testing-library/user-event": "^14.3.0", - "@types/chroma-js": "2.1.4", + "@types/chroma-js": "2.4.0", "@types/jest": "29.4.0", "@types/jest-axe": "3.5.5", "@types/lodash.groupby": "4.6.7", @@ -107,18 +108,16 @@ "babel-plugin-dev-expression": "0.2.3", "babel-plugin-macros": "3.1.0", "babel-plugin-open-source": "1.3.4", - "babel-plugin-preval": "5.1.0", "babel-plugin-styled-components": "2.1.1", - "babel-plugin-transform-commonjs": "1.1.6", "babel-plugin-transform-replace-expressions": "0.2.0", "babel-polyfill": "6.26.0", "change-case": "4.1.2", "chroma-js": "2.4.2", "chromatic": "6.1.0", - "concurrently": "7.6.0", + "concurrently": "8.0.1", "copyfiles": "2.4.1", "cross-env": "7.0.3", - "eslint": "8.35.0", + "eslint": "8.40.0", "eslint-import-resolver-typescript": "3.5.3", "eslint-plugin-github": "4.6.1", "eslint-plugin-jest": "27.2.1", @@ -139,6 +138,7 @@ "husky": "8.0.2", "jest": "29.4.2", "jest-axe": "7.0.1", + "jest-css-modules": "2.1.0", "jest-environment-jsdom": "29.4.3", "jest-fail-on-console": "3.1.1", "jest-matchmedia-mock": "1.1.0", @@ -150,9 +150,9 @@ "lodash.isempty": "4.4.0", "lodash.isobject": "3.0.2", "lodash.keyby": "4.6.0", - "markdownlint-cli2": "^0.6.0", + "markdownlint-cli2": "^0.7.1", "markdownlint-cli2-formatter-pretty": "0.0.3", - "mdast-util-from-markdown": "1.2.0", + "mdast-util-from-markdown": "1.3.0", "mdast-util-frontmatter": "1.0.1", "mdast-util-mdx": "2.0.1", "mdast-util-to-string": "3.1.1", @@ -167,10 +167,12 @@ "recast": "0.22.0", "rimraf": "4.1.2", "rollup": "3.20.2", + "rollup-plugin-postcss": "4.0.2", "rollup-plugin-visualizer": "5.9.0", - "semver": "7.3.8", + "semver": "7.5.0", "size-limit": "8.2.4", "storybook-addon-turbo-build": "1.1.0", + "storybook-css-modules": "1.0.8", "styled-components": "4.4.1", "terser": "5.16.1", "ts-node": "10.9.1", @@ -179,8 +181,8 @@ "unist-util-find": "1.0.2", "unist-util-find-before": "3.0.1", "unist-util-flat-filter": "2.0.0", - "webpack": "5.77.0", - "yaml": "2.2.1" + "webpack": "5.82.1", + "yaml": "2.2.2" }, "engines": { "node": ">=12", @@ -1391,12 +1393,13 @@ "@github/relative-time-element": "^4.1.2", "@lit-labs/react": "1.1.1", "@playwright/test": "1.32.0", - "@primer/behaviors": "1.3.3", - "@primer/octicons-react": "^18.0.0", - "@primer/primitives": "7.11.7", + "@primer/behaviors": "1.3.4", + "@primer/css": "^21.0.1", + "@primer/octicons-react": "^19.1.0", + "@primer/primitives": "7.11.10", "@react-aria/ssr": "^3.1.0", "@rollup/plugin-babel": "6.0.3", - "@rollup/plugin-commonjs": "24.0.1", + "@rollup/plugin-commonjs": "25.0.0", "@rollup/plugin-node-resolve": "15.0.2", "@rollup/plugin-replace": "5.0.2", "@rollup/plugin-terser": "0.4.0", @@ -1424,7 +1427,7 @@ "@testing-library/react": "14.0.0", "@testing-library/react-hooks": "7.0.2", "@testing-library/user-event": "^14.3.0", - "@types/chroma-js": "2.1.4", + "@types/chroma-js": "2.4.0", "@types/jest": "29.4.0", "@types/jest-axe": "3.5.5", "@types/lodash.groupby": "4.6.7", @@ -1448,9 +1451,7 @@ "babel-plugin-dev-expression": "0.2.3", "babel-plugin-macros": "3.1.0", "babel-plugin-open-source": "1.3.4", - "babel-plugin-preval": "5.1.0", "babel-plugin-styled-components": "2.1.1", - "babel-plugin-transform-commonjs": "1.1.6", "babel-plugin-transform-replace-expressions": "0.2.0", "babel-polyfill": "6.26.0", "change-case": "4.1.2", @@ -1458,11 +1459,11 @@ "chromatic": "6.1.0", "classnames": "^2.3.1", "color2k": "^2.0.0", - "concurrently": "7.6.0", + "concurrently": "8.0.1", "copyfiles": "2.4.1", "cross-env": "7.0.3", "deepmerge": "^4.2.2", - "eslint": "8.35.0", + "eslint": "8.40.0", "eslint-import-resolver-typescript": "3.5.3", "eslint-plugin-github": "4.6.1", "eslint-plugin-jest": "27.2.1", @@ -1486,6 +1487,7 @@ "husky": "8.0.2", "jest": "29.4.2", "jest-axe": "7.0.1", + "jest-css-modules": "2.1.0", "jest-environment-jsdom": "29.4.3", "jest-fail-on-console": "3.1.1", "jest-matchmedia-mock": "1.1.0", @@ -1497,9 +1499,9 @@ "lodash.isempty": "4.4.0", "lodash.isobject": "3.0.2", "lodash.keyby": "4.6.0", - "markdownlint-cli2": "^0.6.0", + "markdownlint-cli2": "^0.7.1", "markdownlint-cli2-formatter-pretty": "0.0.3", - "mdast-util-from-markdown": "1.2.0", + "mdast-util-from-markdown": "1.3.0", "mdast-util-frontmatter": "1.0.1", "mdast-util-mdx": "2.0.1", "mdast-util-to-string": "3.1.1", @@ -1515,10 +1517,12 @@ "recast": "0.22.0", "rimraf": "4.1.2", "rollup": "3.20.2", + "rollup-plugin-postcss": "4.0.2", "rollup-plugin-visualizer": "5.9.0", - "semver": "7.3.8", + "semver": "7.5.0", "size-limit": "8.2.4", "storybook-addon-turbo-build": "1.1.0", + "storybook-css-modules": "1.0.8", "styled-components": "4.4.1", "styled-system": "^5.1.5", "terser": "5.16.1", @@ -1528,8 +1532,8 @@ "unist-util-find": "1.0.2", "unist-util-find-before": "3.0.1", "unist-util-flat-filter": "2.0.0", - "webpack": "5.77.0", - "yaml": "2.2.1" + "webpack": "5.82.1", + "yaml": "2.2.2" } }, "@swc/helpers": { From 348127182d62257cabb730fd081d0a85cdbb707f Mon Sep 17 00:00:00 2001 From: Josh Black Date: Tue, 20 Jun 2023 12:09:14 -0500 Subject: [PATCH 3/4] chore: run format --- docs/content/Octicon.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/Octicon.mdx b/docs/content/Octicon.mdx index ec50a67440a..05c656b5065 100644 --- a/docs/content/Octicon.mdx +++ b/docs/content/Octicon.mdx @@ -13,7 +13,7 @@ import data from '../../src/Octicon/Octicon.docs.json' ```jsx live import {CheckIcon, XIcon} from '@primer/octicons-react' -<> +;<> From b09fc00e1faf5ca252f587dfabfff57b5d56c8eb Mon Sep 17 00:00:00 2001 From: Josh Black Date: Mon, 26 Jun 2023 10:53:18 -0500 Subject: [PATCH 4/4] chore: run format --- docs/content/Octicon.mdx | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/content/Octicon.mdx b/docs/content/Octicon.mdx index 05c656b5065..a9dd6c9862f 100644 --- a/docs/content/Octicon.mdx +++ b/docs/content/Octicon.mdx @@ -12,7 +12,6 @@ import data from '../../src/Octicon/Octicon.docs.json' ```jsx live import {CheckIcon, XIcon} from '@primer/octicons-react' - ;<>