From 58d27d3b7e1d360b5d34b88cd3330e12720114a3 Mon Sep 17 00:00:00 2001 From: Tim Down Date: Mon, 3 Oct 2022 16:13:00 +0100 Subject: [PATCH] Merge pull request #9811 from overleaf/td-emacs-cm6-autocomplete Update CM6 Emacs package to use latest version of our fork GitOrigin-RevId: a21cd77c57aa2e48f7a7a78313e7b281dbc97024 --- package-lock.json | 60 ++++++++++++++++++++------------------- services/web/package.json | 4 +-- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7786f75d9b..f7091a2e45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2627,9 +2627,9 @@ "integrity": "sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA==" }, "node_modules/@codemirror/view": { - "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.2.5.tgz", - "integrity": "sha512-4kVS3RZi3nkPNfG2X/7+2L8IhoJv6dJ9yJz4KUlw4rwxI8OmVCKJzC/jnJqp+bVNOml+oA3gSF1kX2VvOiI72Q==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.3.0.tgz", + "integrity": "sha512-jMN9OGKmzRPJ+kksfMrB5e/A9heQncirHsz8XNBpgEbYONCk5tWHMKVWKTNwznkUGD5mnigXI1i5YIcWpscSPg==", "dependencies": { "@codemirror/state": "^6.0.0", "style-mod": "^4.0.0", @@ -4708,19 +4708,6 @@ "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz", "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==" }, - "node_modules/@replit/codemirror-emacs": { - "version": "6.0.1", - "resolved": "git+ssh://git@github.com/overleaf/codemirror-emacs.git#90bcadaaaf38ed0d88cf15f0ddb8e868ca253e17", - "integrity": "sha512-hw2nW0fQarkKcuG7Myos2SzpjfCfukmfFTJsxQ/y2hcw4DCRLqD53unBJ5L7yz/nhB5PPcLhg2iV5WRgnT9chg==", - "license": "MIT", - "peerDependencies": { - "@codemirror/autocomplete": "^6.0.4", - "@codemirror/commands": "^6.0.1", - "@codemirror/search": "^6.0.0", - "@codemirror/state": "^6.1.0", - "@codemirror/view": "^6.0.3" - } - }, "node_modules/@replit/codemirror-vim": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@replit/codemirror-vim/-/codemirror-vim-6.0.2.tgz", @@ -34818,7 +34805,7 @@ "@codemirror/lint": "^6.0.0", "@codemirror/search": "^6.2.1", "@codemirror/state": "^6.1.2", - "@codemirror/view": "^6.2.5", + "@codemirror/view": "^6.3.0", "@lezer/common": "^1.0.1", "@lezer/highlight": "^1.1.0", "@lezer/lr": "^1.2.3", @@ -34833,7 +34820,7 @@ "@pollyjs/core": "^4.2.1", "@pollyjs/persister-fs": "^4.2.1", "@reach/tabs": "^0.15.0", - "@replit/codemirror-emacs": "overleaf/codemirror-emacs#90bcadaaaf38ed0d88cf15f0ddb8e868ca253e17", + "@replit/codemirror-emacs": "overleaf/codemirror-emacs#8640addc01bbe99fec0144993d012b6dfc57d6e2", "@replit/codemirror-vim": "^6.0.2", "@sentry/browser": "^7.8.1", "@uppy/core": "^1.15.0", @@ -35002,6 +34989,7 @@ "chai-exclude": "^2.0.3", "cheerio": "^1.0.0-rc.3", "color-alpha": "^1.1.3", + "color-parse": "^1.4.2", "content-disposition": "^0.5.0", "copy-webpack-plugin": "^10.2.4", "css-loader": "^6.7.1", @@ -35086,6 +35074,19 @@ "@hapi/hoek": "^8.3.0" } }, + "services/web/node_modules/@replit/codemirror-emacs": { + "version": "6.0.0", + "resolved": "git+ssh://git@github.com/overleaf/codemirror-emacs.git#8640addc01bbe99fec0144993d012b6dfc57d6e2", + "integrity": "sha512-qtSe/u/3zai4G2bSwpL7DTfZK/uHViCiAcokqOe+FXKhCLHtrzs5VVgpMwK1JUHLwxo0lpSB4Hkz3epP6K2axw==", + "license": "MIT", + "peerDependencies": { + "@codemirror/autocomplete": "^6.0.2", + "@codemirror/commands": "^6.0.0", + "@codemirror/search": "^6.0.0", + "@codemirror/state": "^6.0.1", + "@codemirror/view": "^6.3.0" + } + }, "services/web/node_modules/@sinonjs/formatio": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", @@ -38357,9 +38358,9 @@ "integrity": "sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA==" }, "@codemirror/view": { - "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.2.5.tgz", - "integrity": "sha512-4kVS3RZi3nkPNfG2X/7+2L8IhoJv6dJ9yJz4KUlw4rwxI8OmVCKJzC/jnJqp+bVNOml+oA3gSF1kX2VvOiI72Q==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.3.0.tgz", + "integrity": "sha512-jMN9OGKmzRPJ+kksfMrB5e/A9heQncirHsz8XNBpgEbYONCk5tWHMKVWKTNwznkUGD5mnigXI1i5YIcWpscSPg==", "requires": { "@codemirror/state": "^6.0.0", "style-mod": "^4.0.0", @@ -42421,7 +42422,7 @@ "@codemirror/lint": "^6.0.0", "@codemirror/search": "^6.2.1", "@codemirror/state": "^6.1.2", - "@codemirror/view": "^6.2.5", + "@codemirror/view": "^6.3.0", "@cypress/react": "^6.0.0", "@juggle/resize-observer": "^3.3.1", "@lezer/common": "^1.0.1", @@ -42439,7 +42440,7 @@ "@pollyjs/core": "^4.2.1", "@pollyjs/persister-fs": "^4.2.1", "@reach/tabs": "^0.15.0", - "@replit/codemirror-emacs": "overleaf/codemirror-emacs#90bcadaaaf38ed0d88cf15f0ddb8e868ca253e17", + "@replit/codemirror-emacs": "overleaf/codemirror-emacs#8640addc01bbe99fec0144993d012b6dfc57d6e2", "@replit/codemirror-vim": "^6.0.2", "@sentry/browser": "^7.8.1", "@testing-library/cypress": "^8.0.3", @@ -42497,6 +42498,7 @@ "classnames": "^2.2.6", "codemirror": "~5.33.0", "color-alpha": "^1.1.3", + "color-parse": "^1.4.2", "connect-redis": "^3.1.0", "content-disposition": "^0.5.0", "contentful": "^6.1.1", @@ -42682,6 +42684,12 @@ "@hapi/hoek": "^8.3.0" } }, + "@replit/codemirror-emacs": { + "version": "git+ssh://git@github.com/overleaf/codemirror-emacs.git#8640addc01bbe99fec0144993d012b6dfc57d6e2", + "integrity": "sha512-qtSe/u/3zai4G2bSwpL7DTfZK/uHViCiAcokqOe+FXKhCLHtrzs5VVgpMwK1JUHLwxo0lpSB4Hkz3epP6K2axw==", + "from": "@replit/codemirror-emacs@overleaf/codemirror-emacs#8640addc01bbe99fec0144993d012b6dfc57d6e2", + "requires": {} + }, "@sinonjs/formatio": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", @@ -44365,12 +44373,6 @@ "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz", "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==" }, - "@replit/codemirror-emacs": { - "version": "git+ssh://git@github.com/overleaf/codemirror-emacs.git#90bcadaaaf38ed0d88cf15f0ddb8e868ca253e17", - "integrity": "sha512-hw2nW0fQarkKcuG7Myos2SzpjfCfukmfFTJsxQ/y2hcw4DCRLqD53unBJ5L7yz/nhB5PPcLhg2iV5WRgnT9chg==", - "from": "@replit/codemirror-emacs@overleaf/codemirror-emacs#90bcadaaaf38ed0d88cf15f0ddb8e868ca253e17", - "requires": {} - }, "@replit/codemirror-vim": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@replit/codemirror-vim/-/codemirror-vim-6.0.2.tgz", diff --git a/services/web/package.json b/services/web/package.json index 5bc2d86d06..7fbc903e1f 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -74,7 +74,7 @@ "@codemirror/lint": "^6.0.0", "@codemirror/search": "^6.2.1", "@codemirror/state": "^6.1.2", - "@codemirror/view": "^6.2.5", + "@codemirror/view": "^6.3.0", "@lezer/common": "^1.0.1", "@lezer/highlight": "^1.1.0", "@lezer/lr": "^1.2.3", @@ -89,7 +89,7 @@ "@pollyjs/core": "^4.2.1", "@pollyjs/persister-fs": "^4.2.1", "@reach/tabs": "^0.15.0", - "@replit/codemirror-emacs": "overleaf/codemirror-emacs#90bcadaaaf38ed0d88cf15f0ddb8e868ca253e17", + "@replit/codemirror-emacs": "overleaf/codemirror-emacs#8640addc01bbe99fec0144993d012b6dfc57d6e2", "@replit/codemirror-vim": "^6.0.2", "@sentry/browser": "^7.8.1", "@uppy/core": "^1.15.0",