ensure local ts is always a project-scoped lookup

scripts/build.js

@@ -99,16 +99,18 @@ async function main() {
   writeFileSync(__dirname + "/../dist/ncc/cli.js", cli);
   writeFileSync(__dirname + "/../dist/ncc/index.js", index);
   writeFileSync(__dirname + "/../dist/ncc/typescript.js", `
+const { Module } = require('module');
+const m = new Module('', null);
+m.paths = Module._nodeModulePaths(process.env.TYPESCRIPT_LOOKUP_PATH || path);
 let typescript;
 try {
-  typescript = require('typescript');
+  typescript = m.require('typescript');
   console.log("ncc: Using typescript@" + typescript.version + " (local user-provided)");
 }
 catch (e) {
   typescript = require('./loaders/ts-loader.js').typescript;
   console.log("ncc: Using typescript@" + typescript.version + " (ncc built-in)");
 }
-
 module.exports = typescript;
 `);
   writeFileSync(__dirname + "/../dist/ncc/sourcemap-register.js", sourcemapSupport);

src/index.js

@@ -42,6 +42,7 @@ module.exports = (
   } = {}
 ) => {
   const resolvedEntry = resolve.sync(entry);
+  process.env.TYPESCRIPT_LOOKUP_PATH = resolvedEntry;
   const shebangMatch = fs.readFileSync(resolvedEntry).toString().match(shebangRegEx);
   const mfs = new MemoryFS();
   const assetNames = Object.create(null);
@@ -154,7 +155,7 @@ module.exports = (
           {
             loader: eval('__dirname + "/loaders/ts-loader.js"'),
             options: {
-              compiler: eval('__dirname + "/typescript"'),
+              compiler: eval('__dirname + "/typescript.js"'),
               compilerOptions: {
                 outDir: '//'
               }

src/loaders/ts-loader.js

@@ -16,14 +16,9 @@ logger.makeLogger = function (loaderOptions, colors) {
   return instance;
 };
 
-const { getOptions } = require("loader-utils");
-const loader = require("ts-loader");
-module.exports = function () {
-  const options = getOptions(this);
-  if (!options.compiler)
-    options.compiler = eval('__dirname + "/../typescript"');
-
-  return loader.apply(this, arguments);
-};
+module.exports = require("ts-loader");
 
+// ts-loader internally has a require("typescript") that applies
+// regardless of "compiler".
+// We could remap this too, as soon as ncc supports aliased externals
 module.exports.typescript = require("typescript");

src/typescript.js

@@ -0,0 +1 @@
+module.exports = require("typescript");