Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into paid-newsletters
Browse files Browse the repository at this point in the history
  • Loading branch information
jeherve committed Jan 13, 2023
2 parents cb09219 + 90ea52f commit fa544f1
Show file tree
Hide file tree
Showing 308 changed files with 1,286 additions and 1,010 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,15 @@ jobs:

- name: Prepare plugin zips
id: prepare
env:
SHA: ${{ github.event.pull_request.head.sha || github.sha }}
run: |
mkdir work
mkdir zips
# Current version must compare greather than any previously used current version for this PR.
# Assume GH run IDs are monotonic.
VERSUFFIX="${GITHUB_RUN_ID}-g$(cd monorepo && git rev-parse --short HEAD)"
VERSUFFIX="${GITHUB_RUN_ID}-g${SHA:0:8}"
# Plugin data is passed as a JSON object.
PLUGIN_DATA="{}"
Expand Down Expand Up @@ -276,9 +278,10 @@ jobs:
SECRET: ${{ secrets.JPBETA_SECRET }}
PLUGIN_DATA: ${{ steps.prepare.outputs.plugin-data }}
PR: ${{ github.event.number }}
SHA: ${{ github.event.pull_request.head.sha || github.sha }}
run: |
curl -v --fail -L \
--url "https://betadownload.jetpack.me/gh-action.php?run_id=$GITHUB_RUN_ID&pr=$PR&commit=$GITHUB_SHA" \
--url "https://betadownload.jetpack.me/gh-action.php?run_id=$GITHUB_RUN_ID&pr=$PR&commit=$SHA" \
--form-string "repo=$GITHUB_REPOSITORY" \
--form-string "branch=${GITHUB_REF#refs/heads/}" \
--form-string "plugins=$PLUGIN_DATA" \
Expand Down
4 changes: 4 additions & 0 deletions docs/testing/regression-checklist/mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,9 @@
{
"regex": "extensions/blocks/",
"testFile": [ "extensions/blocks/checklist.md" ]
},
{
"regex": "^projects\/plugins\/jetpack\/extensions\/(blocks\/(subscriptions|premium-content)\/|shared\/memberships\.js)",
"testFile": [ "extensions/blocks/subscriptions.md" ]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#### Memberships

##### Post visibility

- [ ] Create a post with a post-level setting of "everybody" and verify the post and comments are visible in an incognito window
- [ ] Create a post with a post-level setting of "subscriber-only" and verify the post and comments are only visible to subscribers
- [ ] Create a post with a post-level setting of "paid-subscriber" and verify the post and comments are only only visible to paid subscribers
- [ ] Create a post with a post-level setting of "subscriber" and verify an existing subscriber receives a valid OTP code when their email is entered in the subscribe field


##### Premium Content

- [ ] Add a new payment plan from the premium content block settings
- [ ] Publish a post with subscriber and guest content then verify only subscribers can view content
79 changes: 20 additions & 59 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.20] - 2023-01-11
### Changed
- Updated package dependencies. [#28127]

## [1.0.19] - 2022-12-02
### Changed
- Updated package dependencies. [#27697]
Expand Down Expand Up @@ -90,6 +94,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Initial release.
- Replace missing domains too.

[1.0.20]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.19...v1.0.20
[1.0.19]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.18...v1.0.19
[1.0.18]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.17...v1.0.18
[1.0.17]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.16...v1.0.17
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/babel-plugin-replace-textdomain",
"version": "1.0.20-alpha",
"version": "1.0.20",
"description": "A Babel plugin to replace the textdomain in gettext-style function calls.",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/babel-plugin-replace-textdomain/#readme",
"bugs": {
Expand Down
4 changes: 4 additions & 0 deletions projects/js-packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

### This is a list detailing changes for the Jetpack RNA Components package releases.

## 0.26.5 - 2023-01-11
### Changed
- Updated package dependencies.

## 0.26.4 - 2022-12-19
### Added
- Add Jetpack VaultPress Backup Logo [#27802]
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion projects/js-packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/jetpack-components",
"version": "0.26.5-alpha",
"version": "0.26.5",
"description": "Jetpack Components Package",
"author": "Automattic",
"license": "GPL-2.0-or-later",
Expand Down
4 changes: 4 additions & 0 deletions projects/js-packages/config/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.1.17 - 2023-01-11
### Fixed
- Config: Metro JS cannot resolve `./src/index.sj` without adding the path as the `main` property in package.json [#28154]

## 0.1.16 - 2022-11-28
### Changed
- Updated package dependencies. [#27576]
Expand Down
5 changes: 0 additions & 5 deletions projects/js-packages/config/changelog/fix-react-native-build

This file was deleted.

2 changes: 1 addition & 1 deletion projects/js-packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-config",
"version": "0.1.17-alpha",
"version": "0.1.17",
"description": "Handles Jetpack global configuration shared across all packages",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/config/#readme",
"bugs": {
Expand Down
7 changes: 7 additions & 0 deletions projects/js-packages/connection/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

### This is a list detailing changes for the Jetpack RNA Connection Component releases.

## 0.24.5 - 2023-01-11
### Changed
- Updated package dependencies.

### Fixed
- Connection: Metro JS is unable to build the component SCSS files. Adding a native index file to only export the modules required for the mobile editor build. [#28154]

## 0.24.4 - 2023-01-02
### Fixed
- Connection: Fix box-sizing layout issue on Manage Connection modal [#28101]
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion projects/js-packages/connection/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/jetpack-connection",
"version": "0.24.5-alpha",
"version": "0.24.5",
"description": "Jetpack Connection Component",
"author": "Automattic",
"license": "GPL-2.0-or-later",
Expand Down
5 changes: 5 additions & 0 deletions projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.25] - 2023-01-11
### Changed
- Updated package dependencies. [#28127]

## [1.0.24] - 2022-12-02
### Changed
- Updated package dependencies. [#27576]
Expand Down Expand Up @@ -121,6 +125,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Initial release.

[1.0.25]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.24...v1.0.25
[1.0.24]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.23...v1.0.24
[1.0.23]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.22...v1.0.23
[1.0.22]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.21...v1.0.22
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/i18n-check-webpack-plugin",
"version": "1.0.25-alpha",
"version": "1.0.25",
"description": "A Webpack plugin to check that WordPress i18n hasn't been mangled by Webpack optimizations.",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/i18n-check-webpack-plugin/#readme",
"bugs": {
Expand Down
Loading

0 comments on commit fa544f1

Please sign in to comment.