Merge branch 'v2' into multi-workspace-parcel-ext

package.json

@@ -12,7 +12,7 @@
   ],
   "scripts": {
     "build": "yarn build-bundles && cross-env NODE_ENV=production PARCEL_BUILD_ENV=production gulp",
-    "build-bundles": "rm -rf packages/*/*/lib && cross-env NODE_ENV=production PARCEL_BUILD_ENV=production PARCEL_SELF_BUILD=true parcel build packages/core/{fs,codeframe,package-manager,utils} packages/reporters/{cli,dev-server} packages/utils/{parcel-lsp,parcel-lsp-protocol}",
+    "build-bundles": "rimraf packages/*/*/lib && cross-env NODE_ENV=production PARCEL_BUILD_ENV=production PARCEL_SELF_BUILD=true parcel build packages/core/{fs,codeframe,package-manager,utils} packages/reporters/{cli,dev-server} packages/utils/{parcel-lsp,parcel-lsp-protocol}",
     "build-ts": "lerna run build-ts && lerna run check-ts",
     "build-native": "node scripts/build-native.js",
     "build-native-release": "node scripts/build-native.js --release",

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

@@ -9,6 +9,7 @@ import {
   fsFixture,
   run,
 } from '@parcel/test-utils';
+import {hashString} from '@parcel/rust';
 
 describe('bundler', function () {
   it('should not create shared bundles when a bundle is being reused and disableSharedBundles is enabled', async function () {
@@ -1005,6 +1006,203 @@ describe('bundler', function () {
     ]);
   });
 
+  it('should support inline constants', async () => {
+    await fsFixture(overlayFS, __dirname)`
+      inline-constants-shared-bundles
+        one.html:
+          <script type="module" src="./one.js" />
+
+        two.html:
+          <script type="module" src="./two.js" />
+
+        one.js:
+          import {sharedFn} from './shared';
+          import {constant} from './constants';
+          sideEffectNoop('one' + sharedFn() + constant);
+
+        two.js:
+          import {sharedFn} from './shared';
+
+          sideEffectNoop('two' + sharedFn);
+
+        shared.js:
+          import {constant} from './constants.js';
+
+          export function sharedFn() {
+            return constant;
+          }
+
+        constants.js:
+          export const constant = 'constant';
+
+        package.json:
+          {
+            "@parcel/transformer-js": {
+              "unstable_inlineConstants": true
+            },
+            "@parcel/bundler-default": {
+              "minBundleSize": 0,
+              "minBundles": 3
+            }
+          }
+
+        yarn.lock:`;
+
+    let b = await bundle(
+      [
+        path.join(__dirname, 'inline-constants-shared-bundles', 'one.html'),
+        path.join(__dirname, 'inline-constants-shared-bundles', 'two.html'),
+      ],
+      {
+        mode: 'production',
+        defaultTargetOptions: {
+          shouldScopeHoist: true,
+          sourceMaps: false,
+          shouldOptimize: false,
+        },
+        inputFS: overlayFS,
+      },
+    );
+
+    assertBundles(b, [
+      {
+        assets: ['one.html'],
+      },
+      {
+        assets: ['two.html'],
+      },
+      {
+        assets: ['one.js', 'shared.js', 'constants.js'],
+      },
+      {
+        assets: ['two.js', 'shared.js', 'constants.js'],
+      },
+    ]);
+  });
+
+  it('should support inline constants with shared bundles', async () => {
+    await fsFixture(overlayFS, __dirname)`
+      inline-constants-shared-bundles
+        one.html:
+          <script type="module" src="./one.js" />
+
+        two.html:
+          <script type="module" src="./two.js" />
+
+        one.js:
+          import {sharedFn} from './shared';
+          import {constant} from './constants';
+          sideEffectNoop('one' + sharedFn() + constant);
+
+        two.js:
+          import {sharedFn} from './shared';
+
+          sideEffectNoop('two' + sharedFn);
+
+        shared.js:
+          import {constant} from './constants.js';
+
+          export function sharedFn() {
+            return constant;
+          }
+
+        constants.js:
+          export const constant = 'constant';
+
+        package.json:
+          {
+            "@parcel/transformer-js": {
+              "unstable_inlineConstants": true
+            },
+            "@parcel/bundler-default": {
+              "minBundleSize": 0
+            }
+          }
+
+        yarn.lock:`;
+
+    let b = await bundle(
+      [
+        path.join(__dirname, 'inline-constants-shared-bundles', 'one.html'),
+        path.join(__dirname, 'inline-constants-shared-bundles', 'two.html'),
+      ],
+      {
+        mode: 'production',
+        defaultTargetOptions: {
+          shouldScopeHoist: true,
+          sourceMaps: false,
+          shouldOptimize: false,
+        },
+        inputFS: overlayFS,
+      },
+    );
+
+    assertBundles(b, [
+      {
+        assets: ['one.html'],
+      },
+      {
+        assets: ['two.html'],
+      },
+      {
+        assets: ['one.js', 'constants.js'],
+      },
+      {
+        assets: ['two.js'],
+      },
+      {
+        // shared bundle
+        assets: ['shared.js', 'constants.js'],
+      },
+    ]);
+  });
+
+  it('should support inline constants in non-splittable bundles', async () => {
+    await fsFixture(overlayFS, __dirname)`
+      inline-constants-non-splittable
+        index.js:
+          import {sharedFn} from './shared';
+          sideEffectNoop(sharedFn());
+
+        shared.js:
+          import {constant} from './constants';
+
+          export function sharedFn() {
+            return constant;
+          }
+
+        constants.js:
+          export const constant = 'constant';
+
+        package.json:
+          {
+            "@parcel/transformer-js": {
+              "unstable_inlineConstants": true
+            }
+          }
+
+        yarn.lock:`;
+
+    let b = await bundle(
+      path.join(__dirname, 'inline-constants-non-splittable/index.js'),
+      {
+        mode: 'production',
+        defaultTargetOptions: {
+          shouldScopeHoist: true,
+          sourceMaps: false,
+          shouldOptimize: false,
+        },
+        inputFS: overlayFS,
+      },
+    );
+
+    assertBundles(b, [
+      {
+        assets: ['index.js', 'shared.js', 'constants.js'],
+      },
+    ]);
+  });
+
   describe('manual shared bundles', () => {
     const dir = path.join(__dirname, 'manual-bundle');
 
@@ -1112,7 +1310,7 @@ describe('bundler', function () {
             }]
           }
         }
-      
+
       .parcelrc:
         {
           "extends": "@parcel/config-default",
@@ -1133,14 +1331,14 @@ describe('bundler', function () {
             return [asset];
           }
         });
-      
+
       index.html:
         <script type="module">
           import shared from './shared.js';
-          sideEffectNoop(shared);        
+          sideEffectNoop(shared);
         </script>
         <script type="module" src="./index.js"></script>
-      
+
       index.js:
         import shared from './shared.js';
         sideEffectNoop(shared);
@@ -1323,6 +1521,10 @@ describe('bundler', function () {
           assets: ['math.js', 'add.js', 'subtract.js'],
         },
       ]);
+
+      let targetDistDir = __dirname.replace('/test', '/dist');
+      let hashedIdWithMSB = hashString('bundle:' + 'vendorjs' + targetDistDir);
+      assert(b.getBundles().find(b => b.id == hashedIdWithMSB));
     });
 
     it('should support manual shared bundles with constants module', async function () {
@@ -1388,7 +1590,7 @@ describe('bundler', function () {
           ],
         },
         {
-          assets: ['async.js', 'vendor-constants.js'],
+          assets: ['async.js'],
         },
         {
           // Vendor MSB for JS
@@ -1458,6 +1660,10 @@ describe('bundler', function () {
         },
       ]);
 
+      let targetDistDir = __dirname.replace('/test', '/dist');
+      let hashedIdWithMSB = hashString('bundle:' + 'vendorjs' + targetDistDir);
+      assert(b.getBundles().find(b => b.id == hashedIdWithMSB));
+
       await run(b);
     });
 

packages/core/integration-tests/test/integration/scope-hoisting/commonjs/exports-this/a.js

@@ -0,0 +1,11 @@
+exports.foo = function() {
+    exports.bar()
+}
+
+exports.bar = function() {
+    this.baz()
+}
+
+exports.baz = function() {
+    return 2
+}

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

@@ -3574,6 +3574,23 @@ describe('scope hoisting', function () {
   });
 
   describe('commonjs', function () {
+    it('should wrap when this could refer to an export', async function () {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/scope-hoisting/commonjs/exports-this/a.js',
+        ),
+      );
+
+      let contents = await outputFS.readFile(
+        b.getBundles()[0].filePath,
+        'utf8',
+      );
+
+      let wrapped = contents.includes('exports.bar()');
+      assert.equal(wrapped, true);
+    });
+
     it('supports require of commonjs modules', async function () {
       let b = await bundle(
         path.join(

packages/transformers/js/core/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 crate-type = ["rlib"]
 
 [dependencies]
-swc_core = { version = "0.83.34", features = [
+swc_core = { version = "0.86.1", features = [
   "common",
   "common_ahash",
   "common_sourcemap",