From babab0502c573e7989136e43d42db9390d123fe0 Mon Sep 17 00:00:00 2001 From: velzie Date: Wed, 17 Dec 2025 18:11:47 -0500 Subject: [PATCH 1/2] delete proxy-transports from repo, use npm version --- .github/workflows/main.yml | 3 - packages/chrome/package.json | 2 +- .../scramjet/packages/controller/package.json | 4 +- packages/scramjet/packages/core/package.json | 2 +- .../packages/epoxy-transport/package.json | 4 +- .../packages/libcurl-transport/package.json | 4 +- .../packages/proxy-transports/README.md | 3 - .../packages/proxy-transports/package.json | 23 --- .../proxy-transports/rollup.config.js | 30 --- .../packages/proxy-transports/src/client.ts | 189 ------------------ .../packages/proxy-transports/src/index.ts | 4 - .../packages/proxy-transports/src/types.ts | 36 ---- .../proxy-transports/src/websocket.ts | 113 ----------- .../packages/proxy-transports/tsconfig.json | 7 - packages/scramjet/pnpm-lock.yaml | 143 ++----------- packages/scramjet/pnpm-workspace.yaml | 4 +- packages/scramjet/typedoc | 1 + pnpm-lock.yaml | 75 ++----- pnpm-workspace.yaml | 4 +- 19 files changed, 45 insertions(+), 606 deletions(-) delete mode 100644 packages/scramjet/packages/proxy-transports/README.md delete mode 100644 packages/scramjet/packages/proxy-transports/package.json delete mode 100644 packages/scramjet/packages/proxy-transports/rollup.config.js delete mode 100644 packages/scramjet/packages/proxy-transports/src/client.ts delete mode 100644 packages/scramjet/packages/proxy-transports/src/index.ts delete mode 100644 packages/scramjet/packages/proxy-transports/src/types.ts delete mode 100644 packages/scramjet/packages/proxy-transports/src/websocket.ts delete mode 100644 packages/scramjet/packages/proxy-transports/tsconfig.json create mode 120000 packages/scramjet/typedoc diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7808ec0e..3cceed80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -108,9 +108,6 @@ jobs: if: steps.rewriter-cache.outputs.cache-hit != 'true' run: "cargo install --git https://github.com/r58playz/wasm-snip" - - name: Build proxy-transports - run: cd packages/scramjet/packages/proxy-transports && pnpm build - - name: Build Scramjet (failing) run: pnpm build continue-on-error: true diff --git a/packages/chrome/package.json b/packages/chrome/package.json index 63462d2f..7efe07da 100644 --- a/packages/chrome/package.json +++ b/packages/chrome/package.json @@ -16,8 +16,8 @@ "@iconify/types": "^2.0.0", "@ktibow/iconset-ion": "^8.0.13", "@heyputer/puter.js": "^2.1.2", - "@mercuryworkshop/proxy-transports": "workspace:*", "@mercuryworkshop/epoxy-transport": "workspace:*", + "@mercuryworkshop/proxy-transports": "catalog:", "@mercuryworkshop/rpc": "workspace:*", "@mercuryworkshop/libcurl-transport": "workspace:*", "@mercuryworkshop/scramjet": "workspace:*", diff --git a/packages/scramjet/packages/controller/package.json b/packages/scramjet/packages/controller/package.json index 57110565..68cd2868 100644 --- a/packages/scramjet/packages/controller/package.json +++ b/packages/scramjet/packages/controller/package.json @@ -7,7 +7,7 @@ "dependencies": { "@mercuryworkshop/scramjet": "workspace:*", "@mercuryworkshop/rpc": "workspace:*", - "@mercuryworkshop/proxy-transports": "workspace:*", - "@mercuryworkshop/libcurl-transport": "workspace:*" + "@mercuryworkshop/libcurl-transport": "workspace:*", + "@mercuryworkshop/proxy-transports": "catalog:" } } diff --git a/packages/scramjet/packages/core/package.json b/packages/scramjet/packages/core/package.json index 33168d06..040ee081 100644 --- a/packages/scramjet/packages/core/package.json +++ b/packages/scramjet/packages/core/package.json @@ -74,7 +74,6 @@ "@typescript-eslint/parser": "^8.43.0", "actionlint": "^2.0.6", "ava": "^6.4.1", - "@mercuryworkshop/proxy-transports": "workspace:*", "dotenv": "^17.2.2", "eslint": "^9.35.0", "fastify": "^5.6.0", @@ -92,6 +91,7 @@ "typescript": "^5.9.2" }, "dependencies": { + "@mercuryworkshop/proxy-transports": "catalog:", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", "domutils": "^3.2.2", diff --git a/packages/scramjet/packages/epoxy-transport/package.json b/packages/scramjet/packages/epoxy-transport/package.json index 06443fcf..5c60275e 100644 --- a/packages/scramjet/packages/epoxy-transport/package.json +++ b/packages/scramjet/packages/epoxy-transport/package.json @@ -12,7 +12,7 @@ "prepack": "npm run build" }, "dependencies": { - "@mercuryworkshop/proxy-transports": "workspace:*", - "@mercuryworkshop/epoxy-tls": "2.1.18-1" + "@mercuryworkshop/epoxy-tls": "2.1.18-1", + "@mercuryworkshop/proxy-transports": "catalog:" } } diff --git a/packages/scramjet/packages/libcurl-transport/package.json b/packages/scramjet/packages/libcurl-transport/package.json index cc6e58b0..8507e68d 100644 --- a/packages/scramjet/packages/libcurl-transport/package.json +++ b/packages/scramjet/packages/libcurl-transport/package.json @@ -12,7 +12,7 @@ "prepack": "npm run build" }, "dependencies": { - "@mercuryworkshop/proxy-transports": "workspace:*", - "libcurl.js": "^0.7.2" + "libcurl.js": "^0.7.2", + "@mercuryworkshop/proxy-transports": "catalog:" } } diff --git a/packages/scramjet/packages/proxy-transports/README.md b/packages/scramjet/packages/proxy-transports/README.md deleted file mode 100644 index 3d5648f4..00000000 --- a/packages/scramjet/packages/proxy-transports/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Proxy Transports - -A universal interface for designing "transports", i.e. ways of sending https+wss traffic from the browser through a proxy. diff --git a/packages/scramjet/packages/proxy-transports/package.json b/packages/scramjet/packages/proxy-transports/package.json deleted file mode 100644 index 7573ccd1..00000000 --- a/packages/scramjet/packages/proxy-transports/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "@mercuryworkshop/proxy-transports", - "version": "1.0.0", - "description": "A universal interface for designing \"transports\", i.e. ways of sending https+wss traffic from the browser through a proxy.", - "type": "module", - "packageManager": "pnpm@10.12.1", - "scripts": { - "build": "rollup -c", - "watch": "rollup -cw", - "prepack": "npm run build" - }, - "exports": { - ".": { - "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "require": "./dist/index.js" - } - }, - "devDependencies": { - "rollup": "^4.24.0", - "rollup-plugin-typescript2": "^0.36.0" - } -} diff --git a/packages/scramjet/packages/proxy-transports/rollup.config.js b/packages/scramjet/packages/proxy-transports/rollup.config.js deleted file mode 100644 index 4ed04517..00000000 --- a/packages/scramjet/packages/proxy-transports/rollup.config.js +++ /dev/null @@ -1,30 +0,0 @@ -import typescript from "rollup-plugin-typescript2"; -import { readFile } from "node:fs/promises"; - -const commonPlugins = () => [typescript()]; - -const configs = [ - { - input: "./src/index.ts", - output: { - file: "dist/index.mjs", - format: "esm", - sourcemap: true, - exports: "named", - }, - plugins: commonPlugins(), - }, - { - input: "./src/index.ts", - output: { - file: "dist/index.js", - format: "umd", - name: "ProxyTransports", - sourcemap: true, - exports: "named", - }, - plugins: commonPlugins(), - }, -]; - -export default configs; diff --git a/packages/scramjet/packages/proxy-transports/src/client.ts b/packages/scramjet/packages/proxy-transports/src/client.ts deleted file mode 100644 index 3baf531c..00000000 --- a/packages/scramjet/packages/proxy-transports/src/client.ts +++ /dev/null @@ -1,189 +0,0 @@ -import { - FetchBodyType, - RawHeaders, - ProxyTransport, - TransferrableResponse, -} from "./types"; -import { BareCompatibleWebSocket } from "./websocket"; - -const validChars = - "!#$%&'*+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~"; - -export function validProtocol(protocol: string): boolean { - for (let i = 0; i < protocol.length; i++) { - const char = protocol[i]; - - if (!validChars.includes(char)) { - return false; - } - } - - return true; -} - -const wsProtocols = ["ws:", "wss:"]; -const statusEmpty = [101, 204, 205, 304]; -const statusRedirect = [301, 302, 303, 307, 308]; -const nativeFetch = fetch; - -function headersObjectToEntries(headers: Headers): RawHeaders { - return [...(headers as any)]; -} - -/** - * A Response with additional properties. - */ -export class BareResponse extends Response { - url: string; - rawHeaders: RawHeaders; - redirected: boolean = false; - - static fromTransferrableResponse( - resp: TransferrableResponse, - url: string - ): BareResponse { - const response = new BareResponse( - statusEmpty.includes(resp.status) ? undefined : resp.body, - { - headers: new Headers(resp.headers as HeadersInit), - status: resp.status, - statusText: resp.statusText, - } - ); - - response.url = url; - response.redirected = - resp.status >= 300 && - resp.status < 400 && - resp.headers["location"] !== undefined; - response.rawHeaders = resp.headers; - - return response; - } - - static fromNativeResponse(resp: Response): BareResponse { - let body = statusEmpty.includes(resp.status) ? undefined : resp.body; - const response = new BareResponse(body, { - headers: resp.headers, - status: resp.status, - statusText: resp.statusText, - }); - - response.url = resp.url; - response.rawHeaders = headersObjectToEntries(resp.headers); - response.redirected = resp.redirected; - - return response; - } -} - -const defaultMaxRedirects = 20; -export type BareRequestInit = { - body?: FetchBodyType | null; - headers?: RawHeaders; - method?: string; - redirect?: RequestRedirect; - maxRedirects?: number; -}; - -export class BareCompatibleClient { - /** - * Create a BareCompatibleClient using the provided transport. Calls to fetch and connect will wait for an implementation to be ready. - */ - constructor(public transport: ProxyTransport) {} - - createWebSocket( - remote: string | URL, - protocols: string | string[] | undefined = [], - requestHeaders?: RawHeaders - ): BareCompatibleWebSocket { - try { - remote = new URL(remote); - } catch (err) { - throw new DOMException( - `Faiiled to construct 'WebSocket': The URL '${remote}' is invalid.` - ); - } - - if (!wsProtocols.includes(remote.protocol)) - throw new DOMException( - `Failed to construct 'WebSocket': The URL's scheme must be either 'ws' or 'wss'. '${remote.protocol}' is not allowed.` - ); - - if (!Array.isArray(protocols)) protocols = [protocols]; - - protocols = protocols.map(String); - - for (const proto of protocols) - if (!validProtocol(proto)) - throw new DOMException( - `Failed to construct 'WebSocket': The subprotocol '${proto}' is invalid.` - ); - - requestHeaders = requestHeaders || []; - - const socket = new BareCompatibleWebSocket( - remote, - protocols, - this.transport, - requestHeaders - ); - - return socket; - } - - async fetch( - url: string | URL, - init?: BareRequestInit - ): Promise { - if (!this.transport.ready) { - await this.transport.init(); - } - - let maxRedirects = init?.maxRedirects || defaultMaxRedirects; - const body = init?.body; - const headers: RawHeaders = init?.headers || []; - const method = init?.method || "GET"; - const redirect = init?.redirect || "follow"; - - let urlO = new URL(url); - - if (urlO.protocol.startsWith("blob:")) { - const response = await nativeFetch(urlO); - return BareResponse.fromNativeResponse(response); - } - - for (let i = 0; ; i++) { - const resp = await this.transport.request( - urlO, - method, - body, - headers, - undefined - ); - - const bareresponse = BareResponse.fromTransferrableResponse( - resp, - urlO.toString() - ); - - if (statusRedirect.includes(bareresponse.status)) { - switch (redirect) { - case "follow": { - const location = bareresponse.headers.get("location"); - if (maxRedirects > i && location !== null) { - urlO = new URL(location, urlO); - continue; - } else throw new TypeError("Failed to fetch"); - } - case "error": - throw new TypeError("Failed to fetch"); - case "manual": - return bareresponse; - } - } else { - return bareresponse; - } - } - } -} diff --git a/packages/scramjet/packages/proxy-transports/src/index.ts b/packages/scramjet/packages/proxy-transports/src/index.ts deleted file mode 100644 index 73e9f5f5..00000000 --- a/packages/scramjet/packages/proxy-transports/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export type * from "./types"; - -export { BareCompatibleClient, BareResponse, BareRequestInit } from "./client"; -export { BareCompatibleWebSocket } from "./websocket"; diff --git a/packages/scramjet/packages/proxy-transports/src/types.ts b/packages/scramjet/packages/proxy-transports/src/types.ts deleted file mode 100644 index 2ae0ff0d..00000000 --- a/packages/scramjet/packages/proxy-transports/src/types.ts +++ /dev/null @@ -1,36 +0,0 @@ -export type RawHeaders = [string, string][]; - -export type WebSocketDataType = Blob | ArrayBuffer | string; -export type FetchBodyType = ReadableStream | ArrayBuffer | Blob | string; - -export type TransferrableResponse = { - body: FetchBodyType; - headers: RawHeaders; - status: number; - statusText: string; -}; - -export interface ProxyTransport { - init: () => Promise; - ready: boolean; - connect: ( - url: URL, - protocols: string[], - requestHeaders: RawHeaders, - onopen: (protocol: string, extensions: string) => void, - onmessage: (data: WebSocketDataType) => void, - onclose: (code: number, reason: string) => void, - onerror: (error: string) => void - ) => [ - (data: WebSocketDataType) => void, - (code: number, reason: string) => void, - ]; - - request: ( - remote: URL, - method: string, - body: BodyInit | null, - headers: RawHeaders, - signal: AbortSignal | undefined - ) => Promise; -} diff --git a/packages/scramjet/packages/proxy-transports/src/websocket.ts b/packages/scramjet/packages/proxy-transports/src/websocket.ts deleted file mode 100644 index 7eefe55f..00000000 --- a/packages/scramjet/packages/proxy-transports/src/websocket.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { RawHeaders, ProxyTransport, WebSocketDataType } from "./types"; - -export const WebSocketFields = { - prototype: { - send: WebSocket.prototype.send, - }, - CLOSED: WebSocket.CLOSED, - CLOSING: WebSocket.CLOSING, - CONNECTING: WebSocket.CONNECTING, - OPEN: WebSocket.OPEN, -}; - -export class BareCompatibleWebSocket extends EventTarget { - public url: string; - public readyState: number = WebSocketFields.CONNECTING; - public extensions: string = ""; - public protocol: string = ""; - - private _data: ReturnType[0]; - private _close: ReturnType[1]; - - constructor( - remote: string | URL, - protocols: string | string[] | undefined, - public transport: ProxyTransport, - requestHeaders?: RawHeaders - ) { - super(); - this.url = remote.toString(); - - if (!requestHeaders) { - requestHeaders = []; - } - if (!protocols) { - protocols = []; - } - if (typeof protocols === "string") { - protocols = [protocols]; - } - - const onopen = (protocol: string, extensions: string) => { - this.protocol = protocol; - this.extensions = extensions; - this.readyState = WebSocketFields.OPEN; - - const event = new Event("open"); - this.dispatchEvent(event); - }; - - const onmessage = async (payload) => { - const event = new MessageEvent("message", { data: payload }); - this.dispatchEvent(event); - }; - - const onclose = (code: number, reason: string) => { - this.readyState = WebSocketFields.CLOSED; - const event = new CloseEvent("close", { code, reason }); - this.dispatchEvent(event); - }; - - const onerror = () => { - this.readyState = WebSocketFields.CLOSED; - const event = new Event("error"); - this.dispatchEvent(event); - }; - - (async () => { - if (!transport.ready) { - await transport.init(); - } - const [_data, _close] = transport.connect( - new URL(remote), - protocols, - requestHeaders, - onopen, - onmessage, - onclose, - onerror - ); - - this._data = _data; - this._close = _close; - })(); - } - - async send(data: WebSocketDataType) { - if (!this.transport.ready) { - await this.transport.init(); - } - if (this.readyState === WebSocketFields.CONNECTING) { - throw new DOMException( - "Failed to execute 'send' on 'WebSocket': Still in CONNECTING state." - ); - } - - // we can't check typeof Uint8Array here directly as it may come from another realm - if (typeof data === "object" && "buffer" in data && data.buffer) { - let _data: Uint8Array = data as any; - // this is neccesary in case the buffer is a slice of a larger array - // in which case you risk edge cases such as sending an entire wasm memory buffer over the websocket - data = _data.buffer.slice( - _data.byteOffset, - _data.byteOffset + _data.byteLength - ) as ArrayBuffer; - } - - this._data(data); - } - - close(code: number, reason: string) { - this._close(code, reason); - } -} diff --git a/packages/scramjet/packages/proxy-transports/tsconfig.json b/packages/scramjet/packages/proxy-transports/tsconfig.json deleted file mode 100644 index 520b6031..00000000 --- a/packages/scramjet/packages/proxy-transports/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2024", - "lib": ["es2024", "DOM"], - "declaration": true - } -} diff --git a/packages/scramjet/pnpm-lock.yaml b/packages/scramjet/pnpm-lock.yaml index 0fd83eae..a2cf46f5 100644 --- a/packages/scramjet/pnpm-lock.yaml +++ b/packages/scramjet/pnpm-lock.yaml @@ -25,6 +25,8 @@ importers: specifier: ^1.5.8 version: 1.5.8(@swc/helpers@0.5.17) + packages/bare-mux-custom: {} + packages/bootstrap: dependencies: server: @@ -39,9 +41,6 @@ importers: '@mercuryworkshop/libcurl-transport': specifier: workspace:* version: link:../libcurl-transport - '@mercuryworkshop/proxy-transports': - specifier: workspace:* - version: link:../proxy-transports '@mercuryworkshop/rpc': specifier: workspace:* version: link:../rpc @@ -51,6 +50,9 @@ importers: packages/core: dependencies: + '@mercuryworkshop/proxy-transports': + specifier: ^1.0.0 + version: 1.0.0 dom-serializer: specifier: ^2.0.0 version: 2.0.0 @@ -94,9 +96,6 @@ importers: '@mercuryworkshop/libcurl-transport': specifier: ^1.5.0 version: 1.5.0 - '@mercuryworkshop/proxy-transports': - specifier: workspace:* - version: link:../proxy-transports '@mercuryworkshop/wisp-js': specifier: ^0.4.0 version: 0.4.0 @@ -240,27 +239,15 @@ importers: specifier: 2.1.18-1 version: 2.1.18-1 '@mercuryworkshop/proxy-transports': - specifier: workspace:* - version: link:../proxy-transports + specifier: ^1.0.0 + version: 1.0.0 packages/libcurl-transport: dependencies: - '@mercuryworkshop/proxy-transports': - specifier: workspace:* - version: link:../proxy-transports libcurl.js: specifier: ^0.7.2 version: 0.7.2 - packages/proxy-transports: - devDependencies: - rollup: - specifier: ^4.24.0 - version: 4.52.5 - rollup-plugin-typescript2: - specifier: ^0.36.0 - version: 0.36.0(rollup@4.52.5)(typescript@5.9.3) - packages/rewriter_demo: dependencies: '@mercuryworkshop/scramjet': @@ -820,6 +807,9 @@ packages: '@mercuryworkshop/libcurl-transport@1.5.0': resolution: {integrity: sha512-FV3fFjJYoojmkolMESmZnWosz/tQ9AbVQurt6gcJX69BTvAXzjWf6ganpaeSvilQXVK59PDWyYT3gE0aShd12A==} + '@mercuryworkshop/proxy-transports@1.0.0': + resolution: {integrity: sha512-ZYb7ZhTocU5qCwuih05P/BTQZbFTm8oa8FRpZV7LVn9dVaZUe/Z0b2lLW+ZDvhDrs3cyDE9ESPdga4A9RKo/kA==} + '@mercuryworkshop/wisp-js@0.4.0': resolution: {integrity: sha512-rtUSxW8krWS5RGtcFomnoQl/9nrsDnUh7duPcJeQtIqnt5txB7AZJEa6N87CD7UXJzCZVijr1mUHwZy0kHJ+fQ==} hasBin: true @@ -924,10 +914,6 @@ packages: peerDependencies: typedoc: 0.26.x || 0.27.x || 0.28.x - '@rollup/pluginutils@4.2.1': - resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} - engines: {node: '>= 8.0.0'} - '@rollup/pluginutils@5.3.0': resolution: {integrity: sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==} engines: {node: '>=14.0.0'} @@ -1830,9 +1816,6 @@ packages: common-path-prefix@3.0.0: resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} - commondir@1.0.1: - resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==} - compressible@2.0.18: resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==} engines: {node: '>= 0.6'} @@ -2322,10 +2305,6 @@ packages: resolution: {integrity: sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==} engines: {node: '>= 0.8'} - find-cache-dir@3.3.2: - resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==} - engines: {node: '>=8'} - find-my-way@9.3.0: resolution: {integrity: sha512-eRoFWQw+Yv2tuYlK2pjFS2jGXSxSppAs3hSQjfxVKxM5amECzIgYYc1FEI8ZmhSh/Ig+FrKEz43NLRKJjYCZVg==} engines: {node: '>=20'} @@ -2334,10 +2313,6 @@ packages: resolution: {integrity: sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==} engines: {node: '>=18'} - find-up@4.1.0: - resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} - engines: {node: '>=8'} - find-up@5.0.0: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} @@ -2378,10 +2353,6 @@ packages: resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==} engines: {node: '>= 0.8'} - fs-extra@10.1.0: - resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} - engines: {node: '>=12'} - fs-extra@11.3.2: resolution: {integrity: sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==} engines: {node: '>=14.14'} @@ -2823,10 +2794,6 @@ packages: load-plugin@6.0.3: resolution: {integrity: sha512-kc0X2FEUZr145odl68frm+lMJuQ23+rTXYmR6TImqPtbpmXC4vVXbWKDQ9IzndA0HfyQamWfKLhzsqGSTxE63w==} - locate-path@5.0.0: - resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} - engines: {node: '>=8'} - locate-path@6.0.0: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} @@ -2850,10 +2817,6 @@ packages: lunr@2.3.9: resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==} - make-dir@3.1.0: - resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} - engines: {node: '>=8'} - markdown-extensions@2.0.0: resolution: {integrity: sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==} engines: {node: '>=16'} @@ -3259,18 +3222,10 @@ packages: resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} engines: {node: '>= 0.8.0'} - p-limit@2.3.0: - resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} - engines: {node: '>=6'} - p-limit@3.1.0: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} - p-locate@4.1.0: - resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} - engines: {node: '>=8'} - p-locate@5.0.0: resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} engines: {node: '>=10'} @@ -3283,10 +3238,6 @@ packages: resolution: {integrity: sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==} engines: {node: '>=16.17'} - p-try@2.2.0: - resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} - engines: {node: '>=6'} - package-config@5.0.0: resolution: {integrity: sha512-GYTTew2slBcYdvRHqjhwaaydVMvn/qrGC323+nKclYioNSLTDUM/lGgtGTgyHVtYcozb+XkE8CNhwcraOmZ9Mg==} engines: {node: '>=18'} @@ -3382,10 +3333,6 @@ packages: resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==} engines: {node: '>= 6'} - pkg-dir@4.2.0: - resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} - engines: {node: '>=8'} - pkg-types@1.3.1: resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} @@ -3574,12 +3521,6 @@ packages: rfdc@1.4.1: resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==} - rollup-plugin-typescript2@0.36.0: - resolution: {integrity: sha512-NB2CSQDxSe9+Oe2ahZbf+B4bh7pHwjV5L+RSYpCu7Q5ROuN94F9b6ioWwKfz3ueL3KTtmX4o2MUH2cgHDIEUsw==} - peerDependencies: - rollup: '>=1.26.3' - typescript: '>=2.4.0' - rollup@4.52.5: resolution: {integrity: sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -3648,10 +3589,6 @@ packages: resolution: {integrity: sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==} engines: {node: '>=10'} - semver@6.3.1: - resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} - hasBin: true - semver@7.7.3: resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==} engines: {node: '>=10'} @@ -4755,6 +4692,8 @@ snapshots: dependencies: libcurl.js: 0.7.2 + '@mercuryworkshop/proxy-transports@1.0.0': {} + '@mercuryworkshop/wisp-js@0.4.0': dependencies: bufferutil: 4.0.9 @@ -4913,11 +4852,6 @@ snapshots: dependencies: typedoc: 0.28.14(typescript@5.9.3) - '@rollup/pluginutils@4.2.1': - dependencies: - estree-walker: 2.0.2 - picomatch: 2.3.1 - '@rollup/pluginutils@5.3.0(rollup@4.52.5)': dependencies: '@types/estree': 1.0.8 @@ -5927,8 +5861,6 @@ snapshots: common-path-prefix@3.0.0: {} - commondir@1.0.1: {} - compressible@2.0.18: dependencies: mime-db: 1.54.0 @@ -6511,12 +6443,6 @@ snapshots: transitivePeerDependencies: - supports-color - find-cache-dir@3.3.2: - dependencies: - commondir: 1.0.1 - make-dir: 3.1.0 - pkg-dir: 4.2.0 - find-my-way@9.3.0: dependencies: fast-deep-equal: 3.1.3 @@ -6525,11 +6451,6 @@ snapshots: find-up-simple@1.0.1: {} - find-up@4.1.0: - dependencies: - locate-path: 5.0.0 - path-exists: 4.0.0 - find-up@5.0.0: dependencies: locate-path: 6.0.0 @@ -6557,12 +6478,6 @@ snapshots: fresh@2.0.0: {} - fs-extra@10.1.0: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.2.0 - universalify: 2.0.1 - fs-extra@11.3.2: dependencies: graceful-fs: 4.2.11 @@ -6973,10 +6888,6 @@ snapshots: transitivePeerDependencies: - bluebird - locate-path@5.0.0: - dependencies: - p-locate: 4.1.0 - locate-path@6.0.0: dependencies: p-locate: 5.0.0 @@ -6993,10 +6904,6 @@ snapshots: lunr@2.3.9: {} - make-dir@3.1.0: - dependencies: - semver: 6.3.1 - markdown-extensions@2.0.0: {} markdown-it@14.1.0: @@ -7553,18 +7460,10 @@ snapshots: type-check: 0.4.0 word-wrap: 1.2.5 - p-limit@2.3.0: - dependencies: - p-try: 2.2.0 - p-limit@3.1.0: dependencies: yocto-queue: 0.1.0 - p-locate@4.1.0: - dependencies: - p-limit: 2.3.0 - p-locate@5.0.0: dependencies: p-limit: 3.1.0 @@ -7577,8 +7476,6 @@ snapshots: is-network-error: 1.3.0 retry: 0.13.1 - p-try@2.2.0: {} - package-config@5.0.0: dependencies: find-up-simple: 1.0.1 @@ -7672,10 +7569,6 @@ snapshots: pirates@4.0.7: {} - pkg-dir@4.2.0: - dependencies: - find-up: 4.1.0 - pkg-types@1.3.1: dependencies: confbox: 0.1.8 @@ -7869,16 +7762,6 @@ snapshots: rfdc@1.4.1: {} - rollup-plugin-typescript2@0.36.0(rollup@4.52.5)(typescript@5.9.3): - dependencies: - '@rollup/pluginutils': 4.2.1 - find-cache-dir: 3.3.2 - fs-extra: 10.1.0 - rollup: 4.52.5 - semver: 7.7.3 - tslib: 2.8.1 - typescript: 5.9.3 - rollup@4.52.5: dependencies: '@types/estree': 1.0.8 @@ -7962,8 +7845,6 @@ snapshots: '@types/node-forge': 1.3.14 node-forge: 1.3.1 - semver@6.3.1: {} - semver@7.7.3: {} send@0.19.0: diff --git a/packages/scramjet/pnpm-workspace.yaml b/packages/scramjet/pnpm-workspace.yaml index 82899aba..09e7d80c 100644 --- a/packages/scramjet/pnpm-workspace.yaml +++ b/packages/scramjet/pnpm-workspace.yaml @@ -3,7 +3,6 @@ packages: - "packages/bootstrap" - "packages/controller" - "packages/scramjetserver" - - "packages/proxy-transports" - "packages/epoxy-transport" - "packages/libcurl-transport" - "packages/demo" @@ -11,3 +10,6 @@ packages: - "packages/rpc" - "packages/typedoc" - "packages/create-proxy-app" + +catalog: + "@mercuryworkshop/proxy-transports": 1.0.0 diff --git a/packages/scramjet/typedoc b/packages/scramjet/typedoc new file mode 120000 index 00000000..368f4144 --- /dev/null +++ b/packages/scramjet/typedoc @@ -0,0 +1 @@ +../../../../../packages/scramjet/packages/typedoc \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 58f26530..48198eb8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,12 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +catalogs: + default: + '@mercuryworkshop/proxy-transports': + specifier: 1.0.0 + version: 1.0.0 + importers: .: @@ -231,8 +237,8 @@ importers: specifier: workspace:* version: link:../scramjet/packages/libcurl-transport '@mercuryworkshop/proxy-transports': - specifier: workspace:* - version: link:../scramjet/packages/proxy-transports + specifier: 'catalog:' + version: 1.0.0 '@mercuryworkshop/rpc': specifier: workspace:* version: link:../scramjet/packages/rpc @@ -328,9 +334,6 @@ importers: '@mercuryworkshop/libcurl-transport': specifier: workspace:* version: link:../libcurl-transport - '@mercuryworkshop/proxy-transports': - specifier: workspace:* - version: link:../proxy-transports '@mercuryworkshop/rpc': specifier: workspace:* version: link:../rpc @@ -340,6 +343,9 @@ importers: packages/scramjet/packages/core: dependencies: + '@mercuryworkshop/proxy-transports': + specifier: 'catalog:' + version: 1.0.0 dom-serializer: specifier: ^2.0.0 version: 2.0.0 @@ -383,9 +389,6 @@ importers: '@mercuryworkshop/libcurl-transport': specifier: ^1.5.0 version: 1.5.0 - '@mercuryworkshop/proxy-transports': - specifier: workspace:* - version: link:../proxy-transports '@mercuryworkshop/wisp-js': specifier: ^0.4.0 version: 0.4.0 @@ -529,27 +532,15 @@ importers: specifier: 2.1.18-1 version: 2.1.18-1 '@mercuryworkshop/proxy-transports': - specifier: workspace:* - version: link:../proxy-transports + specifier: 'catalog:' + version: 1.0.0 packages/scramjet/packages/libcurl-transport: dependencies: - '@mercuryworkshop/proxy-transports': - specifier: workspace:* - version: link:../proxy-transports libcurl.js: specifier: ^0.7.2 version: 0.7.2 - packages/scramjet/packages/proxy-transports: - devDependencies: - rollup: - specifier: ^4.24.0 - version: 4.52.5 - rollup-plugin-typescript2: - specifier: ^0.36.0 - version: 0.36.0(rollup@4.52.5)(typescript@5.9.3) - packages/scramjet/packages/rewriter_demo: dependencies: '@mercuryworkshop/scramjet': @@ -1850,6 +1841,9 @@ packages: '@mercuryworkshop/libcurl-transport@1.5.0': resolution: {integrity: sha512-FV3fFjJYoojmkolMESmZnWosz/tQ9AbVQurt6gcJX69BTvAXzjWf6ganpaeSvilQXVK59PDWyYT3gE0aShd12A==} + '@mercuryworkshop/proxy-transports@1.0.0': + resolution: {integrity: sha512-ZYb7ZhTocU5qCwuih05P/BTQZbFTm8oa8FRpZV7LVn9dVaZUe/Z0b2lLW+ZDvhDrs3cyDE9ESPdga4A9RKo/kA==} + '@mercuryworkshop/wisp-js@0.4.0': resolution: {integrity: sha512-rtUSxW8krWS5RGtcFomnoQl/9nrsDnUh7duPcJeQtIqnt5txB7AZJEa6N87CD7UXJzCZVijr1mUHwZy0kHJ+fQ==} hasBin: true @@ -2009,10 +2003,6 @@ packages: tslib: optional: true - '@rollup/pluginutils@4.2.1': - resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} - engines: {node: '>= 8.0.0'} - '@rollup/pluginutils@5.2.0': resolution: {integrity: sha512-qWJ2ZTbmumwiLFomfzTyt5Kng4hwPi9rwCYN4SHb6eaRU1KNO4ccxINHr/VhH4GgPlt1XfSTLX2LBTme8ne4Zw==} engines: {node: '>=14.0.0'} @@ -4102,10 +4092,6 @@ packages: resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==} engines: {node: '>= 0.8'} - fs-extra@10.1.0: - resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} - engines: {node: '>=12'} - fs-extra@11.3.1: resolution: {integrity: sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==} engines: {node: '>=14.14'} @@ -5700,12 +5686,6 @@ packages: rollup: ^3.29.4 || ^4 typescript: ^4.5 || ^5.0 - rollup-plugin-typescript2@0.36.0: - resolution: {integrity: sha512-NB2CSQDxSe9+Oe2ahZbf+B4bh7pHwjV5L+RSYpCu7Q5ROuN94F9b6ioWwKfz3ueL3KTtmX4o2MUH2cgHDIEUsw==} - peerDependencies: - rollup: '>=1.26.3' - typescript: '>=2.4.0' - rollup-plugin-visualizer@6.0.3: resolution: {integrity: sha512-ZU41GwrkDcCpVoffviuM9Clwjy5fcUxlz0oMoTXTYsK+tcIFzbdacnrr2n8TXcHxbGKKXtOdjxM2HUS4HjkwIw==} engines: {node: '>=18'} @@ -8172,6 +8152,8 @@ snapshots: dependencies: libcurl.js: 0.7.2 + '@mercuryworkshop/proxy-transports@1.0.0': {} + '@mercuryworkshop/wisp-js@0.4.0': dependencies: bufferutil: 4.0.9 @@ -8388,11 +8370,6 @@ snapshots: rollup: 4.52.2 tslib: 2.8.1 - '@rollup/pluginutils@4.2.1': - dependencies: - estree-walker: 2.0.2 - picomatch: 2.3.1 - '@rollup/pluginutils@5.2.0(rollup@4.52.2)': dependencies: '@types/estree': 1.0.8 @@ -10819,12 +10796,6 @@ snapshots: fresh@2.0.0: {} - fs-extra@10.1.0: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.2.0 - universalify: 2.0.1 - fs-extra@11.3.1: dependencies: graceful-fs: 4.2.11 @@ -12600,16 +12571,6 @@ snapshots: optionalDependencies: '@babel/code-frame': 7.27.1 - rollup-plugin-typescript2@0.36.0(rollup@4.52.5)(typescript@5.9.3): - dependencies: - '@rollup/pluginutils': 4.2.1 - find-cache-dir: 3.3.2 - fs-extra: 10.1.0 - rollup: 4.52.5 - semver: 7.7.3 - tslib: 2.8.1 - typescript: 5.9.3 - rollup-plugin-visualizer@6.0.3(rollup@4.52.2): dependencies: open: 8.4.2 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 3fa7d9ee..fc9b0b3d 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -13,7 +13,6 @@ packages: - "packages/scramjet/packages/bootstrap" - "packages/scramjet/packages/controller" - "packages/scramjet/packages/scramjetserver" - - "packages/scramjet/packages/proxy-transports" - "packages/scramjet/packages/epoxy-transport" - "packages/scramjet/packages/libcurl-transport" - "packages/scramjet/packages/demo" @@ -21,3 +20,6 @@ packages: - "packages/scramjet/packages/rpc" - "packages/scramjet/packages/typedoc" - "packages/scramjet/packages/create-proxy-app" + +catalog: + "@mercuryworkshop/proxy-transports": 1.0.0 From 583a9dad48948d1c96d9ba80ab60a1591b7ba204 Mon Sep 17 00:00:00 2001 From: velzie Date: Thu, 18 Dec 2025 07:13:11 -0500 Subject: [PATCH 2/2] bump @mercuryworkshop/proxy-transports --- packages/scramjet/pnpm-lock.yaml | 28 ++++++++++++++++++--------- packages/scramjet/pnpm-workspace.yaml | 2 +- pnpm-lock.yaml | 22 +++++++++++++-------- pnpm-workspace.yaml | 2 +- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/packages/scramjet/pnpm-lock.yaml b/packages/scramjet/pnpm-lock.yaml index a2cf46f5..35633e2e 100644 --- a/packages/scramjet/pnpm-lock.yaml +++ b/packages/scramjet/pnpm-lock.yaml @@ -4,6 +4,12 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +catalogs: + default: + '@mercuryworkshop/proxy-transports': + specifier: 1.0.2 + version: 1.0.2 + importers: .: @@ -25,8 +31,6 @@ importers: specifier: ^1.5.8 version: 1.5.8(@swc/helpers@0.5.17) - packages/bare-mux-custom: {} - packages/bootstrap: dependencies: server: @@ -41,6 +45,9 @@ importers: '@mercuryworkshop/libcurl-transport': specifier: workspace:* version: link:../libcurl-transport + '@mercuryworkshop/proxy-transports': + specifier: 'catalog:' + version: 1.0.2 '@mercuryworkshop/rpc': specifier: workspace:* version: link:../rpc @@ -51,8 +58,8 @@ importers: packages/core: dependencies: '@mercuryworkshop/proxy-transports': - specifier: ^1.0.0 - version: 1.0.0 + specifier: 'catalog:' + version: 1.0.2 dom-serializer: specifier: ^2.0.0 version: 2.0.0 @@ -239,11 +246,14 @@ importers: specifier: 2.1.18-1 version: 2.1.18-1 '@mercuryworkshop/proxy-transports': - specifier: ^1.0.0 - version: 1.0.0 + specifier: 'catalog:' + version: 1.0.2 packages/libcurl-transport: dependencies: + '@mercuryworkshop/proxy-transports': + specifier: 'catalog:' + version: 1.0.2 libcurl.js: specifier: ^0.7.2 version: 0.7.2 @@ -807,8 +817,8 @@ packages: '@mercuryworkshop/libcurl-transport@1.5.0': resolution: {integrity: sha512-FV3fFjJYoojmkolMESmZnWosz/tQ9AbVQurt6gcJX69BTvAXzjWf6ganpaeSvilQXVK59PDWyYT3gE0aShd12A==} - '@mercuryworkshop/proxy-transports@1.0.0': - resolution: {integrity: sha512-ZYb7ZhTocU5qCwuih05P/BTQZbFTm8oa8FRpZV7LVn9dVaZUe/Z0b2lLW+ZDvhDrs3cyDE9ESPdga4A9RKo/kA==} + '@mercuryworkshop/proxy-transports@1.0.2': + resolution: {integrity: sha512-zgD+JMYNSx8LxVLWwGPPVnoDHjoh1GqqwUJIjhIwCwhy+Z7g+MhmiTJvCcRPAo7qXXbqJwIrpBJduRSOrjMV7g==} '@mercuryworkshop/wisp-js@0.4.0': resolution: {integrity: sha512-rtUSxW8krWS5RGtcFomnoQl/9nrsDnUh7duPcJeQtIqnt5txB7AZJEa6N87CD7UXJzCZVijr1mUHwZy0kHJ+fQ==} @@ -4692,7 +4702,7 @@ snapshots: dependencies: libcurl.js: 0.7.2 - '@mercuryworkshop/proxy-transports@1.0.0': {} + '@mercuryworkshop/proxy-transports@1.0.2': {} '@mercuryworkshop/wisp-js@0.4.0': dependencies: diff --git a/packages/scramjet/pnpm-workspace.yaml b/packages/scramjet/pnpm-workspace.yaml index 09e7d80c..d52a8e1a 100644 --- a/packages/scramjet/pnpm-workspace.yaml +++ b/packages/scramjet/pnpm-workspace.yaml @@ -12,4 +12,4 @@ packages: - "packages/create-proxy-app" catalog: - "@mercuryworkshop/proxy-transports": 1.0.0 + "@mercuryworkshop/proxy-transports": 1.0.2 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48198eb8..752d0e60 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,8 +7,8 @@ settings: catalogs: default: '@mercuryworkshop/proxy-transports': - specifier: 1.0.0 - version: 1.0.0 + specifier: 1.0.2 + version: 1.0.2 importers: @@ -238,7 +238,7 @@ importers: version: link:../scramjet/packages/libcurl-transport '@mercuryworkshop/proxy-transports': specifier: 'catalog:' - version: 1.0.0 + version: 1.0.2 '@mercuryworkshop/rpc': specifier: workspace:* version: link:../scramjet/packages/rpc @@ -334,6 +334,9 @@ importers: '@mercuryworkshop/libcurl-transport': specifier: workspace:* version: link:../libcurl-transport + '@mercuryworkshop/proxy-transports': + specifier: 'catalog:' + version: 1.0.2 '@mercuryworkshop/rpc': specifier: workspace:* version: link:../rpc @@ -345,7 +348,7 @@ importers: dependencies: '@mercuryworkshop/proxy-transports': specifier: 'catalog:' - version: 1.0.0 + version: 1.0.2 dom-serializer: specifier: ^2.0.0 version: 2.0.0 @@ -533,10 +536,13 @@ importers: version: 2.1.18-1 '@mercuryworkshop/proxy-transports': specifier: 'catalog:' - version: 1.0.0 + version: 1.0.2 packages/scramjet/packages/libcurl-transport: dependencies: + '@mercuryworkshop/proxy-transports': + specifier: 'catalog:' + version: 1.0.2 libcurl.js: specifier: ^0.7.2 version: 0.7.2 @@ -1841,8 +1847,8 @@ packages: '@mercuryworkshop/libcurl-transport@1.5.0': resolution: {integrity: sha512-FV3fFjJYoojmkolMESmZnWosz/tQ9AbVQurt6gcJX69BTvAXzjWf6ganpaeSvilQXVK59PDWyYT3gE0aShd12A==} - '@mercuryworkshop/proxy-transports@1.0.0': - resolution: {integrity: sha512-ZYb7ZhTocU5qCwuih05P/BTQZbFTm8oa8FRpZV7LVn9dVaZUe/Z0b2lLW+ZDvhDrs3cyDE9ESPdga4A9RKo/kA==} + '@mercuryworkshop/proxy-transports@1.0.2': + resolution: {integrity: sha512-zgD+JMYNSx8LxVLWwGPPVnoDHjoh1GqqwUJIjhIwCwhy+Z7g+MhmiTJvCcRPAo7qXXbqJwIrpBJduRSOrjMV7g==} '@mercuryworkshop/wisp-js@0.4.0': resolution: {integrity: sha512-rtUSxW8krWS5RGtcFomnoQl/9nrsDnUh7duPcJeQtIqnt5txB7AZJEa6N87CD7UXJzCZVijr1mUHwZy0kHJ+fQ==} @@ -8152,7 +8158,7 @@ snapshots: dependencies: libcurl.js: 0.7.2 - '@mercuryworkshop/proxy-transports@1.0.0': {} + '@mercuryworkshop/proxy-transports@1.0.2': {} '@mercuryworkshop/wisp-js@0.4.0': dependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index fc9b0b3d..64de5d3c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -22,4 +22,4 @@ packages: - "packages/scramjet/packages/create-proxy-app" catalog: - "@mercuryworkshop/proxy-transports": 1.0.0 + "@mercuryworkshop/proxy-transports": 1.0.2