Fix hoisting of optional require calls (#2078)

parcel-bundler · Oct 6, 2018 · cadb1d4 · cadb1d4
1 parent 9f4cec7
commit cadb1d4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/packages/core/parcel-bundler/src/packagers/JSConcatPackager.js b/packages/core/parcel-bundler/src/packagers/JSConcatPackager.js
@@ -94,11 +94,13 @@ class JSConcatPackager extends Packager {
       let [source, name] = asset.cacheData.imports[identifier];
       let dep = asset.depAssets.get(asset.dependencies.get(source));
 
-      if (name === '*') {
-        this.markUsedExports(dep);
-      }
+      if (dep) {
+        if (name === '*') {
+          this.markUsedExports(dep);
+        }
 
-      this.markUsed(dep, name);
+        this.markUsed(dep, name);
+      }
     }
   }
 

diff --git a/packages/core/parcel-bundler/test/integration/scope-hoisting/commonjs/wrap-optional/a.js b/packages/core/parcel-bundler/test/integration/scope-hoisting/commonjs/wrap-optional/a.js
@@ -0,0 +1,6 @@
+try {
+    output = require('noop')
+}
+catch(_) {
+    output = 42
+}
diff --git a/packages/core/parcel-bundler/test/scope-hoisting.js b/packages/core/parcel-bundler/test/scope-hoisting.js
@@ -1053,5 +1053,17 @@ describe('scope hoisting', function() {
       let output = await run(b);
       assert.deepEqual(output, 9);
     });
+
+    it('should support optional requires', async function() {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/scope-hoisting/commonjs/wrap-optional/a.js'
+        )
+      );
+
+      let output = await run(b);
+      assert.deepEqual(output, 42);
+    });
   });
 });