From 4123f0be85fd7fc0ec0f40d527411faa86f2e90e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:45:07 +0000 Subject: [PATCH 1/8] Bump follow-redirects from 1.15.1 to 1.15.6 in /samples Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.1 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.1...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- samples/package-lock.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/samples/package-lock.json b/samples/package-lock.json index d5e1100d..cd06fd8d 100644 --- a/samples/package-lock.json +++ b/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": { From e558a992545000c71e86eeaac18d097dde9d266c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 00:33:27 +0000 Subject: [PATCH 2/8] Bump follow-redirects from 1.15.1 to 1.15.6 in /website Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.1 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.1...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- website/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index bc6bfbf0..25440c41 100644 --- a/website/yarn.lock +++ b/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" From ebbcdffaab83b7f068314543f29b36ff8072b0b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 06:31:35 +0000 Subject: [PATCH 3/8] Bump follow-redirects from 1.15.2 to 1.15.6 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index b500c59a..6049a6a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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": [ { @@ -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": { From 4b7e26f0a944a0876b38aed1bbeed1d2a7910b89 Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:53:49 -0700 Subject: [PATCH 4/8] chore: skip APIScan (#4432) * chore: try using Windows to build and package * chore: remove Linux step * skip APIScan for core * fix key * revert testPlatforms * Skip APIScan for the editor as well * chore: fix nightly --- .azure-pipelines/publish-nightly.yml | 1 + .azure-pipelines/publish-stable.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.azure-pipelines/publish-nightly.yml b/.azure-pipelines/publish-nightly.yml index c8df3f09..5e0610e7 100644 --- a/.azure-pipelines/publish-nightly.yml +++ b/.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 diff --git a/.azure-pipelines/publish-stable.yml b/.azure-pipelines/publish-stable.yml index 3974b763..382509b1 100644 --- a/.azure-pipelines/publish-stable.yml +++ b/.azure-pipelines/publish-stable.yml @@ -36,6 +36,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 @@ -54,6 +55,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 +70,7 @@ extends: - name: monaco-editor-webpack-plugin workingDirectory: $(Build.SourcesDirectory)/webpack-plugin testPlatforms: [] + packagePlatform: Windows buildSteps: - script: npm ci displayName: Install NPM dependencies From 7782231e063f97879acbb75ee76208fca0ec0f11 Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:56:51 -0700 Subject: [PATCH 5/8] chore: add cgIgnoreDirectories (#4431) --- .azure-pipelines/publish-stable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines/publish-stable.yml b/.azure-pipelines/publish-stable.yml index 382509b1..a0950846 100644 --- a/.azure-pipelines/publish-stable.yml +++ b/.azure-pipelines/publish-stable.yml @@ -32,6 +32,7 @@ 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 From 023ae4284ad10265bb3396c451a3952d7c169c4d Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Tue, 19 Mar 2024 16:19:43 +0100 Subject: [PATCH 6/8] Update monaco editor core to dev version to investigate CI issues. --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6049a6a3..898c52d5 100644 --- a/package-lock.json +++ b/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", @@ -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": { @@ -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": { diff --git a/package.json b/package.json index f756bb84..70431bb6 100644 --- a/package.json +++ b/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", From bfc5f7cd3287b12596df4aa07bfe5963c87bee9d Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Tue, 19 Mar 2024 17:02:01 +0100 Subject: [PATCH 7/8] Adds missing css --- test/smoke/esbuild/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/test/smoke/esbuild/index.html b/test/smoke/esbuild/index.html index 912427e8..0335175f 100644 --- a/test/smoke/esbuild/index.html +++ b/test/smoke/esbuild/index.html @@ -2,6 +2,7 @@ +
From c92a3639858e646af7f81ff0ea87e5297af79b8c Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:37:12 -0700 Subject: [PATCH 8/8] chore: add another skipAPIScan (#4435) --- .azure-pipelines/publish-nightly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines/publish-nightly.yml b/.azure-pipelines/publish-nightly.yml index 5e0610e7..9611b7cc 100644 --- a/.azure-pipelines/publish-nightly.yml +++ b/.azure-pipelines/publish-nightly.yml @@ -71,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