From 7682a8886c59224c960ccdaebb3c80b90f51e95e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 17:35:14 +0800 Subject: [PATCH 01/17] chore(fix): fix proxy agent --- apps/generator-cli/src/app/app.module.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/generator-cli/src/app/app.module.ts b/apps/generator-cli/src/app/app.module.ts index 250f80241d4..50787621e92 100644 --- a/apps/generator-cli/src/app/app.module.ts +++ b/apps/generator-cli/src/app/app.module.ts @@ -1,6 +1,7 @@ import { Inject, Module, OnApplicationBootstrap } from '@nestjs/common'; import { HttpModule, HttpModuleOptions } from '@nestjs/axios'; import { Command } from 'commander'; +import { ProxyAgent } from 'proxy-agent'; import { COMMANDER_PROGRAM, LOGGER } from './constants'; import { VersionManagerController } from './controllers/version-manager.controller'; @@ -15,19 +16,16 @@ import { const hasHttpProxyEnvs = process.env.HTTP_PROXY || process.env.http_proxy; const hasHttpsProxyEnvs = process.env.HTTPS_PROXY || process.env.https_proxy; const httpModuleConfig: HttpModuleOptions = {}; +const proxyAgent = new ProxyAgent(); if (hasHttpProxyEnvs) { httpModuleConfig.proxy = false; - // eslint-disable-next-line @typescript-eslint/no-var-requires - const ProxyAgent = require('proxy-agent').default ?? require('proxy-agent'); - httpModuleConfig.httpAgent = new ProxyAgent(); + httpModuleConfig.httpAgent = proxyAgent; } if (hasHttpsProxyEnvs) { httpModuleConfig.proxy = false; - // eslint-disable-next-line @typescript-eslint/no-var-requires - const ProxyAgent = require('proxy-agent').default ?? require('proxy-agent'); - httpModuleConfig.httpsAgent = new ProxyAgent(); + httpModuleConfig.httpsAgent = proxyAgent; } @Module({ From c4c31d9cab9c8e5e90b616998a960a0298c57fb9 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 17:47:47 +0800 Subject: [PATCH 02/17] chore(fix): fix proxy agent --- apps/generator-cli/src/app/app.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/generator-cli/src/app/app.module.ts b/apps/generator-cli/src/app/app.module.ts index 50787621e92..3164d99c623 100644 --- a/apps/generator-cli/src/app/app.module.ts +++ b/apps/generator-cli/src/app/app.module.ts @@ -1,7 +1,7 @@ import { Inject, Module, OnApplicationBootstrap } from '@nestjs/common'; import { HttpModule, HttpModuleOptions } from '@nestjs/axios'; import { Command } from 'commander'; -import { ProxyAgent } from 'proxy-agent'; +import ProxyAgent from 'proxy-agent'; import { COMMANDER_PROGRAM, LOGGER } from './constants'; import { VersionManagerController } from './controllers/version-manager.controller'; From bef8a645c5aa785b64b68269f59904dfdc721073 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 17:50:13 +0800 Subject: [PATCH 03/17] chore(fix): fix proxy agent --- apps/generator-cli/src/proxy-agent.d.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 apps/generator-cli/src/proxy-agent.d.ts diff --git a/apps/generator-cli/src/proxy-agent.d.ts b/apps/generator-cli/src/proxy-agent.d.ts new file mode 100644 index 00000000000..a6259043ae6 --- /dev/null +++ b/apps/generator-cli/src/proxy-agent.d.ts @@ -0,0 +1,5 @@ +declare module 'proxy-agent' { + const ProxyAgent: new (...args: any[]) => any; + export default ProxyAgent; + export { ProxyAgent }; +} From d49075d7329be50ff3ae88d41b241fa4a7cda5cb Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 17:55:53 +0800 Subject: [PATCH 04/17] chore(fix): fix proxy agent --- apps/generator-cli/src/proxy-agent.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/generator-cli/src/proxy-agent.d.ts b/apps/generator-cli/src/proxy-agent.d.ts index a6259043ae6..7a16b84289b 100644 --- a/apps/generator-cli/src/proxy-agent.d.ts +++ b/apps/generator-cli/src/proxy-agent.d.ts @@ -1,4 +1,5 @@ declare module 'proxy-agent' { + // eslint-disable-next-line @typescript-eslint/no-explicit-any const ProxyAgent: new (...args: any[]) => any; export default ProxyAgent; export { ProxyAgent }; From 8b642ddad1805c923c2e432163583cf01673aaa8 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 18:07:03 +0800 Subject: [PATCH 05/17] chore(fix): fix proxy agent --- apps/generator-cli/jest.config.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/generator-cli/jest.config.ts b/apps/generator-cli/jest.config.ts index 9c6e331269a..4b87a86e6af 100644 --- a/apps/generator-cli/jest.config.ts +++ b/apps/generator-cli/jest.config.ts @@ -4,9 +4,12 @@ export default { preset: '../../jest.preset.js', testEnvironment: 'node', transform: { - '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }], + '^.+\\.[cm]?[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }], }, - moduleFileExtensions: ['ts', 'js', 'html'], + transformIgnorePatterns: [ + 'node_modules/(?!(proxy-agent|agent-base|http-proxy-agent|https-proxy-agent|pac-proxy-agent|socks-proxy-agent|proxy-from-env)/)', + ], + moduleFileExtensions: ['ts', 'js', 'mjs', 'cjs', 'html'], coverageDirectory: '../../coverage/apps/generator-cli', // snapshotFormat: { escapeString: true, printBasicPrototype: true }, }; From f2365497f21a22371cda02176925ff29dbc70bae Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 18:10:35 +0800 Subject: [PATCH 06/17] chore(fix): fix proxy agent --- apps/generator-cli/src/app/app.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/generator-cli/src/app/app.module.ts b/apps/generator-cli/src/app/app.module.ts index 3164d99c623..50787621e92 100644 --- a/apps/generator-cli/src/app/app.module.ts +++ b/apps/generator-cli/src/app/app.module.ts @@ -1,7 +1,7 @@ import { Inject, Module, OnApplicationBootstrap } from '@nestjs/common'; import { HttpModule, HttpModuleOptions } from '@nestjs/axios'; import { Command } from 'commander'; -import ProxyAgent from 'proxy-agent'; +import { ProxyAgent } from 'proxy-agent'; import { COMMANDER_PROGRAM, LOGGER } from './constants'; import { VersionManagerController } from './controllers/version-manager.controller'; From ac5b609f1e43ccb371af4dfbefa098155c9126e5 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 18:18:17 +0800 Subject: [PATCH 07/17] chore(fix): fix proxy agent --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f3a0fd3ffa..ed3b4e81448 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,8 @@ jobs: (npm run oa version-manager set 4.3.1 && npm run oa version | grep -q '4.3.1') || exit 1 test -f ~/my/storage/4.3.1.jar || exit 1 npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate - + # with http proxy + HTTP_PROXY=http://35.209.198.222:80 npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client # release: # if: github.event.pull_request.merged == 'true' # name: Release (Dry) From 3404821f4049ff5bcb57cc722d7867119088f4d7 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 18:23:06 +0800 Subject: [PATCH 08/17] chore(fix): fix proxy agent --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed3b4e81448..08ce3723134 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,7 +93,7 @@ jobs: test -f ~/my/storage/4.3.1.jar || exit 1 npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate # with http proxy - HTTP_PROXY=http://35.209.198.222:80 npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client + HTTP_PROXY=http://35.209.198.1:7080 npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client # release: # if: github.event.pull_request.merged == 'true' # name: Release (Dry) From f819247af3183883dee69b5dd5321332e65becb0 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 18:29:57 +0800 Subject: [PATCH 09/17] chore(fix): fix proxy agent --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08ce3723134..05a15c8bb24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,8 +92,9 @@ jobs: (npm run oa version-manager set 4.3.1 && npm run oa version | grep -q '4.3.1') || exit 1 test -f ~/my/storage/4.3.1.jar || exit 1 npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate - # with http proxy - HTTP_PROXY=http://35.209.198.1:7080 npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client + - name: Test with HTTP proxy + export HTTP_PROXY=http://35.209.198.1:7080 + npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client # release: # if: github.event.pull_request.merged == 'true' # name: Release (Dry) From 1919b88b23dfddff5d47100e092f7220d877786d Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 18:33:46 +0800 Subject: [PATCH 10/17] chore(fix): fix proxy agent --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05a15c8bb24..38568631625 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,8 @@ jobs: (npm run oa version-manager set 4.3.1 && npm run oa version | grep -q '4.3.1') || exit 1 test -f ~/my/storage/4.3.1.jar || exit 1 npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate - - name: Test with HTTP proxy + - name: Test with HTTP proxy + run: | export HTTP_PROXY=http://35.209.198.1:7080 npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client # release: From affa39432ec1ea2fa175b04a0121f9047e0d7950 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 May 2026 18:37:21 +0800 Subject: [PATCH 11/17] chore(fix): fix proxy agent --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38568631625..d2a43a50ecf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,6 +94,9 @@ jobs: npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate - name: Test with HTTP proxy run: | + cd ./examples + yarn global add json && export PATH="$(yarn global bin):$PATH" + yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz export HTTP_PROXY=http://35.209.198.1:7080 npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client # release: From c8678fd308bbd48c6f1d06a126e148c9c64f9671 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 20 May 2026 17:04:08 +0800 Subject: [PATCH 12/17] chore(fix): fix proxy agent --- apps/generator-cli/src/app/app.module.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/generator-cli/src/app/app.module.ts b/apps/generator-cli/src/app/app.module.ts index 50787621e92..db8e7258615 100644 --- a/apps/generator-cli/src/app/app.module.ts +++ b/apps/generator-cli/src/app/app.module.ts @@ -21,6 +21,7 @@ const proxyAgent = new ProxyAgent(); if (hasHttpProxyEnvs) { httpModuleConfig.proxy = false; httpModuleConfig.httpAgent = proxyAgent; + console.log("Using HTTP proxy agent for HTTP requests"); } if (hasHttpsProxyEnvs) { From fa3786dd74c7b92ccd19b7a78242c3efe1568328 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 20 May 2026 17:11:03 +0800 Subject: [PATCH 13/17] chore(fix): fix proxy agent --- .github/workflows/build.yml | 16 ++++++++-------- apps/generator-cli/src/app/app.module.ts | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2a43a50ecf..274f101ba95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,14 +92,14 @@ jobs: (npm run oa version-manager set 4.3.1 && npm run oa version | grep -q '4.3.1') || exit 1 test -f ~/my/storage/4.3.1.jar || exit 1 npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate - - name: Test with HTTP proxy - run: | - cd ./examples - yarn global add json && export PATH="$(yarn global bin):$PATH" - yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz - export HTTP_PROXY=http://35.209.198.1:7080 - npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client -# release: + #- name: Test with HTTP proxy + # run: | + # cd ./examples + # yarn global add json && export PATH="$(yarn global bin):$PATH" + # yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz + # export HTTP_PROXY=http://proxy_ip:proxy_port + # npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client +# rel#ease: # if: github.event.pull_request.merged == 'true' # name: Release (Dry) # # needs: e2e # DONT FORGET TO ENABLE ME !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/apps/generator-cli/src/app/app.module.ts b/apps/generator-cli/src/app/app.module.ts index db8e7258615..50787621e92 100644 --- a/apps/generator-cli/src/app/app.module.ts +++ b/apps/generator-cli/src/app/app.module.ts @@ -21,7 +21,6 @@ const proxyAgent = new ProxyAgent(); if (hasHttpProxyEnvs) { httpModuleConfig.proxy = false; httpModuleConfig.httpAgent = proxyAgent; - console.log("Using HTTP proxy agent for HTTP requests"); } if (hasHttpsProxyEnvs) { From ec25c977f604874b447887f232dc051c56f29bdf Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 20 May 2026 17:17:10 +0800 Subject: [PATCH 14/17] chore(fix): fix proxy agent --- .github/workflows/build.yml | 14 +++++++------- apps/generator-cli/jest.config.ts | 7 ++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 274f101ba95..06de0569690 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,13 +92,13 @@ jobs: (npm run oa version-manager set 4.3.1 && npm run oa version | grep -q '4.3.1') || exit 1 test -f ~/my/storage/4.3.1.jar || exit 1 npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate - #- name: Test with HTTP proxy - # run: | - # cd ./examples - # yarn global add json && export PATH="$(yarn global bin):$PATH" - # yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz - # export HTTP_PROXY=http://proxy_ip:proxy_port - # npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client + - name: Test with HTTP proxy + run: | + cd ./examples + yarn global add json && export PATH="$(yarn global bin):$PATH" + yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz + export HTTP_PROXY=http://127.0.0.1:1234 + npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client # rel#ease: # if: github.event.pull_request.merged == 'true' # name: Release (Dry) diff --git a/apps/generator-cli/jest.config.ts b/apps/generator-cli/jest.config.ts index 4b87a86e6af..9c6e331269a 100644 --- a/apps/generator-cli/jest.config.ts +++ b/apps/generator-cli/jest.config.ts @@ -4,12 +4,9 @@ export default { preset: '../../jest.preset.js', testEnvironment: 'node', transform: { - '^.+\\.[cm]?[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }], + '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }], }, - transformIgnorePatterns: [ - 'node_modules/(?!(proxy-agent|agent-base|http-proxy-agent|https-proxy-agent|pac-proxy-agent|socks-proxy-agent|proxy-from-env)/)', - ], - moduleFileExtensions: ['ts', 'js', 'mjs', 'cjs', 'html'], + moduleFileExtensions: ['ts', 'js', 'html'], coverageDirectory: '../../coverage/apps/generator-cli', // snapshotFormat: { escapeString: true, printBasicPrototype: true }, }; From 15e52f36bb9375b9f6de375c11db6fefdc4db5c5 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 20 May 2026 17:22:15 +0800 Subject: [PATCH 15/17] Revert "chore(fix): fix proxy agent" This reverts commit ec25c977f604874b447887f232dc051c56f29bdf. --- .github/workflows/build.yml | 14 +++++++------- apps/generator-cli/jest.config.ts | 7 +++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 06de0569690..274f101ba95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,13 +92,13 @@ jobs: (npm run oa version-manager set 4.3.1 && npm run oa version | grep -q '4.3.1') || exit 1 test -f ~/my/storage/4.3.1.jar || exit 1 npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate - - name: Test with HTTP proxy - run: | - cd ./examples - yarn global add json && export PATH="$(yarn global bin):$PATH" - yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz - export HTTP_PROXY=http://127.0.0.1:1234 - npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client + #- name: Test with HTTP proxy + # run: | + # cd ./examples + # yarn global add json && export PATH="$(yarn global bin):$PATH" + # yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz + # export HTTP_PROXY=http://proxy_ip:proxy_port + # npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client # rel#ease: # if: github.event.pull_request.merged == 'true' # name: Release (Dry) diff --git a/apps/generator-cli/jest.config.ts b/apps/generator-cli/jest.config.ts index 9c6e331269a..4b87a86e6af 100644 --- a/apps/generator-cli/jest.config.ts +++ b/apps/generator-cli/jest.config.ts @@ -4,9 +4,12 @@ export default { preset: '../../jest.preset.js', testEnvironment: 'node', transform: { - '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }], + '^.+\\.[cm]?[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }], }, - moduleFileExtensions: ['ts', 'js', 'html'], + transformIgnorePatterns: [ + 'node_modules/(?!(proxy-agent|agent-base|http-proxy-agent|https-proxy-agent|pac-proxy-agent|socks-proxy-agent|proxy-from-env)/)', + ], + moduleFileExtensions: ['ts', 'js', 'mjs', 'cjs', 'html'], coverageDirectory: '../../coverage/apps/generator-cli', // snapshotFormat: { escapeString: true, printBasicPrototype: true }, }; From df28723bab27f56f9e1f2336b82e2afc5b3c7957 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 20 May 2026 17:23:30 +0800 Subject: [PATCH 16/17] chore(fix): fix proxy agent --- .github/workflows/build.yml | 16 ++++++++-------- apps/generator-cli/src/proxy-agent.d.ts | 6 ------ 2 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 apps/generator-cli/src/proxy-agent.d.ts diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 274f101ba95..fb883c90ee5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,14 +92,14 @@ jobs: (npm run oa version-manager set 4.3.1 && npm run oa version | grep -q '4.3.1') || exit 1 test -f ~/my/storage/4.3.1.jar || exit 1 npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate - #- name: Test with HTTP proxy - # run: | - # cd ./examples - # yarn global add json && export PATH="$(yarn global bin):$PATH" - # yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz - # export HTTP_PROXY=http://proxy_ip:proxy_port - # npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client -# rel#ease: + - name: Test with HTTP proxy + run: | + cd ./examples + yarn global add json && export PATH="$(yarn global bin):$PATH" + yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz + export HTTP_PROXY=http://127.0.0.1:1234 + npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client +# release: # if: github.event.pull_request.merged == 'true' # name: Release (Dry) # # needs: e2e # DONT FORGET TO ENABLE ME !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/apps/generator-cli/src/proxy-agent.d.ts b/apps/generator-cli/src/proxy-agent.d.ts deleted file mode 100644 index 7a16b84289b..00000000000 --- a/apps/generator-cli/src/proxy-agent.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module 'proxy-agent' { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const ProxyAgent: new (...args: any[]) => any; - export default ProxyAgent; - export { ProxyAgent }; -} From 28f5509fc03403fecf079c59ab6634ba4778a13d Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 20 May 2026 17:26:09 +0800 Subject: [PATCH 17/17] Revert "chore(fix): fix proxy agent" This reverts commit df28723bab27f56f9e1f2336b82e2afc5b3c7957. --- .github/workflows/build.yml | 16 ++++++++-------- apps/generator-cli/src/proxy-agent.d.ts | 6 ++++++ 2 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 apps/generator-cli/src/proxy-agent.d.ts diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb883c90ee5..274f101ba95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,14 +92,14 @@ jobs: (npm run oa version-manager set 4.3.1 && npm run oa version | grep -q '4.3.1') || exit 1 test -f ~/my/storage/4.3.1.jar || exit 1 npm run oa:generate && mkdir ./foo && cd ./foo && npm run oa:generate - - name: Test with HTTP proxy - run: | - cd ./examples - yarn global add json && export PATH="$(yarn global bin):$PATH" - yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz - export HTTP_PROXY=http://127.0.0.1:1234 - npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client -# release: + #- name: Test with HTTP proxy + # run: | + # cd ./examples + # yarn global add json && export PATH="$(yarn global bin):$PATH" + # yarn cache clean && yarn add $GITHUB_WORKSPACE/package.tgz + # export HTTP_PROXY=http://proxy_ip:proxy_port + # npm run oa generate -- -g ruby -i https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o $GITHUB_WORKSPACE/tmp/ruby-client +# rel#ease: # if: github.event.pull_request.merged == 'true' # name: Release (Dry) # # needs: e2e # DONT FORGET TO ENABLE ME !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/apps/generator-cli/src/proxy-agent.d.ts b/apps/generator-cli/src/proxy-agent.d.ts new file mode 100644 index 00000000000..7a16b84289b --- /dev/null +++ b/apps/generator-cli/src/proxy-agent.d.ts @@ -0,0 +1,6 @@ +declare module 'proxy-agent' { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const ProxyAgent: new (...args: any[]) => any; + export default ProxyAgent; + export { ProxyAgent }; +}