Skip to content

Commit

Permalink
Merge pull request #9218 from weseek/support/upgrade-codemirror-and-yjs
Browse files Browse the repository at this point in the history 
support: Upgrade codemirror and yjs packages
  • Loading branch information
@mergify
mergify[bot] authored Oct 8, 2024
2 parents 9f98e49 + 63b2d2a commit e2ef82d
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 61 deletions.
24 changes: 12 additions & 12 deletions packages/editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,26 @@
"@codemirror/merge": "Fixed version at 6.0.0 due to errors caused by dependent packages"
},
"devDependencies": {
"@codemirror/lang-markdown": "^6.2.0",
"@codemirror/language": "^6.8.0",
"@codemirror/language-data": "^6.3.1",
"@codemirror/lang-markdown": "^6.3.0",
"@codemirror/language": "^6.10.3",
"@codemirror/language-data": "^6.5.1",
"@codemirror/merge": "6.0.0",
"@codemirror/state": "^6.2.1",
"@codemirror/view": "^6.15.3",
"@codemirror/state": "^6.4.1",
"@codemirror/view": "^6.34.1",
"@emoji-mart/data": "^1.2.1",
"@emoji-mart/react": "^1.1.1",
"@growi/core": "link:../core",
"@growi/core-styles": "link:../core-styles",
"@popperjs/core": "^2.11.8",
"@replit/codemirror-emacs": "^6.0.1",
"@replit/codemirror-vim": "6.0.14",
"@replit/codemirror-emacs": "^6.1.0",
"@replit/codemirror-vim": "6.2.1",
"@replit/codemirror-vscode-keymap": "^6.0.2",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@uiw/codemirror-theme-eclipse": "^4.21.21",
"@uiw/codemirror-theme-kimbie": "^4.21.21",
"@uiw/codemirror-themes": "^4.21.21",
"@uiw/react-codemirror": "^4.21.8",
"@uiw/codemirror-theme-eclipse": "^4.23.5",
"@uiw/codemirror-theme-kimbie": "^4.23.5",
"@uiw/codemirror-themes": "^4.23.5",
"@uiw/react-codemirror": "^4.23.5",
"bootstrap": "=5.3.2",
"cm6-theme-basic-light": "^0.2.0",
"cm6-theme-material-dark": "^0.2.0",
Expand All @@ -66,6 +66,6 @@
"ts-deepmerge": "^6.2.0",
"y-codemirror.next": "^0.3.5",
"y-socket.io": "^1.1.3",
"yjs": "^13.6.18"
"yjs": "^13.6.19"
}
}
98 changes: 49 additions & 49 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1614,10 +1614,10 @@
"@lezer/highlight" "^1.0.0"
"@lezer/lr" "^1.3.1"

"@codemirror/lang-markdown@^6.0.0", "@codemirror/lang-markdown@^6.2.0":
version "6.2.5"
resolved "https://registry.yarnpkg.com/@codemirror/lang-markdown/-/lang-markdown-6.2.5.tgz#451941bf743d3788e73598f1aedb71cbeb6f71ba"
integrity sha512-Hgke565YcO4fd9pe2uLYxnMufHO5rQwRr+AAhFq8ABuhkrjyX8R5p5s+hZUTdV60O0dMRjxKhBLxz8pu/MkUVA==
"@codemirror/lang-markdown@^6.0.0", "@codemirror/lang-markdown@^6.3.0":
version "6.3.0"
resolved "https://registry.yarnpkg.com/@codemirror/lang-markdown/-/lang-markdown-6.3.0.tgz#949f8803332441705ed6def34c565f2166479538"
integrity sha512-lYrI8SdL/vhd0w0aHIEvIRLRecLF7MiiRfzXFZY94dFwHqC9HtgxgagJ8fyYNBldijGatf9wkms60d8SrAj6Nw==
dependencies:
"@codemirror/autocomplete" "^6.7.1"
"@codemirror/lang-html" "^6.0.0"
Expand Down Expand Up @@ -1726,7 +1726,7 @@
"@lezer/highlight" "^1.2.0"
"@lezer/yaml" "^1.0.0"

"@codemirror/language-data@^6.3.1":
"@codemirror/language-data@^6.5.1":
version "6.5.1"
resolved "https://registry.yarnpkg.com/@codemirror/language-data/-/language-data-6.5.1.tgz#5cb9413d5225ef27a577c23781bbc0b36c58bb67"
integrity sha512-0sWxeUSNlBr6OmkqybUTImADFUP0M3P0IiSde4nc24bz/6jIYzqYSgkOSLS+CBIoW1vU8Q9KUWXscBXeoMVC9w==
Expand Down Expand Up @@ -1754,10 +1754,10 @@
"@codemirror/language" "^6.0.0"
"@codemirror/legacy-modes" "^6.4.0"

"@codemirror/language@^6.0.0", "@codemirror/language@^6.3.0", "@codemirror/language@^6.4.0", "@codemirror/language@^6.6.0", "@codemirror/language@^6.8.0":
version "6.10.2"
resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.10.2.tgz#4056dc219619627ffe995832eeb09cea6060be61"
integrity sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==
"@codemirror/language@^6.0.0", "@codemirror/language@^6.10.3", "@codemirror/language@^6.3.0", "@codemirror/language@^6.4.0", "@codemirror/language@^6.6.0", "@codemirror/language@^6.8.0":
version "6.10.3"
resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.10.3.tgz#eb25fc5ade19032e7bf1dcaa957804e5f1660585"
integrity sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==
dependencies:
"@codemirror/state" "^6.0.0"
"@codemirror/view" "^6.23.0"
Expand Down Expand Up @@ -1799,7 +1799,7 @@
"@codemirror/view" "^6.0.0"
crelt "^1.0.5"

"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.1", "@codemirror/state@^6.2.1", "@codemirror/state@^6.4.0":
"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.1", "@codemirror/state@^6.4.0", "@codemirror/state@^6.4.1":
version "6.4.1"
resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.4.1.tgz#da57143695c056d9a3c38705ed34136e2b68171b"
integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==
Expand All @@ -1814,10 +1814,10 @@
"@codemirror/view" "^6.0.0"
"@lezer/highlight" "^1.0.0"

"@codemirror/view@^6.0.0", "@codemirror/view@^6.15.3", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0":
version "6.33.0"
resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.33.0.tgz#51e270410fc3af92a6e38798e80ebf8add7dc3ec"
integrity sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==
"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0", "@codemirror/view@^6.34.1":
version "6.34.1"
resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.34.1.tgz#b17ed29c563e4adc60086233f2d3e7197e2dc33e"
integrity sha512-t1zK/l9UiRqwUNPm+pdIT0qzJlzuVckbTEMVNFhfWkGiBQClstzg+78vedCvLSX0xJEZ6lwZbPpnljL7L6iwMQ==
dependencies:
"@codemirror/state" "^6.4.0"
style-mod "^4.1.0"
Expand Down Expand Up @@ -3220,15 +3220,15 @@
resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a"
integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==

"@replit/codemirror-emacs@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/@replit/codemirror-emacs/-/codemirror-emacs-6.0.1.tgz#6e74453e456f40cbb18ed1d15030fa0dbd218098"
integrity sha512-2WYkODZGH1QVAXWuOxTMCwktkoZyv/BjYdJi2A5w4fRrmOQFuIACzb6pO9dgU3J+Pm2naeiX2C8veZr/3/r6AA==
"@replit/codemirror-emacs@^6.1.0":
version "6.1.0"
resolved "https://registry.yarnpkg.com/@replit/codemirror-emacs/-/codemirror-emacs-6.1.0.tgz#662dffc3b354c47cbf930219f8cb75cfc9e7f6fe"
integrity sha512-74DITnht6Cs6sHg02PQ169IKb1XgtyhI9sLD0JeOFco6Ds18PT+dkD8+DgXBDokne9UIFKsBbKPnpFRAz60/Lw==

"@replit/codemirror-vim@6.0.14":
version "6.0.14"
resolved "https://registry.yarnpkg.com/@replit/codemirror-vim/-/codemirror-vim-6.0.14.tgz#8f44740b0497406b551726946c9b30f21c867671"
integrity sha512-wwhqhvL76FdRTdwfUWpKCbv0hkp2fvivfMosDVlL/popqOiNLtUhL02ThgHZH8mus/NkVr5Mj582lyFZqQrjOA==
"@replit/codemirror-vim@6.2.1":
version "6.2.1"
resolved "https://registry.yarnpkg.com/@replit/codemirror-vim/-/codemirror-vim-6.2.1.tgz#6673ff4be93b7da03d303ef37d6cbfa5f647b74b"
integrity sha512-qDAcGSHBYU5RrdO//qCmD8K9t6vbP327iCj/iqrkVnjbrpFhrjOt92weGXGHmTNRh16cUtkUZ7Xq7rZf+8HVow==

"@replit/codemirror-vscode-keymap@^6.0.2":
version "6.0.2"
Expand Down Expand Up @@ -4992,10 +4992,10 @@
"@typescript-eslint/types" "6.21.0"
eslint-visitor-keys "^3.4.1"

"@uiw/[email protected].0":
version "4.23.0"
resolved "https://registry.yarnpkg.com/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.23.0.tgz#c3c181153335c208a25d59b8ecbc7fc87fe85356"
integrity sha512-+k5nkRpUWGaHr1JWT8jcKsVewlXw5qBgSopm9LW8fZ6KnSNZBycz8kHxh0+WSvckmXEESGptkIsb7dlkmJT/hQ==
"@uiw/[email protected].5":
version "4.23.5"
resolved "https://registry.yarnpkg.com/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.23.5.tgz#02ebe9c44f76609f15295e1ff9c83e770140c369"
integrity sha512-eTMfT8TejVN/D5vvuz9Lab+MIoRYdtqa2ftZZmU3JpcDIXf9KaExPo+G2Rl9HqySzaasgGXOOG164MAnj3MSIw==
dependencies:
"@codemirror/autocomplete" "^6.0.0"
"@codemirror/commands" "^6.0.0"
Expand All @@ -5005,39 +5005,39 @@
"@codemirror/state" "^6.0.0"
"@codemirror/view" "^6.0.0"

"@uiw/codemirror-theme-eclipse@^4.21.21":
version "4.23.0"
resolved "https://registry.yarnpkg.com/@uiw/codemirror-theme-eclipse/-/codemirror-theme-eclipse-4.23.0.tgz#22c66297e6b5ca944528c84a46943d846694a2aa"
integrity sha512-P48jiLcaIdNJKWMgG/oH9pP6a8w5lW8lM7VWoCAfSs+v0Sj7ErJGtODGQFcOX0pzI7bc64Se5oNMWPMrtQf3Zw==
"@uiw/codemirror-theme-eclipse@^4.23.5":
version "4.23.5"
resolved "https://registry.yarnpkg.com/@uiw/codemirror-theme-eclipse/-/codemirror-theme-eclipse-4.23.5.tgz#6b9f8d66fa63701395322353011bc0a5ecb3998d"
integrity sha512-WsfcdDjQQCpd42KUJcp/2r5UjTvXetR5V6Zp12ZJliL1gpjtHdZ6ZJxSwQhga6pfEBn2ITz5u5lZgBv/zXgtqg==
dependencies:
"@uiw/codemirror-themes" "4.23.0"
"@uiw/codemirror-themes" "4.23.5"

"@uiw/codemirror-theme-kimbie@^4.21.21":
version "4.23.0"
resolved "https://registry.yarnpkg.com/@uiw/codemirror-theme-kimbie/-/codemirror-theme-kimbie-4.23.0.tgz#df24bb54947b9d058a1ba146206c644ff982400a"
integrity sha512-hARic9WzsVSrT3uiuZeYSxyLmNU2LgoCD7hWauOJZm7HQ2EylVKV+xmcg/WkWMOCCyOZYRxn/pd0NWjRQmMVsA==
"@uiw/codemirror-theme-kimbie@^4.23.5":
version "4.23.5"
resolved "https://registry.yarnpkg.com/@uiw/codemirror-theme-kimbie/-/codemirror-theme-kimbie-4.23.5.tgz#ab3e6f179b1fa2b724b1862178119ca7cc89cde2"
integrity sha512-vC3kr0Lr5AhN2J4KhMYHObRovl3aTBrDMC44JSLzgwU+EBceNPEMrFKfY0pnDgyCXof95R8k4+cfH0WjfQFvtA==
dependencies:
"@uiw/codemirror-themes" "4.23.0"
"@uiw/codemirror-themes" "4.23.5"

"@uiw/[email protected].0", "@uiw/codemirror-themes@^4.21.21":
version "4.23.0"
resolved "https://registry.yarnpkg.com/@uiw/codemirror-themes/-/codemirror-themes-4.23.0.tgz#cc5b5242d3e67caf49c2a9120e804b16ad79f86d"
integrity sha512-9fiji9xooZyBQozR1i6iTr56YP7j/Dr/VgsNWbqf5Szv+g+4WM1iZuiDGwNXmFMWX8gbkDzp6ASE21VCPSofWw==
"@uiw/[email protected].5", "@uiw/codemirror-themes@^4.23.5":
version "4.23.5"
resolved "https://registry.yarnpkg.com/@uiw/codemirror-themes/-/codemirror-themes-4.23.5.tgz#742cb8f2a74a857cb44c5f588265865ee2327e91"
integrity sha512-yWUTpaVroxIxjKASQAmKaYy+ZYtF+YB6d8sVmSRK2TVD13M+EWvVT2jBGFLqR1UVg7G0W/McAy8xdeTg+a3slg==
dependencies:
"@codemirror/language" "^6.0.0"
"@codemirror/state" "^6.0.0"
"@codemirror/view" "^6.0.0"

"@uiw/react-codemirror@^4.21.8":
version "4.23.0"
resolved "https://registry.yarnpkg.com/@uiw/react-codemirror/-/react-codemirror-4.23.0.tgz#5eeadcd5de61213ad76ac3c772fffb7e5b54b465"
integrity sha512-MnqTXfgeLA3fsUUQjqjJgemEuNyoGALgsExVm0NQAllAAi1wfj+IoKFeK+h3XXMlTFRCFYOUh4AHDv0YXJLsOg==
"@uiw/react-codemirror@^4.23.5":
version "4.23.5"
resolved "https://registry.yarnpkg.com/@uiw/react-codemirror/-/react-codemirror-4.23.5.tgz#6a16c23062067732cba105ac33ad69cf8e5c2111"
integrity sha512-2zzGpx61L4mq9zDG/hfsO4wAH209TBE8VVsoj/qrccRe6KfcneCwKgRxtQjxBCCnO0Q5S+IP+uwCx5bXRzgQFQ==
dependencies:
"@babel/runtime" "^7.18.6"
"@codemirror/commands" "^6.1.0"
"@codemirror/state" "^6.1.1"
"@codemirror/theme-one-dark" "^6.0.0"
"@uiw/codemirror-extensions-basic-setup" "4.23.0"
"@uiw/codemirror-extensions-basic-setup" "4.23.5"
codemirror "^6.0.0"

"@vitejs/plugin-react@^4.3.1":
Expand Down Expand Up @@ -19251,10 +19251,10 @@ yauzl@^2.10.0:
buffer-crc32 "~0.2.3"
fd-slicer "~1.1.0"

yjs@^13.6.18:
version "13.6.18"
resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.6.18.tgz#d1575203478bc99ad1b89c098e7d4bacb7f91c3b"
integrity sha512-GBTjO4QCmv2HFKFkYIJl7U77hIB1o22vSCSQD1Ge8ZxWbIbn8AltI4gyXbtL+g5/GJep67HCMq3Y5AmNwDSyEg==
yjs@^13.6.18, yjs@^13.6.19:
version "13.6.19"
resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.6.19.tgz#66999f41254ab65be8c8e71bd767d124ad600909"
integrity sha512-GNKw4mEUn5yWU2QPHRx8jppxmCm9KzbBhB4qJLUJFiiYD0g/tDVgXQ7aPkyh01YO28kbs2J/BEbWBagjuWyejw==
dependencies:
lib0 "^0.2.86"

Expand Down

0 comments on commit e2ef82d

Please sign in to comment.