Skip to content

Commit

Permalink
Merge from remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
thachnn committed Mar 23, 2023
2 parents 7c4c31d + c6e026e commit 98bab8e
Show file tree
Hide file tree
Showing 317 changed files with 15,701 additions and 3,200 deletions.
14 changes: 14 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@
# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt

# Prettier bump after release
# 2.8.6
0461cdd8149f0bb9bb95dfac5faed75b47f77689
# 2.8.5
c1808e86a3c7c2c8f43093f99e78fce3b6d0a97d
# 2.8.4
f3b23ab63c9387329dc1993e1d0aa71583d67a0b
# 2.8.3
9e9f8ec13f0420a4825fdba85d79ddeaaef1e00c
# 2.8.2
b9c3cd4c7016dfb1bb3539c5b3db15fdd54b9f6f
# 2.8.1
b87de09bcf9a523fe3da31394ba0e6f5d107cf3e
# 2.8.0
4049e49fe2a939facd6f46be338a3be9c1c0489e
# 2.7.1
1f9baef429df2516ff8eb835fd8c020b5e854a5f
# 2.7.0
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/formatting.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Don't fill the form below manually! Let a program create a report for you:
-->

**Prettier 2.7.1**
**Prettier 2.8.6**
[Playground link](https://prettier.io/playground/#.....)

```sh
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ BEFORE SUBMITTING AN ISSUE:

**Environments:**

- Prettier Version: 2.7.1
- Prettier Version: 2.8.6
- Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
- Runtime: <!-- Node.js v14, Chrome v83, etc. -->
- Operating System: <!-- Windows, Linux, macOS, etc. -->
Expand Down
10 changes: 0 additions & 10 deletions .github/no-response.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
excludePackageNames: ["@babel/parser"],
groupName: "babel",
},
{
matchPackagePrefixes: ["@typescript-eslint/"],
groupName: "typescript-eslint",
},
{
branchPrefix: "renovate/website/",
matchPaths: ["website/package.json"],
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/bundler-friendly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Bundler_Friendly

on:
schedule:
# “At 00:00 on Sunday.” https://crontab.guru/#0%C2%A00%C2%A0*%C2%A0*%C2%A00
- cron: "0 0 * * 0"
# “At 00:00 on Sunday.” https://crontab.guru/#0_0_*_*_SUN
- cron: "0 0 * * SUN"
pull_request:
paths:
- "scripts/tools/bundle-test/**"
Expand All @@ -12,6 +12,7 @@ on:

jobs:
build:
if: github.event_name != 'schedule' || github.repository == 'prettier/prettier'
name: Build
runs-on: ubuntu-latest
steps:
Expand All @@ -36,6 +37,7 @@ jobs:
path: dist

webpack:
if: github.event_name != 'schedule' || github.repository == 'prettier/prettier'
name: Bundle Prettier with webpack
runs-on: ubuntu-latest
needs: [build]
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/dev-package-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Dev_Package_Test

on:
schedule:
# “At 00:00 on Sunday.” https://crontab.guru/#0%C2%A00%C2%A0*%C2%A0*%C2%A00
- cron: "0 0 * * 0"
# “At 00:00 on Sunday.” https://crontab.guru/#0_0_*_*_SUN
- cron: "0 0 * * SUN"
pull_request:
paths:
- "package.json"
Expand All @@ -14,6 +14,7 @@ on:

jobs:
test:
if: github.event_name != 'schedule' || github.repository == 'prettier/prettier'
timeout-minutes: 60
strategy:
fail-fast: false
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ name: "Lock"

on:
schedule:
# “At 00:00.” https://crontab.guru/#0_0_*_*_*
- cron: "0 0 * * *"

jobs:
lock:
if: github.event_name != 'schedule' || github.repository == 'prettier/prettier'
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v3
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: No Response

# Both `issue_comment` and `scheduled` event types are required for this Action
# to work properly.
on:
issue_comment:
types:
- created
schedule:
# “At 00:00.” https://crontab.guru/#0_0_*_*_*
- cron: "0 0 * * *"

permissions:
issues: write

jobs:
no-response:
if: github.event_name != 'schedule' || github.repository == 'prettier/prettier'
runs-on: ubuntu-latest
steps:
- uses: lee-dohm/no-response@v0.5.0
with:
token: ${{ github.token }}
daysUntilClose: 14
responseRequiredLabel: "status:awaiting response"
closeComment: >
This issue has been automatically closed because there has been no response
to our request for more information from the original author. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ package-lock.json
.pnp.*
.nyc_output
.devcontainer
.node-version
# When installing software on gitpod.io, `core.*` files are generated
/core.*

0 comments on commit 98bab8e

Please sign in to comment.