From e74ed28f4fbae6cbe2739c910e807cd85641b8b2 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 14 May 2024 20:11:02 -0700 Subject: [PATCH] dependencies: Patch bad triple-slash reference out of @uppy/core types. Signed-off-by: Anders Kaseorg --- package.json | 5 +++-- patches/@uppy__core@3.10.1.patch | 11 +++++++++++ pnpm-lock.yaml | 25 ++++++++++++++----------- version.py | 2 +- 4 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 patches/@uppy__core@3.10.1.patch diff --git a/package.json b/package.json index e9d1811d56..a7e70a774c 100644 --- a/package.json +++ b/package.json @@ -155,8 +155,9 @@ "source-map@^0.6": "npm:source-map-js@1.0.1" }, "patchedDependencies": { - "source-sans@3.46.0": "patches/source-sans@3.46.0.patch", - "eslint-plugin-no-jquery@2.7.0": "patches/eslint-plugin-no-jquery@2.7.0.patch" + "@uppy/core@3.10.1": "patches/@uppy__core@3.10.1.patch", + "eslint-plugin-no-jquery@2.7.0": "patches/eslint-plugin-no-jquery@2.7.0.patch", + "source-sans@3.46.0": "patches/source-sans@3.46.0.patch" } }, "nyc": { diff --git a/patches/@uppy__core@3.10.1.patch b/patches/@uppy__core@3.10.1.patch new file mode 100644 index 0000000000..4a0fa0d757 --- /dev/null +++ b/patches/@uppy__core@3.10.1.patch @@ -0,0 +1,11 @@ +diff --git a/types/index.d.ts b/types/index.d.ts +index d23ea1113366ad1d5a3300268ab8c49440dfd0be..0eea14653663ab70c4c62194d4715e0034c888b5 100644 +--- a/types/index.d.ts ++++ b/types/index.d.ts +@@ -1,6 +1,3 @@ +-// This references the old types on purpose, to make sure to not create breaking changes for TS consumers. +-// eslint-disable-next-line @typescript-eslint/triple-slash-reference +-/// + import * as UppyUtils from '@uppy/utils' + + // Utility types diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9103cacecc..6b40d3d7d6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ overrides: source-map@^0.6: npm:source-map-js@1.0.1 patchedDependencies: + '@uppy/core@3.10.1': + hash: p55fuvtzi4wgpu6zqubw64gyay + path: patches/@uppy__core@3.10.1.patch eslint-plugin-no-jquery@2.7.0: hash: 3o6vd4atcpz6wln5ovpbrt3cea path: patches/eslint-plugin-no-jquery@2.7.0.patch @@ -51,13 +54,13 @@ importers: version: 7.112.2 '@uppy/core': specifier: ^3.0.2 - version: 3.10.1 + version: 3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay) '@uppy/progress-bar': specifier: ^3.0.1 - version: 3.1.1(@uppy/core@3.10.1) + version: 3.1.1(@uppy/core@3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay)) '@uppy/xhr-upload': specifier: ^3.0.2 - version: 3.6.4(@uppy/core@3.10.1) + version: 3.6.4(@uppy/core@3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay)) '@zxcvbn-ts/core': specifier: ^3.0.1 version: 3.0.4 @@ -9334,14 +9337,14 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@uppy/companion-client@3.8.0(@uppy/core@3.10.1)': + '@uppy/companion-client@3.8.0(@uppy/core@3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay))': dependencies: - '@uppy/core': 3.10.1 + '@uppy/core': 3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay) '@uppy/utils': 5.8.0 namespace-emitter: 2.0.1 p-retry: 6.2.0 - '@uppy/core@3.10.1': + '@uppy/core@3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay)': dependencies: '@transloadit/prettier-bytes': 0.3.2 '@uppy/store-default': 3.2.2 @@ -9352,9 +9355,9 @@ snapshots: nanoid: 4.0.2 preact: 10.20.2 - '@uppy/progress-bar@3.1.1(@uppy/core@3.10.1)': + '@uppy/progress-bar@3.1.1(@uppy/core@3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay))': dependencies: - '@uppy/core': 3.10.1 + '@uppy/core': 3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay) '@uppy/utils': 5.8.0 preact: 10.20.2 @@ -9365,10 +9368,10 @@ snapshots: lodash: 4.17.21 preact: 10.20.2 - '@uppy/xhr-upload@3.6.4(@uppy/core@3.10.1)': + '@uppy/xhr-upload@3.6.4(@uppy/core@3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay))': dependencies: - '@uppy/companion-client': 3.8.0(@uppy/core@3.10.1) - '@uppy/core': 3.10.1 + '@uppy/companion-client': 3.8.0(@uppy/core@3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay)) + '@uppy/core': 3.10.1(patch_hash=p55fuvtzi4wgpu6zqubw64gyay) '@uppy/utils': 5.8.0 nanoid: 4.0.2 diff --git a/version.py b/version.py index 56273739a7..d7bd767809 100644 --- a/version.py +++ b/version.py @@ -48,4 +48,4 @@ API_FEATURE_LEVEL = 260 # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = (270, 1) # last bumped 2024-05-14 for adding @types/is-url +PROVISION_VERSION = (270, 2) # last bumped 2024-05-14 for patching @uppy/core