feat!: bump all upgradable (dev)Dependencies except pure ESM (#437)

prettier · Aug 12, 2022 · 25fcce1 · 25fcce1
1 parent 04a8e04
commit 25fcce1
Show file tree

Hide file tree

Showing 24 changed files with 180 additions and 117 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -249,6 +249,26 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "JounQin",
+      "name": "JounQin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8336744?v=4",
+      "profile": "https://www.1stg.me/",
+      "contributions": [
+        "question",
+        "code",
+        "design",
+        "doc",
+        "ideas",
+        "infra",
+        "maintenance",
+        "plugin",
+        "projectManagement",
+        "review",
+        "test",
+        "tool"
+      ]
     }
   ],
   "repoType": "github",

diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
@@ -0,0 +1,4 @@
+{
+  "node": "16",
+  "sandboxes": []
+}
diff --git a/.eslintignore b/.eslintignore
@@ -2,4 +2,4 @@ node_modules
 .nyc_output
 coverage
 dist
-cli-test/fixtures
+test/fixtures
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,10 +1,15 @@
 const config = {
-  extends: ['kentcdodds', 'kentcdodds/jest'],
+  extends: [
+    'kentcdodds',
+    'kentcdodds/jest',
+    'plugin:node-dependencies/recommended'
+  ],
   rules: {
     quotes: ['error', 'single', { avoidEscape: true }],
     'arrow-parens': ['error', 'as-needed'],
-    'max-len': 'off',
     'import/max-dependencies': 'off',
+    'jest/prefer-snapshot-hint': 'off',
+    'max-len': 'off',
     'space-before-function-paren': [
       'error',
       {

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -23,8 +23,6 @@ Relevant code/config.
 
 What you did:
 
-
-
 What happened:
 
 <!-- Please provide the full error message/screenshots/anything -->
@@ -41,6 +39,4 @@ with as minimal amount of code possible. Then paste a link below:
 
 Problem description:
 
-
-
 Suggested solution:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -15,13 +15,15 @@ merge of your pull request!
 -->
 
 <!-- What changes are being made? (What feature/bug is being fixed here?) -->
+
 **What**:
 
 <!-- Why are these changes necessary? -->
+
 **Why**:
 
 <!-- How were these changes implemented? -->
-**How**:
 
+**How**:
 
 <!-- feel free to add additional comments -->
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,31 +1,34 @@
 name: CI
 
-on: [push]
+on:
+  - push
+  - pull_request
 
 jobs:
   ci:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version:
+          - 12
+          - 14
+          - 16
+          - 18
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node }}
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
 
-    - name: Install dependencies
-      run: npm i
+      - name: Install dependencies
+        run: npm i
 
-    - name: Lint, test, and build
-      run: npm start validate
-
-    - name: Check test coverage
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
+      - name: Lint, test, and build
+        run: npm start validate
 
+      - name: Check test coverage
+        uses: codecov/codecov-action@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,20 +10,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '12.x'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
 
-    - run: npm i
+      - run: npm i
 
-    - run: npm start build
+      - run: npm start build
 
-    - name: Release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      run: npx semantic-release@15
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npx semantic-release
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ dist
 .opt-out
 .DS_Store
 .eslintcache
+*.log
 
 # these cause more harm than good
 # when working with contributors

diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+>=12.22
diff --git a/.prettierignore b/.prettierignore
@@ -2,4 +2,4 @@ node_modules
 .nyc_output
 coverage
 dist
-cli-test/fixtures
+test/fixtures
diff --git a/README.md b/README.md
@@ -281,6 +281,7 @@ Thanks goes to these people ([emoji key][emojis]):
     <td align="center"><a href="http://danielwilhelmsen.com"><img src="https://avatars3.githubusercontent.com/u/1758049?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Wilhelmsen</b></sub></a><br /><a href="https://github.com/prettier/prettier-eslint-cli/commits?author=dpwilhelmsen" title="Code">💻</a> <a href="#maintenance-dpwilhelmsen" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/gwhitney"><img src="https://avatars.githubusercontent.com/u/3825429?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Glen Whitney</b></sub></a><br /><a href="#maintenance-gwhitney" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://campcode.dev/"><img src="https://avatars.githubusercontent.com/u/10620169?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rebecca Vest</b></sub></a><br /><a href="https://github.com/prettier/prettier-eslint-cli/commits?author=idahogurl" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.1stg.me/"><img src="https://avatars.githubusercontent.com/u/8336744?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JounQin</b></sub></a><br /><a href="#question-JounQin" title="Answering Questions">💬</a> <a href="https://github.com/prettier/prettier-eslint-cli/commits?author=JounQin" title="Code">💻</a> <a href="#design-JounQin" title="Design">🎨</a> <a href="https://github.com/prettier/prettier-eslint-cli/commits?author=JounQin" title="Documentation">📖</a> <a href="#ideas-JounQin" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-JounQin" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-JounQin" title="Maintenance">🚧</a> <a href="#plugin-JounQin" title="Plugin/utility libraries">🔌</a> <a href="#projectManagement-JounQin" title="Project Management">📆</a> <a href="https://github.com/prettier/prettier-eslint-cli/pulls?q=is%3Apr+reviewed-by%3AJounQin" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/prettier/prettier-eslint-cli/commits?author=JounQin" title="Tests">⚠️</a> <a href="#tool-JounQin" title="Tools">🔧</a></td>
   </tr>
 </table>
 

diff --git a/cli-test/jest.config.json b/cli-test/jest.config.json
diff --git a/cli-test/tests/__snapshots__/index.js.snap b/cli-test/tests/__snapshots__/index.js.snap
diff --git a/jest.config.js b/jest.config.js
@@ -1,3 +1,8 @@
+// @ts-check
+
+/**
+ * @type {import('@jest/types').Config.InitialOptions}
+ */
 module.exports = {
   testEnvironment: 'node',
   // TODO: test all the files...

diff --git a/package-scripts.js b/package-scripts.js
@@ -48,7 +48,7 @@ module.exports = {
     validate: {
       description:
         'This runs several scripts to make sure things look good before committing or on clean install',
-      script: concurrent.nps('lint', 'build', 'test', 'test.cli'),
+      script: concurrent.nps('lint', 'build', 'test'),
     },
     format: {
       description: 'Formats everything with prettier-eslint',

diff --git a/package.json b/package.json
@@ -10,69 +10,73 @@
     "prettier-eslint": "dist/index.js"
   },
   "scripts": {
+    "build": "nps build",
+    "lint": "nps lint",
+    "prepare": "patch-package && simple-git-hooks",
     "start": "nps",
-    "test": "nps test",
-    "precommit": "lint-staged && opt --in pre-commit --exec \"npm start validate\""
+    "test": "nps test"
   },
   "files": [
     "dist"
   ],
   "keywords": [],
   "author": "Kent C. Dodds <kent@doddsfamily.us> (http://kentcdodds.com/)",
   "maintainers": [
-    "Simon Fridlund <simon@fridlund.email>"
+    "Simon Fridlund <simon@fridlund.email>",
+    "JounQin (https://www.1stG.me) <admin@1stg.me>"
   ],
   "license": "MIT",
   "dependencies": {
     "arrify": "^2.0.1",
-    "boolify": "^1.0.0",
-    "camelcase-keys": "^6.0.0",
-    "chalk": "^2.4.2",
-    "common-tags": "^1.8.0",
-    "core-js": "^3.1.4",
-    "eslint": "^8.14.0",
-    "find-up": "^4.1.0",
-    "get-stdin": "^7.0.0",
-    "glob": "^7.1.4",
-    "ignore": "^5.1.2",
+    "boolify": "^1.0.1",
+    "camelcase-keys": "^7.0.2",
+    "chalk": "^4.1.2",
+    "common-tags": "^1.8.2",
+    "core-js": "^3.24.1",
+    "eslint": "^8.21.0",
+    "find-up": "^5.0.0",
+    "get-stdin": "^8.0.0",
+    "glob": "^7.2.3",
+    "ignore": "^5.2.0",
     "indent-string": "^4.0.0",
     "lodash.memoize": "^4.1.2",
     "loglevel-colored-level-prefix": "^1.0.0",
-    "messageformat": "^2.2.1",
-    "prettier-eslint": "^14.0.3",
-    "rxjs": "^6.5.2",
-    "yargs": "^13.2.4"
+    "messageformat": "^2.3.0",
+    "prettier-eslint": "^15.0.1",
+    "rxjs": "^7.5.6",
+    "yargs": "^13.1.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.4.4",
-    "@babel/core": "^7.4.5",
-    "@babel/node": "^7.4.5",
-    "@babel/preset-env": "^7.4.5",
-    "@babel/register": "^7.4.4",
-    "acorn": "^6.1.1",
-    "ajv": "^6.10.0",
-    "all-contributors-cli": "^6.7.0",
-    "babel-jest": "^24.8.0",
-    "eslint-config-kentcdodds": "^20.2.0",
-    "husky": "^2.4.1",
-    "jest": "^24.8.0",
-    "jest-cli": "^24.8.0",
-    "lint-staged": "^8.2.1",
-    "nps": "^5.9.5",
+    "@babel/cli": "^7.18.10",
+    "@babel/core": "^7.18.10",
+    "@babel/node": "^7.18.10",
+    "@babel/preset-env": "^7.18.10",
+    "all-contributors-cli": "^6.20.0",
+    "eslint-config-kentcdodds": "^20.3.1",
+    "eslint-plugin-node-dependencies": "^0.8.0",
+    "jest": "^28.1.3",
+    "lint-staged": "^12.5.0",
+    "nps": "^5.10.0",
     "nps-utils": "^1.7.0",
-    "opt-cli": "^1.5.1",
-    "pify": "^4.0.1",
-    "rimraf": "^2.6.3",
-    "semantic-release": "^15.13.16",
+    "opt-cli": "^1.6.0",
+    "patch-package": "^6.4.7",
+    "pify": "^5.0.0",
+    "rimraf": "^3.0.2",
+    "semantic-release": "^17.4.7",
+    "simple-git-hooks": "^2.8.0",
     "spawn-command": "0.0.2-1",
     "strip-indent": "^3.0.0",
-    "yargs-parser": "^13.1.1"
+    "yargs-parser": "^21.1.1"
   },
   "lint-staged": {
-    "*.+(js|json|md)": [
-      "node ./dist/index --write",
-      "git add"
-    ]
+    "*.+(js|json|md|yml)": "node ./dist/index --write"
+  },
+  "prettier": {
+    "arrowParens": "avoid",
+    "singleQuote": true
+  },
+  "simple-git-hooks": {
+    "pre-commit": "npx lint-staged && npx opt --in pre-commit --exec \"npm start validate\""
   },
   "repository": {
     "type": "git",

diff --git a/patches/@rushstack+eslint-patch+1.1.4.patch b/patches/@rushstack+eslint-patch+1.1.4.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/@rushstack/eslint-patch/lib/modern-module-resolution.js b/node_modules/@rushstack/eslint-patch/lib/modern-module-resolution.js
+index 6d665b7..888509d 100644
+--- a/node_modules/@rushstack/eslint-patch/lib/modern-module-resolution.js
++++ b/node_modules/@rushstack/eslint-patch/lib/modern-module-resolution.js
+@@ -198,7 +198,7 @@ if (!ConfigArrayFactory.__patched) {
+             try {
+                 ModuleResolver.resolve = function (moduleName, relativeToPath) {
+                     // resolve using ctx.filePath instead of relativeToPath
+-                    return originalResolve.call(this, moduleName, ctx.filePath);
++                    return originalResolve.call(this, moduleName, ctx.filePath || relativeToPath);
+                 };
+                 return originalLoadPlugin.apply(this, arguments);
+             }
diff --git a/patches/eslint-config-kentcdodds+20.3.1.patch b/patches/eslint-config-kentcdodds+20.3.1.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/eslint-config-kentcdodds/jest.js b/node_modules/eslint-config-kentcdodds/jest.js
+index a13e618..81bbc4b 100644
+--- a/node_modules/eslint-config-kentcdodds/jest.js
++++ b/node_modules/eslint-config-kentcdodds/jest.js
+@@ -30,7 +30,7 @@ try {
+
+ module.exports = {
+   env: {
+-    'jest/globals': true,
++    jest: true,
+   },
+   plugins: [
+     'jest',
diff --git a/cli-test/fixtures/stdout1.js → test/fixtures/stdout1.js b/cli-test/fixtures/stdout1.js → test/fixtures/stdout1.js
diff --git a/cli-test/fixtures/stdout2.js → test/fixtures/stdout2.js b/cli-test/fixtures/stdout2.js → test/fixtures/stdout2.js
diff --git a/cli-test/override-config.js → test/override-config.js b/cli-test/override-config.js → test/override-config.js