Skip to content

Commit fdca52b

Browse files
matticbotmatticbot
committed
chore(release): merge in release v6.30.0
2 parents 3eeb881 + bf9e9ee commit fdca52b

12 files changed

Lines changed: 215 additions & 149 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎.github/workflows/auto-merge.yml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
on:
22
pull_request_target:
3-
types: [labeled]
43

54
name: Dependabot auto-merge
65
jobs:
76
auto-merge:
87
name: Auto-merge dependabot PRs for minor and patch updates
98
runs-on: ubuntu-latest
10-
if: |
11-
contains( github.event.pull_request.labels.*.name, 'dependencies' )
12-
&& ! contains( github.event.pull_request.labels.*.name, '[Status] Approved' )
9+
if: github.actor == 'dependabot[bot]'
10+
permissions:
11+
contents: write
12+
pull-requests: write
1313
steps:
14-
- uses: actions/checkout@v2
15-
- uses: ahmadnassri/action-dependabot-auto-merge@v2
14+
- name: Fetch Dependabot metadata
15+
id: metadata
16+
uses: dependabot/fetch-metadata@v2
1617
with:
17-
target: minor # includes patch updates.
18-
github-token: ${{ secrets.DEPENDABOT_TOKEN }}
18+
github-token: "${{ secrets.GITHUB_TOKEN }}"
19+
20+
- name: Enable auto-merge for minor and patch updates
21+
if: steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'
22+
run: gh pr merge --auto --squash "$PR_URL"
23+
env:
24+
PR_URL: ${{ github.event.pull_request.html_url }}
25+
GH_TOKEN: ${{ secrets.DEPENDABOT_TOKEN }}

‎.github/workflows/build-and-test.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Build and Test
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- trunk
8+
- release
9+
- alpha
10+
- 'hotfix/**'
11+
- 'epic/**'
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
build:
19+
uses: Automattic/newspack-scripts/.github/workflows/reusable-build.yml@trunk
20+
21+
lint-js-scss:
22+
needs: build
23+
uses: Automattic/newspack-scripts/.github/workflows/reusable-lint-js-scss.yml@trunk
24+
25+
test-js:
26+
needs: build
27+
uses: Automattic/newspack-scripts/.github/workflows/reusable-test-js.yml@trunk

‎.github/workflows/build-distributable.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Build distributable
2+
3+
on:
4+
pull_request:
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: true
9+
10+
jobs:
11+
build-distributable:
12+
uses: Automattic/newspack-scripts/.github/workflows/reusable-build-distributable.yml@trunk
13+
with:
14+
archive-name: newspack-plugin

‎.github/workflows/i18n.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Internationalization
2+
3+
on:
4+
push:
5+
branches:
6+
- trunk
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
i18n:
14+
uses: Automattic/newspack-scripts/.github/workflows/reusable-i18n.yml@trunk
15+
secrets:
16+
GIT_COMMITTER_TOKEN: ${{ secrets.GIT_COMMITTER_TOKEN }}

‎.github/workflows/php.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: PHP
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- trunk
8+
- release
9+
- alpha
10+
- 'hotfix/**'
11+
- 'epic/**'
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
lint-php:
19+
uses: Automattic/newspack-scripts/.github/workflows/reusable-lint-php.yml@trunk
20+
21+
test-php:
22+
uses: Automattic/newspack-scripts/.github/workflows/reusable-test-php.yml@trunk

‎.github/workflows/release.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- release
7+
- alpha
8+
- 'hotfix/**'
9+
- 'epic/**'
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
build:
17+
uses: Automattic/newspack-scripts/.github/workflows/reusable-build.yml@trunk
18+
19+
release:
20+
needs: build
21+
uses: Automattic/newspack-scripts/.github/workflows/reusable-release.yml@trunk
22+
secrets:
23+
GIT_COMMITTER_TOKEN: ${{ secrets.GIT_COMMITTER_TOKEN }}
24+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
25+
26+
post-release:
27+
if: github.ref == 'refs/heads/release'
28+
needs: release
29+
uses: Automattic/newspack-scripts/.github/workflows/reusable-post-release.yml@trunk
30+
secrets:
31+
GIT_COMMITTER_TOKEN: ${{ secrets.GIT_COMMITTER_TOKEN }}
32+
SLACK_CHANNEL_ID: ${{ secrets.SLACK_CHANNEL_ID }}
33+
SLACK_AUTH_TOKEN: ${{ secrets.SLACK_AUTH_TOKEN }}

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [6.30.1](https://github.com/Automattic/newspack-plugin/compare/v6.30.0...v6.30.1) (2026-02-05)
2+
3+
4+
### Bug Fixes
5+
6+
* **my-account:** teams for memberships navigation ([#4457](https://github.com/Automattic/newspack-plugin/issues/4457)) ([e776e4d](https://github.com/Automattic/newspack-plugin/commit/e776e4d641942491ce692e20da6fb21380530278))
7+
18
# [6.30.0](https://github.com/Automattic/newspack-plugin/compare/v6.29.5...v6.30.0) (2026-02-02)
29

310

‎includes/plugins/woocommerce/my-account/templates/v1/navigation.php‎

Lines changed: 55 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@
2323
break;
2424
}
2525
}
26+
27+
// Teams for WooCommerce Memberships.
28+
$is_teams_area_page = false;
29+
$team = null;
30+
$teams_area_sections = [];
31+
if ( function_exists( 'wc_memberships_for_teams' ) ) {
32+
$teams_area = wc_memberships_for_teams()->get_frontend_instance()->get_teams_area_instance();
33+
$is_teams_area_page = $teams_area->is_teams_area();
34+
$team = $teams_area->get_teams_area_team();
35+
$teams_area_sections = $teams_area->get_teams_area_navigation_items( $team );
36+
}
2637
?>
2738

2839
<div class="newspack-my-account__navigation-topbar">
@@ -44,31 +55,53 @@
4455
</a>
4556
<?php endif; ?>
4657

47-
<a href="<?php echo esc_url( home_url( '/' ) ); ?>" class="newspack-my-account__home-link newspack-ui__button newspack-ui__button--small newspack-ui__button--ghost-light">
48-
<?php Newspack_UI_Icons::print_svg( 'chevronLeft' ); ?>
49-
<?php _e( 'Back to Homepage', 'newspack-plugin' ); ?>
50-
</a>
51-
52-
<ul>
53-
<?php
54-
// Check if viewing a single subscription page.
55-
$is_viewing_single_subscription = false;
56-
if ( function_exists( 'is_wc_endpoint_url' ) && is_wc_endpoint_url( 'view-subscription' ) ) {
57-
$is_viewing_single_subscription = true;
58-
}
58+
<?php
59+
if ( $team ) :
60+
$back_section = array_shift( $teams_area_sections );
5961
?>
60-
<?php foreach ( wc_get_account_menu_items() as $endpoint => $label ) : ?>
62+
<a href="<?php echo esc_url( $back_section['url'] ); ?>" class="newspack-my-account__home-link newspack-ui__button newspack-ui__button--small newspack-ui__button--ghost-light">
63+
<?php Newspack_UI_Icons::print_svg( 'chevronLeft' ); ?>
64+
<?php echo esc_html( $back_section['label'] ); ?>
65+
</a>
66+
<ul>
6167
<?php
62-
// Highlight subscriptions menu item if viewing a single subscription.
63-
$is_current_item = wc_is_current_account_menu_item( $endpoint ) || ( $is_viewing_single_subscription && 'subscriptions' === $endpoint );
68+
foreach ( $teams_area_sections as $section_id => $section_data ) :
69+
$classes = wc_get_account_menu_item_classes( $section_id ) . ' ' . $section_data['class'];
70+
$is_current_item = strpos( $classes, 'is-active' ) !== false;
71+
?>
72+
<li class="<?php echo esc_attr( $classes ); ?>">
73+
<a href="<?php echo esc_url( $section_data['url'] ); ?>" class="newspack-ui__button newspack-ui__button--small <?php echo $is_current_item ? 'newspack-ui__button--accent' : 'newspack-ui__button--ghost'; ?>">
74+
<?php echo esc_html( $section_data['label'] ); ?>
75+
</a>
76+
</li>
77+
<?php endforeach; ?>
78+
</ul>
79+
<?php else : ?>
80+
<a href="<?php echo esc_url( home_url( '/' ) ); ?>" class="newspack-my-account__home-link newspack-ui__button newspack-ui__button--small newspack-ui__button--ghost-light">
81+
<?php Newspack_UI_Icons::print_svg( 'chevronLeft' ); ?>
82+
<?php _e( 'Back to Homepage', 'newspack-plugin' ); ?>
83+
</a>
84+
<ul>
85+
<?php
86+
// Check if viewing a single subscription page.
87+
$is_viewing_single_subscription = false;
88+
if ( function_exists( 'is_wc_endpoint_url' ) && is_wc_endpoint_url( 'view-subscription' ) ) {
89+
$is_viewing_single_subscription = true;
90+
}
6491
?>
65-
<li class="<?php echo esc_attr( wc_get_account_menu_item_classes( $endpoint ) ); ?>">
66-
<a href="<?php echo esc_url( wc_get_account_endpoint_url( $endpoint ) ); ?>" <?php echo $is_current_item ? 'aria-current="page"' : ''; ?> class="newspack-ui__button newspack-ui__button--small <?php echo $is_current_item ? 'newspack-ui__button--accent' : 'newspack-ui__button--ghost'; ?>">
67-
<?php echo esc_html( $label ); ?>
68-
</a>
69-
</li>
70-
<?php endforeach; ?>
71-
</ul>
92+
<?php foreach ( $account_menu_items as $endpoint => $label ) : ?>
93+
<?php
94+
// Highlight subscriptions menu item if viewing a single subscription.
95+
$is_current_item = wc_is_current_account_menu_item( $endpoint ) || ( $is_viewing_single_subscription && 'subscriptions' === $endpoint );
96+
?>
97+
<li class="<?php echo esc_attr( wc_get_account_menu_item_classes( $endpoint ) ); ?>">
98+
<a href="<?php echo esc_url( wc_get_account_endpoint_url( $endpoint ) ); ?>" <?php echo $is_current_item ? 'aria-current="page"' : ''; ?> class="newspack-ui__button newspack-ui__button--small <?php echo $is_current_item ? 'newspack-ui__button--accent' : 'newspack-ui__button--ghost'; ?>">
99+
<?php echo esc_html( $label ); ?>
100+
</a>
101+
</li>
102+
<?php endforeach; ?>
103+
</ul>
104+
<?php endif; ?>
72105
</div>
73106

74107
<div class="newspack-my-account__navigation-footer">

‎newspack.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Plugin Name: Newspack
44
* Description: An advanced open-source publishing and revenue-generating platform for news organizations.
5-
* Version: 6.30.0
5+
* Version: 6.30.1
66
* Author: Automattic
77
* Author URI: https://newspack.com/
88
* License: GPL2
@@ -14,7 +14,7 @@
1414

1515
defined( 'ABSPATH' ) || exit;
1616

17-
define( 'NEWSPACK_PLUGIN_VERSION', '6.30.0' );
17+
define( 'NEWSPACK_PLUGIN_VERSION', '6.30.1' );
1818

1919
// Define NEWSPACK_PLUGIN_FILE.
2020
if ( ! defined( 'NEWSPACK_PLUGIN_FILE' ) ) {

0 commit comments

Comments
 (0)