Merge pull request #7126 from NomicFoundation/fix-default-package-exports

Make forge-std work with and without src/

Author: alcuadrado

.changeset/sharp-goats-judge.md

@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Make `forge-std` work with and without `src/`

v-next/hardhat/src/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.ts

@@ -714,6 +714,10 @@ export class ResolverImplementation implements Resolver {
       const dependencyWithPackageExports = {
         ...dependency,
         exports: dependency.exports ?? {
+          // If someone imports with the full path, we want it to work
+          "./src/*.sol": "./src/*.sol",
+          // If they import assuming the typical remapping into src/, we also
+          // want it to work
           "./*.sol": "./src/*.sol",
         },
       };

v-next/hardhat/test/internal/builtin-plugins/solidity/build-system/resolver/dependency-resolver.ts

@@ -2572,6 +2572,58 @@ submodule2/=lib/submodule2/src/`,
           );
         });
 
+        it("Should simulate package.exports for forge-std, but still allow importing with src/", async () => {
+          await using project =
+            await useTestProjectTemplate(templateWithForgeStd);
+          const resolver = await ResolverImplementation.create(
+            project.path,
+            readUtf8File,
+          );
+          const absoluteFilePath = path.join(project.path, "contracts/A.sol");
+          const result = await resolver.resolveProjectFile(absoluteFilePath);
+          assert.ok(result.success, "Result should be successful");
+
+          assert.deepEqual(
+            await resolver.resolveImport(
+              result.value,
+              "forge-std/src/Test.sol",
+            ),
+            {
+              success: true,
+              value: {
+                file: {
+                  type: ResolvedFileType.NPM_PACKAGE_FILE,
+                  fsPath: path.join(
+                    project.path,
+                    "node_modules/forge-std/src/Test.sol",
+                  ),
+                  content: {
+                    text: `Test`,
+                    importPaths: [],
+                    versionPragmas: [],
+                  },
+                  inputSourceName: "npm/[email protected]/src/Test.sol",
+                  package: {
+                    name: "forge-std",
+                    version: "1.2.3",
+                    rootFsPath: path.join(
+                      project.path,
+                      "node_modules/forge-std",
+                    ),
+                    inputSourceNameRoot: "npm/[email protected]",
+                    exports: undefined,
+                  },
+                },
+                remapping: {
+                  context: "project/",
+                  prefix: "forge-std/",
+                  target: "npm/[email protected]/",
+                },
+              },
+            },
+          );
+        });
+
         it("Should return the right errors as if it had a package.exports", async () => {
           await using project =
             await useTestProjectTemplate(templateWithForgeStd);