From 0c16d74d924bbe0d6144ccd4daf20c5d993314ae Mon Sep 17 00:00:00 2001 From: Michael Pinter Date: Thu, 10 Nov 2022 14:30:35 -0600 Subject: [PATCH 1/2] Ignore https-proxy-agent in browsers --- packages/xrpl/.eslintrc.js | 3 +++ packages/xrpl/HISTORY.md | 2 ++ packages/xrpl/package.json | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/xrpl/.eslintrc.js b/packages/xrpl/.eslintrc.js index 42ce4d9f0d..99178f552e 100644 --- a/packages/xrpl/.eslintrc.js +++ b/packages/xrpl/.eslintrc.js @@ -28,6 +28,9 @@ module.exports = { plugins: [], extends: ['@xrplf/eslint-config/base', 'plugin:mocha/recommended'], rules: { + // Disabled until https://github.com/import-js/eslint-plugin-import/pull/2305 is resolved to + // accomodate this change https://github.com/XRPLF/xrpl.js/pull/2133 + 'import/no-unused-modules': 'off', // Certain rippled APIs require snake_case naming '@typescript-eslint/naming-convention': [ 'error', diff --git a/packages/xrpl/HISTORY.md b/packages/xrpl/HISTORY.md index 0c14c15230..7cc3041b92 100644 --- a/packages/xrpl/HISTORY.md +++ b/packages/xrpl/HISTORY.md @@ -2,6 +2,8 @@ Subscribe to [the **xrpl-announce** mailing list](https://groups.google.com/g/xrpl-announce) for release announcements. We recommend that xrpl.js (ripple-lib) users stay up-to-date with the latest stable release. ## Unreleased +### Fixed +* Ignore `https-proxy-agent` in browsers for improved Vite integration ## 2.5.0 (2022-10-13) ### Added diff --git a/packages/xrpl/package.json b/packages/xrpl/package.json index c0f701af54..9bc2b0a15c 100644 --- a/packages/xrpl/package.json +++ b/packages/xrpl/package.json @@ -18,7 +18,8 @@ "test": "test" }, "browser": { - "ws": "./dist/npm/client/WSWrapper.js" + "ws": "./dist/npm/client/WSWrapper.js", + "https-proxy-agent": false }, "dependencies": { "bignumber.js": "^9.0.0", From 10412e45434b1c87891e063aa535e082366b0a30 Mon Sep 17 00:00:00 2001 From: Michael Pinter Date: Tue, 15 Nov 2022 13:31:50 -0600 Subject: [PATCH 2/2] ignore eslint-comments/no-unused-disable linting rule --- packages/xrpl/.eslintrc.js | 1 + packages/xrpl/src/client/WSWrapper.ts | 1 - packages/xrpl/src/models/methods/subscribe.ts | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/xrpl/.eslintrc.js b/packages/xrpl/.eslintrc.js index 99178f552e..0f22455419 100644 --- a/packages/xrpl/.eslintrc.js +++ b/packages/xrpl/.eslintrc.js @@ -31,6 +31,7 @@ module.exports = { // Disabled until https://github.com/import-js/eslint-plugin-import/pull/2305 is resolved to // accomodate this change https://github.com/XRPLF/xrpl.js/pull/2133 'import/no-unused-modules': 'off', + 'eslint-comments/no-unused-disable': 'off', // Certain rippled APIs require snake_case naming '@typescript-eslint/naming-convention': [ 'error', diff --git a/packages/xrpl/src/client/WSWrapper.ts b/packages/xrpl/src/client/WSWrapper.ts index 781e95abe2..a0c464dd70 100644 --- a/packages/xrpl/src/client/WSWrapper.ts +++ b/packages/xrpl/src/client/WSWrapper.ts @@ -1,4 +1,3 @@ -/* eslint-disable import/no-unused-modules -- Used by webpack */ /* eslint-disable max-classes-per-file -- Needs to be a wrapper for ws */ import { EventEmitter } from 'events' diff --git a/packages/xrpl/src/models/methods/subscribe.ts b/packages/xrpl/src/models/methods/subscribe.ts index 346b915349..33df74b771 100644 --- a/packages/xrpl/src/models/methods/subscribe.ts +++ b/packages/xrpl/src/models/methods/subscribe.ts @@ -136,7 +136,6 @@ export interface LedgerStream extends BaseStream { /** * This response mirrors the LedgerStream, except it does NOT include the 'type' nor 'txn_count' fields. */ -// eslint-disable-next-line import/no-unused-modules -- Detailed enough to be worth exporting for end users. export interface LedgerStreamResponse { /** * The reference transaction cost as of this ledger version, in drops of XRP.