AG-41223 update node to v22 and use pnpm v10

Squashed commit of the following:

commit c9faa17
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon May 12 11:55:10 2025 -0400

    use node18 as minimum, add test github workflow for it

commit dc0cd40
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Sat May 10 15:11:48 2025 -0400

    Revert "add tgz temporary"
    
    This reverts commit d735906.

commit d735906
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Sat May 10 15:11:40 2025 -0400

    add tgz temporary

commit b6f5689
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Sat May 10 14:54:05 2025 -0400

    update node to v22 and use pnpm v10 instead of yarn

Author: slvvko

.github/workflows/test.yaml

@@ -0,0 +1,68 @@
+name: Test Diff Builder
+
+env:
+  # Minimum supported Node.js version is 18.13.0 which is specified in package.json
+  # So we use it for testing to ensure compatibility
+  NODE_VERSION: 18.13.0
+  PNPM_VERSION: 10.7.1
+
+on:
+  push
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: ${{ env.PNPM_VERSION }}
+          run_install: false
+
+      - name: Use Node.jobs
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: pnpm install
+        run: pnpm install
+
+      - name: pnpm lint
+        run: pnpm lint
+
+      - name: pnpm test
+        run: pnpm test
+
+      - name: pnpm build
+        run: pnpm build
+
+  notify:
+    name: Send Slack notification on failure
+    needs: build
+    # Run this job only if the previous job failed and the event was triggered by the 'AdguardTeam/DiffBuilder' repository
+    # Note: 'always()' is needed to run the notify job even if the test job was failed
+    if:
+      ${{
+        always() &&
+        needs.check_code.result == 'failure' &&
+        github.repository == 'AdguardTeam/DiffBuilder' &&
+        (
+          github.event_name == 'push' ||
+          github.event_name == 'workflow_dispatch' ||
+          github.event.pull_request.head.repo.full_name == github.repository
+        )
+      }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Slack notification
+        uses: 8398a7/action-slack@v3
+        with:
+          status: failure
+          fields: workflow, repo, message, commit, author, eventName, ref, job
+          job_name: check_code
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.gitignore

@@ -1,6 +1,8 @@
+.vscode/
 node_modules/
 test-data/
 dist/
+.pnpm-store/
 .eslintcache
 .DS_Store
 build.txt

CHANGELOG.md

@@ -11,17 +11,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Switched from js 'diff' to system GNU utility 'diff' [#4].
 
-[#4]: https://github.com/AdguardTeam/DiffBuilder/issues/4
 [1.1.0]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.18...v1.1.0
+[#4]: https://github.com/AdguardTeam/DiffBuilder/issues/4
 
 ## [1.0.18] - 2024-04-04
 
 ### Fixed
 
 - Do not fail if the old version of the filter does not exist [#3].
 
-[#3]: https://github.com/AdguardTeam/DiffBuilder/issues/3
 [1.0.18]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.17...v1.0.18
+[#3]: https://github.com/AdguardTeam/DiffBuilder/issues/3
 
 ## [1.0.17] - 2024-03-25
 
@@ -30,9 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Throwing of `UnacceptableResponseError` by `DiffUpdater.applyPatch()`
   if response status is unacceptable [AdguardBrowserExtension#2717].
 
-[AdguardBrowserExtension#2717]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2717
 [1.0.17]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.16...v1.0.17
-
+[AdguardBrowserExtension#2717]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2717
 
 ## [1.0.16] - 2024-03-18
 
@@ -42,7 +41,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.16]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.13...v1.0.16
 
-
 ## [1.0.13] - 2024-01-17
 
 ### Changed
@@ -51,7 +49,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.13]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.12...v1.0.13
 
-
 ## [1.0.12] - 2024-01-17
 
 ### Changed
@@ -60,7 +57,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.12]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.11...v1.0.12
 
-
 ## [1.0.11] - 2024-01-16
 
 ### Fixed
@@ -77,7 +73,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.11]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.10...v1.0.11
 
-
 ## [1.0.10] - 2024-01-11
 
 ### Fixed
@@ -87,7 +82,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.10]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.9...v1.0.10
 
-
 ## [1.0.9] - 2024-01-08
 
 ### Fixed
@@ -96,7 +90,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.9]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.8...v1.0.9
 
-
 ## [1.0.8] - 2023-12-29
 
 ### Changed
@@ -105,7 +98,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.8]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.7...v1.0.8
 
-
 ## [1.0.7] - 2023-12-29
 
 ### Fixed
@@ -114,7 +106,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.7]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.6...v1.0.7
 
-
 ## [1.0.6] - 2023-12-26
 
 ### Fixed
@@ -123,7 +114,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.6]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.5...v1.0.6
 
-
 ## [1.0.5] - 2023-12-25
 
 ### Fixed
@@ -132,7 +122,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.5]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.4...v1.0.5
 
-
 ## [1.0.4] - 2023-12-25
 
 ### Changed
@@ -145,7 +134,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.4]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.3...v1.0.4
 
-
 ## [1.0.3] - 2023-12-20
 
 ### Fixed
@@ -154,7 +142,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [1.0.3]: https://github.com/AdguardTeam/DiffBuilder/compare/v1.0.2...v1.0.3
 
-
 ## [1.0.2] - 2023-12-20
 
 ### Fixed

README.md

@@ -7,21 +7,28 @@ A tool for generating differential updates for filter lists.
 - [Prerequisites](#prerequisites)
 - [How to Install](#how-to-install)
 - [How to Use](#how-to-use)
-   - [CLI](#cli)
-   - [API](#api)
-- [Algorithm](#algorithm)
+    - [CLI](#cli)
+    - [API](#api)
+- [Algorithm Overview](#algorithm-overview)
 
 ## Prerequisites
 
-- **diff utility**: This tool relies on the standard Unix `diff` utility to generate patches efficiently. Make sure it's installed on your system.
-  - On macOS: Available by default or through XCode CLI tools
-  - On Linux: Available by default or install via your package manager (e.g., `apt-get install diffutils`)
-  - On Windows: Available via WSL or Git Bash
+<!-- NOTE: Minimal supported Node.js version should be specified in package.json -->
+<!-- and the same one should be used for testing in .github/workflows/test.yaml -->
+- [Node.js] v18.13.0 or higher.
+
+- **diff utility** — this tool relies on the standard Unix `diff` utility to generate patches efficiently.
+  Make sure it's installed on your system:
+    - On macOS: Available by default or through XCode CLI tools.
+    - On Linux: Available by default or install via your package manager (e.g., `apt-get install diffutils`).
+    - On Windows: Available via WSL or Git Bash.
+
+[Node.js]: https://nodejs.org/en/download
 
 ## How to Install
 
 ```bash
-yarn add @adguard/diff-builder
+pnpm add @adguard/diff-builder
 ```
 
 ## How to Use
@@ -65,32 +72,38 @@ Where:
 ## Algorithm Overview
 
 ### 1. Setup
-   - Resolve absolute paths for the old and new filters and the patches directory.
+
+- Resolve absolute paths for the old and new filters and the patches directory.
 
 ### 2. Prepare Patch Directory
-   - Ensure the patches directory exists, creating it if necessary.
+
+- Ensure the patches directory exists, creating it if necessary.
 
 ### 3. Clean Up Old Patches
-   - Delete any outdated patches from the patches directory except empty patches.
+
+- Delete any outdated patches from the patches directory except empty patches.
 
 ### 4. Read Filters and Detect Changes
-   - Read and split the old and new filter files into lines.
-   - Check if there are significant changes between the two sets of lines, excluding 'Diff-Path' and 'Checksum' tags.
+
+- Read and split the old and new filter files into lines.
+- Check if there are significant changes between the two sets of lines, excluding 'Diff-Path' and 'Checksum' tags.
 
 ### 5. Handle No Changes
-   - If no significant changes are found, revert any changes in the new filter and exit.
+
+- If no significant changes are found, revert any changes in the new filter and exit.
 
 ### 6. Process Changes
-   - Generate a new patch name and validate its uniqueness.
-   - Update the 'Diff-Path' tag in the new filter.
-   - Create a diff patch between the old and new filters.
-   - Optionally, add a checksum to the patch.
+
+- Generate a new patch name and validate its uniqueness.
+- Update the 'Diff-Path' tag in the new filter.
+- Create a diff patch between the old and new filters.
+- Optionally, add a checksum to the patch.
 
 ### 7. Finalize
-   - Write the updated new filter back to its file.
-   - Create an empty patch file for future use if necessary.
-   - Save the diff patch to the appropriate file.
 
+- Write the updated new filter back to its file.
+- Create an empty patch file for future use if necessary.
+- Save the diff patch to the appropriate file.
 
 ## API
 

bamboo-specs/build.yaml

@@ -5,7 +5,7 @@ plan:
   key: DIFFBUILDERBUILD
   name: diff builder - build
 variables:
-  dockerNode: adguard/node-ssh:18.13--1
+  dockerNode: adguard/node-ssh:22.14--0
 
 stages:
   - Build:
@@ -21,7 +21,7 @@ Build:
   docker:
     image: ${bamboo.dockerNode}
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.PNPM_DIR}: "${bamboo.cachePnpm}"
   tasks:
     - checkout:
         force-clean-build: true
@@ -37,17 +37,17 @@ Build:
 
             ls -laht
 
-            # Exclude '--ignore-platform' from yarn arguments to fix build
-            originalValue="$bamboo_varsYarn"
+            # Set cache directory
+            pnpm config set store-dir ${bamboo.cachePnpm}
 
-            # Use sed to replace "--ignore-platform" with an empty string
-            modifiedValue=$(echo "$originalValue" | sed 's/--ignore-platform//g')
+            pnpm install ${bamboo_varsPnpm}
 
-            yarn install ${modifiedVarsYarn}
-            yarn lint
-            yarn test
-            yarn build
-            yarn pack --filename diff-builder.tgz
+            pnpm lint
+            pnpm test
+
+            pnpm build
+
+            pnpm pack --out diff-builder.tgz
     - inject-variables:
         file: build.txt
         scope: RESULT
@@ -86,7 +86,7 @@ triggers: []
 branches:
   create: manually
   delete: never
-  link-to-jira: 'true'
+  link-to-jira: true
 
 notifications:
   - events:

bamboo-specs/deploy.yaml

@@ -9,13 +9,13 @@ environments:
 
 npmjs:
   docker:
-    image: adguard/node-ssh:18.13--1
+    image: adguard/node-ssh:22.14--0
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.PNPM_DIR}: "${bamboo.cachePnpm}"
   triggers: [ ]
   tasks:
     - checkout:
-        force-clean-build: 'true'
+        force-clean-build: true
     - artifact-download:
         artifacts:
           - name: diff-builder.tgz