Unmark defer for dependency that become used ('does not export') (#7035)

Author: AGawrys

packages/core/core/src/AssetGraph.js

@@ -304,7 +304,7 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
 
     let {sideEffects, canDefer = true} = childNode.value;
     let dependency = node.value;
-    let previouslyDeferred = childNode.deferred;
+    let previouslyDeferred = node.hasDeferred;
     let defer = this.shouldDeferDependency(dependency, sideEffects, canDefer);
     node.hasDeferred = defer;
     childNode.deferred = defer;

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/index.js

@@ -0,0 +1,3 @@
+import {a} from "./package/";
+
+sideEffectNoop(a);

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/package.json

@@ -0,0 +1 @@
+{}

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/package/a.js

@@ -0,0 +1,8 @@
+import { v } from "./b";
+import c from "./c";
+
+export default class a {
+  constructor() {
+    c(v);
+  }
+}

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/package/b1.js

@@ -0,0 +1,2 @@
+export const d1 = "def";
+export const v = "abc";

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/package/b2.js

@@ -0,0 +1,2 @@
+export { d1 } from "./d";
+export const v = "abc";

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/package/c.js

@@ -0,0 +1,4 @@
+import { d1 } from "./b";
+export default function c() {
+  return d1;
+}

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/package/d.js

@@ -0,0 +1 @@
+export const d1 = "hello", d2 = 2 , d3 = 3;

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/package/index.js

@@ -0,0 +1,2 @@
+export {d2} from './d';
+export {default as a} from "./a";

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/package/package.json

@@ -0,0 +1,3 @@
+{
+  "sideEffects": false
+}

packages/core/integration-tests/test/integration/scope-hoisting/es6/unmarks-defer-for-new-deps/yarn.lock

@@ -5932,4 +5932,36 @@ describe('scope hoisting', function() {
     let res = await run(b, {output: null}, {require: false});
     assert.equal(res.output, 'a');
   });
+
+  it('should unmark dependency as deferred when dependency becomes used', async function() {
+    let testDir = path.join(
+      __dirname,
+      'integration/scope-hoisting/es6/unmarks-defer-for-new-deps',
+    );
+
+    let packageDir = path.join(testDir, '/package');
+
+    await overlayFS.mkdirp(packageDir);
+    await overlayFS.copyFile(
+      path.join(packageDir, 'b1.js'),
+      path.join(packageDir, 'b.js'),
+    );
+
+    await bundle(path.join(testDir, 'index.js'), {
+      inputFS: overlayFS,
+      outputFS: overlayFS,
+      shouldDisableCache: true,
+    });
+
+    await overlayFS.copyFile(
+      path.join(packageDir, 'b2.js'),
+      path.join(packageDir, 'b.js'),
+    );
+
+    await bundle(path.join(testDir, 'index.js'), {
+      inputFS: overlayFS,
+      outputFS: overlayFS,
+      shouldDisableCache: false,
+    });
+  });
 });