mirror of
https://github.com/discourse/discourse.git
synced 2026-09-05 04:40:41 -05:00
DEV: Fixup pnpm-lock and drop unused message-bus-client patch (#43173)
Lockfile issue caused by merge conflict with multiple dependabot PRs. message-bus-client has now made the same change upstream that we patched.
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
diff --git a/package.json b/package.json
|
||||
index d559ffc6c755f755b9ecc22c6d1096ba487cb19d..df59e877dd1cfd8d8388e7099ecfacb076035bdc 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -11,7 +11,6 @@
|
||||
"assets/message-bus.js"
|
||||
],
|
||||
"jsnext:main": "assets/message-bus.js",
|
||||
- "module": "assets/message-bus.js",
|
||||
"repository": "https://github.com/discourse/message_bus",
|
||||
"author": "Sam Saffron, Robin Ward",
|
||||
"license": "MIT",
|
||||
Generated
+3
-6
@@ -31,9 +31,6 @@ patchedDependencies:
|
||||
licensee@11.1.1:
|
||||
hash: 566956dc682db703e899e5b01c65b129e434ad9f0848f5b9f62c3c28afd086e9
|
||||
path: patches/licensee@11.1.1.patch
|
||||
message-bus-client:
|
||||
hash: b9b55d2643b1af05bfbcab2388fe5b68f20ed4ef8bcea9647ab82405bccc20f9
|
||||
path: patches/message-bus-client.patch
|
||||
pikaday:
|
||||
hash: ab597bca99e3c8cc091cd804d003516de8a3744472e0a4b881e598a38b51dc83
|
||||
path: patches/pikaday.patch
|
||||
@@ -636,7 +633,7 @@ importers:
|
||||
version: 4.7.0
|
||||
message-bus-client:
|
||||
specifier: ^4.6.0
|
||||
version: 4.6.0(patch_hash=b9b55d2643b1af05bfbcab2388fe5b68f20ed4ef8bcea9647ab82405bccc20f9)
|
||||
version: 4.6.0
|
||||
pretender:
|
||||
specifier: ^3.4.7
|
||||
version: 3.4.7
|
||||
@@ -9752,7 +9749,7 @@ snapshots:
|
||||
'@ember-decorators/utils@7.0.0(@babel/core@7.29.7)':
|
||||
dependencies:
|
||||
'@embroider/addon-shim': 1.10.3
|
||||
decorator-transforms: 2.3.2(@babel/core@7.29.7)
|
||||
decorator-transforms: 2.4.0(@babel/core@7.29.7)
|
||||
transitivePeerDependencies:
|
||||
- '@babel/core'
|
||||
- supports-color
|
||||
@@ -15124,7 +15121,7 @@ snapshots:
|
||||
|
||||
mersenne-twister@1.1.0: {}
|
||||
|
||||
message-bus-client@4.6.0(patch_hash=b9b55d2643b1af05bfbcab2388fe5b68f20ed4ef8bcea9647ab82405bccc20f9): {}
|
||||
message-bus-client@4.6.0: {}
|
||||
|
||||
micromatch@4.0.8:
|
||||
dependencies:
|
||||
|
||||
@@ -68,7 +68,6 @@ patchedDependencies:
|
||||
"@ember-compat/tracked-built-ins@0.9.1": "patches/@ember-compat__tracked-built-ins@0.9.1.patch"
|
||||
"ember-source@6.10.1": "patches/ember-source@6.10.1.patch"
|
||||
"http-proxy@1.18.1": "patches/http-proxy@1.18.1.patch"
|
||||
"message-bus-client": "patches/message-bus-client.patch"
|
||||
"ember-buffered-proxy": "patches/ember-buffered-proxy.patch"
|
||||
"pikaday": "patches/pikaday.patch"
|
||||
peerDependencyRules:
|
||||
|
||||
Reference in New Issue
Block a user