Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

This commit is contained in:
ADS Merger
2020-07-15 23:51:18 +00:00
parent aae013d498
commit 9d3f12d0b7
554 changed files with 15159 additions and 8223 deletions

View File

@@ -28,14 +28,15 @@ const REPO_ROOT_PATH = path.join(__dirname, '../..');
function log(prefix, message) {
fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
}
function loaderConfig(emptyPaths) {
function loaderConfig() {
const result = {
paths: {
'vs': 'out-build/vs',
'sql': 'out-build/sql',
'vscode': 'empty:'
'vscode': 'empty:',
'azdata': 'empty:' // {{SQL CARBON EDIT}}
},
nodeModules: emptyPaths || []
amdModulesPattern: /^(vs|sql)\// // {{SQL CARBON EDIT}} include sql in regex
};
result['vs/css'] = { inlineResources: true };
return result;