Merge pull request #2419 from Automattic/trunk

Alpha release Nov 29

.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'
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
     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'
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
     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.assignee.login }}, good job getting this PR merged! :tada:
+            Hey @${{ github.event.pull_request.user.login }}, good job getting this PR merged! :tada:
 
             Now, the `needs-changelog` label has been added to it.
 

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.3.0
+Version: 2.4.0-epic-ras-acc.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

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.3.0
+Version: 2.4.0-epic-ras-acc.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

newspack-nelson/sass/theme-description.scss

@@ -6,7 +6,11 @@ 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-epic-ras-acc.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

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.3.0
+Version: 2.4.0-epic-ras-acc.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

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.3.0
+Version: 2.4.0-epic-ras-acc.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: newspack-theme

newspack-theme/functions.php

@@ -42,11 +42,7 @@ 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.
 		 */
-		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' );
-		}
+		load_theme_textdomain( 'newspack', get_template_directory() . '/languages' );
 
 		// Add default posts and comments RSS feed links to head.
 		add_theme_support( 'automatic-feed-links' );

newspack-theme/sass/plugins/woocommerce.scss

@@ -1581,13 +1581,6 @@ 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 ) {

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.3.0
+Version: 2.4.0-epic-ras-acc.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: newspack

newspack-theme/sass/variables-site/_newspack-ui.scss

@@ -0,0 +1,25 @@
+@use "../mixins/utilities";
+
+html body {
+	// Override the Newspack UI font sizes to be based off of the Newspack Theme's 18px font base:
+	--newspack-ui-font-size-m: clamp(1rem, 0.04rem + 2.209vw, 1.611rem); // 18px - 20px
+	--newspack-ui-font-size-l: clamp(1.111rem, 0.762rem + 0.803vw, 1.333rem); // 20px - 24px
+	--newspack-ui-font-size-xl: clamp(1.222rem, 0.35rem + 2.008vw, 1.778rem); // 22px - 32px
+	--newspack-ui-font-size-2xl: clamp(1.444rem, 0.049rem + 3.213vw, 2.333rem); // 26px - 42px
+	--newspack-ui-font-size-3xl: clamp(1.556rem, -0.189rem + 4.016vw, 2.667rem); // 28px - 48px
+	--newspack-ui-font-size-4xl: clamp(1.778rem, -1.014rem + 6.426vw, 3.556rem); // 32px - 64px
+	--newspack-ui-font-size-5xl: clamp(1.889rem, -2.124rem + 9.237vw, 4.444rem); // 34px - 80px
+	--newspack-ui-font-size-6xl: clamp(2rem, -3.234rem + 12.048vw, 5.333rem); // 36px - 96px
+
+	@include utilities.media( mobile ) {
+		// Override the Newspack UI font sizes to be based off of the Newspack Theme's 20px font base on desktop:
+		--newspack-ui-font-size-m: clamp(0.9rem, 0.743rem + 0.402vw, 1rem); // 18px - 20px
+		--newspack-ui-font-size-l: clamp(1rem, 0.686rem + 0.803vw, 1.2rem); // 20px - 24px
+		--newspack-ui-font-size-xl: clamp(1.1rem, 0.315rem + 2.008vw, 1.6rem); // 22px - 32px
+		--newspack-ui-font-size-2xl: clamp(1.3rem, 0.044rem + 3.213vw, 2.1rem); // 26px - 42px
+		--newspack-ui-font-size-3xl: clamp(1.4rem, -0.17rem + 4.016vw, 2.4rem); // 28px - 48px
+		--newspack-ui-font-size-4xl: clamp(1.6rem, -0.912rem + 6.426vw, 3.2rem); // 32px - 64px
+		--newspack-ui-font-size-5xl: clamp(1.7rem, -1.912rem + 9.237vw, 4rem); // 34px - 80px
+		--newspack-ui-font-size-6xl: clamp(1.8rem, -2.911rem + 12.048vw, 4.8rem); // 36px - 96px
+	}
+}

newspack-theme/sass/variables-site/_variables-site.scss

@@ -1,2 +1,3 @@
+@use "newspack-ui";
 @use "structure";
 @use "transitions";

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "newspack",
-	"version": "2.3.0",
+	"version": "2.4.0-epic-ras-acc.1",
 	"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.11.0",
+		"@wordpress/browserslist-config": "^6.12.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.80.6"
+		"sass": "^1.81.0"
 	},
 	"overrides": {
 		"terser-webpack-plugin": {

scripts/create-child-releases.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-console */
+/* eslint-disable no-console, @typescript-eslint/no-var-requires */
 
 const { basename, resolve } = require( 'path' );
 const { stat, readFile } = require( 'fs-extra' );