소스 검색

Merge branch 'main' into ts-4.9

Jake Bailey 2 년 전
부모
커밋
d793f4d6fd

+ 1 - 14
.azure-pipelines/publish-nightly.yml

@@ -38,6 +38,7 @@ extends:
             displayName: Setup, Build & Test monaco-editor-core
 
         tag: next
+        ghCreateTag: false
         publishPackage: true
         publishRequiresApproval: false
 
@@ -54,17 +55,3 @@ extends:
         tag: next
         publishPackage: true
         publishRequiresApproval: false
-
-        postPublishSteps:
-          - checkout: self
-            persistCredentials: true
-
-          - script: |
-              set -e
-
-              git config user.email "vscode@microsoft.com"
-              git config user.name "VSCode"
-
-              git tag -a v$(SetPackageSpec.PACKAGE_VERSION) -m v$(SetPackageSpec.PACKAGE_VERSION)
-              git push origin v$(SetPackageSpec.PACKAGE_VERSION)
-            workingDirectory: $(Build.SourcesDirectory)

+ 2 - 14
.azure-pipelines/publish-stable.yml

@@ -44,6 +44,7 @@ extends:
             displayName: Setup, Build & Test monaco-editor-core
 
         tag: latest
+        ghCreateTag: false
         publishPackage: ${{ parameters.publishMonacoEditorCore }}
         publishRequiresApproval: false
 
@@ -61,20 +62,6 @@ extends:
         publishPackage: ${{ parameters.publishMonacoEditor }}
         publishRequiresApproval: false
 
-        postPublishSteps:
-          - checkout: self
-            persistCredentials: true
-
-          - script: |
-              set -e
-
-              git config user.email "vscode@microsoft.com"
-              git config user.name "VSCode"
-
-              git tag -a v$(SetPackageSpec.PACKAGE_VERSION) -m v$(SetPackageSpec.PACKAGE_VERSION)
-              git push origin v$(SetPackageSpec.PACKAGE_VERSION)
-            workingDirectory: $(Build.SourcesDirectory)
-
       - name: monaco-editor-webpack-plugin
         workingDirectory: $(Build.SourcesDirectory)/webpack-plugin
         testPlatforms: []
@@ -86,5 +73,6 @@ extends:
             displayName: Build plugin
 
         tag: latest
+        ghCreateTag: false
         publishPackage: ${{ parameters.publishWebpackPlugin }}
         publishRequiresApproval: false

+ 7 - 7
package-lock.json

@@ -44,7 +44,7 @@
 				"vscode-languageserver-textdocument": "^1.0.4",
 				"vscode-languageserver-types": "3.16.0",
 				"vscode-uri": "3.0.3",
-				"webpack": "^5.74.0",
+				"webpack": "^5.76.0",
 				"yaserver": "^0.4.0"
 			}
 		},
@@ -7169,9 +7169,9 @@
 			}
 		},
 		"node_modules/webpack": {
-			"version": "5.75.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
-			"integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
+			"version": "5.76.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz",
+			"integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==",
 			"dev": true,
 			"dependencies": {
 				"@types/eslint-scope": "^3.7.3",
@@ -12363,9 +12363,9 @@
 			"dev": true
 		},
 		"webpack": {
-			"version": "5.75.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
-			"integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
+			"version": "5.76.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz",
+			"integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==",
 			"dev": true,
 			"requires": {
 				"@types/eslint-scope": "^3.7.3",

+ 1 - 1
package.json

@@ -71,7 +71,7 @@
 		"vscode-languageserver-textdocument": "^1.0.4",
 		"vscode-languageserver-types": "3.16.0",
 		"vscode-uri": "3.0.3",
-		"webpack": "^5.74.0",
+		"webpack": "^5.76.0",
 		"yaserver": "^0.4.0"
 	},
 	"alias": {

+ 46 - 46
samples/browser-esm-webpack-typescript-react/package-lock.json

@@ -2106,9 +2106,9 @@
 			"peer": true
 		},
 		"node_modules/acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"version": "8.8.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
 			"dev": true,
 			"peer": true,
 			"bin": {
@@ -2488,9 +2488,9 @@
 			}
 		},
 		"node_modules/enhanced-resolve": {
-			"version": "5.9.2",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
-			"integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
+			"version": "5.12.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+			"integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -2692,9 +2692,9 @@
 			}
 		},
 		"node_modules/graceful-fs": {
-			"version": "4.2.9",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-			"integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+			"version": "4.2.10",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+			"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
 			"dev": true,
 			"peer": true
 		},
@@ -2808,10 +2808,10 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/json-parse-better-errors": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
 			"dev": true,
 			"peer": true
 		},
@@ -3509,9 +3509,9 @@
 			}
 		},
 		"node_modules/watchpack": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-			"integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -3523,9 +3523,9 @@
 			}
 		},
 		"node_modules/webpack": {
-			"version": "5.70.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz",
-			"integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==",
+			"version": "5.76.1",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz",
+			"integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -3534,24 +3534,24 @@
 				"@webassemblyjs/ast": "1.11.1",
 				"@webassemblyjs/wasm-edit": "1.11.1",
 				"@webassemblyjs/wasm-parser": "1.11.1",
-				"acorn": "^8.4.1",
+				"acorn": "^8.7.1",
 				"acorn-import-assertions": "^1.7.6",
 				"browserslist": "^4.14.5",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.9.2",
+				"enhanced-resolve": "^5.10.0",
 				"es-module-lexer": "^0.9.0",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.2.9",
-				"json-parse-better-errors": "^1.0.2",
+				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
 				"schema-utils": "^3.1.0",
 				"tapable": "^2.1.1",
 				"terser-webpack-plugin": "^5.1.3",
-				"watchpack": "^2.3.1",
+				"watchpack": "^2.4.0",
 				"webpack-sources": "^3.2.3"
 			},
 			"bin": {
@@ -5106,9 +5106,9 @@
 			"peer": true
 		},
 		"acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"version": "8.8.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
 			"dev": true,
 			"peer": true
 		},
@@ -5382,9 +5382,9 @@
 			"dev": true
 		},
 		"enhanced-resolve": {
-			"version": "5.9.2",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
-			"integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
+			"version": "5.12.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+			"integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
 			"dev": true,
 			"peer": true,
 			"requires": {
@@ -5540,9 +5540,9 @@
 			"dev": true
 		},
 		"graceful-fs": {
-			"version": "4.2.9",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-			"integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+			"version": "4.2.10",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+			"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
 			"dev": true,
 			"peer": true
 		},
@@ -5625,10 +5625,10 @@
 			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
 			"dev": true
 		},
-		"json-parse-better-errors": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+		"json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
 			"dev": true,
 			"peer": true
 		},
@@ -6150,9 +6150,9 @@
 			}
 		},
 		"watchpack": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-			"integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
 			"dev": true,
 			"peer": true,
 			"requires": {
@@ -6161,9 +6161,9 @@
 			}
 		},
 		"webpack": {
-			"version": "5.70.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz",
-			"integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==",
+			"version": "5.76.1",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz",
+			"integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==",
 			"dev": true,
 			"peer": true,
 			"requires": {
@@ -6172,24 +6172,24 @@
 				"@webassemblyjs/ast": "1.11.1",
 				"@webassemblyjs/wasm-edit": "1.11.1",
 				"@webassemblyjs/wasm-parser": "1.11.1",
-				"acorn": "^8.4.1",
+				"acorn": "^8.7.1",
 				"acorn-import-assertions": "^1.7.6",
 				"browserslist": "^4.14.5",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.9.2",
+				"enhanced-resolve": "^5.10.0",
 				"es-module-lexer": "^0.9.0",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.2.9",
-				"json-parse-better-errors": "^1.0.2",
+				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
 				"schema-utils": "^3.1.0",
 				"tapable": "^2.1.1",
 				"terser-webpack-plugin": "^5.1.3",
-				"watchpack": "^2.3.1",
+				"watchpack": "^2.4.0",
 				"webpack-sources": "^3.2.3"
 			}
 		},

+ 7 - 4
samples/package-lock.json

@@ -20,7 +20,7 @@
 				"terser-webpack-plugin": "^5.3.1",
 				"ts-loader": "^9.2.6",
 				"typescript": "^4.9.5",
-				"webpack": "^5.68.0",
+				"webpack": "^5.76.0",
 				"webpack-cli": "^4.9.2",
 				"webpack-dev-server": "^4.7.4",
 				"yaserver": "^0.4.0"
@@ -4194,9 +4194,10 @@
 			}
 		},
 		"node_modules/webpack": {
-			"version": "5.74.0",
+			"version": "5.76.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz",
+			"integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/eslint-scope": "^3.7.3",
 				"@types/estree": "^0.0.51",
@@ -7197,7 +7198,9 @@
 			}
 		},
 		"webpack": {
-			"version": "5.74.0",
+			"version": "5.76.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz",
+			"integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==",
 			"dev": true,
 			"requires": {
 				"@types/eslint-scope": "^3.7.3",

+ 1 - 1
samples/package.json

@@ -23,7 +23,7 @@
 		"typescript": "^4.9.5",
 		"webpack-cli": "^4.9.2",
 		"webpack-dev-server": "^4.7.4",
-		"webpack": "^5.68.0",
+		"webpack": "^5.76.0",
 		"yaserver": "^0.4.0"
 	},
 	"overrides": {

+ 46 - 46
webpack-plugin/package-lock.json

@@ -326,9 +326,9 @@
 			"dev": true
 		},
 		"node_modules/acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"version": "8.8.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
 			"dev": true,
 			"bin": {
 				"acorn": "bin/acorn"
@@ -554,9 +554,9 @@
 			}
 		},
 		"node_modules/enhanced-resolve": {
-			"version": "5.9.2",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
-			"integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
+			"version": "5.12.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+			"integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.4",
@@ -770,9 +770,9 @@
 			"dev": true
 		},
 		"node_modules/graceful-fs": {
-			"version": "4.2.9",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-			"integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+			"version": "4.2.10",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+			"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
 			"dev": true
 		},
 		"node_modules/has": {
@@ -926,10 +926,10 @@
 				"node": ">= 10.13.0"
 			}
 		},
-		"node_modules/json-parse-better-errors": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
 			"dev": true
 		},
 		"node_modules/json-schema-traverse": {
@@ -1646,9 +1646,9 @@
 			"dev": true
 		},
 		"node_modules/watchpack": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-			"integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
 			"dev": true,
 			"dependencies": {
 				"glob-to-regexp": "^0.4.1",
@@ -1659,9 +1659,9 @@
 			}
 		},
 		"node_modules/webpack": {
-			"version": "5.70.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz",
-			"integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==",
+			"version": "5.76.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz",
+			"integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==",
 			"dev": true,
 			"dependencies": {
 				"@types/eslint-scope": "^3.7.3",
@@ -1669,24 +1669,24 @@
 				"@webassemblyjs/ast": "1.11.1",
 				"@webassemblyjs/wasm-edit": "1.11.1",
 				"@webassemblyjs/wasm-parser": "1.11.1",
-				"acorn": "^8.4.1",
+				"acorn": "^8.7.1",
 				"acorn-import-assertions": "^1.7.6",
 				"browserslist": "^4.14.5",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.9.2",
+				"enhanced-resolve": "^5.10.0",
 				"es-module-lexer": "^0.9.0",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.2.9",
-				"json-parse-better-errors": "^1.0.2",
+				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
 				"schema-utils": "^3.1.0",
 				"tapable": "^2.1.1",
 				"terser-webpack-plugin": "^5.1.3",
-				"watchpack": "^2.3.1",
+				"watchpack": "^2.4.0",
 				"webpack-sources": "^3.2.3"
 			},
 			"bin": {
@@ -2089,9 +2089,9 @@
 			"dev": true
 		},
 		"acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"version": "8.8.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
 			"dev": true
 		},
 		"acorn-import-assertions": {
@@ -2246,9 +2246,9 @@
 			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
 		},
 		"enhanced-resolve": {
-			"version": "5.9.2",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
-			"integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
+			"version": "5.12.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+			"integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
 			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.2.4",
@@ -2406,9 +2406,9 @@
 			"dev": true
 		},
 		"graceful-fs": {
-			"version": "4.2.9",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-			"integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+			"version": "4.2.10",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+			"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
 			"dev": true
 		},
 		"has": {
@@ -2518,10 +2518,10 @@
 				"supports-color": "^8.0.0"
 			}
 		},
-		"json-parse-better-errors": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+		"json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
 			"dev": true
 		},
 		"json-schema-traverse": {
@@ -3006,9 +3006,9 @@
 			"dev": true
 		},
 		"watchpack": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-			"integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
 			"dev": true,
 			"requires": {
 				"glob-to-regexp": "^0.4.1",
@@ -3016,9 +3016,9 @@
 			}
 		},
 		"webpack": {
-			"version": "5.70.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz",
-			"integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==",
+			"version": "5.76.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz",
+			"integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==",
 			"dev": true,
 			"requires": {
 				"@types/eslint-scope": "^3.7.3",
@@ -3026,24 +3026,24 @@
 				"@webassemblyjs/ast": "1.11.1",
 				"@webassemblyjs/wasm-edit": "1.11.1",
 				"@webassemblyjs/wasm-parser": "1.11.1",
-				"acorn": "^8.4.1",
+				"acorn": "^8.7.1",
 				"acorn-import-assertions": "^1.7.6",
 				"browserslist": "^4.14.5",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.9.2",
+				"enhanced-resolve": "^5.10.0",
 				"es-module-lexer": "^0.9.0",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.2.9",
-				"json-parse-better-errors": "^1.0.2",
+				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
 				"schema-utils": "^3.1.0",
 				"tapable": "^2.1.1",
 				"terser-webpack-plugin": "^5.1.3",
-				"watchpack": "^2.3.1",
+				"watchpack": "^2.4.0",
 				"webpack-sources": "^3.2.3"
 			}
 		},

+ 1 - 1
website/package.json

@@ -51,7 +51,7 @@
 		"ts-loader": "^9.3.1",
 		"ts-node": "^10.9.1",
 		"typescript": "^4.9.5",
-		"webpack": "^5.74.0",
+		"webpack": "^5.76.0",
 		"webpack-bundle-analyzer": "^4.5.0",
 		"webpack-cli": "^4.10.0",
 		"webpack-dev-server": "^4.9.3"

+ 12 - 15
website/src/website/data/playground-samples/interacting-with-the-editor/line-and-inline-decorations/sample.js

@@ -15,19 +15,16 @@ var editor = monaco.editor.create(document.getElementById("container"), {
 	language: "javascript",
 });
 
-var decorations = editor.deltaDecorations(
-	[],
-	[
-		{
-			range: new monaco.Range(3, 1, 5, 1),
-			options: {
-				isWholeLine: true,
-				linesDecorationsClassName: "myLineDecoration",
-			},
+var decorations = editor.createDecorationsCollection([
+	{
+		range: new monaco.Range(3, 1, 5, 1),
+		options: {
+			isWholeLine: true,
+			linesDecorationsClassName: "myLineDecoration",
 		},
-		{
-			range: new monaco.Range(7, 1, 7, 24),
-			options: { inlineClassName: "myInlineDecoration" },
-		},
-	]
-);
+	},
+	{
+		range: new monaco.Range(7, 1, 7, 24),
+		options: { inlineClassName: "myInlineDecoration" },
+	},
+]);

+ 9 - 12
website/src/website/data/playground-samples/interacting-with-the-editor/listening-to-mouse-events/sample.js

@@ -17,19 +17,16 @@ var editor = monaco.editor.create(document.getElementById("container"), {
 	contextmenu: false,
 });
 
-var decorations = editor.deltaDecorations(
-	[],
-	[
-		{
-			range: new monaco.Range(3, 1, 3, 1),
-			options: {
-				isWholeLine: true,
-				className: "myContentClass",
-				glyphMarginClassName: "myGlyphMarginClass",
-			},
+var decorations = editor.createDecorationsCollection([
+	{
+		range: new monaco.Range(3, 1, 3, 1),
+		options: {
+			isWholeLine: true,
+			className: "myContentClass",
+			glyphMarginClassName: "myGlyphMarginClass",
 		},
-	]
-);
+	},
+]);
 
 // Add a zone to make hit testing more interesting
 var viewZoneId = null;

+ 9 - 12
website/src/website/data/playground-samples/interacting-with-the-editor/rendering-glyphs-in-the-margin/sample.js

@@ -16,18 +16,15 @@ var editor = monaco.editor.create(document.getElementById("container"), {
 	glyphMargin: true,
 });
 
-var decorations = editor.deltaDecorations(
-	[],
-	[
-		{
-			range: new monaco.Range(3, 1, 3, 1),
-			options: {
-				isWholeLine: true,
-				className: "myContentClass",
-				glyphMarginClassName: "myGlyphMarginClass",
-			},
+var decorations = editor.createDecorationsCollection([
+	{
+		range: new monaco.Range(3, 1, 3, 1),
+		options: {
+			isWholeLine: true,
+			className: "myContentClass",
+			glyphMarginClassName: "myGlyphMarginClass",
 		},
-	]
-);
+	},
+]);
 
 // You can now use `decorations` to change or remove the decoration

+ 4 - 4
website/yarn.lock

@@ -3367,10 +3367,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.74.0:
-  version "5.74.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
-  integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
+webpack@^5.76.0:
+  version "5.76.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.0.tgz#f9fb9fb8c4a7dbdcd0d56a98e56b8a942ee2692c"
+  integrity sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"