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

Fixes Microsoft/monaco-editor#204: Do what monaco-html does to resolve vscode-uri

Browse source
This commit is contained in:
Alex Dima 2016-09-26 22:35:04 +03:00
parent 737e0f1650
commit 59d79a9a2b
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.vscode/settings.json vendored
View file

@ -5,5 +5,6 @@
"**/node_modules": true, "**/node_modules": true,
"**/release": true, "**/release": true,
"**/out": true "**/out": true
} },
"typescript.tsdk": "./node_modules/typescript/lib"
} }

20
gulpfile.js
View file

@ -41,6 +41,22 @@ gulp.task('release', ['clean-release','compile'], function() {
jsoncLocation = oldJsconcLocation; jsoncLocation = oldJsconcLocation;
} }
function getDependencyLocation(name, libLocation, container) {
var location = __dirname + '/node_modules/' + name + '/' + libLocation;
if (!fs.existsSync(location)) {
var oldLocation = __dirname + '/node_modules/' + container + '/node_modules/' + name + '/' + libLocation;
if (!fs.existsSync(oldLocation)) {
console.error('Unable to find ' + name + ' node module at ' + location + ' or ' + oldLocation);
return;
}
return oldLocation;
}
return location;
}
var uriLocation = getDependencyLocation('vscode-uri', 'lib', 'vscode-html-languageservice');
function bundleOne(moduleId, exclude) { function bundleOne(moduleId, exclude) {
@ -64,6 +80,10 @@ gulp.task('release', ['clean-release','compile'], function() {
name: 'jsonc-parser', name: 'jsonc-parser',
location: jsoncLocation, location: jsoncLocation,
main: 'main' main: 'main'
}, {
name: 'vscode-uri',
location: uriLocation,
main: 'index'
}, { }, {
name: 'vscode-nls', name: 'vscode-nls',
location: __dirname + '/out/fillers', location: __dirname + '/out/fillers',