From 5d91945479035c63a8496d2b78886ec9e7d17d2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 16:52:45 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump stylelint from 15.10.3 to 15.11.0 Bumps [stylelint](https://github.com/stylelint/stylelint) from 15.10.3 to 15.11.0. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/15.10.3...15.11.0) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 139 ++++++++++++++++++++++++++++++++-------------- package.json | 2 +- 2 files changed, 97 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 14a4ec8a..baa541af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "newspack-scripts": "^5.1.0", "postcss-scss": "^4.0.9", "prettier": "npm:wp-prettier@^2.2.1-beta-1", - "stylelint": "^15.10.3" + "stylelint": "^15.11.0" } }, "node_modules/@automattic/babel-plugin-preserve-i18n": { @@ -8744,12 +8744,12 @@ } }, "node_modules/css-functions-list": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz", - "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", + "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", "dev": true, "engines": { - "node": ">=12.22" + "node": ">=12 || >=16" } }, "node_modules/css-loader": { @@ -11402,16 +11402,17 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=12.0.0" } }, "node_modules/flat-cache/node_modules/rimraf": { @@ -11430,9 +11431,9 @@ } }, "node_modules/flatted": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", - "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, "node_modules/for-each": { @@ -16125,6 +16126,12 @@ "node": ">=4" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -16254,6 +16261,15 @@ "node": ">=0.10.0" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -29443,9 +29459,9 @@ } }, "node_modules/stylelint": { - "version": "15.10.3", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz", - "integrity": "sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==", + "version": "15.11.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz", + "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", "dev": true, "dependencies": { "@csstools/css-parser-algorithms": "^2.3.1", @@ -29455,12 +29471,12 @@ "balanced-match": "^2.0.0", "colord": "^2.9.3", "cosmiconfig": "^8.2.0", - "css-functions-list": "^3.2.0", + "css-functions-list": "^3.2.1", "css-tree": "^2.3.1", "debug": "^4.3.4", "fast-glob": "^3.3.1", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^7.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", @@ -29469,13 +29485,13 @@ "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.28.0", + "known-css-properties": "^0.29.0", "mathml-tag-names": "^2.1.3", "meow": "^10.1.5", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.27", + "postcss": "^8.4.28", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", "postcss-selector-parser": "^6.0.13", @@ -29634,6 +29650,18 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "node_modules/stylelint/node_modules/file-entry-cache": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.1.tgz", + "integrity": "sha512-uLfFktPmRetVCbHe5UPuekWrQ6hENufnA46qEGbfACkK5drjTTdQYUragRgMjHldcbYG+nslUerqMPjbBSHXjQ==", + "dev": true, + "dependencies": { + "flat-cache": "^3.1.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/stylelint/node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -29740,9 +29768,9 @@ } }, "node_modules/stylelint/node_modules/known-css-properties": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.28.0.tgz", - "integrity": "sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==", + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", + "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", "dev": true }, "node_modules/stylelint/node_modules/locate-path": { @@ -38755,9 +38783,9 @@ } }, "css-functions-list": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz", - "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", + "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", "dev": true }, "css-loader": { @@ -40820,12 +40848,13 @@ } }, "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "requires": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "dependencies": { @@ -40841,9 +40870,9 @@ } }, "flatted": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", - "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, "for-each": { @@ -44422,6 +44451,12 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, + "json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -44525,6 +44560,15 @@ "integrity": "sha1-h75jSIZJy9ym9Tqzm+yczSNH9ZI=", "dev": true }, + "keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "requires": { + "json-buffer": "3.0.1" + } + }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -54516,9 +54560,9 @@ } }, "stylelint": { - "version": "15.10.3", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz", - "integrity": "sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==", + "version": "15.11.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz", + "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", "dev": true, "requires": { "@csstools/css-parser-algorithms": "^2.3.1", @@ -54528,12 +54572,12 @@ "balanced-match": "^2.0.0", "colord": "^2.9.3", "cosmiconfig": "^8.2.0", - "css-functions-list": "^3.2.0", + "css-functions-list": "^3.2.1", "css-tree": "^2.3.1", "debug": "^4.3.4", "fast-glob": "^3.3.1", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^7.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", @@ -54542,13 +54586,13 @@ "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.28.0", + "known-css-properties": "^0.29.0", "mathml-tag-names": "^2.1.3", "meow": "^10.1.5", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.27", + "postcss": "^8.4.28", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", "postcss-selector-parser": "^6.0.13", @@ -54634,6 +54678,15 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "file-entry-cache": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.1.tgz", + "integrity": "sha512-uLfFktPmRetVCbHe5UPuekWrQ6hENufnA46qEGbfACkK5drjTTdQYUragRgMjHldcbYG+nslUerqMPjbBSHXjQ==", + "dev": true, + "requires": { + "flat-cache": "^3.1.1" + } + }, "find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -54707,9 +54760,9 @@ } }, "known-css-properties": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.28.0.tgz", - "integrity": "sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==", + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", + "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", "dev": true }, "locate-path": { diff --git a/package.json b/package.json index 3e9c3f46..61cbbb86 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,6 @@ "newspack-scripts": "^5.1.0", "postcss-scss": "^4.0.9", "prettier": "npm:wp-prettier@^2.2.1-beta-1", - "stylelint": "^15.10.3" + "stylelint": "^15.11.0" } } From bef21e0babaf2590d28b75177e171397d68d4d4e Mon Sep 17 00:00:00 2001 From: Derrick Koo Date: Thu, 26 Oct 2023 04:12:07 -0600 Subject: [PATCH 2/3] feat: segmentation criteria for subscriptions and memberships (#1230) * feat: new criteria for subscriptions and memberships * fix: occasional PHP warning if get_post() returns null * refactor: restructure segmentation criteria sections --- includes/class-newspack-popups-inserter.php | 8 ++- src/criteria/default/index.php | 79 ++++++++++++++------- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/includes/class-newspack-popups-inserter.php b/includes/class-newspack-popups-inserter.php index bcd5e43f..1a145f04 100755 --- a/includes/class-newspack-popups-inserter.php +++ b/includes/class-newspack-popups-inserter.php @@ -460,8 +460,14 @@ private static function is_memberships_restricted( $post_id = null ) { * @param string $content The content of the post. */ public static function insert_popups_in_content( $content = '' ) { + $post = get_post(); + + if ( ! $post ) { + return $content; + } + $filtered_content = explode( "\n", $content ); - $post_content = explode( "\n", get_post()->post_content ); + $post_content = explode( "\n", $post->post_content ); if ( // Avoid duplicate execution. true === self::$the_content_has_rendered diff --git a/src/criteria/default/index.php b/src/criteria/default/index.php index 44d47355..cfbb5460 100644 --- a/src/criteria/default/index.php +++ b/src/criteria/default/index.php @@ -34,10 +34,29 @@ /** * Reader Activity. */ - 'newsletter' => [ - 'name' => __( 'Newsletter', 'newspack-popups' ), + 'user_account' => [ + 'name' => __( 'User Account', 'newspack-popups' ), 'category' => 'reader_activity', 'options' => [ + [ + 'label' => __( 'All users', 'newspack-popups' ), + 'value' => '', + ], + [ + 'label' => __( 'Has user account', 'newspack-popups' ), + 'value' => 'with-account', + ], + [ + 'label' => __( 'Does not have user account', 'newspack-popups' ), + 'value' => 'without-account', + ], + ], + ], + 'newsletter' => [ + 'name' => __( 'Newsletter', 'newspack-popups' ), + 'description' => __( 'Subscriber status based on any newsletter list.', 'newspack-popups' ), + 'category' => 'newsletter', + 'options' => [ [ 'label' => __( 'Subscribers and non-subscribers', 'newspack-popups' ), 'value' => '', @@ -54,22 +73,22 @@ ], 'subscribed_lists' => [ 'name' => __( 'Subscribed to newsletter lists', 'newspack-popups' ), - 'description' => __( 'Whether the reader subscribed to any of the selected newsletter lists', 'newspack-popups' ), - 'category' => 'reader_activity', + 'description' => __( 'If the reader is subscribed to any of the selected newsletter lists.', 'newspack-popups' ), + 'category' => 'newsletter', 'matching_function' => 'list__in', 'matching_attribute' => 'newsletter_subscribed_lists', ], 'not_subscribed_lists' => [ 'name' => __( 'Not subscribed to newsletter lists', 'newspack-popups' ), - 'description' => __( 'Whether the reader is not subscribed to any of the selected newsletter lists', 'newspack-popups' ), - 'category' => 'reader_activity', + 'description' => __( 'If the reader is NOT subscribed to any of the selected newsletter lists.', 'newspack-popups' ), + 'category' => 'newsletter', 'matching_function' => 'list__not_in', 'matching_attribute' => 'newsletter_subscribed_lists', ], 'donation' => [ 'name' => __( 'Donation', 'newspack-popups' ), - 'description' => __( '(if checkout happens on-site)', 'newspack-popups' ), - 'category' => 'reader_activity', + 'description' => __( 'If the reader has completed an onsite donation.', 'newspack-popups' ), + 'category' => 'reader_revenue', 'options' => [ [ 'label' => __( 'Donors and non-donors', 'newspack-popups' ), @@ -89,23 +108,33 @@ ], ], ], - 'user_account' => [ - 'name' => __( 'User Account', 'newspack-popups' ), - 'category' => 'reader_activity', - 'options' => [ - [ - 'label' => __( 'All users', 'newspack-popups' ), - 'value' => '', - ], - [ - 'label' => __( 'Has user account', 'newspack-popups' ), - 'value' => 'with-account', - ], - [ - 'label' => __( 'Does not have user account', 'newspack-popups' ), - 'value' => 'without-account', - ], - ], + 'active_subscriptions' => [ + 'name' => __( 'Has active subscription(s)', 'newspack-popups' ), + 'description' => __( 'If the reader is an active subscriber to non-donation products.', 'newspack-popups' ), + 'category' => 'reader_revenue', + 'matching_function' => 'list__in', + 'matching_attribute' => 'active_subscriptions', + ], + 'not_active_subscriptions' => [ + 'name' => __( 'Does not have active subscription(s)', 'newspack-popups' ), + 'description' => __( 'If the reader is NOT an active subscriber to non-donation products.', 'newspack-popups' ), + 'category' => 'reader_revenue', + 'matching_function' => 'list__not_in', + 'matching_attribute' => 'active_subscriptions', + ], + 'active_memberships' => [ + 'name' => __( 'Has active membership(s)', 'newspack-popups' ), + 'description' => __( 'If the reader is a member of membership plans.', 'newspack-popups' ), + 'category' => 'reader_revenue', + 'matching_function' => 'list__in', + 'matching_attribute' => 'active_memberships', + ], + 'not_active_memberships' => [ + 'name' => __( 'Does not have active membership(s)', 'newspack-popups' ), + 'description' => __( 'If the reader is NOT a member of membership plans.', 'newspack-popups' ), + 'category' => 'reader_revenue', + 'matching_function' => 'list__not_in', + 'matching_attribute' => 'active_memberships', ], /** * Referrer Sources. From f08c4545485f3ae68294352e16108e2958c0c02a Mon Sep 17 00:00:00 2001 From: matticbot Date: Tue, 31 Oct 2023 20:43:10 +0000 Subject: [PATCH 3/3] chore(release): 2.26.0-alpha.1 [skip ci] # [2.26.0-alpha.1](https://github.com/Automattic/newspack-popups/compare/v2.25.0...v2.26.0-alpha.1) (2023-10-31) ### Features * segmentation criteria for subscriptions and memberships ([#1230](https://github.com/Automattic/newspack-popups/issues/1230)) ([bef21e0](https://github.com/Automattic/newspack-popups/commit/bef21e0babaf2590d28b75177e171397d68d4d4e)) --- CHANGELOG.md | 7 +++++++ newspack-popups.php | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf5330a3..4ac63b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.26.0-alpha.1](https://github.com/Automattic/newspack-popups/compare/v2.25.0...v2.26.0-alpha.1) (2023-10-31) + + +### Features + +* segmentation criteria for subscriptions and memberships ([#1230](https://github.com/Automattic/newspack-popups/issues/1230)) ([bef21e0](https://github.com/Automattic/newspack-popups/commit/bef21e0babaf2590d28b75177e171397d68d4d4e)) + # [2.25.0](https://github.com/Automattic/newspack-popups/compare/v2.24.0...v2.25.0) (2023-10-31) diff --git a/newspack-popups.php b/newspack-popups.php index f176b01d..187745c5 100755 --- a/newspack-popups.php +++ b/newspack-popups.php @@ -7,7 +7,7 @@ * Author URI: https://newspack.com * Text Domain: newspack-popups * Domain Path: /languages - * Version: 2.25.0 + * Version: 2.26.0-alpha.1 * * @package Newspack_Popups */ diff --git a/package-lock.json b/package-lock.json index 6dcc48d8..48c5d70e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "newspack-popups", - "version": "2.25.0", + "version": "2.26.0-alpha.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "newspack-popups", - "version": "2.25.0", + "version": "2.26.0-alpha.1", "dependencies": { "classnames": "^2.3.2", "intersection-observer": "^0.12.2", diff --git a/package.json b/package.json index ef05bdec..70647496 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "newspack-popups", - "version": "2.25.0", + "version": "2.26.0-alpha.1", "main": "Gruntfile.js", "author": "Automattic", "scripts": {