chore(deps): bump versions, remove yarn usage

Author: Pavel Ageev

.dockerignore

@@ -8,4 +8,4 @@
 !jest.config.js
 !jsconfig.json
 !package.json
-!yarn.lock
+!package-lock.json

.github/workflows/tests.yml

@@ -13,13 +13,13 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: 20.6
+          node-version: 21.6
 
-      - name: yarn
-        run: yarn --frozen-lockfile
+      - name: npm install
+        run: npm ci
 
       - name: test
-        run: yarn run test
+        run: npm run test
 
       - name: test check should succeed
         run: |
@@ -66,7 +66,7 @@ jobs:
             check_report
 
       - name: 'lint configs'
-        run: yarn prettier -c 'data/*'
+        run: npm run prettier -- -c 'data/*'
 
       - name: lint
-        run: yarn run lint
+        run: npm run lint

.gitignore

@@ -5,5 +5,4 @@
 /storage_tmp/
 .env
 *.tgz
-/yarn-error.log
 docker-compose.override.yaml

MAINTAINERS

@@ -1,6 +1,3 @@
-Vyacheslav Artemiev <[email protected]>
-Alexei Kochetov <[email protected]>
-Ruslan Burkhanov <[email protected]>
-Daniil Mikhailov <[email protected]>
-Konstantin Sergievskiy <[email protected]>
-Aleksey Shirokih <[email protected]>
+Lev Galaktionov <[email protected]>
+Nikita Popov <[email protected]>
+Pavel Ageev <[email protected]>

Makefile

@@ -1,45 +1,44 @@
 override APPLICATION_NAME=purr
-override NODE_VERSION=20.6
+override NODE_VERSION=21.6
 
 DOCKER_IMAGE?=ghcr.io/semrush/purr
 DOCKER_TAG?=latest
 CHECK_NAME:=example-com
 SUITE_NAME:=example-com-suite
 
-.PHONY: yarn-install
-yarn-install:
+.PHONY: npm-install
+npm-install:
 	rm -r ${CURDIR}/node_modules || true
 	docker run --rm \
 		-v ${CURDIR}:/app \
 		-w /app \
-		--entrypoint yarn \
 			node:${NODE_VERSION} \
-				install --frozen-lockfile
+				npm ci
 
-.PHONY: yarn-lint
-yarn-lint:
+.PHONY: vendor
+vendor: npm-install
+
+.PHONY: npm-lint
+npm-lint:
 	docker run --rm \
 		-v ${CURDIR}:/app \
 		-w /app \
-		--entrypoint yarn \
 			node:${NODE_VERSION} \
-				run lint
+				npm run lint
 
 .PHONY: lint
-lint: yarn-lint
+lint: npm-lint
 
-.PHONY: yarn-test
-yarn-test:
+.PHONY: npm-test
+npm-test:
 	docker run --rm \
 		-v ${CURDIR}:/app \
 		-w /app \
-		-e PUPPETEER_SKIP_DOWNLOAD=true \
-		--entrypoint yarn \
 			node:${NODE_VERSION} \
-				run test --bail
+				npm run test
 
 .PHONY: test
-test: yarn-test
+test: npm-test
 
 .PHONY: docker-build
 docker-build:
@@ -61,7 +60,6 @@ docker-compose-down:
 run-check: docker-build
 	rm -r ${CURDIR}/storage/* || true
 	docker run --rm \
-		-v ${CURDIR}:/app \
 		--env-file ${CURDIR}/.env \
 			${DOCKER_IMAGE}:${DOCKER_TAG} \
 				check $(CHECK_NAME)

docker/Dockerfile

@@ -1,32 +1,38 @@
-ARG NODE_VERSION=20.6
+ARG NODE_VERSION=21.6
 
 FROM node:${NODE_VERSION} as vendor
 
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+
 WORKDIR /app
 
 COPY package.json /app
-COPY yarn.lock /app
+COPY package-lock.json /app
 
-RUN yarn install --frozen-lockfile --production=true
+RUN npm ci --omit dev
 
 FROM node:${NODE_VERSION}
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-      chromium \
-      chromium-sandbox && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* || true
-
+ARG CHROMIUM_VERSION=121.0.6167.85-1~deb12u1
+ENV CHROMIUM_VERSION=${CHROMIUM_VERSION}
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
 
+RUN apt update && \
+    apt install -y --no-install-recommends \
+      chromium=${CHROMIUM_VERSION} \
+      chromium-sandbox=${CHROMIUM_VERSION} && \
+    apt clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* || true
+
+USER node
 WORKDIR /app
 
+COPY jsconfig.json /app
+COPY package.json /app
+COPY package-lock.json /app
 COPY --chown=node:node src /app/src
 COPY --chown=node:node data /app/data
-RUN chown node:node /app
+COPY --from=vendor --chown=node:node /app/node_modules /app/node_modules
 
-COPY --from=vendor /app/node_modules /app/node_modules
 
-USER node
 ENTRYPOINT ["/app/src/cli.js"]