Merge pull request #1298 from Automattic/trunk

Alpha release Apr 25
Automattic · Apr 25, 2024 · 1a3e33a · 1a3e33a
2 parents f02f318 + 424a341
commit 1a3e33a
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 44 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/includes/class-newspack-popups-inserter.php b/includes/class-newspack-popups-inserter.php
@@ -553,7 +553,7 @@ public static function insert_inline_prompt_in_archive_pages( $post_count ) {
 		foreach ( $archives_popups as $popup ) {
 			// insert popup only on selected archive page types.
 			if ( is_category() && ! in_array( 'category', $popup['options']['archive_page_types'] )
-				|| ( is_tag() && ! in_array( 'tag', $popup['options']['archive_page_types'] ) )
+				|| ( is_tag() && ! in_array( 'tag', $popup['options']['archive_page_types'] ) ) // phpcs:ignore Generic.CodeAnalysis.RequireExplicitBooleanOperatorPrecedence.MissingParentheses
 				|| ( is_author() && ! in_array( 'author', $popup['options']['archive_page_types'] ) )
 				|| ( is_date() && ! in_array( 'date', $popup['options']['archive_page_types'] ) )
 				|| ( is_post_type_archive() && ! in_array( 'post-type', $popup['options']['archive_page_types'] ) )

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,10 +33,10 @@
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
     "newspack-components": "^2.2.1",
-    "qs": "^6.12.0"
+    "qs": "^6.12.1"
   },
   "devDependencies": {
-    "@rushstack/eslint-patch": "^1.8.0",
+    "@rushstack/eslint-patch": "^1.10.2",
     "eslint": "^7.32.0",
     "lint-staged": "^15.2.2",
     "newspack-scripts": "^5.3.0",