use bundled typescript

package.json

@@ -79,14 +79,15 @@
     "rollup-pluginutils": "^2.3.3",
     "rxjs": "^6.3.3",
     "saslprep": "^1.0.2",
+    "season": "^6.0.2",
     "shebang-loader": "^0.0.1",
     "source-map-support": "^0.5.9",
     "stripe": "^6.15.0",
     "terser": "^3.11.0",
     "the-answer": "^1.0.0",
     "ts-loader": "^5.3.1",
     "twilio": "^3.23.2",
-    "typescript": "^3.2.1",
+    "typescript": "^3.2.2",
     "vue": "^2.5.17",
     "vue-server-renderer": "^2.5.17",
     "webpack": "^4.26.0",

scripts/build.js

@@ -66,6 +66,12 @@ async function main() {
   writeFileSync(__dirname + "/../dist/ncc/loaders/shebang-loader.js", shebangLoader);
   writeFileSync(__dirname + "/../dist/ncc/loaders/ts-loader.js", tsLoader);
 
+  // copy typescript types
+  await copy(
+    __dirname + "/../node_modules/typescript/lib/*.ts",
+    __dirname + "/../dist/ncc/loaders/lib/"
+  );
+
   // copy webpack buildin
   await copy(
     __dirname + "/../node_modules/webpack/buildin/*.js",

src/index.js

@@ -105,7 +105,7 @@ module.exports = async (
         },
         {
           test: /\.tsx?$/,
-          use: [{ loader: __dirname + "/loaders/ts-loader.js" }]
+          use: [{ loader: __dirname + "/loaders/ts-loader.js", options: {} }]
         }
       ]
     },
@@ -128,10 +128,14 @@ module.exports = async (
                     /webpackEmptyAsyncContext|webpackEmptyContext/
                   )
                 ) {
+                  module.type = 'HACK'; // hack to ensure __webpack_require__ is added to wrapper
                   return moduleSourcePostModule._value.replace(
                     "var e = new Error",
-                    `try { return require(req) }\ncatch (e) { if (e.code !== 'MODULE_NOT_FOUND') throw e }` +
-                      `\nvar e = new Error`
+                    `if (typeof req === 'number' && __webpack_require__.m[req])\n` +
+                    `  return __webpack_require__(req);\n` +
+                    `try { return require(req) }\n` + 
+                    `catch (e) { if (e.code !== 'MODULE_NOT_FOUND') throw e }\n` +
+                    `var e = new Error`
                   );
                 }
               }

src/loaders/ts-loader.js

@@ -2,4 +2,12 @@
 // optional bundle for the ts-loader, that
 // doesn't get loaded unless the user is
 // compiling typescript
-module.exports = require("ts-loader");
+const { getOptions } = require("loader-utils");
+const loader = require("ts-loader");
+const tsId = require.resolve("typescript");
+module.exports = function () {
+  const options = getOptions(this);
+  if (!options.compiler)
+    options.compiler = tsId;
+  return loader.apply(this, arguments);
+};