Skip to content

Commit 018dbeb

Browse files
committed
Avoid dependency resolution version conflicts by being too specific
1 parent ae2a0db commit 018dbeb

File tree

4 files changed

+33
-45
lines changed

4 files changed

+33
-45
lines changed

django_prose_editor/static/django_prose_editor/editor.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

django_prose_editor/static/django_prose_editor/editor.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,26 @@
3434
"autoprefixer": "^10.4.21",
3535
"postcss": "^8.5.3"
3636
},
37+
"resolutions": {
38+
"prosemirror-changeset": "^2.3.0",
39+
"prosemirror-collab": "^1.3.1",
40+
"prosemirror-commands": "^1.6.2",
41+
"prosemirror-dropcursor": "^1.8.1",
42+
"prosemirror-gapcursor": "^1.3.2",
43+
"prosemirror-history": "^1.4.1",
44+
"prosemirror-inputrules": "^1.4.0",
45+
"prosemirror-keymap": "^1.2.2",
46+
"prosemirror-markdown": "^1.13.1",
47+
"prosemirror-menu": "^1.2.4",
48+
"prosemirror-model": "^1.24.1",
49+
"prosemirror-schema-basic": "^1.2.3",
50+
"prosemirror-schema-list": "^1.5.0",
51+
"prosemirror-state": "^1.4.3",
52+
"prosemirror-tables": "^1.6.4",
53+
"prosemirror-trailing-node": "^3.0.0",
54+
"prosemirror-transform": "^1.10.2",
55+
"prosemirror-view": "^1.38.1"
56+
},
3757
"scripts": {
3858
"dev": "rslib build --watch",
3959
"prod": "NODE_ENV=production rslib build"

yarn.lock

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -612,16 +612,7 @@ prosemirror-collab@^1.3.1:
612612
dependencies:
613613
prosemirror-state "^1.0.0"
614614

615-
prosemirror-commands@^1.0.0:
616-
version "1.7.0"
617-
resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.7.0.tgz#c0a60c808f51157caa146922494fc59fe257f27c"
618-
integrity sha512-6toodS4R/Aah5pdsrIwnTYPEjW70SlO5a66oo5Kk+CIrgJz3ukOoS+FYDGqvQlAX5PxoGWDX1oD++tn5X3pyRA==
619-
dependencies:
620-
prosemirror-model "^1.0.0"
621-
prosemirror-state "^1.0.0"
622-
prosemirror-transform "^1.10.2"
623-
624-
prosemirror-commands@^1.6.2:
615+
prosemirror-commands@^1.0.0, prosemirror-commands@^1.6.2:
625616
version "1.7.1"
626617
resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.7.1.tgz#d101fef85618b1be53d5b99ea17bee5600781b38"
627618
integrity sha512-rT7qZnQtx5c0/y/KlYaGvtG411S97UaL6gdp6RIZ23DLHanMYLyfGBV5DtSnZdthQql7W+lEVbpSfwtO8T+L2w==
@@ -694,14 +685,7 @@ prosemirror-menu@^1.2.4:
694685
prosemirror-history "^1.0.0"
695686
prosemirror-state "^1.0.0"
696687

697-
prosemirror-model@^1.0.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.25.0:
698-
version "1.25.0"
699-
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.25.0.tgz#c147113edc0718a14f03881e4c20367d0221f7af"
700-
integrity sha512-/8XUmxWf0pkj2BmtqZHYJipTBMHIdVjuvFzMvEoxrtyGNmfvdhBiRwYt/eFwy2wA9DtBW3RLqvZnjurEkHaFCw==
701-
dependencies:
702-
orderedmap "^2.0.0"
703-
704-
prosemirror-model@^1.24.1:
688+
prosemirror-model@^1.0.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.24.1, prosemirror-model@^1.25.0:
705689
version "1.25.1"
706690
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.25.1.tgz#aeae9f1ec79fcaa76f6fc619800d91fbcf726870"
707691
integrity sha512-AUvbm7qqmpZa5d9fPKMvH1Q5bqYQvAZWOGRvxsB6iFLyycvC9MwNemNVjHVrWgjaoxAfY8XVg7DbvQ/qxvI9Eg==
@@ -752,30 +736,14 @@ prosemirror-trailing-node@^3.0.0:
752736
"@remirror/core-constants" "3.0.0"
753737
escape-string-regexp "^4.0.0"
754738

755-
prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.10.2, prosemirror-transform@^1.7.3:
739+
prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.10.2, prosemirror-transform@^1.10.3, prosemirror-transform@^1.7.3:
756740
version "1.10.3"
757741
resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.10.3.tgz#fae660bd7ffef3159aff44bc21e9e044aa31b67d"
758742
integrity sha512-Nhh/+1kZGRINbEHmVu39oynhcap4hWTs/BlU7NnxWj3+l0qi8I1mu67v6mMdEe/ltD8hHvU4FV6PHiCw2VSpMw==
759743
dependencies:
760744
prosemirror-model "^1.21.0"
761745

762-
prosemirror-transform@^1.10.3:
763-
version "1.10.4"
764-
resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.10.4.tgz#56419eac14f9f56612c806ae46f9238648f3f02e"
765-
integrity sha512-pwDy22nAnGqNR1feOQKHxoFkkUtepoFAd3r2hbEDsnf4wp57kKA36hXsB3njA9FtONBEwSDnDeCiJe+ItD+ykw==
766-
dependencies:
767-
prosemirror-model "^1.21.0"
768-
769-
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0:
770-
version "1.39.1"
771-
resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.39.1.tgz#9e24cc82649d37ed5d75bf59419694b0566927bb"
772-
integrity sha512-GhLxH1xwnqa5VjhJ29LfcQITNDp+f1jzmMPXQfGW9oNrF0lfjPzKvV5y/bjIQkyKpwCX3Fp+GA4dBpMMk8g+ZQ==
773-
dependencies:
774-
prosemirror-model "^1.20.0"
775-
prosemirror-state "^1.0.0"
776-
prosemirror-transform "^1.1.0"
777-
778-
prosemirror-view@^1.38.1, prosemirror-view@^1.39.1:
746+
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0, prosemirror-view@^1.38.1, prosemirror-view@^1.39.1:
779747
version "1.40.0"
780748
resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.40.0.tgz#212e627a0c4f0198ac9823a1232e0099c9a92865"
781749
integrity sha512-2G3svX0Cr1sJjkD/DYWSe3cfV5VPVTBOxI9XQEGWJDFEpsZb/gh4MV29ctv+OJx2RFX4BLt09i+6zaGM/ldkCw==

0 commit comments

Comments
 (0)