Merge pull request #404 from studiopress/develop

* Bump lodash from 4.17.19 to 4.17.21 (#379) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.19...4.17.21) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump hosted-git-info from 2.7.1 to 2.8.9 (#380) Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.7.1 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](npm/hosted-git-info@v2.7.1...v2.8.9) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump browserslist from 4.14.6 to 4.16.6 (#382) Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.14.6 to 4.16.6. - [Release notes](https://github.com/browserslist/browserslist/releases) - [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md) - [Commits](browserslist/browserslist@4.14.6...4.16.6) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump postcss from 8.1.6 to 8.2.10 (#381) Bumps [postcss](https://github.com/postcss/postcss) from 8.1.6 to 8.2.10. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.1.6...8.2.10) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump trim-newlines from 3.0.0 to 3.0.1 (#383) Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/sindresorhus/trim-newlines/releases) - [Commits](https://github.com/sindresorhus/trim-newlines/commits) --- updated-dependencies: - dependency-name: trim-newlines dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump glob-parent from 5.1.1 to 5.1.2 (#384) Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/gulpjs/glob-parent/releases) - [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md) - [Commits](gulpjs/glob-parent@v5.1.1...v5.1.2) --- updated-dependencies: - dependency-name: glob-parent dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump path-parse from 1.0.6 to 1.0.7 (#386) Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nanoid from 3.1.23 to 3.2.0 (#389) Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](ai/nanoid@3.1.23...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump postcss from 8.2.10 to 8.2.13 (#391) Bumps [postcss](https://github.com/postcss/postcss) from 8.2.10 to 8.2.13. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.2.10...8.2.13) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump ajv from 6.10.0 to 6.12.6 (#393) Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.10.0 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](ajv-validator/ajv@v6.10.0...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump minimist from 1.2.5 to 1.2.6 (#395) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Missing comma in WooCommerce CSS file (#387) Reported here: https://genesiswp.slack.com/archives/CD7D7QAG0/p1634543179001600 * build(deps): bump ansi-regex from 3.0.0 to 3.0.1 (#396) Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](chalk/ansi-regex@v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: ansi-regex dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump async from 2.6.3 to 2.6.4 (#398) Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](caolan/async@v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update/dev deps (#399) * Fix WPForms form creation (#388) * Update OCTS contact form creation * Remove Simple Social Icons and Genesis eNews from OCTS (#400) * Remove Simple Social Icons and Genesis eNews plugin installation from OCTS * build(deps): bump minimatch and recursive-readdir (#401) Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.1.2 and updates ancestor dependency [recursive-readdir](https://github.com/jergason/recursive-readdir). These dependencies need to be updated together. Updates `minimatch` from 3.0.4 to 3.1.2 - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) Updates `recursive-readdir` from 2.2.2 to 2.2.3 - [Release notes](https://github.com/jergason/recursive-readdir/releases) - [Changelog](https://github.com/jergason/recursive-readdir/blob/master/CHANGELOG.md) - [Commits](https://github.com/jergason/recursive-readdir/commits/v2.2.3) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: recursive-readdir dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Release/3.4.2 (#403) * Update changelog for 3.4.2 * Update caniuse-lite and run autoprefixer * Update version / makepot Co-authored-by: Ryan Kienstra <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nathan Rice <[email protected]> Co-authored-by: Ryan Kienstra <[email protected]>
studiopress · Dec 19, 2022 · 0568611 · 0568611
2 parents d1352e1 + 49895fc
commit 0568611
Show file tree

Hide file tree

Showing 8 changed files with 7,446 additions and 1,467 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Genesis Sample Theme Changelog
 
+## [3.4.2] - 2022-12-19
+
+### Changed
+* Update developer dependencies. ([GitHub version](https://github.com/studiopress/genesis-sample/) only.)
+
+### Fixed
+* Add missing comma to WooCommerce styles.
+* WP Forms one-click-theme-setup contact form creation.
+
+### Removed
+* Simple Social Icons and Genesis eNews extended from one-click-theme-setup.
+
 ## [3.4.1] - 2021-03-25
 
 ### Added
@@ -17,9 +29,10 @@
 ## [3.4.0] - 2020-10-20
 Genesis Sample 3.4.0 requires the Genesis Blocks plugin.
 
-* Changed: Install Genesis Blocks instead of Atomic Blocks during one-click theme setup.
-* Changed: Updated one-click-theme-setup content to use Genesis Blocks.
-* Changed: Updated Editor and front-end styles for Genesis Blocks compatibility.
+### Changed
+* Install Genesis Blocks instead of Atomic Blocks during one-click theme setup.
+* Updated one-click-theme-setup content to use Genesis Blocks.
+* Updated Editor and front-end styles for Genesis Blocks compatibility.
 
 ## [3.3.1] - 2020-08-17
 

diff --git a/config/onboarding-shared.php b/config/onboarding-shared.php
@@ -20,16 +20,6 @@
 			'slug'       => 'genesis-blocks/genesis-blocks.php',
 			'public_url' => 'https://wordpress.org/plugins/genesis-blocks/',
 		],
-		[
-			'name'       => __( 'Simple Social Icons', 'genesis-sample' ),
-			'slug'       => 'simple-social-icons/simple-social-icons.php',
-			'public_url' => 'https://wordpress.org/plugins/simple-social-icons/',
-		],
-		[
-			'name'       => __( 'Genesis eNews Extended (Third Party)', 'genesis-sample' ),
-			'slug'       => 'genesis-enews-extended/plugin.php',
-			'public_url' => 'https://wordpress.org/plugins/genesis-enews-extended/',
-		],
 		[
 			'name'       => __( 'WPForms Lite (Third Party)', 'genesis-sample' ),
 			'slug'       => 'wpforms-lite/wpforms.php',

diff --git a/languages/genesis-sample.pot b/languages/genesis-sample.pot
@@ -1,14 +1,14 @@
-# <!=Copyright (C) 2021 StudioPress
+# <!=Copyright (C) 2022 StudioPress
 # This file is distributed under the GPL-2.0-or-later.=!>
 msgid ""
 msgstr ""
-"Project-Id-Version: Genesis Sample 3.4.1\n"
+"Project-Id-Version: Genesis Sample 3.4.2\n"
 "Report-Msgid-Bugs-To: StudioPress <[email protected]>\n"
-"POT-Creation-Date: 2021-03-23 15:47:25+00:00\n"
+"POT-Creation-Date: 2022-12-16 17:31:21+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2021-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2022-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: en\n"
@@ -56,14 +56,6 @@ msgid "Genesis Blocks"
 msgstr ""
 
 #: config/onboarding-shared.php:24
-msgid "Simple Social Icons"
-msgstr ""
-
-#: config/onboarding-shared.php:29
-msgid "Genesis eNews Extended (Third Party)"
-msgstr ""
-
-#: config/onboarding-shared.php:34
 msgid "WPForms Lite (Third Party)"
 msgstr ""
 

diff --git a/lib/woocommerce/genesis-sample-woocommerce.css b/lib/woocommerce/genesis-sample-woocommerce.css
@@ -840,7 +840,7 @@ div.woocommerce-info.wc-memberships-restriction-message.wc-memberships-restricte
 
 @media only screen and (min-width: 860px) {
 
-	.full-width-content .woocommerce ul.products
+	.full-width-content .woocommerce ul.products,
 	.full-width-content.woocommerce ul.products {
 		justify-content: flex-start;
 	}

diff --git a/lib/wpforms.php b/lib/wpforms.php
@@ -24,14 +24,14 @@ function studiopress_maybe_create_wpforms_form() { // phpcs:ignore -- studiopres
 		return;
 	}
 
-	// Form creation requires WPForms 1.5.2 or higher.
+	// Form creation requires WPForms 1.7.6 or higher.
 	// If the site already as an earlier version of the plugin installed, don't create a form.
 	// Plugins do not get upgraded during one-click theme setup.
 	if ( function_exists( 'get_plugins' ) ) {
 		$plugin_data          = get_plugins();
 		$wpforms_lite_version = isset( $plugin_data['wpforms-lite/wpforms.php']['Version'] ) ? $plugin_data['wpforms-lite/wpforms.php']['Version'] : '';
 
-		if ( version_compare( $wpforms_lite_version, '1.5.2', '<' ) ) {
+		if ( version_compare( $wpforms_lite_version, '1.7.6', '<' ) ) {
 			return;
 		}
 	}
@@ -50,12 +50,12 @@ function studiopress_maybe_create_wpforms_form() { // phpcs:ignore -- studiopres
 		delete_option( 'genesis_onboarding_wpforms_id' );
 	}
 
-	// Creates a form using the WPForms 'contact' template.
+	// Creates a form using the WPForms 'simple-contact-form-template' template.
 	$new_form_id = wpforms()->form->add(
 		esc_html__( 'Simple Contact Form', 'genesis-sample' ),
 		[],
 		[
-			'template' => 'contact',
+			'template' => 'simple-contact-form-template',
 			'builder'  => false,
 		]
 	);