@atlaspack/core 2.26.1-dev-yarn-8750a7d2e.0 → 2.26.1-dev-68c10d2af.0

package/dist/loadDotEnv.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = loadEnv;
 const utils_1 = require("@atlaspack/utils");
-// @ts-expect-error TS7016
 const dotenv_1 = __importDefault(require("dotenv"));
 const dotenv_expand_1 = __importDefault(require("dotenv-expand"));
 async function loadEnv(env, fs, filePath, projectRoot) {

package/dist/requests/AtlaspackConfigRequest.js

@@ -141,27 +141,13 @@ async function resolveAtlaspackConfig(options) {
     }
     let { config, extendedFiles } = await parseAndProcessConfig(configPath, contents, options);
     if (options.additionalReporters.length > 0) {
-        if (options.featureFlags.deduplicateReporters) {
-            const reporterMap = new Map();
-            options.additionalReporters.forEach(({ packageName, resolveFrom }) => {
-                reporterMap.set(packageName, { packageName, resolveFrom });
-            });
-            config.reporters?.forEach((reporter) => {
-                if (!reporterMap.has(reporter.packageName)) {
-                    reporterMap.set(reporter.packageName, reporter);
-                }
-            });
-            config.reporters = Array.from(reporterMap.values());
-        }
-        else {
-            config.reporters = [
-                ...options.additionalReporters.map(({ packageName, resolveFrom }) => ({
-                    packageName,
-                    resolveFrom,
-                })),
-                ...(config.reporters ?? []),
-            ];
-        }
+        config.reporters = [
+            ...options.additionalReporters.map(({ packageName, resolveFrom }) => ({
+                packageName,
+                resolveFrom,
+            })),
+            ...(config.reporters ?? []),
+        ];
     }
     return { config, extendedFiles, usedDefault };
 }

package/lib/loadDotEnv.js

@@ -26,8 +26,6 @@ function _dotenvExpand() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// @ts-expect-error TS7016
-
 async function loadEnv(env, fs, filePath, projectRoot) {
   const NODE_ENV = env.NODE_ENV ?? 'development';
   const dotenvFiles = ['.env',

package/lib/requests/AtlaspackConfigRequest.js

@@ -161,33 +161,13 @@ async function resolveAtlaspackConfig(options) {
     extendedFiles
   } = await parseAndProcessConfig(configPath, contents, options);
   if (options.additionalReporters.length > 0) {
-    if (options.featureFlags.deduplicateReporters) {
-      var _config$reporters;
-      const reporterMap = new Map();
-      options.additionalReporters.forEach(({
-        packageName,
-        resolveFrom
-      }) => {
-        reporterMap.set(packageName, {
-          packageName,
-          resolveFrom
-        });
-      });
-      (_config$reporters = config.reporters) === null || _config$reporters === void 0 || _config$reporters.forEach(reporter => {
-        if (!reporterMap.has(reporter.packageName)) {
-          reporterMap.set(reporter.packageName, reporter);
-        }
-      });
-      config.reporters = Array.from(reporterMap.values());
-    } else {
-      config.reporters = [...options.additionalReporters.map(({
-        packageName,
-        resolveFrom
-      }) => ({
-        packageName,
-        resolveFrom
-      })), ...(config.reporters ?? [])];
-    }
+    config.reporters = [...options.additionalReporters.map(({
+      packageName,
+      resolveFrom
+    }) => ({
+      packageName,
+      resolveFrom
+    })), ...(config.reporters ?? [])];
   }
   return {
     config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.26.1-dev-yarn-8750a7d2e.0",
+  "version": "2.26.1-dev-68c10d2af.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -22,21 +22,21 @@
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.7-dev-yarn-8750a7d2e.0",
-    "@atlaspack/cache": "3.2.31-dev-yarn-8750a7d2e.0",
-    "@atlaspack/diagnostic": "2.14.5-dev-yarn-8750a7d2e.0",
-    "@atlaspack/events": "2.14.5-dev-yarn-8750a7d2e.0",
-    "@atlaspack/feature-flags": "2.25.6-dev-yarn-8750a7d2e.0",
-    "@atlaspack/fs": "2.15.31-dev-yarn-8750a7d2e.0",
-    "@atlaspack/graph": "3.5.25-dev-yarn-8750a7d2e.0",
-    "@atlaspack/logger": "2.14.28-dev-yarn-8750a7d2e.0",
-    "@atlaspack/package-manager": "2.14.36-dev-yarn-8750a7d2e.0",
-    "@atlaspack/plugin": "2.14.36-dev-yarn-8750a7d2e.0",
-    "@atlaspack/profiler": "2.14.33-dev-yarn-8750a7d2e.0",
-    "@atlaspack/rust": "3.8.4-dev-yarn-8750a7d2e.0",
-    "@atlaspack/types": "2.15.26-dev-yarn-8750a7d2e.0",
-    "@atlaspack/utils": "3.0.4-dev-yarn-8750a7d2e.0",
-    "@atlaspack/workers": "2.14.36-dev-yarn-8750a7d2e.0",
+    "@atlaspack/build-cache": "2.13.7-dev-68c10d2af.0",
+    "@atlaspack/cache": "3.2.31-dev-68c10d2af.0",
+    "@atlaspack/diagnostic": "2.14.5-dev-68c10d2af.0",
+    "@atlaspack/events": "2.14.5-dev-68c10d2af.0",
+    "@atlaspack/feature-flags": "2.25.6-dev-68c10d2af.0",
+    "@atlaspack/fs": "2.15.31-dev-68c10d2af.0",
+    "@atlaspack/graph": "3.5.25-dev-68c10d2af.0",
+    "@atlaspack/logger": "2.14.28-dev-68c10d2af.0",
+    "@atlaspack/package-manager": "2.14.36-dev-68c10d2af.0",
+    "@atlaspack/plugin": "2.14.36-dev-68c10d2af.0",
+    "@atlaspack/profiler": "2.14.33-dev-68c10d2af.0",
+    "@atlaspack/rust": "3.8.4-dev-68c10d2af.0",
+    "@atlaspack/types": "2.15.26-dev-68c10d2af.0",
+    "@atlaspack/utils": "3.0.4-dev-68c10d2af.0",
+    "@atlaspack/workers": "2.14.36-dev-68c10d2af.0",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -50,7 +50,7 @@
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@atlaspack/babel-register": "2.14.5-dev-yarn-8750a7d2e.0",
+    "@atlaspack/babel-register": "2.14.5-dev-68c10d2af.0",
     "@types/node": ">= 18",
     "graphviz": "^0.0.9",
     "jest-diff": "*",
@@ -61,5 +61,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "8750a7d2e6330244dd618c28a20d5a391080e4a3"
+  "gitHead": "68c10d2af542bd50c28e578d5d872843b520f163"
 }

package/src/loadDotEnv.ts

@@ -2,7 +2,6 @@ import type {FileSystem} from '@atlaspack/fs';
 import type {EnvMap, FilePath} from '@atlaspack/types';
 
 import {resolveConfig} from '@atlaspack/utils';
-// @ts-expect-error TS7016
 import dotenv from 'dotenv';
 import variableExpansion from 'dotenv-expand';
 

package/src/requests/AtlaspackConfigRequest.ts

@@ -12,7 +12,6 @@ import type {
   PureAtlaspackConfigPipeline,
   AtlaspackOptions,
   ProcessedAtlaspackConfig,
-  AtlaspackPluginNode,
 } from '../types';
 
 import {createBuildCache} from '@atlaspack/build-cache';
@@ -198,29 +197,13 @@ export async function resolveAtlaspackConfig(
     await parseAndProcessConfig(configPath, contents, options);
 
   if (options.additionalReporters.length > 0) {
-    if (options.featureFlags.deduplicateReporters) {
-      const reporterMap = new Map<PackageName, AtlaspackPluginNode>();
-
-      options.additionalReporters.forEach(({packageName, resolveFrom}) => {
-        reporterMap.set(packageName, {packageName, resolveFrom});
-      });
-
-      config.reporters?.forEach((reporter) => {
-        if (!reporterMap.has(reporter.packageName)) {
-          reporterMap.set(reporter.packageName, reporter);
-        }
-      });
-
-      config.reporters = Array.from(reporterMap.values());
-    } else {
-      config.reporters = [
-        ...options.additionalReporters.map(({packageName, resolveFrom}) => ({
-          packageName,
-          resolveFrom,
-        })),
-        ...(config.reporters ?? []),
-      ];
-    }
+    config.reporters = [
+      ...options.additionalReporters.map(({packageName, resolveFrom}) => ({
+        packageName,
+        resolveFrom,
+      })),
+      ...(config.reporters ?? []),
+    ];
   }
 
   return {config, extendedFiles, usedDefault};

package/test/AtlaspackConfigRequest.test.ts

@@ -801,78 +801,6 @@ describe('AtlaspackConfigRequest', () => {
     });
   });
 
-  describe('additionalReporters', () => {
-    it('should deduplicate reporters by packageName', async () => {
-      const configPath = path.join(
-        __dirname,
-        'fixtures',
-        'config-with-reporters',
-        '.parcelrc',
-      );
-
-      const options = {
-        ...DEFAULT_OPTIONS,
-        projectRoot: path.join(__dirname, 'fixtures', 'config-with-reporters'),
-        config: configPath,
-        additionalReporters: [
-          {
-            packageName: '@atlaspack/reporter-cli',
-            resolveFrom: '/custom/path',
-          },
-          {
-            packageName: '@atlaspack/reporter-dev-server',
-            resolveFrom: '/another/path',
-          },
-        ],
-      };
-
-      const result = await resolveAtlaspackConfig(options);
-      assert(result !== null && result !== undefined);
-
-      const {config} = result;
-
-      // With feature flag enabled, should have 3 reporters (with deduplication)
-      assert(
-        config.reporters && config.reporters.length === 3,
-        'Should have exactly 3 reporters with deduplication',
-      );
-
-      const cliReporter = config.reporters?.find(
-        (r) => r.packageName === '@atlaspack/reporter-cli',
-      );
-      const bundleAnalyzerReporter = config.reporters?.find(
-        (r) => r.packageName === '@atlaspack/reporter-bundle-analyzer',
-      );
-      const devServerReporter = config.reporters?.find(
-        (r) => r.packageName === '@atlaspack/reporter-dev-server',
-      );
-
-      assert(cliReporter, 'CLI reporter should exist');
-      assert.equal(
-        cliReporter.resolveFrom,
-        '/custom/path',
-        'CLI reporter should use additional reporter resolveFrom',
-      );
-
-      assert(
-        bundleAnalyzerReporter,
-        'Bundle analyzer reporter should exist from original config',
-      );
-
-      assert(devServerReporter, 'Dev server reporter should exist');
-      assert.equal(devServerReporter.resolveFrom, '/another/path');
-
-      const cliReporters = config.reporters?.filter(
-        (r) => r.packageName === '@atlaspack/reporter-cli',
-      );
-      assert.equal(
-        cliReporters?.length,
-        1,
-        'Should have exactly one CLI reporter after deduplication',
-      );
-    });
-  });
-
   describe('resolve', () => {
     it('should return null if there is no .parcelrc file found', async () => {
       let resolved = await resolveAtlaspackConfig(DEFAULT_OPTIONS);