migrate to pnpm (#1245)

dimaMachina · web-flow · commit e32099b84f19 · 2022-11-03T14:16:29.000+01:00
* migrate to pnpm

* attempt to fix ci

* attempt to fix ci 2

* attempt to fix ci 3
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -16,6 +16,7 @@ jobs:
       npmTag: alpha
       buildScript: build
       nodeVersion: 18
+      packageManager: pnpm
     secrets:
       githubToken: ${{ secrets.GUILD_BOT_TOKEN }}
       npmToken: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,6 +10,7 @@ jobs:
     with:
       releaseScript: release
       nodeVersion: 18
+      packageManager: pnpm
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,7 +11,8 @@ jobs:
     name: Lint
     uses: the-guild-org/shared-config/.github/workflows/lint.yml@main
     with:
-      script: yarn ci:lint
+      script: pnpm ci:lint
+      packageManager: pnpm
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
 
@@ -32,15 +33,16 @@ jobs:
         uses: the-guild-org/shared-config/setup@main
         with:
           nodeVersion: 18
+          packageManager: pnpm
 
       - name: Use GraphQL v${{matrix.graphql_version}}
         run: node ./scripts/match-graphql.mjs ${{matrix.graphql_version}}
 
       - name: Install Dependencies
-        run: yarn
+        run: pnpm i --no-frozen-lockfile
 
       - name: Build
-        run: yarn build
+        run: pnpm build
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v3
@@ -68,18 +70,19 @@ jobs:
         uses: the-guild-org/shared-config/setup@main
         with:
           nodeVersion: ${{matrix.node-version}}
+          packageManager: pnpm
 
       - name: Use GraphQL v${{matrix.graphql_version}}
         run: node scripts/match-graphql.mjs ${{matrix.graphql_version}}
 
       - name: Install Dependencies
-        run: yarn
+        run: pnpm i --no-frozen-lockfile
 
       - name: Cache Jest
         uses: actions/cache@v3
         with:
           path: .cache/jest
-          key: ${{runner.os}}-${{matrix.node_version}}-jest-${{hashFiles('yarn.lock')}}
+          key: ${{runner.os}}-${{matrix.node_version}}-jest-${{hashFiles('pnpm-lock.yaml')}}
           restore-keys: |
             ${{runner.os}}-${{matrix.node_version}}-jest-
 
@@ -92,6 +95,6 @@ jobs:
           path: packages/plugin/dist
 
       - name: Test
-        run: yarn test
+        run: pnpm test
         env:
           CI: true
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,2 @@
+strict-peer-dependencies=false
+shell-emulator=true
diff --git a/.prettierignore b/.prettierignore
@@ -3,3 +3,4 @@ docs/rules/
 packages/plugin/tests/__snapshots__/
 examples/prettier/invalid.graphql
 examples/prettier/invalid.js
+pnpm-lock.yaml
diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -11,7 +11,7 @@
     "graphql": "16.6.0"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.13.0",
+    "@graphql-eslint/eslint-plugin": "workspace:*",
     "eslint": "8.26.0"
   }
 }
diff --git a/examples/code-file/package.json b/examples/code-file/package.json
@@ -11,7 +11,7 @@
     "graphql": "16.6.0"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.13.0",
+    "@graphql-eslint/eslint-plugin": "workspace:*",
     "eslint": "8.26.0"
   }
 }
diff --git a/examples/graphql-config-code-file/package.json b/examples/graphql-config-code-file/package.json
@@ -12,7 +12,7 @@
     "graphql-tag": "2.12.6"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.13.0",
+    "@graphql-eslint/eslint-plugin": "workspace:*",
     "eslint": "8.26.0"
   }
 }
diff --git a/examples/graphql-config/package.json b/examples/graphql-config/package.json
@@ -11,7 +11,7 @@
     "graphql": "16.6.0"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.13.0",
+    "@graphql-eslint/eslint-plugin": "workspace:*",
     "eslint": "8.26.0"
   }
 }
diff --git a/examples/monorepo/package.json b/examples/monorepo/package.json
@@ -10,7 +10,7 @@
     "graphql": "16.6.0"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.13.0",
+    "@graphql-eslint/eslint-plugin": "workspace:*",
     "eslint": "8.26.0"
   }
 }
diff --git a/examples/multiple-projects-graphql-config/package.json b/examples/multiple-projects-graphql-config/package.json
@@ -10,7 +10,7 @@
     "graphql": "16.6.0"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.13.0",
+    "@graphql-eslint/eslint-plugin": "workspace:*",
     "eslint": "8.26.0"
   }
 }
diff --git a/examples/prettier/package.json b/examples/prettier/package.json
@@ -11,7 +11,7 @@
     "graphql": "16.6.0"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.13.0",
+    "@graphql-eslint/eslint-plugin": "workspace:*",
     "eslint": "8.26.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.2.1",
diff --git a/examples/svelte-code-file/package.json b/examples/svelte-code-file/package.json
@@ -10,7 +10,7 @@
     "graphql": "16.6.0"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.13.0",
+    "@graphql-eslint/eslint-plugin": "workspace:*",
     "eslint": "8.26.0",
     "svelte": "3.52.0",
     "svelte-eslint-parser": "0.20.0",
diff --git a/examples/vue-code-file/package.json b/examples/vue-code-file/package.json
@@ -10,7 +10,7 @@
     "graphql": "16.6.0"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "3.13.0",
+    "@graphql-eslint/eslint-plugin": "workspace:*",
     "@vue/compiler-sfc": "3.2.41",
     "eslint": "8.26.0",
     "vue-eslint-parser": "9.1.0"
diff --git a/package.json b/package.json
@@ -3,14 +3,9 @@
   "repository": "https://github.com/B2o5T/graphql-eslint",
   "author": "Dotan Simha <dotansimha@gmail.com>",
   "license": "MIT",
-  "workspaces": [
-    "./packages/*",
-    "./examples/*"
-  ],
   "scripts": {
     "generate:configs": "ts-node scripts/generate-configs.ts",
     "generate:docs": "ts-node scripts/generate-docs.ts",
-    "postinstall": "patch-package",
     "lint": "eslint --ignore-path .gitignore --ext ts,js .",
     "ci:lint": "eslint --ignore-path .gitignore --ext ts,js . --output-file eslint_report.json --format json",
     "prebuild": "rimraf packages/*/dist ./tsconfig.tsbuildinfo",
@@ -51,7 +46,6 @@
     "jest-snapshot-serializer-raw": "1.2.0",
     "json-schema-to-markdown": "1.1.1",
     "lint-staged": "13.0.3",
-    "patch-package": "6.5.0",
     "prettier": "2.7.1",
     "rimraf": "3.0.2",
     "ts-node": "10.9.1",
@@ -65,5 +59,12 @@
       "eslint",
       "prettier --write"
     ]
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "eslint@8.26.0": "patches/eslint@8.26.0.patch",
+      "eslint-plugin-eslint-plugin@5.0.6": "patches/eslint-plugin-eslint-plugin@5.0.6.patch",
+      "json-schema-to-markdown@1.1.1": "patches/json-schema-to-markdown@1.1.1.patch"
+    }
   }
 }
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -48,7 +48,9 @@
   "devDependencies": {
     "@types/babel__code-frame": "7.0.3",
     "@types/eslint": "8.4.9",
+    "@types/estree": "1.0.0",
     "@types/graphql-depth-limit": "1.1.3",
+    "@types/json-schema": "7.0.11",
     "@types/lodash.lowercase": "4.3.7",
     "graphql": "16.6.0"
   },
diff --git a/packages/plugin/tests/schema.spec.ts b/packages/plugin/tests/schema.spec.ts
@@ -91,15 +91,15 @@ describe('schema', () => {
         });
         const error = getSchema(gqlConfig.getDefault()) as Error;
         expect(error).toBeInstanceOf(Error);
-        expect(error.message).toMatch('"authorization":"Bearer Foo"');
+        expect(error.message).toMatch('authorization: "Bearer Foo"');
       });
 
       // https://github.com/B2o5T/graphql-eslint/blob/master/docs/parser-options.md#schemaoptions
       it('with `parserOptions.schemaOptions`', () => {
         const gqlConfig = loadGraphQLConfig({ schema: schemaUrl, filePath: '' });
         const error = getSchema(gqlConfig.getDefault(), schemaOptions) as Error;
         expect(error).toBeInstanceOf(Error);
-        expect(error.message).toMatch('"authorization":"Bearer Foo"');
+        expect(error.message).toMatch('authorization: "Bearer Foo"');
       });
     });
   });
diff --git a/patches/eslint-plugin-eslint-plugin@5.0.6.patch b/patches/eslint-plugin-eslint-plugin@5.0.6.patch
@@ -1,7 +1,7 @@
-diff --git a/node_modules/eslint-plugin-eslint-plugin/lib/rules/no-only-tests.js b/node_modules/eslint-plugin-eslint-plugin/lib/rules/no-only-tests.js
+diff --git a/lib/rules/no-only-tests.js b/lib/rules/no-only-tests.js
 index caa646e..29b5177 100644
---- a/node_modules/eslint-plugin-eslint-plugin/lib/rules/no-only-tests.js
-+++ b/node_modules/eslint-plugin-eslint-plugin/lib/rules/no-only-tests.js
+--- a/lib/rules/no-only-tests.js
++++ b/lib/rules/no-only-tests.js
 @@ -36,7 +36,7 @@ module.exports = {
  
                const onlyProperty = test.properties.find(
@@ -20,10 +20,10 @@ index caa646e..29b5177 100644
                test.callee.property.type === 'Identifier' &&
                test.callee.property.name === 'only'
              ) {
-diff --git a/node_modules/eslint-plugin-eslint-plugin/lib/rules/prefer-output-null.js b/node_modules/eslint-plugin-eslint-plugin/lib/rules/prefer-output-null.js
+diff --git a/lib/rules/prefer-output-null.js b/lib/rules/prefer-output-null.js
 index 0716d91..2bee9f4 100644
---- a/node_modules/eslint-plugin-eslint-plugin/lib/rules/prefer-output-null.js
-+++ b/node_modules/eslint-plugin-eslint-plugin/lib/rules/prefer-output-null.js
+--- a/lib/rules/prefer-output-null.js
++++ b/lib/rules/prefer-output-null.js
 @@ -48,7 +48,7 @@ module.exports = {
               */
              function getTestInfo(key) {
@@ -33,10 +33,10 @@ index 0716d91..2bee9f4 100644
                }
                return null;
              }
-diff --git a/node_modules/eslint-plugin-eslint-plugin/lib/utils.js b/node_modules/eslint-plugin-eslint-plugin/lib/utils.js
+diff --git a/lib/utils.js b/lib/utils.js
 index 3129903..c7e1d88 100644
---- a/node_modules/eslint-plugin-eslint-plugin/lib/utils.js
-+++ b/node_modules/eslint-plugin-eslint-plugin/lib/utils.js
+--- a/lib/utils.js
++++ b/lib/utils.js
 @@ -25,10 +25,10 @@ function isNormalFunctionExpression(node) {
  function isRuleTesterConstruction(node) {
    return (
diff --git a/patches/eslint@8.26.0.patch b/patches/eslint@8.26.0.patch
@@ -1,7 +1,7 @@
-diff --git a/node_modules/eslint/lib/linter/linter.js b/node_modules/eslint/lib/linter/linter.js
+diff --git a/lib/linter/linter.js b/lib/linter/linter.js
 index a29ce92..a574871 100644
---- a/node_modules/eslint/lib/linter/linter.js
-+++ b/node_modules/eslint/lib/linter/linter.js
+--- a/lib/linter/linter.js
++++ b/lib/linter/linter.js
 @@ -41,7 +41,8 @@ const { getRuleFromConfig } = require("../config/flat-config-helpers");
  const { FlatConfigArray } = require("../config/flat-config-array");
 
@@ -12,10 +12,10 @@ index a29ce92..a574871 100644
  const DEFAULT_PARSER_NAME = "espree";
  const DEFAULT_ECMA_VERSION = 5;
  const commentParser = new ConfigCommentParser();
-diff --git a/node_modules/eslint/lib/rule-tester/rule-tester.js b/node_modules/eslint/lib/rule-tester/rule-tester.js
+diff --git a/lib/rule-tester/rule-tester.js b/lib/rule-tester/rule-tester.js
 index 2af272b..738f80f 100644
---- a/node_modules/eslint/lib/rule-tester/rule-tester.js
-+++ b/node_modules/eslint/lib/rule-tester/rule-tester.js
+--- a/lib/rule-tester/rule-tester.js
++++ b/lib/rule-tester/rule-tester.js
 @@ -1005,11 +1005,12 @@ class RuleTester {
                      assert.strictEqual(result.output, item.output, "Output is incorrect.");
                  }
diff --git a/patches/json-schema-to-markdown@1.1.1.patch b/patches/json-schema-to-markdown@1.1.1.patch
@@ -1,7 +1,7 @@
-diff --git a/node_modules/json-schema-to-markdown/index.js b/node_modules/json-schema-to-markdown/index.js
+diff --git a/index.js b/index.js
 index 6b805f9..eea11d2 100644
---- a/node_modules/json-schema-to-markdown/index.js
-+++ b/node_modules/json-schema-to-markdown/index.js
+--- a/index.js
++++ b/index.js
 @@ -13,18 +13,14 @@ function generateElementTitle(octothorpes, elementName, elementType, isRequired,
  	if(elementName) {
  		text.push(' `' + elementName + '`')
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+strict-peer-dependencies=false`
	`2`	`+shell-emulator=true`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"graphql": "16.6.0"`
`12`	`12`	`},`
`13`	`13`	`"devDependencies": {`
`14`		`- "@graphql-eslint/eslint-plugin": "3.13.0",`
	`14`	`+ "@graphql-eslint/eslint-plugin": "workspace:*",`
`15`	`15`	`"eslint": "8.26.0"`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"graphql-tag": "2.12.6"`
`13`	`13`	`},`
`14`	`14`	`"devDependencies": {`
`15`		`- "@graphql-eslint/eslint-plugin": "3.13.0",`
	`15`	`+ "@graphql-eslint/eslint-plugin": "workspace:*",`
`16`	`16`	`"eslint": "8.26.0"`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"graphql": "16.6.0"`
`11`	`11`	`},`
`12`	`12`	`"devDependencies": {`
`13`		`- "@graphql-eslint/eslint-plugin": "3.13.0",`
	`13`	`+ "@graphql-eslint/eslint-plugin": "workspace:*",`
`14`	`14`	`"eslint": "8.26.0"`
`15`	`15`	`}`
`16`	`16`	`}`