Fix global __assign and other functions for tsc

cevek · Sep 7, 2020 · 505e3aa · 505e3aa
1 parent 1db6195
commit 505e3aa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/ttypescript/package.json b/packages/ttypescript/package.json
@@ -4,7 +4,7 @@
     "ttsc": "./bin/tsc",
     "ttsserver": "./bin/tsserver"
   },
-  "version": "1.5.11",
+  "version": "1.5.12",
   "description": "Over TypeScript tool to use custom transformers in the tsconfig.json",
   "main": "lib/typescript.js",
   "files": [

diff --git a/packages/ttypescript/src/tsc.ts b/packages/ttypescript/src/tsc.ts
@@ -8,10 +8,14 @@ const ts = loadTypeScript('typescript', { folder: process.cwd(), forceConfigLoad
 const tscFileName = resolve.sync('typescript/lib/tsc', { basedir: process.cwd() });
 const commandLineTsCode = fs
     .readFileSync(tscFileName, 'utf8')
-    .replace(/^[\s\S]+(\(function \(ts\) \{\s+function countLines[\s\S]+)$/, '$1')
+    .replace(/^[\s\S]+(\(function \(ts\) \{\s+function countLines[\s\S]+)$/, '$1');
 
-runInThisContext(`(function (exports, require, module, __filename, __dirname, ts) {${commandLineTsCode}\n});`, {
-    filename: tscFileName,
-    lineOffset: 0,
-    displayErrors: true,
-}).call(ts, ts, require, { exports: ts }, tscFileName, dirname(tscFileName), ts);
+const globalCode = (fs.readFileSync(tscFileName, 'utf8').match(/^([\s\S]*?)var ts;/) || ['', ''])[1];
+runInThisContext(
+    `(function (exports, require, module, __filename, __dirname, ts) {${globalCode}${commandLineTsCode}\n});`,
+    {
+        filename: tscFileName,
+        lineOffset: 0,
+        displayErrors: true,
+    }
+).call(ts, ts, require, { exports: ts }, tscFileName, dirname(tscFileName), ts);