Skip to content

Commit 4416331

Browse files
committed
Merge branch 'main' into next_major
2 parents 942f65a + d6df77f commit 4416331

File tree

6 files changed

+110
-133
lines changed

6 files changed

+110
-133
lines changed

.github/workflows/deploy_preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Deploy preview
1919
with:
2020
node_version: 14
21-
install: yarn
21+
install: yarn && cd docs && yarn && cd ..
2222
build: yarn build:docs:preview
2323
output_dir: docs/public
2424

.github/workflows/deploy_production.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ jobs:
4646
uses: primer/.github/.github/workflows/deploy.yml@main
4747
with:
4848
node_version: 14
49-
install: yarn
49+
install: yarn && cd docs && yarn && cd ..
5050
build: yarn build:docs
5151
output_dir: docs/public

.github/workflows/release_candidate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4343

4444
- name: Output candidate version number
45-
uses: actions/github-script@v5
45+
uses: actions/github-script@v6
4646
with:
4747
script: |
4848
const package = require(`${process.env.GITHUB_WORKSPACE}/package.json`)

.github/workflows/welcome.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
node-version: 14.x
1717

1818
- name: Get or Create Comment
19-
uses: actions/github-script@v5
19+
uses: actions/github-script@v6
2020
with:
2121
github-token: ${{ secrets.GITHUB_TOKEN }}
2222
script: |
@@ -85,20 +85,20 @@ jobs:
8585
name: Semantic Version Label
8686
runs-on: ubuntu-latest
8787
steps:
88-
- uses: actions/github-script@v5
88+
- uses: actions/github-script@v6
8989
id: version-result
9090
with:
9191
github-token: "${{ secrets.GITHUB_TOKEN }}"
9292
result-encoding: string
9393
script: |
9494
const diff_url = context.payload.pull_request.diff_url
9595
const result = await github.request(diff_url)
96-
const match = [...result.data.matchAll(/^\+['"]@primer\/css['"]:\s(patch|minor|major)/m)]
96+
const match = [...result.data.matchAll(/^\+['"]@primer\/css['"]:\s(patch|minor|major)/mg)]
9797
if (match && match[0]) {
9898
return match[0][1]
9999
}
100100
101-
- uses: actions/github-script@v5
101+
- uses: actions/github-script@v6
102102
env:
103103
RELEASE: ${{ steps.version-result.outputs.result }}
104104
with:

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"prepublishOnly": "script/prepublish",
3636
"start": "yarn dev",
3737
"dev": "cd docs && yarn && yarn develop",
38-
"postinstall": "cd docs && yarn",
3938
"pretest": "yarn dist && script/pretest",
4039
"test": "NODE_OPTIONS=--experimental-vm-modules yarn jest",
4140
"release": "changeset publish",
@@ -46,13 +45,13 @@
4645
},
4746
"devDependencies": {
4847
"@changesets/changelog-github": "0.4.4",
49-
"@changesets/cli": "2.20.0",
48+
"@changesets/cli": "2.22.0",
5049
"@github/prettier-config": "0.0.4",
5150
"@koddsson/postcss-sass": "5.0.1",
5251
"@primer/stylelint-config": "^12.3.3",
5352
"autoprefixer": "10.4.4",
5453
"chokidar-cli": "3.0.0",
55-
"cssstats": "4.0.2",
54+
"cssstats": "4.0.5",
5655
"eslint": "8.13.0",
5756
"eslint-plugin-github": "4.3.6",
5857
"eslint-plugin-jest": "26.0.0",
@@ -65,7 +64,7 @@
6564
"js-yaml": "4.1.0",
6665
"postcss": "8.4.12",
6766
"postcss-calc": "8.2.4",
68-
"postcss-import": "14.0.2",
67+
"postcss-import": "14.1.0",
6968
"postcss-load-config": "3.1.4",
7069
"postcss-scss": "4.0.3",
7170
"postcss-simple-vars": "6.0.3",

0 commit comments

Comments
 (0)