AG-41223 update node to v22 and pnpm to v10 [vscode-adblock-syntax]

Squashed commit of the following:

commit 6b707e0
Author: scripthunter7 <d.tota@adguard.com>
Date:   Mon Apr 7 17:53:07 2025 +0200

    update gitignore

commit 3bb35d0
Author: scripthunter7 <d.tota@adguard.com>
Date:   Mon Apr 7 13:47:40 2025 +0200

    fix builds

commit e28a00e
Author: scripthunter7 <d.tota@adguard.com>
Date:   Mon Apr 7 13:42:57 2025 +0200

    Remove packageManager field

commit 470dee6
Author: scripthunter7 <d.tota@adguard.com>
Date:   Mon Apr 7 13:39:53 2025 +0200

    update node to v22 and pnpm to v10

Author: scripthunter7

.github/workflows/check.yml

@@ -1,7 +1,8 @@
 name: Check code
 
 env:
-  NODE_VERSION: 20
+  NODE_VERSION: 22
+  PNPM_VERSION: 10.7.1
 
 on:
   push:
@@ -19,26 +20,35 @@ jobs:
       - name: Check out to repository
         uses: actions/checkout@v4
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: ${{ env.PNPM_VERSION }}
+          run_install: false
+
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
+          cache: pnpm
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
+
+      - name: List files
+        run: ls -alt
 
       - name: Check TypeScript types
-        run: yarn test:compile
+        run: pnpm test:compile
 
       - name: Run markdownlint
-        run: yarn lint:md
+        run: pnpm lint:md
 
       - name: Run ESLint
-        run: yarn lint:ts
+        run: pnpm lint:ts
 
       - name: Run Jest tests
-        run: yarn test
+        run: pnpm test
 
   notify:
     name: Send Slack notification on failure

.github/workflows/release.yml

@@ -1,7 +1,8 @@
 name: Create GitHub Release
 
 env:
-  NODE_VERSION: 20
+  NODE_VERSION: 22
+  PNPM_VERSION: 10.7.1
 
 on:
   push:
@@ -19,35 +20,43 @@ jobs:
       - name: Check out the repository
         uses: actions/checkout@v4
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: ${{ env.PNPM_VERSION }}
+          run_install: false
+
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-          registry-url: https://registry.npmjs.org
-          cache: yarn
+          cache: pnpm
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
+
+      - name: List files
+        run: ls -alt
 
       - name: Run markdownlint
-        run: yarn lint:md
+        run: pnpm lint:md
 
       - name: Run ESLint
-        run: yarn lint:ts
+        run: pnpm lint:ts
 
       # Convert grammar to PList format & Test compile & Run ESBuild & Generate VSIX file
       - name: Create production build
-        run: yarn build:prod
+        run: pnpm build:prod
 
       - name: Create build.txt with version
-        run: yarn build:txt
+        run: pnpm build:txt
 
       - name: Extract changelog
         run: |
-          # Import version from out/build.txt
-          export VERSION=$(cat out/build.txt | cut -d '=' -f2)
+          # Import version from package.json using pnpm
+          export VERSION=$(pnpm pkg get version | tr -d '"')
 
-          yarn extract-changelog -e $VERSION
+          pnpm extract-changelog -e $VERSION
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2

.gitignore

@@ -5,3 +5,4 @@
 coverage
 node_modules
 out
+.pnpm-store/

.husky/pre-commit

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn test:compile
-yarn lint:staged
-yarn test
+pnpm test:compile
+pnpm lint:staged
+pnpm test

.yarnrc

@@ -22,18 +22,24 @@ Table of Contents:
 
 Ensure that the following software is installed on your computer:
 
-- [Node.js][nodejs] (we recommend using the latest LTS version)
-- [Yarn][yarn]
-- [Git][git]
+- [Node.js][nodejs]: v22 (you can install multiple versions using [nvm][nvm])
+- [pnpm][pnpm]: v10
 - [VSCode][vscode]
+- [Git][git]
+
+[git]: https://git-scm.com/
+[nodejs]: https://nodejs.org/en/download
+[nvm]: https://github.com/nvm-sh/nvm
+[pnpm]: https://pnpm.io/installation
 
 ## Initial setup
 
 After cloning the repository, follow these steps to initialize the project:
 
-1. Install dependencies by calling `yarn`. This will also install client and server dependencies via `postinstall`
-   scripts. After installation, it will initialize [Husky Git hooks][husky] through the `prepare` script.
-1. Install recommended VSCode extensions (refer to the [`.vscode/extensions.json`][vscode-extensions-file] file).
+1. Install dependencies by calling `pnpm install`.
+   This will also install client and server dependencies via `postinstall` scripts.
+   After installation, it will initialize [Husky Git hooks][husky] through the `prepare` script.
+2. Install recommended VSCode extensions (refer to the [`.vscode/extensions.json`][vscode-extensions-file] file).
    **These extensions are REQUIRED for the development process.**
 
 ## Project structure
@@ -76,7 +82,7 @@ If you've made changes to the extension code and want to test them, follow these
 
 To create a production build of the extension:
 
-1. Run `yarn build:prod` command. This generates a production build and a `.vsix` file in the `out` folder.
+1. Run `pnpm build:prod` command. This generates a production build and a `.vsix` file in the `out` folder.
 1. To ensure the build is correct, install the generated `.vsix` file in VSCode. Open the command palette
    (`Ctrl + Shift + P`), select "Extensions: Install from VSIX...", and choose the `vscode-adblock.vsix` file.
 
@@ -101,7 +107,7 @@ To create a production build of the extension:
 1. Update the TM grammar in the `syntaxes/adblock.yaml-tmLanguage` file.
 1. Create/modify example rules in the `test/static/rules` folder. Add link for GitHub issues to rules if related to some
    issue.
-1. Create/modify unit tests in `test/grammar`. Ensure tests pass by running `yarn test`.
+1. Create/modify unit tests in `test/grammar`. Ensure tests pass by running `pnpm test`.
 
 > [!TIP]
 > Open the `test/static` folder in the "Extension Development Host" window and you can check the syntax highlighting
@@ -114,39 +120,39 @@ To create a production build of the extension:
 
 During development, you can use the following commands (listed in `package.json`).
 
-- `yarn build:grammar` - Compiles the TextMate (TM) grammar into a PList format, since VSCode does not natively support
+- `pnpm build:grammar` - Compiles the TextMate (TM) grammar into a PList format, since VSCode does not natively support
   YAML grammars.
-- `yarn build:prod` - Generates a production build of the extension, including a `.vsix` file in the `out` directory for
+- `pnpm build:prod` - Generates a production build of the extension, including a `.vsix` file in the `out` directory for
   VSCode installation.
-- `yarn build:txt` - Creates a `build.txt` file in the out directory containing the current version number, primarily
+- `pnpm build:txt` - Creates a `build.txt` file in the out directory containing the current version number, primarily
   for Continuous Integration (CI) purposes.
-- `yarn build:vsix` - Produces a `.vsix` file in the out directory, which is used to install the extension in VSCode.
-- `yarn clean` - Removes all generated files in the output directories, cleaning up the build results.
-- `yarn esbuild:aglint` - Base ESBuild command for building integrated AGLint with the common options.
-- `yarn esbuild:agtree` - Base ESBuild command for building integrated AGTree with the common options.
+- `pnpm build:vsix` - Produces a `.vsix` file in the out directory, which is used to install the extension in VSCode.
+- `pnpm clean` - Removes all generated files in the output directories, cleaning up the build results.
+- `pnpm esbuild:aglint` - Base ESBuild command for building integrated AGLint with the common options.
+- `pnpm esbuild:agtree` - Base ESBuild command for building integrated AGTree with the common options.
   Integrated AGTree comes with the integrated AGLint, this command just helps to bundle it to a separate file.
   This is needed because AGTree is also used by the server, and by bundling it to a separate file, we can avoid
   double-bundling AGTree.
-- `yarn esbuild:server` - Base ESBuild command for building the server with the common options.
-- `yarn esbuild:client` - Base ESBuild command for building the client with the common options.
-- `yarn extract-changelog` - Extract changes from the `CHANGELOG.md` for a specific version. Typically, this is used by
+- `pnpm esbuild:server` - Base ESBuild command for building the server with the common options.
+- `pnpm esbuild:client` - Base ESBuild command for building the client with the common options.
+- `pnpm extract-changelog` - Extract changes from the `CHANGELOG.md` for a specific version. Typically, this is used by
   CI.
-- `yarn increment` - Increment the patch version number of the extension in the `package.json` file. Typically, this is
+- `pnpm increment` - Increment the patch version number of the extension in the `package.json` file. Typically, this is
   used by CI.
-- `yarn lint:md` - Lint the markdown files with [markdownlint][markdownlint].
-- `yarn lint:staged` - Run linters on staged files. Typically, this is used by Husky Git hooks.
-- `yarn lint:ts` - Lint the code with [ESLint][eslint].
-- `yarn lint` - Run all linters.
-- `yarn test:compile` - Check if the code compiles with [TypeScript][typescript].
-- `yarn test` - Run tests with [Jest][jest].
-- `yarn watch:aglint` - Watch for changes in the AGLint code and create a development build automatically.
-- `yarn watch:agtree` - Watch for changes in the AGTree code and create a development build automatically.
-- `yarn watch:client` - Watch for changes in the client code and create a development build automatically.
-- `yarn watch:grammar` - Watch for changes in the TM grammar and rebuild it automatically.
-- `yarn watch:server` - Watch for changes in the server code and create a development build automatically.
+- `pnpm lint:md` - Lint the markdown files with [markdownlint][markdownlint].
+- `pnpm lint:staged` - Run linters on staged files. Typically, this is used by Husky Git hooks.
+- `pnpm lint:ts` - Lint the code with [ESLint][eslint].
+- `pnpm lint` - Run all linters.
+- `pnpm test:compile` - Check if the code compiles with [TypeScript][typescript].
+- `pnpm test` - Run tests with [Jest][jest].
+- `pnpm watch:aglint` - Watch for changes in the AGLint code and create a development build automatically.
+- `pnpm watch:agtree` - Watch for changes in the AGTree code and create a development build automatically.
+- `pnpm watch:client` - Watch for changes in the client code and create a development build automatically.
+- `pnpm watch:grammar` - Watch for changes in the TM grammar and rebuild it automatically.
+- `pnpm watch:server` - Watch for changes in the server code and create a development build automatically.
 
 > [!NOTE]
-> Watch commands (e.g., `yarn watch:client`) are typically used by VSCode tasks (see
+> Watch commands (e.g., `pnpm watch:client`) are typically used by VSCode tasks (see
 > [`.vscode/tasks.json`][vscode-tasks-file] file and
 > [*Running the extension in development mode*](#running-the-extension-in-development-mode) section).
 > In most cases, you don't need to run them manually.
@@ -168,11 +174,9 @@ Explore the following links for more information on development:
 [contribute]: https://adguard.com/contribute.html
 [esbuild-problem-matcher-extension]: https://marketplace.visualstudio.com/items?itemName=connor4312.esbuild-problem-matchers
 [eslint]: https://eslint.org/
-[git]: https://git-scm.com/
 [husky]: https://typicode.github.io/husky
 [jest]: https://jestjs.io/
 [markdownlint]: https://github.com/DavidAnson/markdownlint
-[nodejs]: https://nodejs.org/en/
 [nova-light-show]: https://novalightshow.netlify.app/
 [server-dir]: ./server
 [syntaxes-dir]: ./syntaxes
@@ -187,4 +191,3 @@ Explore the following links for more information on development:
 [vscode-problem-matcher-docs]: https://code.visualstudio.com/docs/editor/tasks#_processing-task-output-with-problem-matchers
 [vscode-tasks-file]: ./.vscode/tasks.json
 [vscode]: https://code.visualstudio.com/
-[yarn]: https://yarnpkg.com/

CONTRIBUTING.md

@@ -5,7 +5,7 @@ plan:
   key: VSCODEADBLOCKSYNTAXBUILD
   name: vscode adblock syntax - build release
 variables:
-  dockerNode: adguard/node-ssh:21.7--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,41 +37,29 @@ Build:
 
             ls -laht
 
-            # Exclude '--ignore-optional' from yarn arguments
-            # This is needed for installing swc core optional dependencies properly
-            originalYarnArgs="$bamboo_varsYarn"
-            modifiedYarnArgs=$(echo "$originalYarnArgs" | sed 's/--ignore-optional//g')
+            # Set cache directory
+            pnpm config set store-dir ${bamboo.cachePnpm}
 
-            # Install common dependencies
-            yarn install ${modifiedYarnArgs}
-
-            # Install dependencies in ./server
-            cd ./server
-            yarn install ${modifiedYarnArgs}
-            cd ..
-
-            # Install dependencies in ./client
-            cd ./client
-            yarn install ${modifiedYarnArgs}
-            cd ..
+            # Install dependencies
+            pnpm install
 
             # Check TypeScript types
-            yarn test:compile
+            pnpm test:compile
 
             # Run markdownlint
-            yarn lint:md
+            pnpm lint:md
 
             # Run ESLint
-            yarn lint:ts
+            pnpm lint:ts
 
             # Run Jest tests
-            yarn test
+            pnpm test
 
             # Create production build
-            yarn build:prod
+            pnpm build:prod
 
             # Create build.txt file with version
-            yarn build:txt
+            pnpm build:txt
     - inject-variables:
         file: out/build.txt
         scope: RESULT
@@ -96,14 +84,8 @@ Build:
 
             echo "Size before cleanup:" && du -h | tail -n 1
 
-            # cleanup root directory
-            rm -rf node_modules
-
-            # cleanup client directory
-            rm -rf client/node_modules
-
-            # cleanup server directory
-            rm -rf server/node_modules
+            # Cleanup
+            pnpm clean
 
             echo "Size after cleanup:" && du -h | tail -n 1
   # Store the .vsix file as a build artifact