debug

galargh · galargh · commit 29ddf3b5f411 · 2025-02-25T17:23:43.000+01:00
diff --git a/.github/workflows/v-next-ci.yml b/.github/workflows/v-next-ci.yml
@@ -57,189 +57,12 @@ jobs:
       - name: Run check
         run: node scripts/check-v-next-npm-scripts.js
 
-  list-packages:
-    name: List packages
-    needs: is-v-next
-    if: ${{ needs.is-v-next.outputs.is_v_next == 'true' }}
-    runs-on: ubuntu-latest
-    outputs:
-      packages: ${{ steps.filter.outputs.changes }}
-      should_bundle: ${{ contains(steps.filter.outputs.hardhat_files, '.github/workflows/v-next-ci.yml') || contains(steps.filter.outputs.hardhat_files, 'pnpm-lock.yaml') }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      - run: yq -p yaml -o json pnpm-lock.yaml | tee pnpm-lock.json
-      - id: generate
-        env:
-          PACKAGE_IGNORE: |
-            [
-              ".",
-              "packages/",
-              "v-next/hardhat/templates/"
-            ]
-          COMMON_FILTERS: |
-            [
-              ".github/workflows/v-next-ci.yml",
-              "config-v-next/**",
-              "pnpm-lock.yaml"
-            ]
-        run: |
-          echo "filters<<EOF" >> $GITHUB_OUTPUT
-          node scripts/generate-filters.js |
-            yq -Po yaml 'with_entries(.key |= sub("^v-next/", ""))' |
-            tee -a $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-      - id: filter
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-        with:
-          list-files: json
-          filters: ${{ steps.generate.outputs.filters }}
-          base: v-next # TODO: Remove once v-next becomes the default branch
-
-  bundle:
-    # Depending on list-packages only to check whether pnpm-lock.yaml has changed
-    # This could be handled by a simpler job, but an extra runner would have to be allocated for it
-    needs: list-packages
-
-    if: needs.list-packages.outputs.should_bundle == 'true'
-
-    # Using a matrix strategy even though there's only one package
-    # because we will want to add, at least, hardhat-toolbox in the future
-    strategy:
-      fail-fast: false
-      matrix:
-        package: ["hardhat"]
-
-    name: "[${{ matrix.package }}] bundle"
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: v-next/${{ matrix.package }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-env
-        with:
-          node-version: 22
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile --prefer-offline
-      - name: Build
-        run: pnpm build
-      - name: Deploy
-        run: |
-          pnpm deploy --config.shamefully-hoist=true --config.hoist=true --config.node-linker=true --config.shared-workspace-lockfile=false --filter="$(jq -r .name package.json)" --prod --no-optional bundle
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.package }}
-          path: |
-            v-next/${{ matrix.package }}/bundle
-
-  bundle-aggregate:
-    needs: bundle
-
-    if: ${{ !cancelled() }}
-
-    name: bundle
-    runs-on: ubuntu-latest
-
-    permissions:
-      pull-requests: write
-
-    steps:
-      - env:
-          result: ${{ needs.bundle.result }}
-        run: |
-          if [[ "$result" == "failure" ]]; then
-            exit 1
-          fi
-        shell: bash
-      - uses: actions/download-artifact@v4
-      - id: download
-        run: ls -1 | wc -l | xargs -I {} -0 echo "count={}" | tee -a $GITHUB_OUTPUT
-        shell: bash
-      - id: comment
-        if: steps.download.outputs.count != '0'
-        run: |
-          echo 'body<<EOF' >> $GITHUB_OUTPUT
-          for bundle in *; do
-            echo "# $bundle" | tee -a $GITHUB_OUTPUT
-            echo '' | tee -a $GITHUB_OUTPUT
-            echo "Total size of the bundle: "'`'"$(du -sh $bundle --exclude=$bundle/node_modules/.pnpm | cut -f1)"'`' | tee -a $GITHUB_OUTPUT
-            echo "Total number of dependencies (including transitive): "'`'"$(find $bundle/node_modules/@* $bundle/node_modules -mindepth 1 -maxdepth 1 -type d ! -name '.*' ! -name '@*' | wc -l)"'`' | tee -a $GITHUB_OUTPUT
-            echo '' | tee -a $GITHUB_OUTPUT
-            echo '<details>' | tee -a $GITHUB_OUTPUT
-            echo '<summary>List of dependencies (sorted by size)</summary>' | tee -a $GITHUB_OUTPUT
-            echo '' | tee -a $GITHUB_OUTPUT
-            echo '```' | tee -a $GITHUB_OUTPUT
-            du -shc $bundle/node_modules/@*/* $bundle/node_modules/* |
-              grep -Ev '/node_modules/@[^/]+$' | sort -rh |
-              sed "s|$bundle/node_modules/||" | tee -a $GITHUB_OUTPUT
-            echo '```' | tee -a $GITHUB_OUTPUT
-            echo '</details>' | tee -a $GITHUB_OUTPUT
-            echo '' | tee -a $GITHUB_OUTPUT
-          done
-          echo 'EOF' >> $GITHUB_OUTPUT
-      - if: github.event_name == 'pull_request' && steps.download.outputs.count != '0'
-        uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2.9.0
-        with:
-          header: bundle
-          message: ${{ steps.comment.outputs.body }}
-
-  lint:
-    needs: list-packages
-
-    if: needs.list-packages.outputs.packages != '[]'
-
-    strategy:
-      fail-fast: false
-      matrix:
-        package: ${{ fromJson(needs.list-packages.outputs.packages) }}
-
-    name: "[${{ matrix.package }}] lint"
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: v-next/${{ matrix.package }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-env
-        with:
-          node-version: 22
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile --prefer-offline
-      - name: Build
-        run: pnpm build
-      - name: Lint
-        run: pnpm lint
-
-  lint-aggregate:
-    needs: lint
-
-    if: ${{ !cancelled() }}
-
-    name: lint
-    runs-on: ubuntu-latest
-
-    steps:
-      - env:
-          result: ${{ needs.lint.result }}
-        run: |
-          if [[ "$result" == "failure" ]]; then
-            exit 1
-          fi
-        shell: bash
-
   ci:
-    needs: list-packages
-
-    if: needs.list-packages.outputs.packages != '[]'
 
     strategy:
       fail-fast: false
       matrix:
-        package: ${{ fromJson(needs.list-packages.outputs.packages) }}
+        package: ['hardhat']
         os: [ubuntu-latest, macos-13, macos-latest, windows-latest]
         node: [22]
 
@@ -261,7 +84,7 @@ jobs:
       - name: Run tests
         env:
           __DO_NOT_USE_IS_HARDHAT_CI: true
-        run: pnpm run test
+        run: pnpm run test:only
 
   ci-aggregate:
     needs: ci
diff --git a/v-next/hardhat-utils/src/fs.ts b/v-next/hardhat-utils/src/fs.ts
@@ -1,7 +1,7 @@
 import type { ReadStream, WriteStream } from "node:fs";
 
 import { createReadStream, createWriteStream } from "node:fs";
-import fsPromises from "node:fs/promises";
+import fsPromises, { FileHandle, open } from "node:fs/promises";
 import path from "node:path";
 import { finished } from "node:stream/promises";
 
@@ -210,13 +210,11 @@ export async function readJsonFileAsStream<T>(
 ): Promise<T> {
   const parser = new JSONParser();
 
-  let fileContents: ReadStream;
+  let fileHandle: FileHandle
+  let fileReadStream: ReadStream;
   try {
-    fileContents = createReadStream(absolutePathToFile, {
-      encoding: "utf8",
-      autoClose: true,
-      flags: "r",
-    });
+    fileHandle = await open(absolutePathToFile, "r");
+    fileReadStream = fileHandle.createReadStream();
   } catch (e) {
     ensureError<NodeJS.ErrnoException>(e);
 
@@ -231,7 +229,7 @@ export async function readJsonFileAsStream<T>(
     throw new FileSystemAccessError(e.message, e);
   }
 
-  const readPipeline = fileContents.pipe(parser);
+  const readPipeline = fileReadStream.pipe(parser);
 
   // NOTE: We save only the last result as it contains the fully parsed object
   let result: T | undefined;
@@ -248,6 +246,8 @@ export async function readJsonFileAsStream<T>(
 
   try {
     await finished(readPipeline);
+
+    await fileHandle.close();
   } catch (e) {
     ensureError(e);
     throw new FileSystemAccessError(absolutePathToFile, e);
@@ -304,14 +304,11 @@ export async function writeJsonFileAsStream<T>(
     await mkdir(dirPath);
   }
 
-  let fileContents: WriteStream;
+  let fileHandle: FileHandle
+  let fileWriteStream: WriteStream;
   try {
-    fileContents = createWriteStream(absolutePathToFile, {
-      encoding: "utf8",
-      autoClose: true,
-      mode: 0o666,
-      flags: "w",
-    });
+    fileHandle = await open(absolutePathToFile, "w");
+    fileWriteStream = fileHandle.createWriteStream();
   } catch (e) {
     ensureError<NodeJS.ErrnoException>(e);
     // if the directory was created, we should remove it
@@ -326,7 +323,7 @@ export async function writeJsonFileAsStream<T>(
   }
 
   const jsonStream = new JsonStreamStringify(object);
-  const writePipeline = jsonStream.pipe(fileContents);
+  const writePipeline = jsonStream.pipe(fileWriteStream);
 
   try {
     await finished(jsonStream);
@@ -337,6 +334,7 @@ export async function writeJsonFileAsStream<T>(
 
   try {
     await finished(writePipeline);
+    await fileHandle.close();
   } catch (e) {
     ensureError(e);
     throw new FileSystemAccessError(e.message, e);
diff --git a/v-next/hardhat/test/internal/builtin-plugins/solidity/build-system/cache.ts b/v-next/hardhat/test/internal/builtin-plugins/solidity/build-system/cache.ts
@@ -51,7 +51,7 @@ describe("ObjectCache", () => {
       await cache.set(randomKey, "randomValue");
       assert.equal(await cache.get(randomKey), "randomValue");
     });
-    it("should overwrite the value if the key is present", async () => {
+    it.only("should overwrite the value if the key is present", async () => {
       const randomKey = randomUUID();
       await cache.set(randomKey, "randomValue");
       assert.equal(await cache.get(randomKey), "randomValue");
