diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 0000000000..bcaa3377df
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+18.17
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 194148df11..9b6d5fac76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
# Monaco Editor Changelog
+## [0.44.0]
+
+- Removes old diff editor implementation.
+- Custom diff algorithms no longer can be passed via diff editor options, instead a service should be used ([see #3558 for more details](https://github.com/microsoft/monaco-editor/issues/3558)).
+
## [0.42.0]
- Uses new diff editor widget by default. Use `experimental.useVersion2: false` to use the old widget. The old widget will be replaced in the next update.
diff --git a/package-lock.json b/package-lock.json
index ae809d5d99..9cd99ce901 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "monaco-editor",
- "version": "0.43.0",
+ "version": "0.44.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "monaco-editor",
- "version": "0.43.0",
+ "version": "0.44.0",
"hasInstallScript": true,
"license": "MIT",
"devDependencies": {
@@ -25,7 +25,7 @@
"jsdom": "^19.0.0",
"jsonc-parser": "^3.0.0",
"mocha": "^9.2.0",
- "monaco-editor-core": "0.42.0-rc1",
+ "monaco-editor-core": "0.44.0-rc1",
"parcel": "^2.7.0",
"pin-github-action": "^1.8.0",
"playwright": "^1.32.2",
@@ -3175,6 +3175,17 @@
"node": ">= 4"
}
},
+ "node_modules/encoding": {
+ "version": "0.1.13",
+ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "iconv-lite": "^0.6.2"
+ }
+ },
"node_modules/end-of-stream": {
"version": "1.4.4",
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -5326,9 +5337,9 @@
"dev": true
},
"node_modules/monaco-editor-core": {
- "version": "0.42.0-rc1",
- "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.42.0-rc1.tgz",
- "integrity": "sha512-Y3MCaVVKAb+JTy80uL0FxgzOWRMeIa6VJb7T4yPBI6eFSin4Rnx7WDc2L0BRr+jS6GPH74i2xpL4EDoIAWDZmQ==",
+ "version": "0.44.0-rc1",
+ "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.44.0-rc1.tgz",
+ "integrity": "sha512-7dSz2GkAZO4tr0RgbLvjpRKzCamKxHm9yRCaPL+XA90HKEdrKv3uX30BwYq5rji8yuS62YuvcaaPaXEfULZbaA==",
"dev": true
},
"node_modules/mri": {
@@ -9731,6 +9742,17 @@
"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
"dev": true
},
+ "encoding": {
+ "version": "0.1.13",
+ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "requires": {
+ "iconv-lite": "^0.6.2"
+ }
+ },
"end-of-stream": {
"version": "1.4.4",
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -11037,9 +11059,9 @@
}
},
"monaco-editor-core": {
- "version": "0.42.0-rc1",
- "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.42.0-rc1.tgz",
- "integrity": "sha512-Y3MCaVVKAb+JTy80uL0FxgzOWRMeIa6VJb7T4yPBI6eFSin4Rnx7WDc2L0BRr+jS6GPH74i2xpL4EDoIAWDZmQ==",
+ "version": "0.44.0-rc1",
+ "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.44.0-rc1.tgz",
+ "integrity": "sha512-7dSz2GkAZO4tr0RgbLvjpRKzCamKxHm9yRCaPL+XA90HKEdrKv3uX30BwYq5rji8yuS62YuvcaaPaXEfULZbaA==",
"dev": true
},
"mri": {
diff --git a/package.json b/package.json
index 15ab30f932..3039223ea1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "monaco-editor",
- "version": "0.43.0",
- "vscodeRef": "16e9205452dd417e32f164325b589b94892846b4",
+ "version": "0.44.0",
+ "vscodeRef": "e7e037083ff4455cf320e344325dacb480062c3c",
"private": true,
"description": "A browser based code editor",
"homepage": "https://github.com/microsoft/monaco-editor",
@@ -52,7 +52,7 @@
"jsdom": "^19.0.0",
"jsonc-parser": "^3.0.0",
"mocha": "^9.2.0",
- "monaco-editor-core": "0.42.0-rc1",
+ "monaco-editor-core": "0.44.0-rc1",
"parcel": "^2.7.0",
"pin-github-action": "^1.8.0",
"playwright": "^1.32.2",
diff --git a/samples/package-lock.json b/samples/package-lock.json
index a5400f221b..d5e1100d36 100644
--- a/samples/package-lock.json
+++ b/samples/package-lock.json
@@ -10,7 +10,7 @@
"license": "MIT",
"devDependencies": {
"css-loader": "^5.2.7",
- "electron": "^19.1.8",
+ "electron": "^22.3.25",
"file-loader": "^6.2.0",
"glob": "^7.2.0",
"html-webpack-plugin": "^5.5.0",
@@ -355,6 +355,16 @@
"@types/node": "*"
}
},
+ "node_modules/@types/yauzl": {
+ "version": "2.10.1",
+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz",
+ "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
"node_modules/@webassemblyjs/ast": {
"version": "1.11.1",
"dev": true,
@@ -777,8 +787,9 @@
},
"node_modules/buffer-crc32": {
"version": "0.2.13",
+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
"dev": true,
- "license": "MIT",
"engines": {
"node": "*"
}
@@ -1050,20 +1061,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/concat-stream": {
- "version": "1.6.2",
- "dev": true,
- "engines": [
- "node >= 0.8"
- ],
- "license": "MIT",
- "dependencies": {
- "buffer-from": "^1.0.0",
- "inherits": "^2.0.3",
- "readable-stream": "^2.2.2",
- "typedarray": "^0.0.6"
- }
- },
"node_modules/config-chain": {
"version": "1.1.13",
"dev": true,
@@ -1373,21 +1370,21 @@
"license": "MIT"
},
"node_modules/electron": {
- "version": "19.1.8",
- "resolved": "https://registry.npmjs.org/electron/-/electron-19.1.8.tgz",
- "integrity": "sha512-UfPQdFjgKI0xCm1V5sV3iAVOs0kCwAE91xWzV5tI7ij14yOkxTdXp9BqTzFaSbQYLYxn6q1BUUe1nlzjJjzAnw==",
+ "version": "22.3.25",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.25.tgz",
+ "integrity": "sha512-AjrP7bebMs/IPsgmyowptbA7jycTkrJC7jLZTb5JoH30PkBC6pZx/7XQ0aDok82SsmSiF4UJDOg+HoLrEBiqmg==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
- "@electron/get": "^1.14.1",
+ "@electron/get": "^2.0.0",
"@types/node": "^16.11.26",
- "extract-zip": "^1.0.3"
+ "extract-zip": "^2.0.1"
},
"bin": {
"electron": "cli.js"
},
"engines": {
- "node": ">= 8.6"
+ "node": ">= 12.20.55"
}
},
"node_modules/electron-to-chromium": {
@@ -1624,19 +1621,63 @@
}
},
"node_modules/extract-zip": {
- "version": "1.7.0",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
"dev": true,
- "license": "BSD-2-Clause",
"dependencies": {
- "concat-stream": "^1.6.2",
- "debug": "^2.6.9",
- "mkdirp": "^0.5.4",
+ "debug": "^4.1.1",
+ "get-stream": "^5.1.0",
"yauzl": "^2.10.0"
},
"bin": {
"extract-zip": "cli.js"
+ },
+ "engines": {
+ "node": ">= 10.17.0"
+ },
+ "optionalDependencies": {
+ "@types/yauzl": "^2.9.1"
+ }
+ },
+ "node_modules/extract-zip/node_modules/debug": {
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.1.2"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/extract-zip/node_modules/get-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+ "dev": true,
+ "dependencies": {
+ "pump": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/extract-zip/node_modules/ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
"node_modules/fast-deep-equal": {
"version": "3.1.3",
"dev": true,
@@ -1668,8 +1709,9 @@
},
"node_modules/fd-slicer": {
"version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
"dev": true,
- "license": "MIT",
"dependencies": {
"pend": "~1.2.0"
}
@@ -2646,22 +2688,6 @@
"node": "*"
}
},
- "node_modules/minimist": {
- "version": "1.2.6",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/mkdirp": {
- "version": "0.5.6",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "minimist": "^1.2.6"
- },
- "bin": {
- "mkdirp": "bin/cmd.js"
- }
- },
"node_modules/monaco-editor": {
"version": "0.32.1",
"dev": true,
@@ -2697,9 +2723,16 @@
}
},
"node_modules/nanoid": {
- "version": "3.3.4",
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
"dev": true,
- "license": "MIT",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -2990,8 +3023,9 @@
},
"node_modules/pend": {
"version": "1.2.0",
- "dev": true,
- "license": "MIT"
+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+ "dev": true
},
"node_modules/picocolors": {
"version": "1.0.0",
@@ -3030,7 +3064,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.16",
+ "version": "8.4.31",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+ "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true,
"funding": [
{
@@ -3040,11 +3076,14 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
}
],
- "license": "MIT",
"dependencies": {
- "nanoid": "^3.3.4",
+ "nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
@@ -4072,11 +4111,6 @@
"node": ">= 0.6"
}
},
- "node_modules/typedarray": {
- "version": "0.0.6",
- "dev": true,
- "license": "MIT"
- },
"node_modules/typescript": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz",
@@ -4503,8 +4537,9 @@
},
"node_modules/yauzl": {
"version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
"dev": true,
- "license": "MIT",
"dependencies": {
"buffer-crc32": "~0.2.3",
"fd-slicer": "~1.1.0"
@@ -4767,6 +4802,16 @@
"@types/node": "*"
}
},
+ "@types/yauzl": {
+ "version": "2.10.1",
+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz",
+ "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ },
"@webassemblyjs/ast": {
"version": "1.11.1",
"dev": true,
@@ -5062,6 +5107,8 @@
},
"buffer-crc32": {
"version": "0.2.13",
+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
"dev": true
},
"buffer-from": {
@@ -5234,16 +5281,6 @@
"version": "0.0.1",
"dev": true
},
- "concat-stream": {
- "version": "1.6.2",
- "dev": true,
- "requires": {
- "buffer-from": "^1.0.0",
- "inherits": "^2.0.3",
- "readable-stream": "^2.2.2",
- "typedarray": "^0.0.6"
- }
- },
"config-chain": {
"version": "1.1.13",
"dev": true,
@@ -5434,14 +5471,14 @@
"dev": true
},
"electron": {
- "version": "19.1.8",
- "resolved": "https://registry.npmjs.org/electron/-/electron-19.1.8.tgz",
- "integrity": "sha512-UfPQdFjgKI0xCm1V5sV3iAVOs0kCwAE91xWzV5tI7ij14yOkxTdXp9BqTzFaSbQYLYxn6q1BUUe1nlzjJjzAnw==",
+ "version": "22.3.25",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.25.tgz",
+ "integrity": "sha512-AjrP7bebMs/IPsgmyowptbA7jycTkrJC7jLZTb5JoH30PkBC6pZx/7XQ0aDok82SsmSiF4UJDOg+HoLrEBiqmg==",
"dev": true,
"requires": {
"@electron/get": "2.0.0",
"@types/node": "^16.11.26",
- "extract-zip": "^1.0.3"
+ "extract-zip": "^2.0.1"
},
"dependencies": {
"@types/node": {
@@ -5603,13 +5640,41 @@
}
},
"extract-zip": {
- "version": "1.7.0",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
"dev": true,
"requires": {
- "concat-stream": "^1.6.2",
- "debug": "^2.6.9",
- "mkdirp": "^0.5.4",
+ "@types/yauzl": "^2.9.1",
+ "debug": "^4.1.1",
+ "get-stream": "^5.1.0",
"yauzl": "^2.10.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "get-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+ "dev": true,
+ "requires": {
+ "pump": "^3.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
}
},
"fast-deep-equal": {
@@ -5633,6 +5698,8 @@
},
"fd-slicer": {
"version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
"dev": true,
"requires": {
"pend": "~1.2.0"
@@ -6232,17 +6299,6 @@
"brace-expansion": "^1.1.7"
}
},
- "minimist": {
- "version": "1.2.6",
- "dev": true
- },
- "mkdirp": {
- "version": "0.5.6",
- "dev": true,
- "requires": {
- "minimist": "^1.2.6"
- }
- },
"monaco-editor": {
"version": "0.32.1",
"dev": true
@@ -6267,7 +6323,9 @@
}
},
"nanoid": {
- "version": "3.3.4",
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
"dev": true
},
"negotiator": {
@@ -6444,6 +6502,8 @@
},
"pend": {
"version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
"dev": true
},
"picocolors": {
@@ -6467,10 +6527,12 @@
}
},
"postcss": {
- "version": "8.4.16",
+ "version": "8.4.31",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+ "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true,
"requires": {
- "nanoid": "^3.3.4",
+ "nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
}
@@ -7129,10 +7191,6 @@
"mime-types": "~2.1.24"
}
},
- "typedarray": {
- "version": "0.0.6",
- "dev": true
- },
"typescript": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz",
@@ -7378,6 +7436,8 @@
},
"yauzl": {
"version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
"dev": true,
"requires": {
"buffer-crc32": "~0.2.3",
diff --git a/samples/package.json b/samples/package.json
index ddf82cf0e0..c70e4c6f54 100644
--- a/samples/package.json
+++ b/samples/package.json
@@ -11,7 +11,7 @@
"license": "MIT",
"devDependencies": {
"css-loader": "^5.2.7",
- "electron": "^19.1.8",
+ "electron": "^22.3.25",
"file-loader": "^6.2.0",
"glob": "^7.2.0",
"html-webpack-plugin": "^5.5.0",
diff --git a/webpack-plugin/package-lock.json b/webpack-plugin/package-lock.json
index 32b06e2807..c949d2f995 100644
--- a/webpack-plugin/package-lock.json
+++ b/webpack-plugin/package-lock.json
@@ -1059,10 +1059,16 @@
"dev": true
},
"node_modules/nanoid": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz",
- "integrity": "sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==",
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
"dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -1206,9 +1212,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.12",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz",
- "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==",
+ "version": "8.4.31",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+ "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true,
"funding": [
{
@@ -1218,10 +1224,14 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
}
],
"dependencies": {
- "nanoid": "^3.3.1",
+ "nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
@@ -2618,9 +2628,9 @@
"dev": true
},
"nanoid": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz",
- "integrity": "sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==",
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
"dev": true
},
"neo-async": {
@@ -2726,12 +2736,12 @@
}
},
"postcss": {
- "version": "8.4.12",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz",
- "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==",
+ "version": "8.4.31",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+ "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true,
"requires": {
- "nanoid": "^3.3.1",
+ "nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
}
diff --git a/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.css b/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.html b/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.html
deleted file mode 100644
index 75b9b160de..0000000000
--- a/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.js b/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.js
deleted file mode 100644
index b6b51257c7..0000000000
--- a/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// The diff editor offers a navigator to jump between changes. Once the diff is computed the next() and previous() method allow navigation. By default setting the selection in the editor manually resets the navigation state.
-var originalModel = monaco.editor.createModel(
- "just some text\n\nHello World\n\nSome more text",
- "text/plain"
-);
-var modifiedModel = monaco.editor.createModel(
- "just some Text\n\nHello World\n\nSome more changes",
- "text/plain"
-);
-
-var diffEditor = monaco.editor.createDiffEditor(
- document.getElementById("container")
-);
-diffEditor.setModel({
- original: originalModel,
- modified: modifiedModel,
-});
-
-var navi = monaco.editor.createDiffNavigator(diffEditor, {
- followsCaret: true, // resets the navigator state when the user selects something in the editor
- ignoreCharChanges: true, // jump from line to line
-});
-
-window.setInterval(function () {
- navi.next();
-}, 2000);
diff --git a/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.json b/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.json
deleted file mode 100644
index f0f5176650..0000000000
--- a/website/src/website/data/playground-samples/creating-the-diffeditor/navigating-a-diff/sample.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "title": "Navigating A Diff"
-}