Merge pull request #4647 from NomicFoundation/esm-support-hardhat-viem

Exclude artifacts/package.json from artifacts in getArtifactPaths
NomicFoundation · Dec 5, 2023 · 309dc21 · 309dc21
2 parents efbcce6 + b475fc4
commit 309dc21
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/.changeset/dry-moose-draw.md b/.changeset/dry-moose-draw.md
@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Modified the artifacts cleanup logic to avoid removing a `package.json` file under the artifacts directory
diff --git a/packages/hardhat-core/src/internal/artifacts.ts b/packages/hardhat-core/src/internal/artifacts.ts
@@ -154,14 +154,8 @@ export class Artifacts implements IArtifacts {
       return cached;
     }
 
-    const buildInfosDir = path.join(this._artifactsPath, BUILD_INFO_DIR_NAME);
-
-    const paths = await getAllFilesMatching(
-      this._artifactsPath,
-      (f) =>
-        f.endsWith(".json") &&
-        !f.startsWith(buildInfosDir) &&
-        !f.endsWith(".dbg.json")
+    const paths = await getAllFilesMatching(this._artifactsPath, (f) =>
+      this._isArtifactPath(f)
     );
 
     const result = paths.sort();
@@ -563,14 +557,8 @@ export class Artifacts implements IArtifacts {
       return cached;
     }
 
-    const buildInfosDir = path.join(this._artifactsPath, BUILD_INFO_DIR_NAME);
-
-    const paths = getAllFilesMatchingSync(
-      this._artifactsPath,
-      (f) =>
-        f.endsWith(".json") &&
-        !f.startsWith(buildInfosDir) &&
-        !f.endsWith(".dbg.json")
+    const paths = getAllFilesMatchingSync(this._artifactsPath, (f) =>
+      this._isArtifactPath(f)
     );
 
     const result = paths.sort();
@@ -934,6 +922,15 @@ Please replace "${contractName}" for the correct contract name wherever you are
 
     return undefined;
   }
+
+  private _isArtifactPath(file: string) {
+    return (
+      file.endsWith(".json") &&
+      file !== path.join(this._artifactsPath, "package.json") &&
+      !file.startsWith(path.join(this._artifactsPath, BUILD_INFO_DIR_NAME)) &&
+      !file.endsWith(".dbg.json")
+    );
+  }
 }
 
 /**