Skip to content

Commit

Permalink
Merge branch 'main' into chore/update-project-to-node-v18
Browse files Browse the repository at this point in the history
  • Loading branch information
joshblack authored Apr 10, 2023
2 parents affce50 + f132e29 commit a91d639
Show file tree
Hide file tree
Showing 87 changed files with 561 additions and 399 deletions.
5 changes: 5 additions & 0 deletions .changeset/old-falcons-learn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Bump @primer/primitives to `7.11.5`
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions contributor-docs/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,20 @@ We are slowly moving away from using `Jest` snapshots as a way to test visual ch

#### Updating `theme-preval` snapshots

If you need to update the `theme-preval` snapshots, you will need to run the following commands:

```sh
npm run build
npm run test -- -u
```

After running that command, make sure to update the cache-busting timestamp in [src/theme-preval.js](https://github.com/primer/react/blob/main/src/theme-preval.js)
If you need to update the `theme-preval` snapshots, make sure to first update the cache-busting timestamp in [src/theme-preval.js](https://github.com/primer/react/blob/main/src/theme-preval.js)

```diff
- // Cache bust: 2022-02-23 12:00:00 GMT (This file is cached by our deployment tooling, update this timestamp to rebuild this file)
+ // Cache bust: 2023-02-24 12:00:00 GMT (This file is cached by our deployment tooling, update this timestamp to rebuild this file)
```

After you will need to run the following commands and commit changes to the `themePreval.test.ts.snap` file:

```sh
npm run build
npm run test -- -u
```

### Running Tests

| Task | Command |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function ThemeSwitcher() {
return (
<ActionMenu>
<ActionMenu.Button aria-label="Select field type">{selectedItem?.name}</ActionMenu.Button>
{/* eslint-disable-next-line primer-react/no-system-props */}
<ActionMenu.Overlay width="medium">
<ActionList selectionVariant="single">
{items.map((type, index) => (
Expand Down
2 changes: 1 addition & 1 deletion generated/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -3438,7 +3438,7 @@
"stories": [
{
"id": "components-relativetime--default",
"code": "(args) => {\n const { date, ...rest } = args\n return <RelativeTime {...rest} date={new Date(date)} />\n}"
"code": "() => <RelativeTime date={new Date('2020-01-01T00:00:00Z')} />"
}
],
"props": [
Expand Down
92 changes: 55 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"@lit-labs/react": "1.1.1",
"@primer/behaviors": "1.3.3",
"@primer/octicons-react": "^18.0.0",
"@primer/primitives": "7.11.3",
"@primer/primitives": "7.11.5",
"@react-aria/ssr": "^3.1.0",
"@styled-system/css": "^5.1.5",
"@styled-system/props": "^5.1.5",
Expand Down Expand Up @@ -132,7 +132,7 @@
"@rollup/plugin-node-resolve": "15.0.1",
"@rollup/plugin-replace": "5.0.2",
"@rollup/plugin-terser": "0.4.0",
"@rollup/plugin-typescript": "11.0.0",
"@rollup/plugin-typescript": "11.1.0",
"@rollup/plugin-virtual": "3.0.1",
"@size-limit/preset-big-lib": "8.2.4",
"@storybook/addon-a11y": "6.5.16",
Expand All @@ -155,7 +155,7 @@
"@testing-library/user-event": "^14.3.0",
"@types/chroma-js": "2.1.4",
"@types/jest": "29.4.0",
"@types/jest-axe": "3.5.3",
"@types/jest-axe": "3.5.5",
"@types/lodash.groupby": "4.6.7",
"@types/lodash.isempty": "4.4.7",
"@types/lodash.isobject": "3.0.7",
Expand All @@ -174,7 +174,7 @@
"babel-plugin-macros": "3.1.0",
"babel-plugin-open-source": "1.3.4",
"babel-plugin-preval": "5.1.0",
"babel-plugin-styled-components": "2.0.2",
"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",
Expand All @@ -192,7 +192,7 @@
"eslint-plugin-mdx": "2.0.5",
"eslint-plugin-playwright": "0.12.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-primer-react": "2.0.2",
"eslint-plugin-primer-react": "2.0.3",
"eslint-plugin-react": "7.32.2",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-storybook": "0.6.11",
Expand Down
Loading

0 comments on commit a91d639

Please sign in to comment.