@atlaspack/packager-js 2.15.0 → 2.16.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaspack/packager-js
 
+## 2.16.0
+
+### Minor Changes
+
+- [#644](https://github.com/atlassian-labs/atlaspack/pull/644) [`fc59be7`](https://github.com/atlassian-labs/atlaspack/commit/fc59be71f43dd87d3e6fb7f3f50c424d2b664858) Thanks [@marcins](https://github.com/marcins)! - Removes the unused unstable `forceSkipWrapAssets` feature
+
+### Patch Changes
+
+- [#633](https://github.com/atlassian-labs/atlaspack/pull/633) [`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b) Thanks [@sbhuiyan-atlassian](https://github.com/sbhuiyan-atlassian)! - Ported various HMR changes from Parcel
+
+- Updated dependencies [[`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b), [`0501255`](https://github.com/atlassian-labs/atlaspack/commit/05012550da35b05ce7d356a8cc29311e7f9afdca)]:
+  - @atlaspack/feature-flags@2.18.1
+  - @atlaspack/types@2.15.3
+  - @atlaspack/utils@2.15.1
+  - @atlaspack/plugin@2.14.13
+
 ## 2.15.0
 
 ### Minor Changes

package/lib/DevPackager.js

@@ -18,6 +18,13 @@ function _sourceMap() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
   _assert = function () {
@@ -108,6 +115,17 @@ class DevPackager {
             deps[specifier] = dep.specifier;
           }
         }
+        if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
+          // Add dependencies for parcelRequire calls added by runtimes
+          // so that the HMR runtime can correctly traverse parents.
+          let hmrDeps = asset.meta.hmrDeps;
+          if (this.options.hmrOptions && Array.isArray(hmrDeps)) {
+            for (let id of hmrDeps) {
+              (0, _assert().default)(typeof id === 'string');
+              deps[id] = id;
+            }
+          }
+        }
         let {
           code,
           mapBuffer

package/lib/ScopeHoistingPackager.js

@@ -99,14 +99,12 @@ class ScopeHoistingPackager {
   needsPrelude = false;
   usedHelpers = new Set();
   externalAssets = new Set();
-  forceSkipWrapAssets = [];
-  constructor(options, bundleGraph, bundle, parcelRequireName, useAsyncBundleRuntime, forceSkipWrapAssets, logger) {
+  constructor(options, bundleGraph, bundle, parcelRequireName, useAsyncBundleRuntime, logger) {
     this.options = options;
     this.bundleGraph = bundleGraph;
     this.bundle = bundle;
     this.parcelRequireName = parcelRequireName;
     this.useAsyncBundleRuntime = useAsyncBundleRuntime;
-    this.forceSkipWrapAssets = forceSkipWrapAssets ?? [];
     this.logger = logger;
     let OutputFormat = OUTPUT_FORMATS[this.bundle.env.outputFormat];
     this.outputFormat = new OutputFormat(this);
@@ -326,18 +324,6 @@ class ScopeHoistingPackager {
             actions.skipChildren();
             return;
           }
-          // This prevents children of a wrapped asset also being wrapped - it's an "unsafe" optimisation
-          // that should only be used when you know (or think you know) what you're doing.
-          //
-          // In particular this can force an async bundle to be scope hoisted where it previously would not be
-          // due to the entry asset being wrapped.
-          if (this.forceSkipWrapAssets.length > 0 && this.forceSkipWrapAssets.some(p => p === _path().default.relative(this.options.projectRoot, asset.filePath))) {
-            this.logger.verbose({
-              message: `Force skipping wrapping of ${_path().default.relative(this.options.projectRoot, asset.filePath)}`
-            });
-            actions.skipChildren();
-            return;
-          }
           if (!asset.meta.isConstantModule) {
             this.wrappedAssets.add(asset.id);
             wrapped.push(asset);

package/lib/index.js

@@ -47,12 +47,6 @@ const CONFIG_SCHEMA = {
   properties: {
     unstable_asyncBundleRuntime: {
       type: 'boolean'
-    },
-    unstable_forceSkipWrapAssets: {
-      type: 'array',
-      items: {
-        type: 'string'
-      }
     }
   },
   additionalProperties: false
@@ -62,7 +56,7 @@ var _default = exports.default = new (_plugin().Packager)({
     config,
     options
   }) {
-    var _conf$contents, _conf$contents2;
+    var _conf$contents;
     let packageKey = '@atlaspack/packager-js';
     let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
       packageKey
@@ -84,8 +78,7 @@ var _default = exports.default = new (_plugin().Packager)({
     let name = (packageName === null || packageName === void 0 ? void 0 : packageName.contents) ?? '';
     return {
       parcelRequireName: 'parcelRequire' + (0, _rust().hashString)(name).slice(-4),
-      unstable_asyncBundleRuntime: Boolean(conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.unstable_asyncBundleRuntime),
-      unstable_forceSkipWrapAssets: (conf === null || conf === void 0 || (_conf$contents2 = conf.contents) === null || _conf$contents2 === void 0 ? void 0 : _conf$contents2.unstable_forceSkipWrapAssets) ?? []
+      unstable_asyncBundleRuntime: Boolean(conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.unstable_asyncBundleRuntime)
     };
   },
   async package({
@@ -108,7 +101,7 @@ var _default = exports.default = new (_plugin().Packager)({
       }
     }
     if (contents == null) {
-      let packager = bundle.env.shouldScopeHoist ? new _ScopeHoistingPackager.ScopeHoistingPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName, (0, _nullthrows().default)(config).unstable_asyncBundleRuntime, (0, _nullthrows().default)(config).unstable_forceSkipWrapAssets, logger) : new _DevPackager.DevPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName);
+      let packager = bundle.env.shouldScopeHoist ? new _ScopeHoistingPackager.ScopeHoistingPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName, (0, _nullthrows().default)(config).unstable_asyncBundleRuntime, logger) : new _DevPackager.DevPackager(options, bundleGraph, bundle, (0, _nullthrows().default)(config).parcelRequireName);
       ({
         contents,
         map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,12 +16,12 @@
   },
   "dependencies": {
     "@atlaspack/diagnostic": "2.14.1",
-    "@atlaspack/feature-flags": "2.18.0",
-    "@atlaspack/plugin": "2.14.12",
+    "@atlaspack/feature-flags": "2.18.1",
+    "@atlaspack/plugin": "2.14.13",
     "@atlaspack/rust": "3.3.5",
     "@parcel/source-map": "^2.1.1",
-    "@atlaspack/types": "2.15.2",
-    "@atlaspack/utils": "2.15.0",
+    "@atlaspack/types": "2.15.3",
+    "@atlaspack/utils": "2.15.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },

package/src/DevPackager.js

@@ -8,6 +8,7 @@ import {
   normalizeSeparators,
 } from '@atlaspack/utils';
 import SourceMap from '@parcel/source-map';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import invariant from 'assert';
 import path from 'path';
 import fs from 'fs';
@@ -112,6 +113,18 @@ export class DevPackager {
           }
         }
 
+        if (getFeatureFlag('hmrImprovements')) {
+          // Add dependencies for parcelRequire calls added by runtimes
+          // so that the HMR runtime can correctly traverse parents.
+          let hmrDeps = asset.meta.hmrDeps;
+          if (this.options.hmrOptions && Array.isArray(hmrDeps)) {
+            for (let id of hmrDeps) {
+              invariant(typeof id === 'string');
+              deps[id] = id;
+            }
+          }
+        }
+
         let {code, mapBuffer} = results[i];
         let output = code || '';
         wrapped +=

package/src/ScopeHoistingPackager.js

@@ -102,7 +102,6 @@ export class ScopeHoistingPackager {
   needsPrelude: boolean = false;
   usedHelpers: Set<string> = new Set();
   externalAssets: Set<Asset> = new Set();
-  forceSkipWrapAssets: Array<string> = [];
   logger: PluginLogger;
 
   constructor(
@@ -111,7 +110,6 @@ export class ScopeHoistingPackager {
     bundle: NamedBundle,
     parcelRequireName: string,
     useAsyncBundleRuntime: boolean,
-    forceSkipWrapAssets: Array<string>,
     logger: PluginLogger,
   ) {
     this.options = options;
@@ -119,7 +117,6 @@ export class ScopeHoistingPackager {
     this.bundle = bundle;
     this.parcelRequireName = parcelRequireName;
     this.useAsyncBundleRuntime = useAsyncBundleRuntime;
-    this.forceSkipWrapAssets = forceSkipWrapAssets ?? [];
     this.logger = logger;
 
     let OutputFormat = OUTPUT_FORMATS[this.bundle.env.outputFormat];
@@ -444,27 +441,7 @@ export class ScopeHoistingPackager {
             actions.skipChildren();
             return;
           }
-          // This prevents children of a wrapped asset also being wrapped - it's an "unsafe" optimisation
-          // that should only be used when you know (or think you know) what you're doing.
-          //
-          // In particular this can force an async bundle to be scope hoisted where it previously would not be
-          // due to the entry asset being wrapped.
-          if (
-            this.forceSkipWrapAssets.length > 0 &&
-            this.forceSkipWrapAssets.some(
-              (p) =>
-                p === path.relative(this.options.projectRoot, asset.filePath),
-            )
-          ) {
-            this.logger.verbose({
-              message: `Force skipping wrapping of ${path.relative(
-                this.options.projectRoot,
-                asset.filePath,
-              )}`,
-            });
-            actions.skipChildren();
-            return;
-          }
+
           if (!asset.meta.isConstantModule) {
             this.wrappedAssets.add(asset.id);
             wrapped.push(asset);

package/src/index.js

@@ -17,7 +17,6 @@ import {ScopeHoistingPackager} from './ScopeHoistingPackager';
 type JSPackagerConfig = {|
   parcelRequireName: string,
   unstable_asyncBundleRuntime: boolean,
-  unstable_forceSkipWrapAssets: Array<string>,
 |};
 
 const CONFIG_SCHEMA: SchemaEntity = {
@@ -26,12 +25,6 @@ const CONFIG_SCHEMA: SchemaEntity = {
     unstable_asyncBundleRuntime: {
       type: 'boolean',
     },
-    unstable_forceSkipWrapAssets: {
-      type: 'array',
-      items: {
-        type: 'string',
-      },
-    },
   },
   additionalProperties: false,
 };
@@ -73,8 +66,6 @@ export default (new Packager({
       unstable_asyncBundleRuntime: Boolean(
         conf?.contents?.unstable_asyncBundleRuntime,
       ),
-      unstable_forceSkipWrapAssets:
-        conf?.contents?.unstable_forceSkipWrapAssets ?? [],
     };
   },
   async package({
@@ -108,7 +99,6 @@ export default (new Packager({
             bundle,
             nullthrows(config).parcelRequireName,
             nullthrows(config).unstable_asyncBundleRuntime,
-            nullthrows(config).unstable_forceSkipWrapAssets,
             logger,
           )
         : new DevPackager(