Skip to content

Commit

Permalink
Merge branch 'master' into update-ignore
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	src/cli/util.js
#	src/common/get-file-info.js
  • Loading branch information
fisker committed May 29, 2020
2 parents e791ed1 + b3edda8 commit 50be7b1
Show file tree
Hide file tree
Showing 6,865 changed files with 284,767 additions and 249,427 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
13 changes: 0 additions & 13 deletions .azure-pipelines/jobs/dev-lint.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .azure-pipelines/jobs/dev-test.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .azure-pipelines/jobs/prod-build.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .azure-pipelines/jobs/prod-lint.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .azure-pipelines/jobs/prod-pack.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .azure-pipelines/jobs/prod-test.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .azure-pipelines/steps/download-dist.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .azure-pipelines/steps/install-dependencies.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .azure-pipelines/steps/install-nodejs.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .azure-pipelines/steps/publish-code-coverage.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .azure-pipelines/steps/publish-test-results.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .azure-pipelines/steps/upload-dist.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ coverage:
target: 80%
project:
default:
target: auto
target: 95%
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
end_of_line = lf
insert_final_newline = true

[cspell.json]
indent_size = 4
insert_final_newline = false

[website/blog/*.md]
trim_trailing_whitespace = false
3 changes: 1 addition & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
/tests/**/*.js
!/tests/**/jsfmt.spec.js
!/**/.eslintrc.js
/test.js
/scripts/build/shims
/test*.js
/scripts/release/node_modules
/coverage/
/dist/
Expand Down
63 changes: 59 additions & 4 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,86 @@ env:
node: true
extends:
- eslint:recommended
- plugin:react/recommended
- plugin:prettier/recommended
parserOptions:
ecmaVersion: 2018
plugins:
- import
- unicorn
rules:
curly: error
dot-notation: error
eqeqeq:
- error
- always
- null: ignore
import/no-extraneous-dependencies:
- error
- devDependencies: ["tests*/**", "scripts/**"]
no-else-return: error
no-inner-declarations: error
no-unneeded-ternary: error
no-useless-return: error
no-unused-vars:
- error
- ignoreRestSiblings: true
no-var: error
object-shorthand: error
one-var:
- error
- never
prefer-arrow-callback: error
prefer-const: error
react/display-name: off
react/no-deprecated: off
react/prop-types: off
prefer-destructuring:
- error
- VariableDeclarator:
array: false
object: true
AssignmentExpression:
array: false
object: false
- enforceForRenamedProperties: false
prefer-object-spread: error
prefer-rest-params: error
prefer-spread: error
quotes:
- error
- double
- avoidEscape: true
strict: error
symbol-description: error
yoda:
- error
- never
- exceptRange: true
unicorn/better-regex: error
unicorn/new-for-builtins: error
unicorn/no-useless-undefined: error
unicorn/prefer-includes: error
unicorn/prefer-string-slice: error
overrides:
- files:
- scripts/**/*.js
rules:
no-console: off
- files:
- scripts/build/shims/*.js
parserOptions:
sourceType: module
- files:
- "{tests,tests_config,tests_integration}/**/*.js"
env:
jest: true
- files:
- tests/**/*.js
rules:
strict: off
globals:
run_spec: false
- files:
- src/cli/**/*.js
rules:
no-restricted-modules:
- error
- patterns:
- ".."
5 changes: 4 additions & 1 deletion .github/ISSUE_TEMPLATE/formatting.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,22 @@ Tip! Don't write this stuff manually.
-->

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

```sh
# Options (if any):
--single-quote
```

**Input:**

```jsx
// code snippet
```

**Output:**

```jsx
// code snippet
```
Expand Down
6 changes: 4 additions & 2 deletions .github/ISSUE_TEMPLATE/integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ BEFORE SUBMITTING AN ISSUE:
-->

**Environments:**
- Prettier Version: 1.19.1

- Prettier Version: 2.0.5
- Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
- Runtime: <!-- Node.js v6, Chrome v67, etc. -->
- Runtime: <!-- Node.js v14, Chrome v83, etc. -->
- Operating System: <!-- Windows, Linux, macOS, etc. -->

**Steps to reproduce:**

<!-- shell script, js code, or a link to the minimal reproducible repository -->

**Expected behavior:**
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/dev-package-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Dev_Package_Test

on:
schedule:
- cron: "0 0 * * 1"
pull_request:
paths:
- "package.json"
- ".github/workflows/dev-package-test.yml"

jobs:
test:
strategy:
fail-fast: false
matrix:
os:
- "ubuntu-latest"
node:
- "10"
NPM_CLIENT:
- "yarn"
- "npm"
- "pnpm"
env:
INSTALL_PACKAGE: true
NPM_CLIENT: ${{ matrix.NPM_CLIENT }}
name: Test with ${{ matrix.NPM_CLIENT }}
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 1

- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}

- name: Install Dependencies
run: yarn install --frozen-lockfile

- name: Install Client Package
if: matrix.NPM_CLIENT == 'pnpm'
run: npm install --global ${{ matrix.NPM_CLIENT }}

- name: Run Tests
run: yarn test:dev-package --maxWorkers=2
Loading

0 comments on commit 50be7b1

Please sign in to comment.