Merge branch 'release/v3.1' into fix/AG-27583

AdguardTeam · Nov 19, 2024 · 9ff2244 · 9ff2244
2 parents 7acc3cb + 8b099ef
commit 9ff2244
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 34 deletions.
diff --git a/bamboo-specs/dnr-rulesets-auto-build.yaml b/bamboo-specs/dnr-rulesets-auto-build.yaml
@@ -39,9 +39,9 @@ Build:
 
             BRANCH="${bamboo.planRepository.branchName}"
 
-            # Deploy package from "release/v3.1" branch only
-            # TODO: replace "release/v3.1" to "master" branch after merge
-            if [ $BRANCH != "release/v3.1" ]
+            # Deploy package from "stable/dnr-rulesets" branch only
+            # TODO: replace "stable/dnr-rulesets" to "master" branch after merge
+            if [ $BRANCH != "stable/dnr-rulesets" ]
             then
               echo "deployment is not supported on branch ${BRANCH}, skipping"
               exit 0;
@@ -97,7 +97,7 @@ Build:
 
             # TODO: remove the checking after release/v3.1 is merged into master
             BRANCH="${bamboo.planRepository.branchName}"
-            if [ $BRANCH != "release/v3.1" ]
+            if [ $BRANCH != "stable/dnr-rulesets" ]
             then
               echo "nothing to clean on branch ${BRANCH}, skipping"
               exit 0;
@@ -145,8 +145,8 @@ other:
 # TODO: remove the branch-overrides after release/v3.1 is merged into master
 branch-overrides:
   -
-    ^(release\/v3\.1.+|(?!release\/v3\.1).*)$:
-      # for branches other than 'release-v3.1' no build should be run
+    ^(stable\/dnr-rulesets.+|(?!stable\/dnr-rulesets).*)$:
+      # for branches other than 'stable/dnr-rulesets' no build should be run
       stages:
         - Build:
             - SkipBuild

diff --git a/bamboo-specs/dnr-rulesets-auto-deploy.yaml b/bamboo-specs/dnr-rulesets-auto-deploy.yaml
@@ -21,7 +21,7 @@ npmjs:
   triggers:
     - build-success:
         # TODO: remove 'branch' after release/v3.1 is merged into master
-        branch: release-v3.1
+        branch: stable-dnr-rulesets
   tasks:
     - checkout:
         force-clean-build: 'true'

diff --git a/bamboo-specs/dnr-rulesets-increment.yaml b/bamboo-specs/dnr-rulesets-increment.yaml
@@ -31,8 +31,8 @@ Increment:
 
             # Throw error if current branch is not "master",
             # because we do not deploy changes from other branches
-            # TODO: remove "release/v3.1" branch after merge
-            if [ $branch != "master" && $branch != "release/v3.1" ]
+            # TODO: remove "stable/dnr-rulesets" branch after merge
+            if [ $branch != "master" && $branch != "stable/dnr-rulesets" ]
             then
               echo "increment is not supported on branch ${branch}"
               exit 1;

diff --git a/packages/dnr-rulesets/package.json b/packages/dnr-rulesets/package.json
@@ -52,4 +52,4 @@
         "typescript": "^5.4.5",
         "typescript-eslint": "^8.0.1"
     }
-}
+}
diff --git a/packages/dnr-rulesets/tsconfig.base.json b/packages/dnr-rulesets/tsconfig.base.json
@@ -1,20 +1,20 @@
 {
     "$schema": "https://json.schemastore.org/tsconfig",
     "compilerOptions": {
-      "target": "esnext",
-      "module": "commonjs",
-      "moduleResolution": "node",
-      "strict": true,
-      "noUnusedLocals": true,
-      "noUnusedParameters": true,
-      "noImplicitReturns": true,
-      "noFallthroughCasesInSwitch": true,
-      "resolveJsonModule": true,
-      "skipLibCheck": true,
-      "esModuleInterop": true,
-      "types": ["node"],
-      "lib": ["es2022"],
-      "outDir": "dist",
+        "target": "esnext",
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "strict": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noImplicitReturns": true,
+        "noFallthroughCasesInSwitch": true,
+        "resolveJsonModule": true,
+        "skipLibCheck": true,
+        "esModuleInterop": true,
+        "types": ["node"],
+        "lib": ["es2022"],
+        "outDir": "dist",
     },
     "exclude": ["node_modules"],
-}
+}
diff --git a/packages/dnr-rulesets/tsconfig.cli.json b/packages/dnr-rulesets/tsconfig.cli.json
@@ -2,8 +2,8 @@
     "$schema": "https://json.schemastore.org/tsconfig",
     "extends": "./tsconfig.base.json",
     "compilerOptions": {
-      "rootDir": "src",
-      "declaration": false,
+        "rootDir": "src",
+        "declaration": false,
     },
     "include": ["src/cli.ts"],
-}
+}
diff --git a/packages/dnr-rulesets/tsconfig.json b/packages/dnr-rulesets/tsconfig.json
@@ -2,9 +2,9 @@
     "$schema": "https://json.schemastore.org/tsconfig",
     "extends": "./tsconfig.base.json",
     "compilerOptions": {
-      "types": ["jest"],
+        "types": ["jest"],
     },
     "ts-node": {
-      "swc": true
+        "swc": true
     },
-}
+}
diff --git a/packages/dnr-rulesets/tsconfig.lib.json b/packages/dnr-rulesets/tsconfig.lib.json
@@ -2,8 +2,8 @@
     "$schema": "https://json.schemastore.org/tsconfig",
     "extends": "./tsconfig.base.json",
     "compilerOptions": {
-      "rootDir": "src",
-      "declaration": true,
+        "rootDir": "src",
+        "declaration": true,
     },
     "include": ["src/lib/index.ts"],
-}
+}
diff --git a/packages/tsurlfilter/tsurlfilter.tgz b/packages/tsurlfilter/tsurlfilter.tgz
diff --git a/packages/tswebextension/tswebextension.tgz b/packages/tswebextension/tswebextension.tgz
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,4 +52,4 @@ @@
             "typescript": "^5.4.5",
             "typescript-eslint": "^8.0.1"
         }
-    }
+    }