Merge branch 'main' into samstrohkorbatt/python-fstring

.azure-pipelines/publish-nightly.yml

@@ -48,6 +48,7 @@ extends:
       - name: monaco-editor-core
         workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core
         testPlatforms: []
+        skipAPIScan: true # package build requires Linux
         buildSteps:
           - script: sudo apt install -y libkrb5-dev
             displayName: Install libkrb5-dev
@@ -70,6 +71,7 @@ extends:
       - name: monaco-editor
         workingDirectory: $(Build.SourcesDirectory)/out/monaco-editor
         testPlatforms: []
+        skipAPIScan: true # package build requires Linux
         buildSteps:
           - script: npm ci
             displayName: Install NPM dependencies

.azure-pipelines/publish-stable.yml

@@ -32,10 +32,12 @@ parameters:
 extends:
   template: azure-pipelines/npm-package/pipeline.yml@templates
   parameters:
+    cgIgnoreDirectories: $(Build.SourcesDirectory)/dependencies/vscode/extensions
     npmPackages:
       - name: monaco-editor-core
         workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core
         testPlatforms: []
+        skipAPIScan: true # package build requires Linux
         buildSteps:
           - script: sudo apt install -y libkrb5-dev
             displayName: Install libkrb5-dev
@@ -54,6 +56,7 @@ extends:
       - name: monaco-editor
         workingDirectory: $(Build.SourcesDirectory)/out/monaco-editor
         testPlatforms: []
+        skipAPIScan: true # package build requires Linux
         buildSteps:
           - script: npm ci
             displayName: Install NPM dependencies
@@ -68,6 +71,7 @@ extends:
       - name: monaco-editor-webpack-plugin
         workingDirectory: $(Build.SourcesDirectory)/webpack-plugin
         testPlatforms: []
+        packagePlatform: Windows
         buildSteps:
           - script: npm ci
             displayName: Install NPM dependencies

package-lock.json

@@ -25,7 +25,7 @@
 				"jsdom": "^19.0.0",
 				"jsonc-parser": "^3.0.0",
 				"mocha": "^9.2.0",
-				"monaco-editor-core": "0.47.0-rc",
+				"monaco-editor-core": "0.48.0-dev-20240319",
 				"parcel": "^2.7.0",
 				"pin-github-action": "^1.8.0",
 				"playwright": "^1.32.2",
@@ -4173,9 +4173,9 @@
 			}
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+			"version": "1.15.6",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 			"dev": true,
 			"funding": [
 				{
@@ -5388,9 +5388,9 @@
 			"dev": true
 		},
 		"node_modules/monaco-editor-core": {
-			"version": "0.47.0-rc",
-			"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.47.0-rc.tgz",
-			"integrity": "sha512-ceoa8L9y0qpBJ7nckIUNvRQJpJEKm0HoMEPH07xSGDwIAGEKuLRO0eIFvx0L5cEo0zQsKzoBfL65esVadrO5zA==",
+			"version": "0.48.0-dev-20240319",
+			"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240319.tgz",
+			"integrity": "sha512-w8QasiJcJY/XPHPqtqj1+aokHrFIFBYuKOOABFT9vDmTEp/0euMxARhwc0R1VvtQ1hSFVKb0CQq6X1kMdgvbbQ==",
 			"dev": true
 		},
 		"node_modules/mri": {
@@ -10340,9 +10340,9 @@
 			"dev": true
 		},
 		"follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+			"version": "1.15.6",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 			"dev": true
 		},
 		"form-data": {
@@ -11144,9 +11144,9 @@
 			}
 		},
 		"monaco-editor-core": {
-			"version": "0.47.0-rc",
-			"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.47.0-rc.tgz",
-			"integrity": "sha512-ceoa8L9y0qpBJ7nckIUNvRQJpJEKm0HoMEPH07xSGDwIAGEKuLRO0eIFvx0L5cEo0zQsKzoBfL65esVadrO5zA==",
+			"version": "0.48.0-dev-20240319",
+			"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240319.tgz",
+			"integrity": "sha512-w8QasiJcJY/XPHPqtqj1+aokHrFIFBYuKOOABFT9vDmTEp/0euMxARhwc0R1VvtQ1hSFVKb0CQq6X1kMdgvbbQ==",
 			"dev": true
 		},
 		"mri": {

package.json

@@ -52,7 +52,7 @@
 		"jsdom": "^19.0.0",
 		"jsonc-parser": "^3.0.0",
 		"mocha": "^9.2.0",
-		"monaco-editor-core": "0.47.0-rc",
+		"monaco-editor-core": "0.48.0-dev-20240319",
 		"parcel": "^2.7.0",
 		"pin-github-action": "^1.8.0",
 		"playwright": "^1.32.2",

samples/package-lock.json

@@ -1776,7 +1776,9 @@
 			}
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.15.1",
+			"version": "1.15.6",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 			"dev": true,
 			"funding": [
 				{
@@ -1784,7 +1786,6 @@
 					"url": "https://github.com/sponsors/RubenVerborgh"
 				}
 			],
-			"license": "MIT",
 			"engines": {
 				"node": ">=4.0"
 			},
@@ -5742,7 +5743,9 @@
 			}
 		},
 		"follow-redirects": {
-			"version": "1.15.1",
+			"version": "1.15.6",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 			"dev": true
 		},
 		"forwarded": {

test/smoke/esbuild/index.html

@@ -2,6 +2,7 @@
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+		<link rel="stylesheet" type="text/css" href="out/index.css" />
 	</head>
 	<body>
 		<div id="editor-container" style="position: absolute; width: 500px; height: 400px"></div>

website/yarn.lock

@@ -1493,9 +1493,9 @@ find-up@^4.0.0:
     path-exists "^4.0.0"
 
 follow-redirects@^1.0.0:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 forwarded@0.2.0:
   version "0.2.0"