Use consistent casing, rerun import on top of master

pull/2748/head
Alex Dima 6 years ago
parent 7e126d7c02
commit 18f80838f6

@ -21,9 +21,10 @@ const TYPESCRIPT_LIB_DESTINATION = path.join(__dirname, '../src/lib');
const npmLsOutput = JSON.parse(child_process.execSync("npm ls typescript --depth=0 --json=true").toString()); const npmLsOutput = JSON.parse(child_process.execSync("npm ls typescript --depth=0 --json=true").toString());
const typeScriptDependencyVersion = npmLsOutput.dependencies.typescript.version; const typeScriptDependencyVersion = npmLsOutput.dependencies.typescript.version;
fs.writeFileSync(path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServicesMetadata.ts'), fs.writeFileSync(
`export const typeScriptVersion = "${typeScriptDependencyVersion}"; path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServicesMetadata.ts'),
`); `export const typescriptVersion = "${typeScriptDependencyVersion}";\n`
);
var tsServices = fs.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescriptServices.js')).toString(); var tsServices = fs.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescriptServices.js')).toString();

@ -1 +1 @@
export const typeScriptVersion = "3.3.3333"; export const typescriptVersion = "3.5.1";

@ -5,7 +5,7 @@
'use strict'; 'use strict';
import * as mode from './tsMode'; import * as mode from './tsMode';
import { typeScriptVersion } from './lib/typescriptServicesMetadata'; // do not import the whole typescriptServices here import { typescriptVersion } from './lib/typescriptServicesMetadata'; // do not import the whole typescriptServices here
import Emitter = monaco.Emitter; import Emitter = monaco.Emitter;
import IEvent = monaco.IEvent; import IEvent = monaco.IEvent;
@ -205,7 +205,7 @@ function createAPI(): typeof monaco.languages.typescript {
NewLineKind: NewLineKind, NewLineKind: NewLineKind,
ScriptTarget: ScriptTarget, ScriptTarget: ScriptTarget,
ModuleResolutionKind: ModuleResolutionKind, ModuleResolutionKind: ModuleResolutionKind,
typeScriptVersion, typescriptVersion,
typescriptDefaults: typescriptDefaults, typescriptDefaults: typescriptDefaults,
javascriptDefaults: javascriptDefaults, javascriptDefaults: javascriptDefaults,
getTypeScriptWorker: getTypeScriptWorker, getTypeScriptWorker: getTypeScriptWorker,

2
src/monaco.d.ts vendored

@ -166,7 +166,7 @@ declare module monaco.languages.typescript {
setEagerModelSync(value: boolean): void; setEagerModelSync(value: boolean): void;
} }
export var typeScriptVersion: string; export var typescriptVersion: string;
export var typescriptDefaults: LanguageServiceDefaults; export var typescriptDefaults: LanguageServiceDefaults;
export var javascriptDefaults: LanguageServiceDefaults; export var javascriptDefaults: LanguageServiceDefaults;

Loading…
Cancel
Save