Merge branch 'v2' into wbinnssmith/css-sourcemaps

packages/core/core/src/BundleGraph.js

@@ -647,15 +647,9 @@ export default class BundleGraph {
   }
 
   // Resolve the export `symbol` of `asset` to the source,
-  // stopping at the first asset after leaving `bundle` (symbol is null in that case)
+  // stopping at the first asset after leaving `bundle` (symbol is nullish in that case)
   resolveSymbol(asset: Asset, symbol: Symbol, boundary: ?Bundle) {
-    if (boundary && !this.bundleHasAsset(boundary, asset)) {
-      return {
-        asset,
-        exportSymbol: symbol,
-        symbol: undefined,
-      };
-    }
+    let assetOutside = boundary && !this.bundleHasAsset(boundary, asset);
 
     let identifier = asset.symbols.get(symbol);
     if (symbol === '*') {
@@ -676,6 +670,11 @@ export default class BundleGraph {
           break;
         }
 
+        if (assetOutside) {
+          // We found the symbol, but `asset` is outside, return `asset` and the original symbol
+          break;
+        }
+
         let {
           asset: resolvedAsset,
           symbol: resolvedSymbol,
@@ -701,7 +700,12 @@ export default class BundleGraph {
         let resolved = this.getDependencyResolution(dep);
         if (!resolved) continue;
         let result = this.resolveSymbol(resolved, symbol, boundary);
-        if (result.symbol != null) {
+        if (result.symbol != undefined) {
+          if (assetOutside) {
+            // We found the symbol, but `asset` is outside, return `asset` and the original symbol
+            break;
+          }
+
           return {
             asset: result.asset,
             symbol: result.symbol,

packages/core/core/src/public/Asset.js

@@ -20,7 +20,7 @@ import type {
   MutableAsset as IMutableAsset,
   PackageJSON,
   Stats,
-  Symbol,
+  Symbol as ISymbol,
 } from '@parcel/types';
 import type {Asset as AssetValue, ParcelOptions} from '../types';
 
@@ -31,6 +31,8 @@ import UncommittedAsset from '../UncommittedAsset';
 import CommittedAsset from '../CommittedAsset';
 import {createEnvironment} from '../Environment';
 
+const inspect = Symbol.for('nodejs.util.inspect.custom');
+
 const assetValueToAsset: WeakMap<AssetValue, Asset> = new WeakMap();
 const assetValueToMutableAsset: WeakMap<
   AssetValue,
@@ -76,6 +78,11 @@ class BaseAsset {
     _assetToAssetValue.set(this, asset.value);
   }
 
+  // $FlowFixMe
+  [inspect]() {
+    return `Asset(${this.filePath})`;
+  }
+
   get id(): string {
     return this.#asset.value.id;
   }
@@ -120,7 +127,7 @@ class BaseAsset {
     return this.#asset.value.sideEffects;
   }
 
-  get symbols(): Map<Symbol, Symbol> {
+  get symbols(): Map<ISymbol, ISymbol> {
     return this.#asset.value.symbols;
   }
 

packages/core/core/src/public/Dependency.js

@@ -4,13 +4,15 @@ import type {
   Environment as IEnvironment,
   SourceLocation,
   Meta,
-  Symbol,
+  Symbol as ISymbol,
 } from '@parcel/types';
 import type {Dependency as InternalDependency} from '../types';
 import Environment from './Environment';
 import Target from './Target';
 import nullthrows from 'nullthrows';
 
+const inspect = Symbol.for('nodejs.util.inspect.custom');
+
 const internalDependencyToDependency: WeakMap<
   InternalDependency,
   Dependency,
@@ -39,6 +41,11 @@ export default class Dependency implements IDependency {
     internalDependencyToDependency.set(dep, this);
   }
 
+  // $FlowFixMe
+  [inspect]() {
+    return `Dependency(${String(this.sourcePath)} -> ${this.moduleSpecifier})`;
+  }
+
   get id(): string {
     return this.#dep.id;
   }
@@ -98,7 +105,7 @@ export default class Dependency implements IDependency {
     return this.#dep.sourcePath;
   }
 
-  get symbols(): Map<Symbol, Symbol> {
+  get symbols(): Map<ISymbol, ISymbol> {
     return this.#dep.symbols;
   }
 

packages/core/integration-tests/test/integration/less-url-behavior/index.less

@@ -0,0 +1,3 @@
+.index {
+  behavior: url(#default#VML);
+}

packages/core/integration-tests/test/integration/scope-hoisting/commonjs/tree-shaking-no-unknown-objects/a.js

@@ -0,0 +1 @@
+module.exports = window;

packages/core/integration-tests/test/integration/scope-hoisting/commonjs/tree-shaking-no-unknown-objects/index.js

@@ -0,0 +1,3 @@
+const foo = require('./a');
+foo.bar = 42;
+output = window.bar;

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary2/async.js

@@ -0,0 +1,4 @@
+import { layers } from './library/index.js';
+
+export default layers.a;
+

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary2/index.js

@@ -0,0 +1,3 @@
+import t from "./library/components.js";
+
+output = import("./async.js").then((c) => [c.default, t().a]);

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary2/library/components.js

@@ -0,0 +1,4 @@
+import { layers } from './constants.js';
+export default function(){
+	return layers;
+}

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary2/library/constants.js

@@ -0,0 +1,3 @@
+export const layers = {
+	a: "foo",
+};

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary2/library/index.js

@@ -0,0 +1 @@
+export * from "./constants.js";

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary3/index.js

@@ -0,0 +1,3 @@
+import { themed } from './theme/components.js';
+
+output = import('./media-card/index.js').then(m => [m.default, themed()])

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary3/media-card/index.js

@@ -0,0 +1,3 @@
+import { layers } from '../theme/index.js';
+
+export default Object.keys(layers);

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary3/theme/components.js

@@ -0,0 +1,4 @@
+export { createTheme } from "./createTheme.js";
+export function themed() {
+	return "themed";
+}

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary3/theme/createTheme.js

@@ -0,0 +1,3 @@
+export function createTheme() {
+    return "foo";
+}

packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-bundle-boundary3/theme/index.js

@@ -0,0 +1,5 @@
+export var layers = {
+    a: 1,
+    b: 2
+};
+export * from './createTheme.js';

packages/core/integration-tests/test/integration/scope-hoisting/es6/tree-shaking-no-unknown-objects/a.js

@@ -0,0 +1 @@
+export const foo = window;

packages/core/integration-tests/test/integration/scope-hoisting/es6/tree-shaking-no-unknown-objects/index.js

@@ -0,0 +1,5 @@
+import {foo} from './a';
+
+foo.bar = 42;
+
+output = window.bar;

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

@@ -216,4 +216,21 @@ describe('less', function() {
     assert(css.includes('.a'));
     assert(css.includes('.b'));
   });
+
+  it('should ignore url() with IE behavior specifiers', async function() {
+    let b = await bundle(
+      path.join(__dirname, '/integration/less-url-behavior/index.less'),
+    );
+
+    assertBundles(b, [
+      {
+        name: 'index.css',
+        assets: ['index.less'],
+      },
+    ]);
+
+    let css = await outputFS.readFile(path.join(distDir, 'index.css'), 'utf8');
+
+    assert(css.includes('url(#default#VML)'));
+  });
 });

packages/core/integration-tests/test/scope-hoisting.js

@@ -201,7 +201,7 @@ describe('scope hoisting', function() {
       assert.equal(output, 15);
     });
 
-    it('can import from a different bundle via a re-export', async function() {
+    it('can import from a different bundle via a re-export (1)', async function() {
       let b = await bundle(
         path.join(
           __dirname,
@@ -225,6 +225,30 @@ describe('scope hoisting', function() {
       assert.deepEqual(output, ['operational', 'ui']);
     });
 
+    it('can import from a different bundle via a re-export (2)', async function() {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/scope-hoisting/es6/re-export-bundle-boundary2/index.js',
+        ),
+      );
+
+      let output = await run(b);
+      assert.deepEqual(output, ['foo', 'foo']);
+    });
+
+    it('can import from its own bundle with a split package', async function() {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/scope-hoisting/es6/re-export-bundle-boundary3/index.js',
+        ),
+      );
+
+      let output = await run(b);
+      assert.deepEqual(output, [['a', 'b'], 'themed']);
+    });
+
     it('supports importing all exports re-exported from multiple modules deep', async function() {
       let b = await bundle(
         path.join(
@@ -904,8 +928,7 @@ describe('scope hoisting', function() {
         b.getBundles()[0].filePath,
         'utf8',
       );
-      assert(!/bar/.test(contents));
-      assert(!/displayName/.test(contents));
+      assert(!contents.includes('exports.bar ='));
     });
 
     it('should correctly rename references to default exported classes', async function() {
@@ -930,6 +953,17 @@ describe('scope hoisting', function() {
       let output = await run(b);
       assert.deepEqual(output.foo, 'bar');
     });
+
+    it('does not tree-shake assignments to unknown objects', async () => {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/scope-hoisting/es6/tree-shaking-no-unknown-objects/index.js',
+        ),
+      );
+
+      assert.equal(await run(b), 42);
+    });
   });
 
   describe('commonjs', function() {
@@ -1879,6 +1913,17 @@ describe('scope hoisting', function() {
       let output = await run(b);
       assert.deepEqual(output, [4, 2]);
     });
+
+    it('does not tree-shake assignments to unknown objects', async () => {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/scope-hoisting/commonjs/tree-shaking-no-unknown-objects/index.js',
+        ),
+      );
+
+      assert.equal(await run(b), 42);
+    });
   });
 
   it('should not throw with JS included from HTML', async function() {

packages/dev/babel-preset/index.js

@@ -4,17 +4,17 @@ module.exports = () => ({
       require('@babel/preset-env'),
       {
         targets: {
-          node: 8
-        }
-      }
+          node: 10,
+        },
+      },
     ],
     require('@babel/preset-react'),
-    require('@babel/preset-flow')
+    require('@babel/preset-flow'),
   ],
   plugins: [
     require('@babel/plugin-proposal-class-properties'),
     require('@babel/plugin-proposal-nullish-coalescing-operator'),
-    require('@babel/plugin-proposal-optional-chaining')
+    require('@babel/plugin-proposal-optional-chaining'),
   ],
   env: {
     production: {
@@ -23,10 +23,10 @@ module.exports = () => ({
         // it can be removed through dead code elimination below
         [
           'babel-plugin-transform-inline-environment-variables',
-          {include: ['PARCEL_BUILD_ENV']}
+          {include: ['PARCEL_BUILD_ENV']},
         ],
-        'babel-plugin-minify-dead-code-elimination'
-      ]
-    }
-  }
+        'babel-plugin-minify-dead-code-elimination',
+      ],
+    },
+  },
 });

packages/shared/scope-hoisting/src/link.js

@@ -697,7 +697,7 @@ export function link({
           verifyScopeState(path.scope);
         }
 
-        treeShake(path.scope, exported);
+        treeShake(path.scope, exported, exportsMap);
       },
     },
   });