Merge branch 'master' of github.com:zeit/ncc

Author: rauchg

dist/ncc/typescript/readme.md

@@ -0,0 +1,10 @@
+# About this directory
+
+This directory will contain:
+
+- `index.js` the TypeScript entry point
+- `typescript.js` the local NCC TypeScript build to use when no local version is available
+
+These are generated by the `build` step defined in `../../package.json`.
+
+These files are published to npm.

scripts/build.js

@@ -28,9 +28,7 @@ async function main() {
 
   const { code: nodeLoader, assets: nodeLoaderAssets } = await ncc(
     __dirname + "/../src/loaders/node-loader",
-    {
-      minify: true
-    }
+    { minify: true }
   );
 
   const { code: relocateLoader, assets: relocateLoaderAssets } = await ncc(
@@ -45,30 +43,48 @@ async function main() {
 
   const { code: tsLoader, assets: tsLoaderAssets } = await ncc(
     __dirname + "/../src/loaders/ts-loader",
-    { minify: true }
+    {
+      externals: ["typescript"],
+      minify: true
+    }
   );
 
   const { code: sourcemapSupport, assets: sourcemapAssets } = await ncc(
     require.resolve("source-map-support/register"),
     { minfiy: true }
   );
 
+  const { code: typescript, assets: typescriptAssets } = await ncc(
+    "typescript",
+    { minify: true }
+  );
+
   // detect unexpected asset emissions from core build
   if (
     Object.keys(cliAssets).length ||
     Object.keys(indexAssets).some(asset => !asset.startsWith('locales/')) ||
     Object.keys(nodeLoaderAssets).length ||
     Object.keys(relocateLoaderAssets).length ||
     Object.keys(shebangLoaderAssets).length ||
-    Object.keys(tsLoaderAssets).some(asset => !asset.startsWith('lib/')) ||
-    Object.keys(sourcemapAssets).length
+    Object.keys(tsLoaderAssets).length ||
+    Object.keys(sourcemapAssets).length ||
+    Object.keys(typescriptAssets).some(asset => !asset.startsWith('lib/'))
   ) {
     console.error("New assets are being emitted by the core build");
   }
 
   writeFileSync(__dirname + "/../dist/ncc/cli.js", cli);
   writeFileSync(__dirname + "/../dist/ncc/index.js", index);
+  writeFileSync(__dirname + "/../dist/ncc/typescript/index.js", `
+try {
+  module.exports = require('typescript');
+}
+catch (e) {
+  module.exports = require('./typescript.js');
+}
+`);
   writeFileSync(__dirname + "/../dist/ncc/sourcemap-register.js", sourcemapSupport);
+  writeFileSync(__dirname + "/../dist/ncc/typescript/typescript.js", typescript);
   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);

src/index.js

@@ -1,7 +1,7 @@
 const resolve = require("resolve");
 const fs = require("graceful-fs");
 const crypto = require("crypto");
-const { dirname, sep } = require("path");
+const { sep, dirname } = require("path");
 const webpack = require("webpack");
 const MemoryFS = require("memory-fs");
 const terser = require("terser");
@@ -11,6 +11,9 @@ const shebangRegEx = require('./utils/shebang');
 const { pkgNameRegEx } = require("./utils/get-package-base");
 const nccCacheDir = require("./utils/ncc-cache-dir");
 
+// support glob graceful-fs
+fs.gracefulify(require("fs"));
+
 const nodeBuiltins = new Set([...require("repl")._builtinLibs, "constants", "module", "timers", "console", "_stream_writable", "_stream_readable", "_stream_duplex"]);
 
 const SUPPORTED_EXTENSIONS = [".js", ".json", ".node", ".mjs", ".ts", ".tsx"];
@@ -126,24 +129,25 @@ module.exports = (
         {
           test: /\.node$/,
           use: [{
-            loader: __dirname + "/loaders/node-loader.js"
+            loader: eval('__dirname + "/loaders/node-loader.js"')
           }]
         },
         {
           test: /\.(js|mjs|tsx?)$/,
           use: [{
-            loader: __dirname + "/loaders/relocate-loader.js",
+            loader: eval('__dirname + "/loaders/relocate-loader.js"'),
             options: { cwd: dirname(resolvedEntry) }
           }]
         },
         {
           test: /\.tsx?$/,
           use: [{
-            loader: __dirname + "/loaders/uncacheable.js"
-          }, 
+            loader: eval('__dirname + "/loaders/uncacheable.js"')
+          },
           {
-            loader: __dirname + "/loaders/ts-loader.js",
+            loader: eval('__dirname + "/loaders/ts-loader.js"'),
             options: {
+              compiler: eval('__dirname + "/typescript"'),
               compilerOptions: {
                 outDir: '//'
               }
@@ -154,7 +158,7 @@ module.exports = (
           parser: { amd: false },
           exclude: /\.node$/,
           use: [{
-            loader: __dirname + "/loaders/shebang-loader.js"
+            loader: eval('__dirname + "/loaders/shebang-loader.js"')
           }]
         }
       ]
@@ -178,36 +182,6 @@ module.exports = (
               if (err) console.error(err);
               assetState.assetPermissions = JSON.parse(_assetPermissions || 'null') || Object.create(null);
             }); */
-            // hack to ensure __webpack_require__ is added to empty context wrapper
-            compilation.hooks.additionalModuleRuntimeRequirements.tap("ncc", (module, runtimeRequirements) => {
-              if(module._contextDependencies)
-                runtimeRequirements.add('__webpack_require__');
-            });
-            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",
-                    `if (typeof req === 'number')\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`
-                  );
-                }
-              }
-            );
           });
 
           compiler.hooks.normalModuleFactory.tap("ncc", NormalModuleFactory => {

src/loaders/relocate-loader.js

@@ -10,7 +10,6 @@ const getUniqueAssetName = require('../utils/dedupe-names');
 const sharedlibEmit = require('../utils/sharedlib-emit');
 const glob = require('glob');
 const getPackageBase = require('../utils/get-package-base');
-const { getOptions } = require('loader-utils');
 
 // binary support for inlining logic from - node-pre-gyp/lib/pre-binding.js
 function isPregypId (id) {
@@ -114,9 +113,6 @@ function isExpressionReference(node, parent) {
   // disregard the `bar` in var bar = asdf
   if (parent.type === 'VariableDeclarator' && node.id === node) return false;
 
-  // disregard the `x` in import/export 'x';
-  if (parent.type === 'ImportDeclaration' || parent.type === 'ExportNamedDeclaration' || parent.type === 'ExportAllDeclaration') return false;
-
 	return true;
 }
 
@@ -275,14 +271,13 @@ function handleWrappers (ast, scope, magicString, len) {
   return { ast, scope, transformed };
 }
 
-const relocateRegEx = /_\_dirname|_\_filename|require\.main|node-pre-gyp|bindings|define|['"]\.\.?\//;
+const relocateRegEx = /_\_dirname|_\_filename|require\.main|node-pre-gyp|bindings|define|require\(\s*[^'"]/;
 
 module.exports = function (code) {
   if (this.cacheable)
     this.cacheable();
   this.async();
   const id = this.resourcePath;
-  const { cwd } = getOptions(this);
 
   if (id.endsWith('.json') || !code.match(relocateRegEx))
     return this.callback(null, code);
@@ -497,8 +492,8 @@ module.exports = function (code) {
         node.arguments[0].type === 'Literal';
   }
 
-  // detect require(...) || require.resolve(...);
-  function isRequire (node) {
+  // detect require(...)
+  function isRequire (node, requireResolve) {
     return node &&
         node.type === 'CallExpression' &&
         (node.callee.type === 'Identifier' &&
@@ -507,8 +502,16 @@ module.exports = function (code) {
           node.callee.type === 'MemberExpression' &&
           node.callee.object.type === 'Identifier' &&
           node.callee.object.name === 'require' &&
+          (!requireResolve ||
           node.callee.property.type === 'Identifier' &&
-          node.callee.property.name === 'resolve');
+          node.callee.property.name === 'resolve'));
+  }
+
+  function isAnalyzableRequire (expression) {
+    if (expression.type === 'Identifier' || expression.type === 'MemberExpression')
+      return false;
+    // "possibly" analyzable (this can be further restricted over time)
+    return true;
   }
 
   ({ ast, scope, transformed } = handleWrappers(ast, scope, magicString, code.length));
@@ -543,18 +546,9 @@ module.exports = function (code) {
           }
         }
       }
-      // special trigger for './asset.txt' references
-      else if (node.type === 'Literal' && typeof node.value === 'string' &&
-               (node.value.startsWith('./') || node.value.startsWith('../')) &&
-               isExpressionReference(node, parent)) {
-        staticChildValue = node.value;
-        staticChildNode = node;
-        staticChildValueBindingsInstance = staticBindingsInstance;
-        return this.skip();
-      }
       // require('bindings')('asdf')
-      else if (node.type === 'CallExpression' &&  
-          !isESM && isStaticRequire(node.callee) &&
+      else if (node.type === 'CallExpression' && !isESM &&
+          isStaticRequire(node.callee) &&
           node.callee.arguments[0].value === 'bindings') {
         staticChildValue = computeStaticValue(node, true);
         if (staticChildValue) {
@@ -563,6 +557,12 @@ module.exports = function (code) {
           return this.skip();
         }
       }
+      // require(dynamic) -> __non_webpack_require__(dynamic)
+      else if (isRequire(node) && !isAnalyzableRequire(node.arguments[0])) {
+        transformed = true;
+        magicString.overwrite(node.callee.start, node.callee.end, "__non_webpack_require__");
+        return this.skip();
+      }
       // nbind.init(...) -> require('./resolved.node')
       else if (nbindId && node.type === 'CallExpression' &&
           node.callee.type === 'MemberExpression' &&
@@ -701,12 +701,9 @@ module.exports = function (code) {
           return;
         }
         // no static value -> see if we should emit the asset if it exists
-        // never inline an asset path into a require statement though
+        // Currently we only handle files. In theory whole directories could also be emitted if necessary.
         let stats;
-        if (typeof staticChildValue === 'string' && !isRequire(node)) {
-          if (staticChildValue.startsWith('./') || staticChildValue.startsWith('../')) {
-            staticChildValue = path.resolve(cwd, staticChildValue);
-          }
+        if (typeof staticChildValue === 'string') {
           try {
             stats = fs.statSync(staticChildValue);
           }

src/typescript/index.js

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

test/index.test.js

@@ -1,5 +1,5 @@
 const fs = require("fs");
-const ncc = global.coverage ? require("../src/index") : require("../src");
+const ncc = global.coverage ? require("../src/index") : require("../");
 const mkdirp = require("mkdirp");
 const rimraf = require("rimraf");
 const { dirname } = require("path");
@@ -20,11 +20,6 @@ for (const unitTest of fs.readdirSync(`${__dirname}/unit`)) {
     const inputFile = fs.readdirSync(testDir).find(file => file.includes("input"));
     await ncc(`${testDir}/${inputFile}`).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].source] instanceof Buffer);
-        }
         const actual = code
           .trim()
           // Windows support
@@ -36,6 +31,12 @@ for (const unitTest of fs.readdirSync(`${__dirname}/unit`)) {
           fs.writeFileSync(`${testDir}/actual.js`, actual);
           throw e;
         }
+
+        // very simple asset validation in unit tests
+        if (unitTest.startsWith("asset-")) {
+          expect(Object.keys(assets).length).toBeGreaterThan(0);
+          expect(assets[Object.keys(assets)[0].source] instanceof Buffer);
+        }
       }
     );
   });

test/unit/amd-disable/output.js

@@ -32,12 +32,12 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(901);
+/******/ 	return __webpack_require__(947);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 901:
+/***/ 947:
 /***/ (function() {
 
 if (typeof define === 'function' && define.amd)

test/unit/asset-fs-inline-path-enc-es-2/output.js

@@ -34,26 +34,12 @@ module.exports =
 /******/ 	runtime(__webpack_require__);
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(954);
+/******/ 	return __webpack_require__(259);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 589:
-/***/ (function(module) {
-
-module.exports = require("path");
-
-/***/ }),
-
-/***/ 66:
-/***/ (function(module) {
-
-module.exports = require("fs");
-
-/***/ }),
-
-/***/ 954:
+/***/ 259:
 /***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -67,6 +53,20 @@ __webpack_require__.r(__webpack_exports__);
 
 console.log(fs__WEBPACK_IMPORTED_MODULE_0___default.a.readFileSync(__dirname + '/asset.txt', 'utf8'));
 
+/***/ }),
+
+/***/ 589:
+/***/ (function(module) {
+
+module.exports = require("path");
+
+/***/ }),
+
+/***/ 66:
+/***/ (function(module) {
+
+module.exports = require("fs");
+
 /***/ })
 
 /******/ },