浏览代码

Merge pull request #2775 from microsoft/ts_faff

Expose full ts object to global ts
Alexandru Dima 3 年之前
父节点
当前提交
df3ee0f9d7
共有 4 个文件被更改,包括 7 次插入1 次删除
  1. 1 0
      build/importTypescript.js
  2. 1 0
      src/typescript/lib/typescriptServices.js
  3. 2 1
      src/typescript/tsWorker.ts
  4. 3 0
      test/smoke/smoke.test.js

+ 1 - 0
build/importTypescript.js

@@ -134,6 +134,7 @@ export var IndentStyle = ts.IndentStyle;
 export var ScriptKind = ts.ScriptKind;
 export var ScriptTarget = ts.ScriptTarget;
 export var TokenClass = ts.TokenClass;
+export var typescript = ts;
 // END MONACOCHANGE
 `;
 	fs.writeFileSync(

+ 1 - 0
src/typescript/lib/typescriptServices.js

@@ -160240,4 +160240,5 @@ export var IndentStyle = ts.IndentStyle;
 export var ScriptKind = ts.ScriptKind;
 export var ScriptTarget = ts.ScriptTarget;
 export var TokenClass = ts.TokenClass;
+export var typescript = ts;
 // END MONACOCHANGE

+ 2 - 1
src/typescript/tsWorker.ts

@@ -496,4 +496,5 @@ export function create(ctx: worker.IWorkerContext, createData: ICreateData): Typ
 }
 
 /** Allows for clients to have access to the same version of TypeScript that the worker uses */
-globalThis.ts = ts;
+// @ts-ignore
+globalThis.ts = ts.typescript;

+ 3 - 0
test/smoke/smoke.test.js

@@ -172,6 +172,9 @@ describe(`Smoke Test '${TESTS_TYPE}'`, () => {
 
 		// check that the TypeScript worker exposes `ts` as a global
 		assert.strictEqual(await tsWorker.evaluate(`typeof ts`), 'object');
+
+		// check that the TypeScript worker exposes the full `ts` as a global
+		assert.strictEqual(await tsWorker.evaluate(`typeof ts.optionDeclarations`), 'object');
 	});
 });