Merge branch 'master' into feature/AG-19767

AdguardTeam · Oct 17, 2023 · 9a35ea4 · 9a35ea4
2 parents a3b3965 + 1f1fe7e
commit 9a35ea4
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 130 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,7 +2,7 @@
 name: test
 
 env:
-  NODE_VERSION: 16
+  NODE_VERSION: 18
 
 on:
   push:

diff --git a/bamboo-specs/adguard-api-build.yaml b/bamboo-specs/adguard-api-build.yaml
@@ -5,7 +5,7 @@ plan:
   key: ADGUARDAPIBUILD
   name: Adguard API  - build
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Build:

diff --git a/bamboo-specs/adguard-api-deploy.yaml b/bamboo-specs/adguard-api-deploy.yaml
@@ -9,7 +9,7 @@ environments:
 
 npmjs:
   docker:
-    image: adguard/node-ssh:16.17--1
+    image: adguard/node-ssh:18.13--1
     volumes:
       ${system.YARN_DIR}: "${bamboo.cacheYarn}"
   triggers: [ ]

diff --git a/bamboo-specs/adguard-api-increment.yaml b/bamboo-specs/adguard-api-increment.yaml
@@ -5,7 +5,7 @@ plan:
   key: ADGUARDAPIINCREMENT
   name: Adguard API  - increment
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Increment:

diff --git a/bamboo-specs/agtree-build.yaml b/bamboo-specs/agtree-build.yaml
@@ -5,7 +5,7 @@ plan:
   key: AGTREEBUILD
   name: AGTree - build
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Build:

diff --git a/bamboo-specs/agtree-deploy.yaml b/bamboo-specs/agtree-deploy.yaml
@@ -9,7 +9,7 @@ environments:
 
 npmjs:
   docker:
-    image: adguard/node-ssh:16.17--1
+    image: adguard/node-ssh:18.13--1
     volumes:
       ${system.YARN_DIR}: "${bamboo.cacheYarn}"
   triggers: [ ]

diff --git a/bamboo-specs/agtree-increment.yaml b/bamboo-specs/agtree-increment.yaml
@@ -5,7 +5,7 @@ plan:
   key: AGTREEINCR
   name: AGTree - increment
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Increment:

diff --git a/bamboo-specs/agtree-test.yaml b/bamboo-specs/agtree-test.yaml
@@ -5,7 +5,7 @@ plan:
   key: AGTREETEST
   name: AGTree - tests
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Test:

diff --git a/bamboo-specs/tsurlfilter-build.yaml b/bamboo-specs/tsurlfilter-build.yaml
@@ -5,7 +5,7 @@ plan:
   key: TSURLFILTERBUILD
   name: tsurlfilter - build
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Build:

diff --git a/bamboo-specs/tsurlfilter-deploy.yaml b/bamboo-specs/tsurlfilter-deploy.yaml
@@ -12,7 +12,7 @@ environments:
 
 npmjs • 1.x:
   docker:
-    image: adguard/node-ssh:16.17--1
+    image: adguard/node-ssh:18.13--1
     volumes:
       ${system.YARN_DIR}: "${bamboo.cacheYarn}"
   triggers: [ ]

diff --git a/bamboo-specs/tsurlfilter-increment.yaml b/bamboo-specs/tsurlfilter-increment.yaml
@@ -5,7 +5,7 @@ plan:
   key: TSURLFILTERINCR
   name: tsurlfilter - increment
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Increment:

diff --git a/bamboo-specs/tsurlfilter-tests.yaml b/bamboo-specs/tsurlfilter-tests.yaml
@@ -5,7 +5,7 @@ plan:
   key: TSURLFILTERTEST
   name: tsurlfilter - tests
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Test:

diff --git a/bamboo-specs/tswebextension-build.yaml b/bamboo-specs/tswebextension-build.yaml
@@ -5,7 +5,7 @@ plan:
   key: TSWEBEXTENSIONBUILD
   name: tswebextension - build
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Build:

diff --git a/bamboo-specs/tswebextension-deploy.yaml b/bamboo-specs/tswebextension-deploy.yaml
@@ -9,7 +9,7 @@ environments:
 
 npmjs:
   docker:
-    image: adguard/node-ssh:16.17--1
+    image: adguard/node-ssh:18.13--1
     volumes:
       ${system.YARN_DIR}: "${bamboo.cacheYarn}"
   triggers: [ ]

diff --git a/bamboo-specs/tswebextension-increment.yaml b/bamboo-specs/tswebextension-increment.yaml
@@ -5,7 +5,7 @@ plan:
   key: TSWEBEXTENSIONINCR
   name: tswebextension - increment
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Increment:

diff --git a/bamboo-specs/tswebextension-tests.yaml b/bamboo-specs/tswebextension-tests.yaml
@@ -5,7 +5,7 @@ plan:
   key: TSWEBEXTENSIONTEST
   name: tswebextension - tests
 variables:
-  dockerContainer: adguard/node-ssh:16.17--1
+  dockerContainer: adguard/node-ssh:18.13--1
 
 stages:
   - Test:

diff --git a/packages/tsurlfilter/CHANGELOG.md b/packages/tsurlfilter/CHANGELOG.md
@@ -1,18 +1,26 @@
 # TSUrlFilter Changelog
 
 All notable changes to this project will be documented in this file.
+
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-
 <!-- TODO: manually add compare links for version to the end of the file -->
 <!-- e.g. [1.0.77]: https://github.com/AdguardTeam/tsurlfilter/compare/tsurlfilter-v1.0.76...tsurlfilter-v1.0.77 -->
 
+
+## [2.2.1] - 2023-10-13
+
+### Changed
+- Updated `@adguard/scriptlets` to `v1.9.83`.
+
+
 ## [2.2.0] - 2023-10-12
 
 ### Added
 - Support for $badfilter rules to Declarative Converter.
 
+
 ## [2.1.12] - 2023-09-25
 
 ### Fixed

diff --git a/packages/tsurlfilter/package.json b/packages/tsurlfilter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adguard/tsurlfilter",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "This is a TypeScript library that implements AdGuard's content blocking rules",
   "main": "dist/es/index.js",
   "module": "dist/es/index.js",
@@ -86,7 +86,7 @@
     ]
   },
   "dependencies": {
-    "@adguard/scriptlets": "^1.9.72",
+    "@adguard/scriptlets": "^1.9.83",
     "cidr-tools": "^6.4.1",
     "commander": "9.4.1",
     "is-cidr": "4.0.2",

diff --git a/packages/tsurlfilter/yarn.lock b/packages/tsurlfilter/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@adguard/scriptlets@^1.9.72":
-  version "1.9.72"
-  resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.9.72.tgz#79db94d91083b531ff83d37a97c2d608877e62f2"
-  integrity sha512-4nxqXTyD+sDonMdlXchp2sxqcfafWM4RRrv13yVe9prDloWyMTd2D8z4RF65aKRodc/waW4Xe7ehvdnE94X1qg==
+"@adguard/scriptlets@^1.9.83":
+  version "1.9.83"
+  resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.9.83.tgz#77d1e6a0e0eb74a359618281e62cfcf829e408ec"
+  integrity sha512-Nnv/tW1yEujFovc54mZWBrZNGYe0vqHcymgRmveAWNSSGDEoYh+kG/YtvweNZa01yx859O6Tfq/8kXajtWaTPg==
   dependencies:
     "@babel/runtime" "^7.20.13"
     js-yaml "^3.13.1"

diff --git a/packages/tswebextension/CHANGELOG.md b/packages/tswebextension/CHANGELOG.md
@@ -1,12 +1,21 @@
 # TSWebExtension Changelog
 
 All notable changes to this project will be documented in this file.
+
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 <!-- TODO: manually add compare links for version to the end of the file -->
 <!-- e.g. [0.1.2]: https://github.com/AdguardTeam/tsurlfilter/compare/tswebextension-v0.1.1...tswebextension-v0.1.2 -->
 
+
+## [0.4.1] - 2023-10-13
+
+### Changed
+- Updated `@adguard/tsurlfilter` to `v2.2.1`.
+- Updated `@adguard/scriptlets` to `v1.9.83`.
+
+
 ## [0.4.0] - 2023-10-12
 
 ### Added

diff --git a/packages/tswebextension/package.json b/packages/tswebextension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adguard/tswebextension",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "This is a TypeScript library that implements AdGuard's extension API",
   "main": "dist/index.js",
   "typings": "dist/types/lib/mv2/background/index.d.ts",
@@ -83,8 +83,8 @@
   "dependencies": {
     "@adguard/assistant": "^4.3.70",
     "@adguard/extended-css": "^2.0.52",
-    "@adguard/scriptlets": "^1.9.72",
-    "@adguard/tsurlfilter": "^2.2.0",
+    "@adguard/scriptlets": "^1.9.83",
+    "@adguard/tsurlfilter": "^2.2.1",
     "bowser": "2.11.0",
     "commander": "11.0.0",
     "fs-extra": "11.1.1",