@atlaspack/core 2.25.2-dev-native-compiled-test-712d92d32.0 → 2.26.1-dev-yarn-8750a7d2e.0

package/src/requests/AtlaspackConfigRequest.ts

@@ -12,6 +12,7 @@ import type {
   PureAtlaspackConfigPipeline,
   AtlaspackOptions,
   ProcessedAtlaspackConfig,
+  AtlaspackPluginNode,
 } from '../types';
 
 import {createBuildCache} from '@atlaspack/build-cache';
@@ -197,13 +198,29 @@ export async function resolveAtlaspackConfig(
     await parseAndProcessConfig(configPath, contents, options);
 
   if (options.additionalReporters.length > 0) {
-    config.reporters = [
-      ...options.additionalReporters.map(({packageName, resolveFrom}) => ({
-        packageName,
-        resolveFrom,
-      })),
-      ...(config.reporters ?? []),
-    ];
+    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 ?? []),
+      ];
+    }
   }
 
   return {config, extendedFiles, usedDefault};

package/src/requests/BundleGraphRequest.ts

@@ -192,7 +192,11 @@ export default function createBundleGraphRequest(
       //       force: true,
       //     },
       //   );
-      //   require('./asset-graph-diff.js')(jsAssetGraph, assetGraph);
+      //   require('./asset-graph-diff.ts')(
+      //     jsAssetGraph,
+      //     assetGraph,
+      //     options.projectRoot,
+      //   );
       // }
 
       measurement && measurement.end();

package/src/requests/TargetRequest.ts

@@ -1151,6 +1151,7 @@ export class TargetResolver {
             shouldScopeHoist:
               shouldScopeHoist && descriptor.scopeHoist !== false,
             sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap),
+            customEnv: descriptor.env,
           }),
           loc: toInternalSourceLocation(this.options.projectRoot, loc),
         });

package/src/requests/asset-graph-diff.ts

@@ -4,7 +4,7 @@ import deepClone from 'rfdc/default';
 import {diff} from 'jest-diff';
 import AssetGraph from '../AssetGraph';
 import type {AssetGraphNode} from '../types';
-import {fromProjectPathRelative, toProjectPath} from '../projectPath';
+import {toProjectPath} from '../projectPath';
 
 function filterNode(node: any) {
   let clone = deepClone(node);
@@ -71,7 +71,11 @@ function compactDeep(
   }
 }
 
-function assetGraphDiff(jsAssetGraph: AssetGraph, rustAssetGraph: AssetGraph) {
+function assetGraphDiff(
+  jsAssetGraph: AssetGraph,
+  rustAssetGraph: AssetGraph,
+  projectRoot: string,
+) {
   const getNodes = (graph: any) => {
     let nodes: Record<string, any> = {};
 
@@ -81,12 +85,12 @@ function assetGraphDiff(jsAssetGraph: AssetGraph, rustAssetGraph: AssetGraph) {
       if (!node) return;
 
       if (node.type === 'dependency') {
-        let sourcePath = node.value.sourcePath ?? toProjectPath('', 'entry');
-        nodes[
-          `dep:${fromProjectPathRelative(sourcePath)}:${node.value.specifier}`
-        ] = filterNode(node);
+        let sourcePath = node.value.sourcePath
+          ? toProjectPath(projectRoot, node.value.sourcePath)
+          : toProjectPath(projectRoot, 'entry');
+        nodes[`dep:${sourcePath}:${node.value.specifier}`] = filterNode(node);
       } else if (node.type === 'asset') {
-        nodes[`asset:${fromProjectPathRelative(node.value.filePath)}`] =
+        nodes[`asset:${toProjectPath(projectRoot, node.value.filePath)}`] =
           filterNode(node);
       }
     });

package/src/types.ts

@@ -226,7 +226,6 @@ export type Asset = {
   plugin: PackageName | null | undefined;
   configKeyPath?: string;
   isLargeBlob?: boolean;
-  compiledCssStyles?: string[];
 };
 
 export type InternalGlob = ProjectPath;

package/test/AtlaspackConfigRequest.test.ts

@@ -801,6 +801,78 @@ 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);

package/test/TargetRequest.test.ts

@@ -382,6 +382,9 @@ describe('TargetResolver', () => {
             loc: undefined,
             sourceType: 'module',
             unstableSingleFileOutput: false,
+            customEnv: {
+              useFlag: 'false',
+            },
           }),
           loc: {
             filePath: relative(
@@ -416,6 +419,9 @@ describe('TargetResolver', () => {
             loc: undefined,
             sourceType: 'module',
             unstableSingleFileOutput: false,
+            customEnv: {
+              useFlag: 'true',
+            },
           }),
           loc: {
             filePath: relative(
@@ -501,6 +507,9 @@ describe('TargetResolver', () => {
             loc: undefined,
             sourceType: 'module',
             unstableSingleFileOutput: false,
+            customEnv: {
+              useFlag: 'false',
+            },
           }),
           loc: {
             filePath: relative(
@@ -535,6 +544,9 @@ describe('TargetResolver', () => {
             loc: undefined,
             sourceType: 'module',
             unstableSingleFileOutput: false,
+            customEnv: {
+              useFlag: 'true',
+            },
           }),
           loc: {
             filePath: relative(

package/test/fixtures/config-with-reporters/.parcelrc

@@ -0,0 +1,7 @@
+{
+  "extends": "@atlaspack/config-default",
+  "reporters": [
+    "@atlaspack/reporter-cli",
+    "@atlaspack/reporter-bundle-analyzer"
+  ]
+}

package/test/fixtures/custom-targets/package.json

@@ -9,11 +9,17 @@
     "browserModern": {
       "engines": {
         "browsers": ["last 1 version"]
+      },
+      "env": {
+        "useFlag": "false"
       }
     },
     "browserLegacy": {
       "engines": {
         "browsers": ["ie11"]
+      },
+      "env": {
+        "useFlag": "true"
       }
     }
   }