this is better than before?

Author: nickjacob

package.json

@@ -15,7 +15,7 @@
     "testEnvironment": "node"
   },
   "peerDependencies": {
-    "typescript": "~3.3.1",
+    "typescript": "~3.8.3",
     "webpack": "^4.29.1"
   },
   "devDependencies": {
@@ -41,13 +41,14 @@
     "google-closure-compiler": "^20181231.0.0-webpack-beta",
     "jest": "^24.1.0",
     "memory-fs": "^0.4.1",
+    "postscribe": "^2.0.8",
     "source-map": "^0.6.1",
     "ts-loader": "^5.3.3",
-    "typescript": "~3.3.1",
+    "typescript": "~3.8.3",
     "webpack": "^4.29.1"
   },
   "dependencies": {
     "fs-extra": "^7.0.1",
-    "tsickle": "^0.34.3"
+    "tsickle": "^0.38.1"
   }
 }

src/fix-output.ts

@@ -5,13 +5,15 @@
  */
 export const fixCode = (code: string): string => {
   return code
+    .replace(/^\s*var\s*tsickle.+=.*goog\.requireType.*$/g, "")
     .replace(
       /(?:const|var)\s*.*tsickle_forward_declare_.*\s*=\s*goog\.forwardDeclare.*/g,
       ""
     )
     .replace(/!\.(\w)/gm, "!$1")
     .replace(/goog\.require.*/gm, "")
-    .replace(/tsickle_forward_declare_\d\./gm, "");
+    .replace(/tsickle_forward_declare_\d\./gm, "")
+    .replace(/var\s* tsickle_.+=\s+/g, "");
 };
 
 /**
@@ -30,6 +32,7 @@ export const fixExtern = (extern: string | null): string => {
     .replace(/!\.(\w)/gm, "!$1")
     .replace(/^\.(\w+\s+=\s+{}\s*;?\s*$)/gm, "var $1")
     .replace(/^\.(\w+\s+=\s+function.+$)/gm, "var $1")
+    .replace(/^\.(\w+\s*;\s*$)/gm, "var $1")
     .replace(/^\./gm, "");
 
   return fixed.replace(/([<{])!\.(\w)/gm, "$1!$2");

src/index.ts

@@ -8,6 +8,7 @@ import { EOL } from "os";
 import webpack = require("webpack");
 import { fixCode, fixExtern } from "./fix-output";
 import { jsToTS, tsToJS } from "./path-utils";
+import { TcpSocketConnectOpts } from "net";
 
 const LOADER_NAME = "tsickle-loader";
 const DEFAULT_EXTERN_DIR = "dist/externs";
@@ -137,7 +138,7 @@ const tsickleLoader: webpack.loader.Loader = function(
     transformTypesToClosure: true,
     typeBlackListPaths: new Set(),
     untyped: false,
-    logWarning: (warning: unknown) =>
+    logWarning: warning =>
       handleDiagnostics(this, [warning], diagnosticsHost, "warning")
   };
 
@@ -161,11 +162,13 @@ const tsickleLoader: webpack.loader.Loader = function(
     const tsPathName = jsToTS(path);
     const extern = output.externs[tsPathName];
     if (extern != null) {
-      console.info(`appending extern for ${path} to::\n${extern}\n`);
+      // console.info(`appending extern for ${path} to (${externFile}) ::\n${extern}\n`);
       fs.appendFileSync(externFile, fixExtern(extern));
     }
 
-    return fixCode(source);
+    const fixed = fixCode(source);
+    // console.info("FIXED CODE:: \n", fixed);
+    return fixed;
   }
 
   this.emitError(

test/examples/js-import.ts

@@ -0,0 +1,5 @@
+import postscribe from "postscribe";
+
+export default function loadHtml (): void {
+  postscribe(document.body, "hello");
+}

test/examples/js-module.js

@@ -0,0 +1,3 @@
+export default function mainFnJSExample () {
+  return 'hello world from JS'
+}

test/loader.test.js

@@ -37,7 +37,7 @@ test('It will correctly collapse unnecessary modules (tree shaking)', async () =
   })
 
   expect(output).toContain('myRealExport')
-})
+}, 10e3)
 
 test('will work with closure compiler plugin', async () => {
   const externDir = path.resolve(__dirname, 'tmp', 'externs-' + Math.floor(Math.random() * 10))

yarn.lock

@@ -4440,11 +4440,23 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
+postscribe@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/postscribe/-/postscribe-2.0.8.tgz#5b7a53aad4b690b6c2f75818fcefe74490f410d5"
+  integrity sha1-W3pTqtS2kLbC91gY/O/nRJD0ENU=
+  dependencies:
+    prescribe ">=1.1.2"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
+prescribe@>=1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/prescribe/-/prescribe-1.1.3.tgz#8d3122445f3fbaf4c4c5817ea527a17fc8139ee6"
+  integrity sha1-jTEiRF8/uvTExYF+pSehf8gTnuY=
+
 pretty-format@^24.0.0:
   version "24.0.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.0.0.tgz#cb6599fd73ac088e37ed682f61291e4678f48591"
@@ -5104,11 +5116,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
 spdx-correct@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -5504,14 +5511,10 @@ ts-loader@^5.3.3:
     micromatch "^3.1.4"
     semver "^5.0.1"
 
-tsickle@^0.34.3:
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.3.tgz#8085067a26d7bff466ddadb2eba18849b49159b8"
-  integrity sha512-mb1v3nsr6rYaZky22xj0d6qv4ogAR40Bc6r37jwWOg3bEIO/ZppEFZiEADs/NNVLcWTPgmNmPZgaX5CfAH6oXA==
-  dependencies:
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.7.3"
+tsickle@^0.38.1:
+  version "0.38.1"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.38.1.tgz#30762db759d40c435943093b6972c7f2efb384ef"
+  integrity sha512-4xZfvC6+etRu6ivKCNqMOd1FqcY/m6JY3Y+yr5+Xw+i751ciwrWINi6x/3l1ekcODH9GZhlf0ny2LpzWxnjWYA==
 
 tslib@^1.9.0:
   version "1.9.3"
@@ -5547,10 +5550,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@~3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.1.tgz#6de14e1db4b8a006ac535e482c8ba018c55f750b"
-  integrity sha512-cTmIDFW7O0IHbn1DPYjkiebHxwtCMU+eTy30ZtJNBPF9j2O1ITu5XH2YnBeVRKWHqF+3JQwWJv0Q0aUgX8W7IA==
+typescript@~3.8.3:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
+  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
 
 uglify-js@^3.1.4:
   version "3.4.9"