Skip to content

Commit 7d343d6

Browse files
authored
Merge branch 'main' into tylerjdev/treeview-trailing-action-as-prop
2 parents a450d97 + e1268ff commit 7d343d6

File tree

180 files changed

+11979
-11699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+11979
-11699
lines changed
Lines changed: 5 additions & 0 deletions

.changeset/config.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@
66
"access": "public",
77
"baseBranch": "main",
88
"updateInternalDependencies": "patch",
9-
"ignore": ["example-*", "codesandbox"]
9+
"ignore": ["example-*", "codesandbox"],
10+
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
11+
"onlyUpdatePeerDependentsWhenOutOfRange": true
12+
}
1013
}

.changeset/eleven-chefs-poke.md

Lines changed: 5 additions & 0 deletions
Lines changed: 5 additions & 0 deletions

.changeset/spotty-coats-post.md

Lines changed: 5 additions & 0 deletions

.changeset/sweet-ladybugs-rest.md

Lines changed: 5 additions & 0 deletions

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ body:
2323
id: reproduce
2424
attributes:
2525
label: Steps to reproduce
26-
description: 'How do we reproduce the error you described above? Feel free to use the `@primer/react` template on [CodeSandbox](https://codesandbox.io/s/primer-react-qyyepc) to get started'
26+
description: 'How do we reproduce the error you described above? Feel free to use the `@primer/react` template on [CodeSandbox](https://codesandbox.io/p/sandbox/github/primer/react/tree/main/examples/codesandbox) to get started'
2727
placeholder: |
2828
1. Go to '...'
2929
2. Click on '....'

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,10 @@ jobs:
7272
run: npm ci
7373
- name: Build
7474
run: npm run build
75-
- name: Test
76-
run: npm run test -- --coverage
7775
- name: Run tests defined in vitest
7876
uses: docker://mcr.microsoft.com/playwright:v1.53.2-jammy
7977
with:
80-
args: npx vitest
78+
args: npm test
8179

8280
type-check:
8381
runs-on: ubuntu-latest
@@ -123,7 +121,7 @@ jobs:
123121
- name: Install dependencies
124122
run: npm ci
125123
- name: Build
126-
run: npm run build
124+
run: npx turbo build
127125

128126
build-components-json:
129127
runs-on: ubuntu-latest

.github/workflows/migration-status.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,3 @@ jobs:
3434
- name: Run migration script
3535
run: |
3636
node --experimental-strip-types script/styled-components-migration-status.mts >> $GITHUB_STEP_SUMMARY
37-
38-
vitest:
39-
runs-on: ubuntu-latest
40-
steps:
41-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
42-
- name: Set up Node.js
43-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
44-
with:
45-
node-version: 22
46-
cache: 'npm'
47-
- name: Install dependencies
48-
run: npm ci
49-
- name: Run migration script
50-
run: |
51-
node --experimental-strip-types script/vitest-migration-status.mts >> $GITHUB_STEP_SUMMARY

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ coverage/
3434
# Playwright
3535
stats.html
3636
blob-report
37+
results.json
3738

3839
# TypeScript
3940
*.tsbuildinfo

0 commit comments

Comments
 (0)