TypeScript

.gitignore

@@ -2,6 +2,7 @@
 dist/**/*.js
 !scripts
 !src
+!src/*.js
 !test
 !test/integration
 !test/integration/*.js

readme.md

@@ -17,8 +17,9 @@ together with all its dependencies, gcc-style.
 ## Design goals
 
 - Zero configuration
-- Only support Node.js (soon, optionally with TypeScript) codebases
-- Make it work as well as possible with the entire Node.js / npm ecosystem
+- TypeScript built-in
+- Only supports Node.js programs as input / output
+- Support all Node.js patterns and npm modules
 
 ## Usage
 
@@ -41,7 +42,20 @@ $ ncc run input.js
 
 Build to a temporary folder and run the built JS file through Node.js, with source maps support for debugging.
 
-### Node.js
+### With TypeScript
+
+The only requirement is to point `ncc` to `.ts` or `.tsx` files. A `tsconfig.json`
+file is necessary. Most likely you want to indicate `es2015` support:
+
+```json
+{
+  "compilerOptions": {
+    "target": "es2015"
+  }
+}
+```
+
+### Programmatically From Node.js
 
 ```js
 require('@zeit/ncc')('/path/to/input', {

scripts/build.js

@@ -7,27 +7,55 @@ const glob = promisify(require("glob"));
 const bytes = require("bytes");
 
 async function main() {
-  const { code: cli, assets: cliAssets } = await ncc(__dirname + "/../src/cli", {
-    externals: ["./index.js"]
-  });
-  const { code: index, assets: indexAssets } = await ncc(__dirname + "/../src/index", {
-    // we dont care about watching, so we don't want
-    // to bundle it. even if we did want watching and a bigger
-    // bundle, webpack (and therefore ncc) cannot currently bundle
-    // chokidar, which is quite convenient
-    externals: ["chokidar", "./relocate-loader.js"]
-  });
-
-  const { code: nodeLoader, assets: nodeLoaderAssets } = await ncc(__dirname + "/../src/loaders/node-loader");
-  const { code: relocateLoader, assets: relocateLoaderAssets } = await ncc(__dirname + "/../src/loaders/relocate-loader");
-  const { code: shebangLoader, assets: shebangLoaderAssets } = await ncc(__dirname + "/../src/loaders/shebang-loader");
-
-  const { code: sourcemapSupport, assets: sourcemapAssets } = await ncc(require.resolve("source-map-support/register"));
-
-  if (Object.keys(cliAssets).length || Object.keys(indexAssets).length ||
-      Object.keys(relocateLoaderAssets).length || Object.keys(nodeLoaderAssets).length ||
-      Object.keys(shebangLoaderAssets).length || Object.keys(sourcemapAssets).length) {
-    console.error('Assets emitted by core build, these need to be written into the dist directory');
+  const { code: cli, assets: cliAssets } = await ncc(
+    __dirname + "/../src/cli",
+    {
+      externals: ["./index.js"]
+    }
+  );
+  const { code: index, assets: indexAssets } = await ncc(
+    __dirname + "/../src/index",
+    {
+      // we dont care about watching, so we don't want
+      // to bundle it. even if we did want watching and a bigger
+      // bundle, webpack (and therefore ncc) cannot currently bundle
+      // chokidar, which is quite convenient
+      externals: ["chokidar"]
+    }
+  );
+
+  const { code: nodeLoader, assets: nodeLoaderAssets } = await ncc(
+    __dirname + "/../src/loaders/node-loader"
+  );
+
+  const { code: relocateLoader, assets: relocateLoaderAssets } = await ncc(
+    __dirname + "/../src/loaders/relocate-loader"
+  );
+
+  const { code: shebangLoader, assets: shebangLoaderAssets } = await ncc(
+    __dirname + "/../src/loaders/shebang-loader"
+  );
+
+  const { code: tsLoader, assets: tsLoaderAssets } = await ncc(
+    __dirname + "/../src/loaders/ts-loader"
+  );
+
+  const { code: sourcemapSupport, assets: sourcemapAssets } = await ncc(
+    require.resolve("source-map-support/register")
+  );
+
+  if (
+    Object.keys(cliAssets).length ||
+    Object.keys(indexAssets).length ||
+    Object.keys(nodeLoaderAssets).length ||
+    Object.keys(relocateLoaderAssets).length ||
+    Object.keys(shebangLoaderAssets).length ||
+    Object.keys(tsLoaderAssets).length ||
+    Object.keys(sourcemapAssets).length
+  ) {
+    console.error(
+      "Assets emitted by core build, these need to be written into the dist directory"
+    );
   }
 
   writeFileSync(__dirname + "/../dist/ncc/cli.js", cli);
@@ -36,6 +64,7 @@ async function main() {
   writeFileSync(__dirname + "/../dist/ncc/loaders/node-loader.js", nodeLoader);
   writeFileSync(__dirname + "/../dist/ncc/loaders/relocate-loader.js", relocateLoader);
   writeFileSync(__dirname + "/../dist/ncc/loaders/shebang-loader.js", shebangLoader);
+  writeFileSync(__dirname + "/../dist/ncc/loaders/ts-loader.js", tsLoader);
 
   // copy webpack buildin
   await copy(
@@ -45,9 +74,7 @@ async function main() {
 
   for (const file of await glob(__dirname + "/../dist/**/*.js")) {
     console.log(
-      `✓ ${relative(__dirname + "/../", file)} (${bytes(
-        statSync(file).size
-      )})`
+      `✓ ${relative(__dirname + "/../", file)} (${bytes(statSync(file).size)})`
     );
   }
 }

src/index.js

@@ -2,7 +2,7 @@ const resolve = require("resolve");
 const fs = require("fs");
 const webpack = require("webpack");
 const MemoryFS = require("memory-fs");
-const WebpackParser = require('webpack/lib/Parser');
+const WebpackParser = require("webpack/lib/Parser");
 const webpackParse = WebpackParser.parse;
 const terser = require("terser");
 const shebangRegEx = require('./utils/shebang');
@@ -12,22 +12,22 @@ const shebangRegEx = require('./utils/shebang');
 // of being able to `return` in the top level of a
 // requireable module
 // https://github.com/zeit/ncc/issues/40
-WebpackParser.parse = function (source, opts = {}) {
+WebpackParser.parse = function(source, opts = {}) {
   return webpackParse.call(this, source, {
     ...opts,
     allowReturnOutsideFunction: true
   });
-}
+};
 
-const SUPPORTED_EXTENSIONS = [".js", ".mjs", ".json", ".node"];
+const SUPPORTED_EXTENSIONS = [".ts", ".tsx", ".js", ".mjs", ".json", ".node"];
 
 function resolveModule(context, request, callback, forcedExternals = []) {
   const resolveOptions = {
     basedir: context,
     preserveSymlinks: true,
     extensions: SUPPORTED_EXTENSIONS
   };
-  
+
   if (new Set(forcedExternals).has(request)) {
     console.error(`ncc: Skipping bundling "${request}" per config`);
     return callback(null, `commonjs ${request}`);
@@ -45,7 +45,15 @@ function resolveModule(context, request, callback, forcedExternals = []) {
   });
 }
 
-module.exports = async (entry, { externals = [], minify = false, sourceMap = false, filename = "index.js" } = {}) => {
+module.exports = async (
+  entry,
+  {
+    externals = [],
+    minify = false,
+    sourceMap = false,
+    filename = "index.js"
+  } = {}
+) => {
   const shebangMatch = fs.readFileSync(resolve.sync(entry)).toString().match(shebangRegEx);
   const mfs = new MemoryFS();
   const assetNames = Object.create(null);
@@ -85,18 +93,22 @@ module.exports = async (entry, { externals = [], minify = false, sourceMap = fal
           }]
         },
         {
-          test: /\.(js|mjs)$/,
+          test: /\.node$/,
           use: [{
-            loader: __dirname + "/loaders/relocate-loader.js",
+            loader: __dirname + "/loaders/node-loader.js",
             options: { assetNames, assets }
           }]
         },
         {
-          test: /\.node$/,
+          test: /\.(js|mjs)$/,
           use: [{
-            loader: __dirname + "/loaders/node-loader.js",
+            loader: __dirname + "/loaders/relocate-loader.js",
             options: { assetNames, assets }
           }]
+        },
+        {
+          test: /\.tsx?$/,
+          use: [{ loader: __dirname + "/loaders/ts-loader.js" }]
         }
       ]
     },
@@ -105,14 +117,28 @@ module.exports = async (entry, { externals = [], minify = false, sourceMap = fal
         apply(compiler) {
           // override "not found" context to try built require first
           compiler.hooks.compilation.tap("ncc", compilation => {
-            compilation.moduleTemplates.javascript.hooks.render.tap("ncc", (moduleSourcePostModule, module, options, dependencyTemplates) => {
-              if (module._contextDependencies &&
-                  moduleSourcePostModule._value.match(/webpackEmptyAsyncContext|webpackEmptyContext/)) {
-                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`);
+            compilation.moduleTemplates.javascript.hooks.render.tap(
+              "ncc",
+              (
+                moduleSourcePostModule,
+                module,
+                options,
+                dependencyTemplates
+              ) => {
+                if (
+                  module._contextDependencies &&
+                  moduleSourcePostModule._value.match(
+                    /webpackEmptyAsyncContext|webpackEmptyContext/
+                  )
+                ) {
+                  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`
+                  );
+                }
               }
-            });
+            );
           });
 
           compiler.hooks.normalModuleFactory.tap("ncc", NormalModuleFactory => {
@@ -198,15 +224,13 @@ module.exports = async (entry, { externals = [], minify = false, sourceMap = fal
 };
 
 // this could be rewritten with actual FS apis / globs, but this is simpler
-function getFlatFiles (mfsData, output, curBase = '') {
+function getFlatFiles(mfsData, output, curBase = "") {
   for (const path of Object.keys(mfsData)) {
     const item = mfsData[path];
-    const curPath = curBase + '/' + path;
+    const curPath = curBase + "/" + path;
     // directory
-    if (item[""] === true)
-      getFlatFiles(item, output, curPath);
+    if (item[""] === true) getFlatFiles(item, output, curPath);
     // file
-    else if (!curPath.endsWith("/"))
-      output[curPath.substr(1)] = mfsData[path];
+    else if (!curPath.endsWith("/")) output[curPath.substr(1)] = mfsData[path];
   }
 }

src/loaders/ts-loader.js

@@ -0,0 +1,5 @@
+// we re-export so that we generate a unique
+// optional bundle for the ts-loader, that
+// doesn't get loaded unless the user is
+// compiling typescript
+module.exports = require("ts-loader");

test/index.test.js

@@ -6,28 +6,32 @@ const { dirname } = require("path");
 
 for (const unitTest of fs.readdirSync(`${__dirname}/unit`)) {
   it(`should generate correct output for ${unitTest}`, async () => {
-    const expected = fs.readFileSync(`${__dirname}/unit/${unitTest}/output.js`)
-        .toString().trim()
-        // Windows support
-        .replace(/\r/g, '');
-    await ncc(`${__dirname}/unit/${unitTest}/input.js`, { minify: false, sourceMap: false }).then(async ({ code, assets }) => {
-      // very simple asset validation in unit tests
-      if (unitTest.startsWith('asset-')) {
-        expect(Object.keys(assets).length).toBeGreaterThan(0);
-        expect(assets[Object.keys(assets)[0]] instanceof Buffer);
-      }
-      const actual = code.trim()
+    const expected = fs
+      .readFileSync(`${__dirname}/unit/${unitTest}/output.js`)
+      .toString()
+      .trim()
       // Windows support
-      .replace(/\r/g, '');
-      try {
-        expect(actual).toBe(expected);
-      }
-      catch (e) {
-        // useful for updating fixtures
-        fs.writeFileSync(`${__dirname}/unit/${unitTest}/actual.js`, actual);
-        throw e;
+      .replace(/\r/g, "");
+    await ncc(`${__dirname}/unit/${unitTest}/input.js`, { minify: false }).then(
+      async ({ code, assets }) => {
+        // very simple asset validation in unit tests
+        if (unitTest.startsWith("asset-")) {
+          expect(Object.keys(assets).length).toBeGreaterThan(0);
+          expect(assets[Object.keys(assets)[0]] instanceof Buffer);
+        }
+        const actual = code
+          .trim()
+          // Windows support
+          .replace(/\r/g, "");
+        try {
+          expect(actual).toBe(expected);
+        } catch (e) {
+          // useful for updating fixtures
+          fs.writeFileSync(`${__dirname}/unit/${unitTest}/actual.js`, actual);
+          throw e;
+        }
       }
-    });
+    );
   });
 }
 
@@ -39,16 +43,18 @@ function clearDir (dir) {
     rimraf.sync(dir);
   }
   catch (e) {
-    if (e.code !== "ENOENT")
-      throw e;
+    if (e.code !== "ENOENT") throw e;
   }
 }
 
 for (const integrationTest of fs.readdirSync(__dirname + "/integration")) {
   // ignore e.g.: `.json` files
-  if (!integrationTest.endsWith(".js")) continue;
+  if (!/\.(mjs|tsx?|js)$/.test(integrationTest)) continue;
   it(`should evaluate ${integrationTest} without errors`, async () => {
-    const { code, map, assets } = await ncc(__dirname + "/integration/" + integrationTest, { minify: true, sourceMap: true });
+    const { code, map, assets } = await ncc(
+      __dirname + "/integration/" + integrationTest,
+      { minify: true, sourceMap: true }
+    );
     const tmpDir = `${__dirname}/tmp/${integrationTest}/`;
     clearDir(tmpDir);
     mkdirp.sync(tmpDir);