Skip to content

Commit 49c55d4

Browse files
committed
AG-55211 require specific engines.pnpm in root package.json
Squashed commit of the following: commit 0c45b6a Merge: 4c0fb7c ca1b6e3 Author: slvvko <v.leleka@adguard.com> Date: Tue Jun 16 12:43:36 2026 -0400 Merge branch 'master' into fix/AG-55211 commit 4c0fb7c Author: slvvko <v.leleka@adguard.com> Date: Mon Jun 15 23:56:09 2026 -0400 clean up commit 87a7a3b Author: slvvko <v.leleka@adguard.com> Date: Fri Jun 12 13:48:18 2026 -0400 Revert "set engines.node >=22" This reverts commit ce9b535. commit 9571f4b Author: slvvko <v.leleka@adguard.com> Date: Fri Jun 12 13:47:08 2026 -0400 update dockerfile commit 3151720 Author: slvvko <v.leleka@adguard.com> Date: Fri Jun 12 13:37:35 2026 -0400 fix DEVELOPMENT.md commit 34e6663 Author: slvvko <v.leleka@adguard.com> Date: Fri Jun 12 13:35:15 2026 -0400 update github workflows commit ce9b535 Author: slvvko <v.leleka@adguard.com> Date: Fri Jun 12 13:31:20 2026 -0400 set engines.node >=22 commit 868bfc0 Author: slvvko <v.leleka@adguard.com> Date: Fri Jun 12 13:27:27 2026 -0400 update dockerfile - use pre-configured adguard image commit 1898e95 Author: slvvko <v.leleka@adguard.com> Date: Fri Jun 12 13:24:48 2026 -0400 require specific engines.pnpm in root package.json
1 parent ca1b6e3 commit 49c55d4

5 files changed

Lines changed: 8 additions & 23 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Github Release
22

33
env:
44
NODE_VERSION: 22.14.0
5-
PNPM_VERSION: 10.7.1
5+
PNPM_VERSION: 10.33.4
66

77
# Workflow need write access to the repository to create a GitHub release
88
permissions:

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Test Scriptlets
22

33
env:
44
NODE_VERSION: 22.14.0
5-
PNPM_VERSION: 10.7.1
5+
PNPM_VERSION: 10.33.4
66

77
on:
88
push:

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Redirect Resources library.
1111
| Tool | Version | Notes |
1212
| ---- | ------- | ----- |
1313
| [Node.js](https://nodejs.org/) | 22 | Use [nvm](https://github.com/nvm-sh/nvm) to manage versions |
14-
| [pnpm](https://pnpm.io/) | 10.7 | Package manager |
14+
| [pnpm](https://pnpm.io/) | 10.33.4 | Package manager |
1515
| [Git](https://git-scm.com/) | Latest | Version control |
1616

1717
> **Note**: Development is tested on macOS and Linux. Windows users should use

Dockerfile

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,9 @@
22
# Dependencies are cached until package.json/pnpm-lock.yaml change
33
# Each stage can be built independently via --target
44

5-
FROM node:22.21.1-slim AS base
5+
FROM adguard/node-ssh:22.22--0 AS base
66
SHELL ["/bin/bash", "-lc"]
77

8-
USER root
9-
10-
# Install git (not included in slim image) and pnpm, then configure git
11-
RUN apt-get update && \
12-
apt-get install -y --no-install-recommends git && \
13-
rm -rf /var/lib/apt/lists/* && \
14-
npm install -g pnpm@10.7.1 && \
15-
git config --global --add safe.directory '*'
16-
178
WORKDIR /scriptlets
189

1910
ENV PNPM_STORE=/pnpm-store
@@ -24,19 +15,10 @@ RUN pnpm config set store-dir /pnpm-store
2415
# ============================================================================
2516
# Stage: base-puppeteer
2617
# Heavy base with bundled Chromium — used only for QUnit tests
27-
# node v22.21.1 is used in this image
2818
# ============================================================================
29-
FROM ghcr.io/puppeteer/puppeteer:24.35.0 AS base-puppeteer
19+
FROM adguard/puppeteer-runner:22.21.1--24.35.0--0 AS base-puppeteer
3020
SHELL ["/bin/bash", "-lc"]
3121

32-
# by default the puppeteer image is run as a non-root user "pptruser"
33-
# but root user is needed for global npm installs
34-
USER root
35-
36-
# Install pnpm globally and configure git
37-
RUN npm install -g pnpm@10.7.1 && \
38-
git config --global --add safe.directory '*'
39-
4022
WORKDIR /scriptlets
4123

4224
ENV PNPM_STORE=/pnpm-store

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
},
3434
"author": "AdGuard",
3535
"license": "GPL-3.0",
36+
"engines": {
37+
"pnpm": "=10.33.4"
38+
},
3639
"repository": {
3740
"type": "git",
3841
"url": "git+https://github.com/AdguardTeam/Scriptlets.git"

0 commit comments

Comments
 (0)