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

Merge branch 'main' into patch-1

Browse source
This commit is contained in:
Trey Smith 2023-01-18 11:44:30 -05:00 • committed by GitHub
commit a0a88bd7c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 520 additions and 392 deletions
Download patch file Download diff file Expand all files Collapse all files

12
samples/browser-esm-webpack-typescript-react/package-lock.json generated
View file

@ -2844,9 +2844,9 @@
}
},
"node_modules/loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"dependencies": {
"big.js": "^5.2.2",
@ -5652,9 +5652,9 @@
"peer": true
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",

4
samples/electron-amd-nodeIntegration/main.js
View file

@ -10,7 +10,9 @@ function createWindow() {
height: 600,
webPreferences: {
nodeIntegration: true,
worldSafeExecuteJavaScript: true
worldSafeExecuteJavaScript: true,
sandbox: false,
contextIsolation: false
}
});
mainWindow.loadURL(`file://${__dirname}/electron-index.html`);

5
samples/electron-esm-webpack/.gitignore vendored
View file

@ -1,2 +1,3 @@
/dist/*.js
/dist/*.ttf
dist/*.js
dist/*.txt
dist/*.ttf

37
samples/package-lock.json generated
View file

@ -10,7 +10,7 @@
"license": "MIT",
"devDependencies": {
"css-loader": "^5.2.7",
"electron": "^17.2.0",
"electron": "^19.1.8",
"file-loader": "^6.2.0",
"glob": "^7.2.0",
"html-webpack-plugin": "^5.5.0",
@ -1372,13 +1372,14 @@
"license": "MIT"
},
"node_modules/electron": {
"version": "17.4.11",
"version": "19.1.8",
"resolved": "https://registry.npmjs.org/electron/-/electron-19.1.8.tgz",
"integrity": "sha512-UfPQdFjgKI0xCm1V5sV3iAVOs0kCwAE91xWzV5tI7ij14yOkxTdXp9BqTzFaSbQYLYxn6q1BUUe1nlzjJjzAnw==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"@electron/get": "^1.13.0",
"@types/node": "^14.6.2",
"@electron/get": "^1.14.1",
"@types/node": "^16.11.26",
"extract-zip": "^1.0.3"
},
"bin": {
@ -1394,9 +1395,10 @@
"license": "ISC"
},
"node_modules/electron/node_modules/@types/node": {
"version": "14.18.23",
"dev": true,
"license": "MIT"
"version": "16.18.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.3.tgz",
"integrity": "sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==",
"dev": true
},
"node_modules/emojis-list": {
"version": "3.0.0",
@ -2459,9 +2461,10 @@
}
},
"node_modules/loader-utils": {
"version": "2.0.2",
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"license": "MIT",
"dependencies": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@ -5424,16 +5427,20 @@
"dev": true
},
"electron": {
"version": "17.4.11",
"version": "19.1.8",
"resolved": "https://registry.npmjs.org/electron/-/electron-19.1.8.tgz",
"integrity": "sha512-UfPQdFjgKI0xCm1V5sV3iAVOs0kCwAE91xWzV5tI7ij14yOkxTdXp9BqTzFaSbQYLYxn6q1BUUe1nlzjJjzAnw==",
"dev": true,
"requires": {
"@electron/get": "2.0.0",
"@types/node": "^14.6.2",
"@types/node": "^16.11.26",
"extract-zip": "^1.0.3"
},
"dependencies": {
"@types/node": {
"version": "14.18.23",
"version": "16.18.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.3.tgz",
"integrity": "sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==",
"dev": true
}
}
@ -6102,7 +6109,9 @@
"dev": true
},
"loader-utils": {
"version": "2.0.2",
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",

2
samples/package.json
View file

@ -11,7 +11,7 @@
"license": "MIT",
"devDependencies": {
"css-loader": "^5.2.7",
"electron": "^17.2.0",
"electron": "^19.1.8",
"file-loader": "^6.2.0",
"glob": "^7.2.0",
"html-webpack-plugin": "^5.5.0",