Skip to content

Commit db2cc1a

Browse files
committed
Merge branch 'v11-major' into rm-dldts
2 parents c0edb95 + 294326f commit db2cc1a

Some content is hidden

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

54 files changed

+648
-189
lines changed

.changeset/quick-pets-protect.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Each contributor is required to [sign a CLA](https://cla.shopify.com/). This pro
137137

138138
### Contribution prerequisites
139139

140-
- You have Node installed at v18.13.0+ and Yarn at v1.22.18+
140+
- You have Node installed at v18.12.0+ and Yarn at v1.22.18+
141141

142142
### Best practices
143143

.github/workflows/changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
with:
2222
fetch-depth: 0
2323

24-
- name: Setup Node with v18.13.0
24+
- name: Setup Node with v18.12.0
2525
uses: actions/setup-node@v3
2626
with:
27-
node-version: 18.13.0
27+
node-version: 18.12.0
2828

2929
- name: Check for Changeset
3030
run: npx @changesets/cli status --since="origin/main"

.github/workflows/ci-a11y-vrt.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
sudo rm -rf "/usr/local/share/boost"
3333
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
3434
35-
- name: Setup Node with v18.13.0
35+
- name: Setup Node with v18.12.0
3636
uses: actions/setup-node@v3
3737
with:
38-
node-version: 18.13.0
38+
node-version: 18.12.0
3939
cache: yarn
4040

4141
- name: Restore cache
@@ -72,10 +72,10 @@ jobs:
7272
with:
7373
fetch-depth: 0 # Chromatic git history to track changes
7474

75-
- name: Setup Node with v18.13.0
75+
- name: Setup Node with v18.12.0
7676
uses: actions/setup-node@v3
7777
with:
78-
node-version: 18.13.0
78+
node-version: 18.12.0
7979
cache: yarn
8080

8181
- name: Restore cache

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
node-version: ['16.16.0', '18.13.0']
16+
node-version: ['16.13.0', '18.12.0']
1717
steps:
1818
- name: Checkout branch
1919
uses: actions/checkout@v3

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18.13.0
1+
v18.12.0

dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: polaris
22
up:
33
- node:
44
yarn: v1.22.18
5-
version: v18.13.0 # to be kept in sync with .nvmrc and .github/workflows/ci.yml
5+
version: v18.12.0 # to be kept in sync with .nvmrc and .github/workflows/ci.yml
66
- custom:
77
name: Build monorepo
88
met?: yarn build --output-logs=none

documentation/Nodejs support.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,40 @@ The `package.json` engines. This should match the `.github/workflows/ci.yml` and
1616

1717
```json
1818
"engines": {
19-
"node": "^16.16.0 || ^18.13.0"
19+
"node": "^16.13.0 || >=18.12.0"
2020
},
2121
```
2222

2323
The GitHub actions `.github/workflows/ci.yml` file. This should match the `package.json` and list all supported versions.
2424

2525
```yml
26-
node-version: ['16.16.0', '18.13.0']
26+
node-version: ['16.13.0', '18.12.0']
2727
```
2828
2929
The `dev.yml` file which creates a local development environment. This should match the `.nvmrc` file.
3030

3131
```yml
32-
version: v18.13.0
32+
version: v18.12.0
3333
```
3434

3535
The `.nvmrc` file for local development. This should match the `dev.yml` file.
3636

3737
```
38-
v18.13.0
38+
v18.12.0
3939
```
4040
4141
The `shipit.yml` files. This should point towards the GitHub Actions the packages require to pass before publishing.
4242
4343
```yml
4444
ci:
4545
require:
46-
- 'Validate with Node v16.16.0'
47-
- 'Validate with Node v18.13.0'
46+
- 'Validate with Node v16.13.0'
47+
- 'Validate with Node v18.12.0'
4848
4949
merge:
5050
require:
51-
- 'Validate with Node v16.16.0'
52-
- 'Validate with Node v18.13.0'
51+
- 'Validate with Node v16.13.0'
52+
- 'Validate with Node v18.12.0'
5353
```
5454

5555
The `rollup.config.mjs` for some monorepo packages. This should match the minimum supported version.

documentation/guides/migrating-from-v10-to-v11.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ We've removed the following deprecated prop from the Collapsible component:
3232

3333
### Removed KonamiCode component
3434

35-
??
35+
We are removing low usage components from Polaris. We love fun but we also want to ensure we are shipping exactly what our users need. If you want to use this in your project feel free to copy the [component sourcecode](https://github.com/Shopify/polaris/blob/%40shopify/polaris%4010.24.0/polaris-react/src/components/KonamiCode/KonamiCode.tsx).
3636

3737
## Tokens

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"engines": {
6-
"node": "^16.16.0 || ^18.13.0"
6+
"node": "^16.13.0 || >=18.12.0"
77
},
88
"workspaces": {
99
"packages": [

0 commit comments

Comments
 (0)