github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade @codemirror/view (#12574)

Browse source 
* Upgrade @codemirror/view
* Disable emptyLineFiller extension

GitOrigin-RevId: 57ce4194ece0ea448e24184f0b3a3e13352cb014
This commit is contained in:
Alf Eaton 2023-04-14 09:53:48 +01:00 committed by Copybot
parent 01f4df08ee
commit 161decd67d
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
package-lock.json generated
View file

@ -3263,9 +3263,9 @@
"integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==" "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="
}, },
"node_modules/@codemirror/view": { "node_modules/@codemirror/view": {
"version": "6.9.3", "version": "6.9.4",
"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.3.tgz", "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.4.tgz",
"integrity": "sha512-BJ5mvEIhFM+SrNwc5X8pLIvMM9ffjkviVbxpg84Xk2OE8ZyKaEbId8kX+nAYEEso7+qnbwsXe1bkAHsasebMow==", "integrity": "sha512-Ov2H9gwlGUxiH94zWxlLtTlyogSFaQDIYjtSEcfzgh7MkKmKVchkmr4JbtR5zBev3jY5DVtKvUC8yjd1bKW55A==",
"dependencies": { "dependencies": {
"@codemirror/state": "^6.1.4", "@codemirror/state": "^6.1.4",
"style-mod": "^4.0.0", "style-mod": "^4.0.0",
@ -35098,7 +35098,7 @@
"@codemirror/lint": "^6.2.0", "@codemirror/lint": "^6.2.0",
"@codemirror/search": "^6.3.0", "@codemirror/search": "^6.3.0",
"@codemirror/state": "^6.2.0", "@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.9.3", "@codemirror/view": "^6.9.4",
"@contentful/rich-text-html-renderer": "^16.0.2", "@contentful/rich-text-html-renderer": "^16.0.2",
"@contentful/rich-text-types": "^16.0.2", "@contentful/rich-text-types": "^16.0.2",
"@google-cloud/bigquery": "^6.0.1", "@google-cloud/bigquery": "^6.0.1",
@ -39962,9 +39962,9 @@
"integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==" "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="
}, },
"@codemirror/view": { "@codemirror/view": {
"version": "6.9.3", "version": "6.9.4",
"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.3.tgz", "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.4.tgz",
"integrity": "sha512-BJ5mvEIhFM+SrNwc5X8pLIvMM9ffjkviVbxpg84Xk2OE8ZyKaEbId8kX+nAYEEso7+qnbwsXe1bkAHsasebMow==", "integrity": "sha512-Ov2H9gwlGUxiH94zWxlLtTlyogSFaQDIYjtSEcfzgh7MkKmKVchkmr4JbtR5zBev3jY5DVtKvUC8yjd1bKW55A==",
"requires": { "requires": {
"@codemirror/state": "^6.1.4", "@codemirror/state": "^6.1.4",
"style-mod": "^4.0.0", "style-mod": "^4.0.0",
@ -44775,7 +44775,7 @@
"@codemirror/lint": "^6.2.0", "@codemirror/lint": "^6.2.0",
"@codemirror/search": "^6.3.0", "@codemirror/search": "^6.3.0",
"@codemirror/state": "^6.2.0", "@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.9.3", "@codemirror/view": "^6.9.4",
"@contentful/rich-text-html-renderer": "^16.0.2", "@contentful/rich-text-html-renderer": "^16.0.2",
"@contentful/rich-text-types": "^16.0.2", "@contentful/rich-text-types": "^16.0.2",
"@google-cloud/bigquery": "^6.0.1", "@google-cloud/bigquery": "^6.0.1",

5
services/web/frontend/js/features/source-editor/extensions/index.ts
View file

@ -38,7 +38,7 @@ import { thirdPartyExtensions } from './third-party-extensions'
import { lineNumbers } from './line-numbers' import { lineNumbers } from './line-numbers'
import { highlightActiveLine } from './highlight-active-line' import { highlightActiveLine } from './highlight-active-line'
import importOverleafModules from '../../../../macros/import-overleaf-module.macro' import importOverleafModules from '../../../../macros/import-overleaf-module.macro'
import { emptyLineFiller } from './empty-line-filler' // import { emptyLineFiller } from './empty-line-filler'
import { goToLinePanel } from './go-to-line' import { goToLinePanel } from './go-to-line'
import { parserWatcher } from './wait-for-parser' import { parserWatcher } from './wait-for-parser'
import { drawSelection } from './draw-selection' import { drawSelection } from './draw-selection'
@ -123,7 +123,8 @@ export const createExtensions = (options: Record<string, any>): Extension[] => [
spelling(options.spelling), spelling(options.spelling),
shortcuts(), shortcuts(),
symbolPalette(), symbolPalette(),
emptyLineFiller(), // NOTE: must be before `trackChanges` // TODO: re-enable this once incompatibility with @codemirror/view is fixed
// emptyLineFiller(), // NOTE: must be before `trackChanges`
trackChanges(options.currentDoc, options.changeManager), trackChanges(options.currentDoc, options.changeManager),
visual(options.currentDoc, options.visual), visual(options.currentDoc, options.visual),
verticalOverflow(), verticalOverflow(),

2
services/web/package.json
View file

@ -78,7 +78,7 @@
"@codemirror/lint": "^6.2.0", "@codemirror/lint": "^6.2.0",
"@codemirror/search": "^6.3.0", "@codemirror/search": "^6.3.0",
"@codemirror/state": "^6.2.0", "@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.9.3", "@codemirror/view": "^6.9.4",
"@contentful/rich-text-html-renderer": "^16.0.2", "@contentful/rich-text-html-renderer": "^16.0.2",
"@contentful/rich-text-types": "^16.0.2", "@contentful/rich-text-types": "^16.0.2",
"@google-cloud/bigquery": "^6.0.1", "@google-cloud/bigquery": "^6.0.1",