Experimental bundler integration

CONTRIBUTING.md

@@ -27,7 +27,7 @@ yarn install
 yarn build-native
 ```
 
-If you want, you can create a temporary example for debugging in the folder `packages/examples`. You can start by copying the `simple` example and try to reproduce the bug. It has everything set up for working on local changes and you can run `yarn build` to build the project. If you're re-using another example or creating one from scratch, make sure to use the `--no-cache` flag for `parcel build` to see your local changes reflected. *Please don't commit this example.*
+If you want, you can create a temporary example for debugging in the folder `packages/examples`. You can start by copying the `simple` example and try to reproduce the bug. It has everything set up for working on local changes and you can run `yarn build` to build the project. If you're re-using another example or creating one from scratch, make sure to use the `--no-cache` flag for `parcel build` to see your local changes reflected. _Please don't commit this example._
 
 After you've figured out where the issue originated from and found a fix, try to add a test case or ask for help on how to proceed if the use case is more complex.
 

packages/core/core/src/BundleGraph.js

@@ -732,12 +732,13 @@ export default class BundleGraph {
       if (
         inboundDependencies.every(
           dependency =>
-            !this.bundleHasDependency(bundle, dependency) ||
-            this._graph.hasEdge(
-              bundleNodeId,
-              this._graph.getNodeIdByContentKey(dependency.id),
-              bundleGraphEdgeTypes.internal_async,
-            ),
+            dependency.specifierType !== SpecifierType.url &&
+            (!this.bundleHasDependency(bundle, dependency) ||
+              this._graph.hasEdge(
+                bundleNodeId,
+                this._graph.getNodeIdByContentKey(dependency.id),
+                bundleGraphEdgeTypes.internal_async,
+              )),
         )
       ) {
         this._graph.removeEdge(
@@ -1307,9 +1308,10 @@ export default class BundleGraph {
         // Shared bundles seem to depend on being used in the opposite order
         // they were added.
         // TODO: Should this be the case?
-        this._graph
-          .getNodeIdsConnectedFrom(nodeId, bundleGraphEdgeTypes.references)
-          .reverse(),
+        this._graph.getNodeIdsConnectedFrom(
+          nodeId,
+          bundleGraphEdgeTypes.references,
+        ),
     });
 
     return [...referencedBundles];

packages/core/graph/src/Graph.js

@@ -407,13 +407,17 @@ export default class Graph<TNode, TEdgeType: number = 1> {
     return null;
   }
 
-  topoSort(): Array<NodeId> {
+  topoSort(type?: TEdgeType): Array<NodeId> {
     let sorted: Array<NodeId> = [];
-    this.traverse({
-      exit: nodeId => {
-        sorted.push(nodeId);
+    this.traverse(
+      {
+        exit: nodeId => {
+          sorted.push(nodeId);
+        },
       },
-    });
+      null,
+      type,
+    );
     return sorted.reverse();
   }
 

packages/core/integration-tests/test/cache.js

@@ -4360,7 +4360,7 @@ describe('cache', function () {
       it('should support adding bundler config', async function () {
         let b = await testCache(
           {
-            entries: ['*.html'],
+            entries: ['index.js'],
             mode: 'production',
             async setup() {
               let pkgFile = path.join(inputDir, 'package.json');
@@ -4374,85 +4374,217 @@ describe('cache', function () {
               );
             },
             async update(b) {
-              let html = await overlayFS.readFile(
-                b.bundleGraph.getBundles().find(b => b.name === 'b.html')
-                  ?.filePath,
-                'utf8',
-              );
-              assert.equal(html.match(/<script/g)?.length, 7);
-
+              assertBundles(b.bundleGraph, [
+                {
+                  assets: ['a.js'],
+                },
+                {
+                  assets: ['b.js'],
+                },
+                {
+                  name: 'index.js',
+                  assets: [
+                    'index.js',
+                    'c.js',
+                    'bundle-url.js',
+                    'cacheLoader.js',
+                    'js-loader.js',
+                    'bundle-manifest.js',
+                  ],
+                },
+                {
+                  assets: ['common.js', 'lodash.js'],
+                },
+              ]);
               let pkgFile = path.join(inputDir, 'package.json');
               let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
               await overlayFS.writeFile(
                 pkgFile,
                 JSON.stringify({
                   ...pkg,
                   '@parcel/bundler-default': {
-                    http: 1,
+                    minBundleSize: 9000000,
                   },
                 }),
               );
             },
           },
-          'shared-many',
+          'dynamic-common-large',
         );
 
-        let html = await overlayFS.readFile(
-          b.bundleGraph.getBundles().find(b => b.name === 'b.html')?.filePath,
-          'utf8',
-        );
-        assert.equal(html.match(/<script/g)?.length, 5);
+        assertBundles(b.bundleGraph, [
+          {
+            assets: ['a.js', 'common.js', 'lodash.js'],
+          },
+          {
+            assets: ['b.js', 'common.js', 'lodash.js'],
+          },
+          {
+            name: 'index.js',
+            assets: [
+              'index.js',
+              'c.js',
+              'bundle-url.js',
+              'cacheLoader.js',
+              'js-loader.js',
+              'bundle-manifest.js',
+            ],
+          },
+        ]);
       });
 
-      it('should support updating bundler config', async function () {
+      it('should support adding bundler config for parallel request limits', async function () {
         let b = await testCache(
           {
-            entries: ['*.html'],
+            entries: ['index.js'],
             mode: 'production',
+            async setup() {
+              let pkgFile = path.join(inputDir, 'package.json');
+              let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
+              await overlayFS.writeFile(
+                pkgFile,
+                JSON.stringify({
+                  ...pkg,
+                  '@parcel/bundler-default': undefined,
+                }),
+              );
+            },
             async update(b) {
-              let html = await overlayFS.readFile(
-                b.bundleGraph.getBundles().find(b => b.name === 'b.html')
-                  ?.filePath,
-                'utf8',
+              assert.deepEqual(b.bundleGraph.getBundles().length, 7);
+              let pkgFile = path.join(inputDir, 'package.json');
+              let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
+              await overlayFS.writeFile(
+                pkgFile,
+                JSON.stringify({
+                  ...pkg,
+                  '@parcel/bundler-default': {
+                    maxParallelRequests: 0,
+                  },
+                }),
               );
-              assert.equal(html.match(/<script/g)?.length, 5);
+            },
+          },
+          'large-bundlegroup',
+        );
+        assert.deepEqual(b.bundleGraph.getBundles().length, 5);
+      });
 
+      it('should support updating bundler config', async function () {
+        let b = await testCache(
+          {
+            entries: ['index.js'],
+            mode: 'production',
+            async setup() {
               let pkgFile = path.join(inputDir, 'package.json');
               let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
               await overlayFS.writeFile(
                 pkgFile,
                 JSON.stringify({
                   ...pkg,
                   '@parcel/bundler-default': {
-                    http: 2,
+                    minBundleSize: 8000,
+                  },
+                }),
+              );
+            },
+            async update(b) {
+              assertBundles(b.bundleGraph, [
+                {
+                  assets: ['a.js'],
+                },
+                {
+                  assets: ['b.js'],
+                },
+                {
+                  name: 'index.js',
+                  assets: [
+                    'index.js',
+                    'c.js',
+                    'bundle-url.js',
+                    'cacheLoader.js',
+                    'js-loader.js',
+                    'bundle-manifest.js',
+                  ],
+                },
+                {
+                  assets: ['common.js', 'lodash.js'],
+                },
+              ]);
+              let pkgFile = path.join(inputDir, 'package.json');
+              let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
+              await overlayFS.writeFile(
+                pkgFile,
+                JSON.stringify({
+                  ...pkg,
+                  '@parcel/bundler-default': {
+                    minBundleSize: 9000000,
                   },
                 }),
               );
             },
           },
-          'shared-many',
+          'dynamic-common-large',
         );
 
-        let html = await overlayFS.readFile(
-          b.bundleGraph.getBundles().find(b => b.name === 'b.html')?.filePath,
-          'utf8',
-        );
-        assert.equal(html.match(/<script/g)?.length, 7);
+        assertBundles(b.bundleGraph, [
+          {
+            assets: ['a.js', 'common.js', 'lodash.js'],
+          },
+          {
+            assets: ['b.js', 'common.js', 'lodash.js'],
+          },
+          {
+            name: 'index.js',
+            assets: [
+              'index.js',
+              'c.js',
+              'bundle-url.js',
+              'cacheLoader.js',
+              'js-loader.js',
+              'bundle-manifest.js',
+            ],
+          },
+        ]);
       });
 
       it('should support removing bundler config', async function () {
         let b = await testCache(
           {
-            entries: ['*.html'],
+            entries: ['index.js'],
             mode: 'production',
-            async update(b) {
-              let html = await overlayFS.readFile(
-                b.bundleGraph.getBundles().find(b => b.name === 'b.html')
-                  ?.filePath,
-                'utf8',
+            async setup() {
+              let pkgFile = path.join(inputDir, 'package.json');
+              let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
+              await overlayFS.writeFile(
+                pkgFile,
+                JSON.stringify({
+                  ...pkg,
+                  '@parcel/bundler-default': {
+                    minBundleSize: 9000000,
+                  },
+                }),
               );
-              assert.equal(html.match(/<script/g)?.length, 5);
-
+            },
+            async update(b) {
+              assertBundles(b.bundleGraph, [
+                {
+                  assets: ['a.js', 'common.js', 'lodash.js'],
+                },
+                {
+                  assets: ['b.js', 'common.js', 'lodash.js'],
+                },
+                {
+                  name: 'index.js',
+                  assets: [
+                    'index.js',
+                    'c.js',
+                    'bundle-url.js',
+                    'cacheLoader.js',
+                    'js-loader.js',
+                    'bundle-manifest.js',
+                  ],
+                },
+              ]);
               let pkgFile = path.join(inputDir, 'package.json');
               let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
               await overlayFS.writeFile(
@@ -4464,14 +4596,30 @@ describe('cache', function () {
               );
             },
           },
-          'shared-many',
+          'dynamic-common-large',
         );
-
-        let html = await overlayFS.readFile(
-          b.bundleGraph.getBundles().find(b => b.name === 'b.html')?.filePath,
-          'utf8',
-        );
-        assert.equal(html.match(/<script/g)?.length, 7);
+        assertBundles(b.bundleGraph, [
+          {
+            assets: ['a.js'],
+          },
+          {
+            assets: ['b.js'],
+          },
+          {
+            name: 'index.js',
+            assets: [
+              'index.js',
+              'c.js',
+              'bundle-url.js',
+              'cacheLoader.js',
+              'js-loader.js',
+              'bundle-manifest.js',
+            ],
+          },
+          {
+            assets: ['common.js', 'lodash.js'],
+          },
+        ]);
       });
     });
   });