Update dependencies

This commit is contained in:
Alex Dima 2018-08-10 12:30:59 +02:00
parent a50aef743c
commit 552bfedb75
3 changed files with 32 additions and 33 deletions

36
package-lock.json generated
View file

@ -11,15 +11,15 @@
"dev": true "dev": true
}, },
"monaco-editor-core": { "monaco-editor-core": {
"version": "0.13.2", "version": "0.14.1",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.13.2.tgz", "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.14.1.tgz",
"integrity": "sha512-UwUpmT+37fryykVcfuG/KA3sUV/Siip2V+kzzH/F6gzi6QGAe/A/qvr5sfTALdoW55V5aVpUNctPFUw5Bm1Qeg==", "integrity": "sha512-bWJuPbDEftxaN2bG+JZ29+aJhg0rmq+y6VmCUqPZpmw8bSevoYjuTcdLkt9BbNaGnwosAVy+vSktXgs/JW7OvQ==",
"dev": true "dev": true
}, },
"monaco-languages": { "monaco-languages": {
"version": "1.3.1", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.3.1.tgz", "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.4.0.tgz",
"integrity": "sha512-zOrUBPBUW7RenUoQocl/O5wPlPVR5Ekb4GstgeCxD8PXM5qfU2djdIgAbxIVIPgoGemrQrKKfPV093T0Ot7n4Q==", "integrity": "sha512-39MZMAEKToktfSpOS0Soj05IvkT5vbebL9AIBGPn8fGi8WgJOcfS3YLiMu07gZKViR7CFZ4RyQJKJHglx0fPdA==",
"dev": true "dev": true
}, },
"monaco-plugin-helpers": { "monaco-plugin-helpers": {
@ -28,7 +28,7 @@
"integrity": "sha512-7kUx8dtd5qVNVgUARBRhnM8oftPglYwlINfigC4yGUiuzqtIN22u1tly8umiOCIPR0eFiBLjt6aN23oZh2QJgg==", "integrity": "sha512-7kUx8dtd5qVNVgUARBRhnM8oftPglYwlINfigC4yGUiuzqtIN22u1tly8umiOCIPR0eFiBLjt6aN23oZh2QJgg==",
"dev": true, "dev": true,
"requires": { "requires": {
"typescript": "^2.7.2" "typescript": "2.9.2"
}, },
"dependencies": { "dependencies": {
"typescript": { "typescript": {
@ -39,12 +39,6 @@
} }
} }
}, },
"monaco-typescript": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/monaco-typescript/-/monaco-typescript-3.1.0.tgz",
"integrity": "sha512-GQWDKoXVrh4r0TpjJuRTpGEDeyN0/bqel4Op08CV0bpFL4xifFDfLPAyGeDPJiSlapaY5i+shC6VK0JELfE1OQ==",
"dev": true
},
"requirejs": { "requirejs": {
"version": "2.3.5", "version": "2.3.5",
"resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz", "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz",
@ -64,13 +58,13 @@
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {
"version": "3.4.6", "version": "3.4.7",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.7.tgz",
"integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==", "integrity": "sha512-J0M2i1mQA+ze3EdN9SBi751DNdAXmeFLfJrd/MDIkRc3G3Gbb9OPVSx7GIQvVwfWxQARcYV2DTxIkMyDAk3o9Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "~2.16.0", "commander": "2.16.0",
"source-map": "~0.6.1" "source-map": "0.6.1"
} }
}, },
"vscode-html-languageservice": { "vscode-html-languageservice": {
@ -79,9 +73,9 @@
"integrity": "sha512-3SMcTOaiqFTCiHOeAFbHcBSsAgJA81q9PrRdOR7b5LQhkGDUwL5FEETp9gzd+A4c1Bxe14Zu51bY7+jwfTnfzA==", "integrity": "sha512-3SMcTOaiqFTCiHOeAFbHcBSsAgJA81q9PrRdOR7b5LQhkGDUwL5FEETp9gzd+A4c1Bxe14Zu51bY7+jwfTnfzA==",
"dev": true, "dev": true,
"requires": { "requires": {
"vscode-languageserver-types": "^3.10.0", "vscode-languageserver-types": "3.10.0",
"vscode-nls": "^3.2.4", "vscode-nls": "3.2.4",
"vscode-uri": "^1.0.5" "vscode-uri": "1.0.5"
} }
}, },
"vscode-languageserver-types": { "vscode-languageserver-types": {

View file

@ -19,13 +19,12 @@
"url": "https://github.com/Microsoft/monaco-editor/issues" "url": "https://github.com/Microsoft/monaco-editor/issues"
}, },
"devDependencies": { "devDependencies": {
"monaco-editor-core": "0.13.2", "monaco-editor-core": "0.14.1",
"monaco-languages": "^1.3.1", "monaco-languages": "^1.4.0",
"monaco-plugin-helpers": "^1.0.2", "monaco-plugin-helpers": "^1.0.2",
"monaco-typescript": "^3.1.0",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"typescript": "^3.0.1", "typescript": "^3.0.1",
"uglify-js": "^3.4.6", "uglify-js": "^3.4.7",
"vscode-html-languageservice": "^2.1.4", "vscode-html-languageservice": "^2.1.4",
"vscode-languageserver-types": "^3.10.0" "vscode-languageserver-types": "^3.10.0"
} }

View file

@ -12,14 +12,21 @@
<script> <script>
// Loading basic-languages to get the html language definition // Loading basic-languages to get the html language definition
// Loading monaco-typescript to get javascript coloring var paths = {
var require = { 'vs/basic-languages': '../node_modules/monaco-languages/release/dev',
paths: { 'vs/language/html': '../release/dev',
'vs/basic-languages': '../node_modules/monaco-languages/release/dev', 'vs': '../node_modules/monaco-editor-core/dev/vs'
'vs/language/typescript': '../node_modules/monaco-typescript/release/dev', };
'vs/language/html': '../release/dev', if (document.location.protocol === 'http:') {
'vs': '../node_modules/monaco-editor-core/dev/vs' // Add support for running local http server
let testIndex = document.location.pathname.indexOf('/test/');
if (testIndex !== -1) {
let prefix = document.location.pathname.substr(0, testIndex);
paths['vs/language/html'] = prefix + '/release/dev';
} }
}
var require = {
paths: paths
}; };
</script> </script>
<script src="../node_modules/monaco-editor-core/dev/vs/loader.js"></script> <script src="../node_modules/monaco-editor-core/dev/vs/loader.js"></script>
@ -29,7 +36,6 @@
<script> <script>
require([ require([
'vs/basic-languages/monaco.contribution', 'vs/basic-languages/monaco.contribution',
'vs/language/typescript/monaco.contribution',
'vs/language/html/monaco.contribution' 'vs/language/html/monaco.contribution'
], function() { ], function() {
var editor = monaco.editor.create(document.getElementById('container'), { var editor = monaco.editor.create(document.getElementById('container'), {