ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for notebook-renderers not being included in langpack generation and revert preinstall change (#23689)

Browse Source 
* Fix for notebook-renderers not being included in langpack generation

* revert change to preinstall
This commit is contained in:
Alex Ma
2023-07-07 10:51:03 -07:00
committed by GitHub
parent f4688f447c
commit 344b3bdf97
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/lib/locFunc.js
View File

File diff suppressed because one or more lines are too long

1
build/lib/locFunc.ts
View File

@@ -183,6 +183,7 @@ const textFields = {
//list of extensions from vscode that are to be included with ADS. //list of extensions from vscode that are to be included with ADS.
const VSCODEExtensions = [ const VSCODEExtensions = [
"bat", "bat",
"builtin-notebook-renderer",
"configuration-editing", "configuration-editing",
"docker", "docker",
"git", "git",

10
build/npm/preinstall.js
View File

@@ -10,11 +10,11 @@ const minorNodeVersion = parseInt(nodeVersion[2]);
const patchNodeVersion = parseInt(nodeVersion[3]); const patchNodeVersion = parseInt(nodeVersion[3]);
if (majorNodeVersion < 16 || (majorNodeVersion === 16 && minorNodeVersion < 17)) { if (majorNodeVersion < 16 || (majorNodeVersion === 16 && minorNodeVersion < 17)) {
console.error('\x1b[1;31m*** Please use node.js versions >=16.17.x and <17.\x1b[0;0m'); console.error('\033[1;31m*** Please use node.js versions >=16.17.x and <17.\033[0;0m');
err = true; err = true;
} }
if (majorNodeVersion >= 17) { if (majorNodeVersion >= 17) {
console.warn('\x1b[1;31m*** Warning: Versions of node.js >= 17 have not been tested.\x1b[0;0m') console.warn('\033[1;31m*** Warning: Versions of node.js >= 17 have not been tested.\033[0;0m')
} }
const path = require('path'); const path = require('path');
@@ -33,18 +33,18 @@ if (
) || ) ||
majorYarnVersion >= 2 majorYarnVersion >= 2
) { ) {
console.error('\x1b[1;31m*** Please use yarn >=1.10.1 and <2.\x1b[0;0m'); console.error('\033[1;31m*** Please use yarn >=1.10.1 and <2.\033[0;0m');
err = true; err = true;
} }
if (!/yarn[\w-.]*\.c?js$|yarnpkg$/.test(process.env['npm_execpath'])) { if (!/yarn[\w-.]*\.c?js$|yarnpkg$/.test(process.env['npm_execpath'])) {
console.error('\x1b[1;31m*** Please use yarn to install dependencies.\x1b[0;0m'); console.error('\033[1;31m*** Please use yarn to install dependencies.\033[0;0m');
err = true; err = true;
} }
if (process.platform === 'win32') { if (process.platform === 'win32') {
if (!hasSupportedVisualStudioVersion()) { if (!hasSupportedVisualStudioVersion()) {
console.error('\x1b[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites.\x1b[0;0m'); console.error('\033[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites.\033[0;0m');
err = true; err = true;
} }
if (!err) { if (!err) {