From 8a4f93740b082332c1941e9a240b68af4a9ba48b Mon Sep 17 00:00:00 2001 From: Saihajpreet Singh Date: Mon, 4 Dec 2023 16:03:41 -0500 Subject: [PATCH 1/5] Remove package manager --- package.json | 1 - pnpm-lock.yaml | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index f46d34a12..68717b2e3 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ }, "license": "(Apache-2.0 OR MIT)", "private": true, - "packageManager": "pnpm@8.10.4", "engines": { "node": ">=18.0.0", "pnpm": ">=8" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index adc54c415..e576624ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,7 +53,7 @@ importers: examples/arweave-blocks-transactions: devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -69,7 +69,7 @@ importers: version: 6.26.0 devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -88,7 +88,7 @@ importers: version: 6.26.0 devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -107,7 +107,7 @@ importers: version: 6.26.0 devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -126,7 +126,7 @@ importers: version: 6.26.0 devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -178,7 +178,7 @@ importers: version: 5.0.4 devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -196,7 +196,7 @@ importers: examples/ethereum-gravatar: devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -217,7 +217,7 @@ importers: examples/matic-lens-protocol-posts-subgraph: dependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -230,7 +230,7 @@ importers: examples/near-blocks: devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -239,7 +239,7 @@ importers: examples/near-receipts: devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli '@graphprotocol/graph-ts': specifier: 0.31.0 @@ -248,7 +248,7 @@ importers: examples/substreams-powered-subgraph: devDependencies: '@graphprotocol/graph-cli': - specifier: 0.61.0 + specifier: 0.62.0 version: link:../../packages/cli packages/cli: From fd3663581509e8e3215cfa701230e2494971e325 Mon Sep 17 00:00:00 2001 From: Saihajpreet Singh Date: Mon, 4 Dec 2023 16:06:05 -0500 Subject: [PATCH 2/5] update pnpm --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d7e146a9..bca41e156 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: name: Setup Env with: nodeVersion: 20 - packageManager: pnpm + packageManager: pnpm@8 - name: Lint run: pnpm lint @@ -40,7 +40,7 @@ jobs: name: Setup Env with: nodeVersion: 20 - packageManager: pnpm + packageManager: pnpm@8 - name: Setup git user information run: | @@ -69,7 +69,7 @@ jobs: name: Setup Env with: nodeVersion: 20 - packageManager: pnpm + packageManager: pnpm@8 - name: Build Packages run: pnpm build @@ -96,7 +96,7 @@ jobs: name: Setup Env with: nodeVersion: 20 - packageManager: pnpm + packageManager: pnpm@8 - name: Build Packages run: pnpm build # will also check types diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 288ccac5f..8095f4870 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,7 +20,7 @@ jobs: npmTag: alpha buildScript: build nodeVersion: 20 - packageManager: pnpm + packageManager: pnpm@8 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} npmToken: ${{ secrets.NPM_TOKEN }} @@ -32,7 +32,7 @@ jobs: npmTag: rc buildScript: build nodeVersion: 20 - packageManager: pnpm + packageManager: pnpm@8 restoreDeletedChangesets: true secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b919ba16..b0fe3c669 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: uses: the-guild-org/shared-config/setup@main with: nodeVersion: 20 - packageManager: pnpm + packageManager: pnpm@8 - name: Set variables id: vars run: | From 8be87a206577db2956ff540ad5122c0fe26e1b19 Mon Sep 17 00:00:00 2001 From: Saihajpreet Singh Date: Mon, 4 Dec 2023 16:08:07 -0500 Subject: [PATCH 3/5] Revert "update pnpm" This reverts commit fd3663581509e8e3215cfa701230e2494971e325. --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bca41e156..3d7e146a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: name: Setup Env with: nodeVersion: 20 - packageManager: pnpm@8 + packageManager: pnpm - name: Lint run: pnpm lint @@ -40,7 +40,7 @@ jobs: name: Setup Env with: nodeVersion: 20 - packageManager: pnpm@8 + packageManager: pnpm - name: Setup git user information run: | @@ -69,7 +69,7 @@ jobs: name: Setup Env with: nodeVersion: 20 - packageManager: pnpm@8 + packageManager: pnpm - name: Build Packages run: pnpm build @@ -96,7 +96,7 @@ jobs: name: Setup Env with: nodeVersion: 20 - packageManager: pnpm@8 + packageManager: pnpm - name: Build Packages run: pnpm build # will also check types diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8095f4870..288ccac5f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,7 +20,7 @@ jobs: npmTag: alpha buildScript: build nodeVersion: 20 - packageManager: pnpm@8 + packageManager: pnpm secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} npmToken: ${{ secrets.NPM_TOKEN }} @@ -32,7 +32,7 @@ jobs: npmTag: rc buildScript: build nodeVersion: 20 - packageManager: pnpm@8 + packageManager: pnpm restoreDeletedChangesets: true secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b0fe3c669..0b919ba16 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: uses: the-guild-org/shared-config/setup@main with: nodeVersion: 20 - packageManager: pnpm@8 + packageManager: pnpm - name: Set variables id: vars run: | From 5142591c8a2ef870e68f98904c7b4e2b2d1fc31e Mon Sep 17 00:00:00 2001 From: Saihajpreet Singh Date: Mon, 4 Dec 2023 16:08:48 -0500 Subject: [PATCH 4/5] try --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 68717b2e3..e9c6a254d 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ }, "license": "(Apache-2.0 OR MIT)", "private": true, + "packageManager": "pnpm@8", "engines": { "node": ">=18.0.0", "pnpm": ">=8" From 34e2f68b4fadef4abb26ccf8d8e5e32b311c8c43 Mon Sep 17 00:00:00 2001 From: Saihajpreet Singh Date: Mon, 4 Dec 2023 16:52:34 -0500 Subject: [PATCH 5/5] try --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index e9c6a254d..6c7ae3968 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,9 @@ }, "license": "(Apache-2.0 OR MIT)", "private": true, - "packageManager": "pnpm@8", "engines": { "node": ">=18.0.0", - "pnpm": ">=8" + "pnpm": ">=7" }, "scripts": { "build": "pnpm --filter=@graphprotocol/graph-* build",