Merge branch 'main' into next

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
fisker Cheung committed 2021-12-07 15:15:42 +08:00
commit 011672669e
84 files changed
+1494 -776

No files matched your search

+1 -1
View File
@@ -1,2 +1,2 @@
tidelift: npm/prettier
open_collective: prettier
tidelift: npm/prettier
+1 -1
View File
@@ -26,7 +26,7 @@ Don't fill the form below manually! Let a program create a report for you:
-->
**Prettier 2.5.0**
**Prettier 2.5.1**
[Playground link](https://prettier.io/playground/#.....)
```sh
+1 -1
View File
@@ -20,7 +20,7 @@ BEFORE SUBMITTING AN ISSUE:
**Environments:**
- Prettier Version: 2.5.0
- Prettier Version: 2.5.1
- Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
- Runtime: <!-- Node.js v14, Chrome v83, etc. -->
- Operating System: <!-- Windows, Linux, macOS, etc. -->
+1 -1
View File
@@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Setup Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
node-version: ${{ matrix.node }}
cache: "yarn"
+1 -1
View File
@@ -48,7 +48,7 @@ jobs:
fetch-depth: 2
- name: Setup Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
node-version: ${{ matrix.node }}
cache: "yarn"
+1 -1
View File
@@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Setup Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
cache: "yarn"
+1 -1
View File
@@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Setup Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
cache: "yarn"
+3 -3
View File
@@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Setup Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
cache: "yarn"
@@ -63,7 +63,7 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Setup Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
cache: "yarn"
@@ -111,7 +111,7 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Setup Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
node-version: ${{ matrix.node }}
cache: "yarn"
+1 -1
View File
@@ -23,7 +23,7 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Setup Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
version: "14"
cache: "yarn"