prettierx: Merge Prettier 2.3.0 updates - draft 1

.eslintignore

@@ -3,7 +3,7 @@
 /tests/integration/cli/
 !/tests/format/**/jsfmt.spec.js
 !/**/.eslintrc.js
-/test*.js
+/test*.*
 /scripts/release/node_modules
 /coverage/
 /dist/

.eslintrc.yml

@@ -6,9 +6,10 @@ extends:
   - eslint:recommended
   - prettier
 plugins:
+  - prettier-internal-rules
   - import
+  - regexp
   - unicorn
-  - prettier-internal-rules
 settings:
   import/internal-regex: ^linguist-languages/
 rules:
@@ -69,12 +70,23 @@ rules:
     - error
     - never
     - exceptRange: true
+  regexp/match-any:
+    - error
+    - allows:
+        - dotAll
+  regexp/no-useless-flag: error
   unicorn/better-regex: error
   unicorn/explicit-length-check: error
   unicorn/new-for-builtins: error
   unicorn/no-array-for-each: error
   unicorn/no-array-push-push: error
   unicorn/no-useless-undefined: error
+  unicorn/prefer-array-flat:
+    - error
+    - functions:
+        - flat
+        - flatten
+  unicorn/prefer-array-flat-map: error
   unicorn/prefer-includes: error
   unicorn/prefer-number-properties: error
   unicorn/prefer-optional-catch-binding: error
@@ -90,6 +102,9 @@ overrides:
       - "**/*.mjs"
     parserOptions:
       sourceType: module
+    rules:
+      unicorn/prefer-module: error
+      unicorn/prefer-node-protocol: error
   - files:
       - "tests/format/**/jsfmt.spec.js"
       - "tests/config/**/*.js"
@@ -106,6 +121,8 @@ overrides:
       - tests/**/*.js
     rules:
       strict: off
+      unicorn/prefer-array-flat: off
+      unicorn/prefer-array-flat-map: off
     globals:
       run_spec: false
   - files:

.git-blame-ignore-revs

@@ -5,6 +5,8 @@
 # See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
 
 # Prettier bump after release
+# 2.3.0
+3d8dc612b54cef741a1c31da1011a2d48748a1dd
 # 2.2.1
 80961835a68e3de1b14819a7b77583a54d2b63d7
 # 2.2.0

.github/SECURITY.md

@@ -1,5 +1,9 @@
-# Security Policy
+# prettierx security
 
-## Reporting a Vulnerability
+- <mailto:[email protected]>
+- https://www.linkedin.com/in/chrisbrody/
 
-To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the fix and disclosure.
+<!--
+  Note that .github/SECURITY.md from [email protected] is
+  not to be merged into prettierx.
+-->

.github/workflows/dev-package-test.yml

@@ -18,7 +18,7 @@ jobs:
           - "ubuntu-latest"
         node:
           # Run tests on minimal version we support
-          - "10"
+          - "12"
         NPM_CLIENT:
           - "yarn"
           - "npm"

.github/workflows/dev-test.yml

@@ -1,10 +1,15 @@
 name: Dev
 
 on:
+  # [prettierx ...]
   push:
     branches:
       - main
-      - patch-release
+      # - master
+      # - patch-release
+      - dev
+      - dev-*
+      - prettierx-*
   pull_request:
 
 jobs:
@@ -21,23 +26,19 @@ jobs:
           - "16"
           - "14"
           - "12"
-          - "10"
         include:
           # only enable coverage on the fastest job
           - os: "ubuntu-latest"
             node: "16"
-            ENABLE_CODE_COVERAGE: true
+            # [prettierx] code coverage not enabled:
+            # ENABLE_CODE_COVERAGE: true
             FULL_TEST: true
             CHECK_TEST_PARSERS: true
         exclude:
           - os: "macos-latest"
             node: "14"
-          - os: "macos-latest"
-            node: "12"
           - os: "windows-latest"
             node: "14"
-          - os: "windows-latest"
-            node: "12"
     env:
       ENABLE_CODE_COVERAGE: ${{ matrix.ENABLE_CODE_COVERAGE }}
       FULL_TEST: ${{ matrix.FULL_TEST }}
@@ -67,6 +68,7 @@ jobs:
         if: matrix.os != 'macos-latest'
         run: yarn test --maxWorkers=2
 
+      # [prettierx] code coverage not enabled (see above)
       - name: Upload Coverage
         uses: codecov/[email protected]
         if: matrix.ENABLE_CODE_COVERAGE
@@ -79,6 +81,7 @@ jobs:
         env:
           PRETTIER_FALLBACK_RESOLVE: true
 
+      # [prettierx] code coverage not enabled (see above)
       - name: Upload Coverage (PRETTIER_FALLBACK_RESOLVE)
         uses: codecov/[email protected]
         if: matrix.ENABLE_CODE_COVERAGE

.github/workflows/lint.yml

@@ -1,10 +1,16 @@
 name: Lint
 
 on:
+  # [prettierx ...]
   push:
     branches:
       - main
-      - patch-release
+      # [prettierx ...]
+      # - master
+      # - patch-release
+      - dev
+      - dev-*
+      - prettierx-*
   pull_request:
 
 jobs:

.github/workflows/prettierx-npm-dev-test-nodejs.yml

@@ -0,0 +1,37 @@
+# This workflow will do a clean install of npm dependencies and
+# run tests across different versions of node
+# For more information see:
+# https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: npm clean dev test
+
+on:
+  push:
+    branches:
+      - dev
+      - dev-*
+      - prettierx-*
+  pull_request:
+
+jobs:
+  build:
+    # ref:
+    # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        node-version:
+          - 14.x
+        os: [ubuntu-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm i
+      - run: npm test
+        env:
+          CI: true