Revert "Merge pull request #2421 from Automattic/alpha"

This reverts commit c765ae6, reversing changes made to 86448eb.
Automattic · Dec 9, 2024 · aeb1ce2 · aeb1ce2
1 parent b9a78df
commit aeb1ce2
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 239 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   labeler:
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
     permissions:
       contents: read
       pull-requests: write
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/labeler@v5
 
   comment_pr:
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
     permissions:
       contents: read
       pull-requests: write
@@ -25,7 +25,7 @@ jobs:
         uses: thollander/actions-comment-pull-request@v3
         with:
           message: |
-            Hey @${{ github.event.pull_request.user.login }}, good job getting this PR merged! :tada:
+            Hey @${{ github.event.pull_request.assignee.login }}, good job getting this PR merged! :tada:
 
             Now, the `needs-changelog` label has been added to it.
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/newspack-joseph/sass/theme-description.scss b/newspack-joseph/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.0-alpha.1
+Version: 2.3.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-katharine/sass/theme-description.scss b/newspack-katharine/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.0-alpha.1
+Version: 2.3.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-nelson/sass/theme-description.scss b/newspack-nelson/sass/theme-description.scss
@@ -6,11 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-<<<<<<< HEAD
-Version: 2.4.0-alpha.1
-=======
 Version: 2.3.0
->>>>>>> release
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-sacha/sass/theme-description.scss b/newspack-sacha/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.0-alpha.1
+Version: 2.3.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-scott/sass/theme-description.scss b/newspack-scott/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.0-alpha.1
+Version: 2.3.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

diff --git a/newspack-theme/functions.php b/newspack-theme/functions.php
@@ -42,7 +42,11 @@ function newspack_setup() {
 		 * If you're building a theme based on Newspack Theme, use a find and replace
 		 * to change 'newspack' to the name of your theme in all the template files.
 		 */
-		load_theme_textdomain( 'newspack', get_template_directory() . '/languages' );
+		if ( version_compare( $GLOBALS['wp_version'], '6.7', '<' ) ) {
+			load_theme_textdomain( 'newspack', get_template_directory() . '/languages' );
+		} else {
+			load_textdomain( 'newspack', get_template_directory() . '/languages/' . determine_locale() . '.mo' );
+		}
 
 		// Add default posts and comments RSS feed links to head.
 		add_theme_support( 'automatic-feed-links' );

diff --git a/newspack-theme/sass/plugins/woocommerce.scss b/newspack-theme/sass/plugins/woocommerce.scss
@@ -1581,6 +1581,13 @@ table.woocommerce-table--order-details.shop_table,
 	.woocommerce-product-gallery__trigger {
 		right: 1rem;
 	}
+
+	.wc_payment_method {
+		> label:first-of-type img {
+			float: none;
+			margin-left: 0.5 * structure.$size__spacing-unit;
+		}
+	}
 }
 
 @media only screen and ( min-width: 768px ) {

diff --git a/newspack-theme/sass/theme-description.scss b/newspack-theme/sass/theme-description.scss
@@ -6,7 +6,7 @@ Author URI: https://newspack.com
 Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box.
 Requires at least: 6.6
 Tested up to: 6.7
-Version: 2.4.0-alpha.1
+Version: 2.3.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: newspack

diff --git a/newspack-theme/sass/variables-site/_newspack-ui.scss b/newspack-theme/sass/variables-site/_newspack-ui.scss
diff --git a/newspack-theme/sass/variables-site/_variables-site.scss b/newspack-theme/sass/variables-site/_variables-site.scss
@@ -1,3 +1,2 @@
-@use "newspack-ui";
 @use "structure";
 @use "transitions";
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "newspack",
-	"version": "2.4.0-alpha.1",
+	"version": "2.3.0",
 	"description": "A theme for Newspack. https://newspack.com",
 	"bugs": {
 		"url": "https://github.com/Automattic/newspack-theme/issues"
@@ -43,7 +43,7 @@
 	"devDependencies": {
 		"@octokit/rest": "^20.0.2",
 		"@rushstack/eslint-patch": "^1.10.4",
-		"@wordpress/browserslist-config": "^6.12.0",
+		"@wordpress/browserslist-config": "^6.11.0",
 		"chokidar-cli": "^3.0.0",
 		"classnames": "^2.5.1",
 		"cssnano": "^7.0.6",
@@ -55,7 +55,7 @@
 		"postcss-focus-within": "^9.0.1",
 		"postcss-scss": "^4.0.9",
 		"rtlcss": "^4.3.0",
-		"sass": "^1.81.0"
+		"sass": "^1.80.6"
 	},
 	"overrides": {
 		"terser-webpack-plugin": {

diff --git a/scripts/create-child-releases.js b/scripts/create-child-releases.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-console, @typescript-eslint/no-var-requires */
+/* eslint-disable no-console */
 
 const { basename, resolve } = require( 'path' );
 const { stat, readFile } = require( 'fs-extra' );