From 3ea776887968086d4c76edcfb85276998f5c4c23 Mon Sep 17 00:00:00 2001 From: ajaz Date: Wed, 10 Jun 2026 18:47:32 +0530 Subject: [PATCH 1/8] fix/Downgrade @graphql-mesh/http from 0.96.9 to 0.3.26 and add overrides for @graphql-mesh/utils@0.43.20 to resolve errors --- src/templates/package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/templates/package.json b/src/templates/package.json index 451171f1..1b4af006 100644 --- a/src/templates/package.json +++ b/src/templates/package.json @@ -24,7 +24,7 @@ "@graphql-mesh/transform-type-merging": "0.5.20", "@graphql-mesh/types": "0.91.12", "@graphql-mesh/soap": "0.14.25", - "@graphql-mesh/http": "^0.96.9", + "@graphql-mesh/http": "0.3.26", "graphql": "^16.6.0", "@adobe/plugin-hooks": "0.4.0", "@adobe/plugin-on-fetch": "0.1.1", @@ -41,6 +41,9 @@ "keywords": [ "api-mesh" ], + "overrides": { + "@graphql-mesh/utils": "0.43.20" + }, "license": "Apache-2.0", "scripts": { "start": "nodemon --watch .env -e js,json,yaml node_modules/.bin/aio api-mesh run", From cd1278d6e59fe55ad0ea26092425370b43daaf02 Mon Sep 17 00:00:00 2001 From: ajaz Date: Wed, 10 Jun 2026 19:15:03 +0530 Subject: [PATCH 2/8] fix: revert @graphql-mesh/http version downgrade --- src/templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/package.json b/src/templates/package.json index 1b4af006..a59d39a1 100644 --- a/src/templates/package.json +++ b/src/templates/package.json @@ -24,7 +24,7 @@ "@graphql-mesh/transform-type-merging": "0.5.20", "@graphql-mesh/types": "0.91.12", "@graphql-mesh/soap": "0.14.25", - "@graphql-mesh/http": "0.3.26", + "@graphql-mesh/http": "^0.96.9", "graphql": "^16.6.0", "@adobe/plugin-hooks": "0.4.0", "@adobe/plugin-on-fetch": "0.1.1", From c097f7072865efe74843a8ac4b9b9c8e7cabd7e3 Mon Sep 17 00:00:00 2001 From: ajaz Date: Wed, 10 Jun 2026 19:31:23 +0530 Subject: [PATCH 3/8] fix: downgrade @graphql-mesh/http version --- package.json | 5 +++-- src/templates/package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 31bf2ade..30f8c5ee 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@escape.tech/graphql-armor": "3.2.0", "@graphql-mesh/cli": "0.82.30", "@graphql-mesh/graphql": "0.34.13", - "@graphql-mesh/http": "^0.96.9", + "@graphql-mesh/http": "0.3.26", "@graphql-mesh/json-schema": "0.35.38", "@graphql-mesh/openapi": "0.33.39", "@graphql-mesh/plugin-http-details-extensions": "^0.103.4", @@ -129,7 +129,8 @@ "stdout-stderr": "^0.1.9" }, "overrides": { - "plain-crypto-js": "./_EXCLUDE_UNSAFE_DEPENDENCIES_/plain-crypto-js" + "plain-crypto-js": "./_EXCLUDE_UNSAFE_DEPENDENCIES_/plain-crypto-js", + "@graphql-mesh/utils": "0.43.20" }, "engines": { "node": "^16.13 || >=18.0.0", diff --git a/src/templates/package.json b/src/templates/package.json index a59d39a1..1b4af006 100644 --- a/src/templates/package.json +++ b/src/templates/package.json @@ -24,7 +24,7 @@ "@graphql-mesh/transform-type-merging": "0.5.20", "@graphql-mesh/types": "0.91.12", "@graphql-mesh/soap": "0.14.25", - "@graphql-mesh/http": "^0.96.9", + "@graphql-mesh/http": "0.3.26", "graphql": "^16.6.0", "@adobe/plugin-hooks": "0.4.0", "@adobe/plugin-on-fetch": "0.1.1", From 1c1cbba966ce5d9b94728804898a53c9db34ab87 Mon Sep 17 00:00:00 2001 From: ajaz Date: Mon, 22 Jun 2026 17:52:16 +0530 Subject: [PATCH 4/8] fix: remove unused @graphql-mesh/http from templates/package.json --- src/templates/package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/templates/package.json b/src/templates/package.json index 1b4af006..bb874dda 100644 --- a/src/templates/package.json +++ b/src/templates/package.json @@ -24,7 +24,6 @@ "@graphql-mesh/transform-type-merging": "0.5.20", "@graphql-mesh/types": "0.91.12", "@graphql-mesh/soap": "0.14.25", - "@graphql-mesh/http": "0.3.26", "graphql": "^16.6.0", "@adobe/plugin-hooks": "0.4.0", "@adobe/plugin-on-fetch": "0.1.1", @@ -35,15 +34,15 @@ "fastify": "^4.10.2", "graphql-yoga": "3.1.1" }, + "overrides": { + "@graphql-mesh/utils": "0.43.20" + }, "engines": { "node": ">=18.0.0" }, "keywords": [ "api-mesh" ], - "overrides": { - "@graphql-mesh/utils": "0.43.20" - }, "license": "Apache-2.0", "scripts": { "start": "nodemon --watch .env -e js,json,yaml node_modules/.bin/aio api-mesh run", From b97008002434147fc5588bac4198594188334625 Mon Sep 17 00:00:00 2001 From: ajaz Date: Thu, 25 Jun 2026 17:10:54 +0530 Subject: [PATCH 5/8] feat: Add integration test for init template dependency resolution --- jest.config.js | 1 + package.json | 1 + .../__tests__/init.integration.test.js | 52 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 src/commands/api-mesh/__tests__/init.integration.test.js diff --git a/jest.config.js b/jest.config.js index 117724ba..04cedfa4 100644 --- a/jest.config.js +++ b/jest.config.js @@ -6,6 +6,7 @@ const config = { testEnvironment: 'node', reporters: ['default', 'jest-junit'], setupFilesAfterEnv: ['./jest.setup.js'], + testPathIgnorePatterns: ['/node_modules/', '\\.integration\\.test\\.js$'], }; module.exports = config; diff --git a/package.json b/package.json index 30f8c5ee..41ccd551 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "postpack": "rm -f oclif.manifest.json", "test": "jest", "test:ci": "jest --ci", + "test:integration": "jest --testPathPattern=\\.integration\\.test\\.js", "unit-tests": "jest --ci", "version": "oclif-dev readme && git add README.md" }, diff --git a/src/commands/api-mesh/__tests__/init.integration.test.js b/src/commands/api-mesh/__tests__/init.integration.test.js new file mode 100644 index 00000000..8491cc5b --- /dev/null +++ b/src/commands/api-mesh/__tests__/init.integration.test.js @@ -0,0 +1,52 @@ +/* +Copyright 2021 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +const { execSync } = require('child_process'); +const fs = require('fs'); +const path = require('path'); +const os = require('os'); + +jest.setTimeout(120000); + +describe('init template dependency resolution', () => { + let tmpDir; + + beforeEach(() => { + tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mesh-init-')); + fs.copyFileSync( + path.resolve(__dirname, '../../../templates/package.json'), + path.join(tmpDir, 'package.json'), + ); + }); + + afterEach(() => { + fs.rmSync(tmpDir, { recursive: true, force: true }); + }); + + test('template package.json resolves without ERESOLVE errors', () => { + let stderr = ''; + try { + execSync('npm install --dry-run --json', { + cwd: tmpDir, + encoding: 'utf8', + stdio: ['pipe', 'pipe', 'pipe'], + }); + } catch (error) { + stderr = error.stderr || ''; + if (stderr.includes('ERESOLVE')) { + throw new Error(`Template package.json has dependency conflicts:\n${stderr}`); + } + throw error; + } + expect(stderr).not.toContain('ERESOLVE'); + }); +}); From f67a64602742d7dc93412fb626db82c69aae8447 Mon Sep 17 00:00:00 2001 From: ajaz Date: Thu, 25 Jun 2026 17:46:08 +0530 Subject: [PATCH 6/8] fix: minor --- jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jest.config.js b/jest.config.js index 04cedfa4..d5038d9c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -6,7 +6,7 @@ const config = { testEnvironment: 'node', reporters: ['default', 'jest-junit'], setupFilesAfterEnv: ['./jest.setup.js'], - testPathIgnorePatterns: ['/node_modules/', '\\.integration\\.test\\.js$'], + testPathIgnorePatterns: ['/node_modules/'], }; module.exports = config; From c5b31a14404e143cbc1d79698e00d22463100a4f Mon Sep 17 00:00:00 2001 From: Ajaz Date: Thu, 25 Jun 2026 18:56:19 +0530 Subject: [PATCH 7/8] fix: test --- src/commands/api-mesh/__tests__/init.integration.test.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/commands/api-mesh/__tests__/init.integration.test.js b/src/commands/api-mesh/__tests__/init.integration.test.js index 8491cc5b..38d24cf7 100644 --- a/src/commands/api-mesh/__tests__/init.integration.test.js +++ b/src/commands/api-mesh/__tests__/init.integration.test.js @@ -33,7 +33,6 @@ describe('init template dependency resolution', () => { }); test('template package.json resolves without ERESOLVE errors', () => { - let stderr = ''; try { execSync('npm install --dry-run --json', { cwd: tmpDir, @@ -41,12 +40,11 @@ describe('init template dependency resolution', () => { stdio: ['pipe', 'pipe', 'pipe'], }); } catch (error) { - stderr = error.stderr || ''; + const stderr = error.stderr || ''; if (stderr.includes('ERESOLVE')) { throw new Error(`Template package.json has dependency conflicts:\n${stderr}`); } throw error; } - expect(stderr).not.toContain('ERESOLVE'); }); }); From 7f0b03b8c11e50c512751f084338a7eb63610fde Mon Sep 17 00:00:00 2001 From: Sumaiya <108254100+AjazSumaiya@users.noreply.github.com> Date: Thu, 2 Jul 2026 15:16:10 +0530 Subject: [PATCH 8/8] Bump version to 5.7.1-beta.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 41ccd551..7c2e1f7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@adobe/aio-cli-plugin-api-mesh", - "version": "5.7.0", + "version": "5.7.1-beta.0", "description": "Adobe I/O CLI plugin to develop and manage API mesh sources", "keywords": [ "oclif-plugin"