SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 12:45:39 +01:00
Code Issues Projects Releases Packages Activity

Merge branch 'main' into samstrohkorbatt/python-fstring

Browse source
This commit is contained in:
samstrohkorbatt 2024-03-19 16:31:16 -06:00 • committed by GitHub
commit c1707b8fde
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.azure-pipelines/publish-nightly.yml
View file

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

4
.azure-pipelines/publish-stable.yml
View file

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

26
package-lock.json generated
View file

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

2
package.json
View file

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

9
samples/package-lock.json generated
View file

@ -1776,7 +1776,9 @@
} }
}, },
"node_modules/follow-redirects": { "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, "dev": true,
"funding": [ "funding": [
{ {
@ -1784,7 +1786,6 @@
"url": "https://github.com/sponsors/RubenVerborgh" "url": "https://github.com/sponsors/RubenVerborgh"
} }
], ],
"license": "MIT",
"engines": { "engines": {
"node": ">=4.0" "node": ">=4.0"
}, },
@ -5742,7 +5743,9 @@
} }
}, },
"follow-redirects": { "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 "dev": true
}, },
"forwarded": { "forwarded": {

1
test/smoke/esbuild/index.html
View file

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

6
website/yarn.lock
View file

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