Pull request #601: AG-24589 Update scriptlets to v1.9.62

Merge in ADGUARD-FILTERS/tsurlfilter from feature/AG-24589 to master Squashed commit of the following: commit 86cfec9 Author: Vladimir Zhelvis <[email protected]> Date: Fri Aug 4 13:18:25 2023 +0300 update scriptlets to 1.9.62 commit 6694d42 Author: Vladimir Zhelvis <[email protected]> Date: Fri Aug 4 11:00:39 2023 +0300 update scriptlets
AdguardTeam · Aug 4, 2023 · 30ded45 · 30ded45
1 parent 7de315b
commit 30ded45
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 20 deletions.
diff --git a/packages/tsurlfilter/CHANGELOG.md b/packages/tsurlfilter/CHANGELOG.md
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- 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.1.6] - 2023-08-04
+
+### Changed
+- Updated `@adguard/scriptlets` to `v1.9.62`.
+- Esm module now imports external dependencies instead of bundling.
+
 
 ## [2.1.5] - 2023-07-21
 

diff --git a/packages/tsurlfilter/package.json b/packages/tsurlfilter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adguard/tsurlfilter",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "This is a TypeScript library that implements AdGuard's content blocking rules",
   "main": "dist/es/index.js",
   "module": "dist/es/index.js",
@@ -85,7 +85,7 @@
     ]
   },
   "dependencies": {
-    "@adguard/scriptlets": "^1.9.57",
+    "@adguard/scriptlets": "^1.9.62",
     "commander": "9.4.1",
     "ip6addr": "0.2.3",
     "is-cidr": "4.0.2",

diff --git a/packages/tsurlfilter/rollup.config.ts b/packages/tsurlfilter/rollup.config.ts
@@ -45,6 +45,18 @@ const commonConfig = {
     ],
 };
 
+const commonExternal = [
+    '@adguard/scriptlets',
+    'is-ip',
+    'punycode/',
+    'tldts',
+    'is-cidr',
+    'netmask',
+    'ip6addr',
+    'zod',
+    'commander',
+];
+
 const esmConfig = {
     input: [
         'src/index.ts',
@@ -60,6 +72,7 @@ const esmConfig = {
             sourcemap: false,
         },
     ],
+    external: commonExternal,
     ...commonConfig,
 };
 
@@ -77,6 +90,7 @@ const esmDeclarativeConverterConfig = {
             sourcemap: false,
         },
     ],
+    external: commonExternal,
     ...commonConfig,
 };
 
@@ -115,19 +129,10 @@ const cliConfig = {
         },
     ],
     external: [
-        '@adguard/scriptlets',
-        'is-ip',
-        'punycode/',
-        'tldts',
-        'is-cidr',
-        'netmask',
-        'ip6addr',
-        'zod',
-        'path',
-        'commander',
         'fs',
+        'path',
+        ...commonExternal,
     ],
-
     plugins: [
         // Allow json resolution
         json(),

diff --git a/packages/tsurlfilter/yarn.lock b/packages/tsurlfilter/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@adguard/scriptlets@^1.9.57":
-  version "1.9.57"
-  resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.9.57.tgz#186d611f4ee9315f01588c15a7d2ed11b2e8036e"
-  integrity sha512-CvQmszEnEjgrK68JOJ+cLRf3IFoN8tmF6e7yzJpEnSJvyopZH1e10R8bT8FjE+WtBeUyjrVs8jVMuGGa7RRfGg==
+"@adguard/scriptlets@^1.9.62":
+  version "1.9.62"
+  resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.9.62.tgz#f60b83bb928c160f59153989c9491504e510498b"
+  integrity sha512-uWSlfMnAJUmIVsChl7KrECBXDJotSfq/N94iNLtfwnJI7br9Q5Gl65iuH89rh0Fs62OwexKlj3cnrzHL4TEFyw==
   dependencies:
     "@babel/runtime" "^7.20.13"
     js-yaml "^3.13.1"

diff --git a/packages/tswebextension/CHANGELOG.md b/packages/tswebextension/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- 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.3.8] - 2023-08-04
+
+### Changed
+- Updated `@adguard/tsurlfilter` to `v2.1.6`.
+- Updated `@adguard/scriptlets` to `v1.9.62`.
+
 
 ## [0.3.7] - 2023-07-21
 

diff --git a/packages/tswebextension/package.json b/packages/tswebextension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adguard/tswebextension",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "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.57",
-    "@adguard/tsurlfilter": "^2.1.5",
+    "@adguard/scriptlets": "^1.9.62",
+    "@adguard/tsurlfilter": "^2.1.6",
     "bowser": "2.11.0",
     "commander": "11.0.0",
     "fs-extra": "11.1.1",

diff --git a/packages/tswebextension/rollup.config.ts b/packages/tswebextension/rollup.config.ts
@@ -141,6 +141,9 @@ const backgroundMv3Config = {
         'deepmerge',
         'tldts',
         'webextension-polyfill',
+        'util',
+        'assert',
+        'stream',
     ],
     plugins: [
         ...commonPlugins,