@atlaspack/reporter-conditional-manifest 2.14.5-canary.13 → 2.14.5-canary.131

package/CHANGELOG.md

@@ -1,5 +1,121 @@
 # @atlaspack/reporter-conditional-manifest
 
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies [[`13aef17`](https://github.com/atlassian-labs/atlaspack/commit/13aef177eea289a6e40d2113b5ec1ac9be18a33d)]:
+  - @atlaspack/feature-flags@2.19.1
+  - @atlaspack/plugin@2.14.19
+
+## 2.15.0
+
+### Minor Changes
+
+- [#640](https://github.com/atlassian-labs/atlaspack/pull/640) [`dbb4072`](https://github.com/atlassian-labs/atlaspack/commit/dbb40721ebeb45990a14ba04e6b44e7f836fb32d) Thanks [@JakeLane](https://github.com/JakeLane)! - Clean up conditional bundling feature flags
+
+### Patch Changes
+
+- Updated dependencies [[`dbb4072`](https://github.com/atlassian-labs/atlaspack/commit/dbb40721ebeb45990a14ba04e6b44e7f836fb32d), [`becf977`](https://github.com/atlassian-labs/atlaspack/commit/becf977f625d5ee46dae3d4c679f173bf5f40cc0), [`c4415a4`](https://github.com/atlassian-labs/atlaspack/commit/c4415a455543d984ca28452c2cb87a794d22497c), [`f0f7c71`](https://github.com/atlassian-labs/atlaspack/commit/f0f7c7168a1d3d18c6f30d2daed611275692b7c5), [`18a57cf`](https://github.com/atlassian-labs/atlaspack/commit/18a57cf8a4789b2de5ad8e2676f317a26cc91417)]:
+  - @atlaspack/feature-flags@2.19.0
+  - @atlaspack/plugin@2.14.18
+
+## 2.14.17
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/plugin@2.14.17
+
+## 2.14.16
+
+### Patch Changes
+
+- Updated dependencies [[`e8a60ff`](https://github.com/atlassian-labs/atlaspack/commit/e8a60ffbea41caef265786bbf73349771760081c)]:
+  - @atlaspack/feature-flags@2.18.4
+  - @atlaspack/plugin@2.14.16
+
+## 2.14.15
+
+### Patch Changes
+
+- Updated dependencies [[`5ded263`](https://github.com/atlassian-labs/atlaspack/commit/5ded263c7f11b866e8885b81c73e20dd060b25be)]:
+  - @atlaspack/feature-flags@2.18.3
+  - @atlaspack/plugin@2.14.15
+
+## 2.14.14
+
+### Patch Changes
+
+- Updated dependencies [[`644b157`](https://github.com/atlassian-labs/atlaspack/commit/644b157dee72a871acc2d0facf0b87b8eea51956)]:
+  - @atlaspack/feature-flags@2.18.2
+  - @atlaspack/plugin@2.14.14
+
+## 2.14.13
+
+### Patch Changes
+
+- 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/plugin@2.14.13
+
+## 2.14.12
+
+### Patch Changes
+
+- Updated dependencies [[`10fbcfb`](https://github.com/atlassian-labs/atlaspack/commit/10fbcfbfa49c7a83da5d7c40983e36e87f524a75), [`85c52d3`](https://github.com/atlassian-labs/atlaspack/commit/85c52d3f7717b3c84a118d18ab98cfbfd71dcbd2)]:
+  - @atlaspack/feature-flags@2.18.0
+  - @atlaspack/plugin@2.14.12
+
+## 2.14.11
+
+### Patch Changes
+
+- Updated dependencies [[`73ea3c4`](https://github.com/atlassian-labs/atlaspack/commit/73ea3c4d85d4401fdd15abcbf988237e890e7ad3), [`b1b3693`](https://github.com/atlassian-labs/atlaspack/commit/b1b369317c66f8a431c170df2ebba4fa5b2e38ef)]:
+  - @atlaspack/feature-flags@2.17.0
+  - @atlaspack/plugin@2.14.11
+
+## 2.14.10
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/plugin@2.14.10
+
+## 2.14.9
+
+### Patch Changes
+
+- [#503](https://github.com/atlassian-labs/atlaspack/pull/503) [`209692f`](https://github.com/atlassian-labs/atlaspack/commit/209692ffb11eae103a0d65c5e1118a5aa1625818) Thanks [@JakeLane](https://github.com/JakeLane)! - Fix conditional bundling reporter when condition is reused
+
+- Updated dependencies [[`209692f`](https://github.com/atlassian-labs/atlaspack/commit/209692ffb11eae103a0d65c5e1118a5aa1625818), [`f4da1e1`](https://github.com/atlassian-labs/atlaspack/commit/f4da1e120e73eeb5e8b8927f05e88f04d6148c7b)]:
+  - @atlaspack/feature-flags@2.16.0
+  - @atlaspack/plugin@2.14.9
+
+## 2.14.8
+
+### Patch Changes
+
+- Updated dependencies [[`30f6017`](https://github.com/atlassian-labs/atlaspack/commit/30f60175ba4d272c5fc193973c63bc298584775b)]:
+  - @atlaspack/feature-flags@2.15.1
+  - @atlaspack/plugin@2.14.8
+
+## 2.14.7
+
+### Patch Changes
+
+- Updated dependencies [[`a1773d2`](https://github.com/atlassian-labs/atlaspack/commit/a1773d2a62d0ef7805ac7524621dcabcc1afe929)]:
+  - @atlaspack/feature-flags@2.15.0
+  - @atlaspack/plugin@2.14.7
+
+## 2.14.6
+
+### Patch Changes
+
+- Updated dependencies [[`e0f5337`](https://github.com/atlassian-labs/atlaspack/commit/e0f533757bd1019dbd108a04952c87da15286e09)]:
+  - @atlaspack/feature-flags@2.14.4
+  - @atlaspack/plugin@2.14.6
+
 ## 2.14.5
 
 ### Patch Changes

package/lib/ConditionalManifestReporter.js

@@ -28,13 +28,6 @@ function _plugin() {
   return data;
 }
 var _Config = require("./Config");
-function _featureFlags() {
-  const data = require("@atlaspack/feature-flags");
-  _featureFlags = function () {
-    return data;
-  };
-  return data;
-}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const manifestHashes = exports.manifestHashes = new Map();
 const updateManifest = async (outputFS, logger, conditionalManifestFilename, conditionalManifest) => {
@@ -63,16 +56,17 @@ async function report({
     const mapBundles = bundles => bundles.map(bundle => (0, _path().relative)(bundle.target.distDir, bundle.filePath));
     const manifest = {};
     for (const conditions of bundles.values()) {
-      const bundleInfo = {};
       for (const [key, cond] of conditions) {
+        var _manifest$bundle$targ, _bundleInfo$key, _bundleInfo$key2;
         const bundle = cond.bundle;
+        const relativeBundlePath = (0, _path().relative)(bundle.target.distDir, bundle.filePath);
+        const bundleInfo = ((_manifest$bundle$targ = manifest[bundle.target.name]) === null || _manifest$bundle$targ === void 0 ? void 0 : _manifest$bundle$targ[relativeBundlePath]) ?? {};
         bundleInfo[key] = {
-          // Reverse bundles so we load children bundles first
-          ifTrueBundles: mapBundles(cond.ifTrueBundles).reverse(),
-          ifFalseBundles: mapBundles(cond.ifFalseBundles).reverse()
+          ifTrueBundles: mapBundles(cond.ifTrueBundles).concat(((_bundleInfo$key = bundleInfo[key]) === null || _bundleInfo$key === void 0 ? void 0 : _bundleInfo$key.ifTrueBundles) ?? []).sort(),
+          ifFalseBundles: mapBundles(cond.ifFalseBundles).concat(((_bundleInfo$key2 = bundleInfo[key]) === null || _bundleInfo$key2 === void 0 ? void 0 : _bundleInfo$key2.ifFalseBundles) ?? []).sort()
         };
         manifest[bundle.target.name] ??= {};
-        manifest[bundle.target.name][(0, _path().relative)(bundle.target.distDir, bundle.filePath)] = bundleInfo;
+        manifest[bundle.target.name][relativeBundlePath] = bundleInfo;
       }
     }
     const targets = new Set(event.bundleGraph.getBundles().map(bundle => bundle.target));
@@ -84,17 +78,7 @@ async function report({
       const conditionalManifest = JSON.stringify(
       // If there's no content, send an empty manifest so we can still map from it safely
       manifest[target.name] ?? {}, null, 2);
-      if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingReporterDuplicateFix')) {
-        await updateManifest(options.outputFS, logger, conditionalManifestFilename, conditionalManifest);
-      } else {
-        await options.outputFS.mkdirp((0, _path().dirname)(conditionalManifestFilename));
-        await options.outputFS.writeFile(conditionalManifestFilename, conditionalManifest, {
-          mode: 0o666
-        });
-        logger.info({
-          message: 'Wrote conditional manifest to ' + conditionalManifestFilename
-        });
-      }
+      await updateManifest(options.outputFS, logger, conditionalManifestFilename, conditionalManifest);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/reporter-conditional-manifest",
-  "version": "2.14.5-canary.13+e0f533757",
+  "version": "2.14.5-canary.131+75286ffe8",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,10 +15,10 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/feature-flags": "2.14.1-canary.81+e0f533757",
-    "@atlaspack/plugin": "2.14.5-canary.13+e0f533757",
+    "@atlaspack/feature-flags": "2.14.1-canary.199+75286ffe8",
+    "@atlaspack/plugin": "2.14.5-canary.131+75286ffe8",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "e0f533757bd1019dbd108a04952c87da15286e09"
+  "gitHead": "75286ffe8068fae73afa5954a6d2a0f53fbf5e0d"
 }

package/src/ConditionalManifestReporter.js

@@ -12,7 +12,6 @@ import type {
   FilePath,
 } from '@atlaspack/types-internal';
 import {getConfig} from './Config';
-import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 export const manifestHashes: Map<FilePath, string> = new Map();
 
@@ -60,18 +59,27 @@ export async function report({
 
     const manifest = {};
     for (const conditions of bundles.values()) {
-      const bundleInfo = {};
       for (const [key, cond] of conditions) {
         const bundle = cond.bundle;
+        const relativeBundlePath = relative(
+          bundle.target.distDir,
+          bundle.filePath,
+        );
+
+        const bundleInfo =
+          manifest[bundle.target.name]?.[relativeBundlePath] ?? {};
+
         bundleInfo[key] = {
-          // Reverse bundles so we load children bundles first
-          ifTrueBundles: mapBundles(cond.ifTrueBundles).reverse(),
-          ifFalseBundles: mapBundles(cond.ifFalseBundles).reverse(),
+          ifTrueBundles: mapBundles(cond.ifTrueBundles)
+            .concat(bundleInfo[key]?.ifTrueBundles ?? [])
+            .sort(),
+          ifFalseBundles: mapBundles(cond.ifFalseBundles)
+            .concat(bundleInfo[key]?.ifFalseBundles ?? [])
+            .sort(),
         };
+
         manifest[bundle.target.name] ??= {};
-        manifest[bundle.target.name][
-          relative(bundle.target.distDir, bundle.filePath)
-        ] = bundleInfo;
+        manifest[bundle.target.name][relativeBundlePath] = bundleInfo;
       }
     }
 
@@ -90,26 +98,12 @@ export async function report({
         2,
       );
 
-      if (getFeatureFlag('conditionalBundlingReporterDuplicateFix')) {
-        await updateManifest(
-          options.outputFS,
-          logger,
-          conditionalManifestFilename,
-          conditionalManifest,
-        );
-      } else {
-        await options.outputFS.mkdirp(dirname(conditionalManifestFilename));
-        await options.outputFS.writeFile(
-          conditionalManifestFilename,
-          conditionalManifest,
-          {mode: 0o666},
-        );
-
-        logger.info({
-          message:
-            'Wrote conditional manifest to ' + conditionalManifestFilename,
-        });
-      }
+      await updateManifest(
+        options.outputFS,
+        logger,
+        conditionalManifestFilename,
+        conditionalManifest,
+      );
     }
   }
 }