Skip to content

chore: update dependencies (oct 2025) #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkoo merged 6 commits into from
Nov 3, 2025
Merged

chore: update dependencies (oct 2025) #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38c2fc2
chore: update dependencies (oct 2025)
dkoo Oct 30, 2025
d736b9a
chore: fix JS for linters
dkoo Oct 30, 2025
35e6d27
chore: remove --legacy-peer-deps
dkoo Oct 30, 2025
cc22ae8
chore: remove ignoreFiles from .stylelintrc.js (moved to newspack-scr…
dkoo Oct 31, 2025
5b0ab82
chore: redirect to Plugin settings if available; fix standalone page …
dkoo Oct 31, 2025
2e31586
chore: bump newspack packages
dkoo Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require( '@rushstack/eslint-patch/modern-module-resolution' );

module.exports = {
extends: [ './node_modules/newspack-scripts/config/eslintrc.js' ],
extends: [ './node_modules/newspack-scripts/.eslintrc.js' ],
ignorePatterns: [ 'dist/', 'node_modules/' ],
rules: {
'no-nested-ternary': 'off',
Expand Down
6 changes: 0 additions & 6 deletions .stylelintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
module.exports = {
ignoreFiles: [
'dist/**',
'node_modules/**',
'release/**',
'scripts/**',
],
extends: [ './node_modules/newspack-scripts/config/stylelint.config.js' ],
};
3 changes: 2 additions & 1 deletion includes/admin/class-post-primary-brand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ public static function enqueue_scripts() {
filemtime( NEWSPACK_MULTIBRANDED_SITE_PLUGIN_DIR . '/dist/postPrimaryBrand.js' )
);

$page_slug = class_exists( 'Newspack\Newspack' ) ? 'newspack-settings#/additional-brands' : Admin::MULTI_BRANDED_PAGE_SLUG;
wp_localize_script(
'newspack-post-primary-brand',
'newspackPostPrimaryBrandVars',
array(
'adminURL' => admin_url( 'admin.php?page=' . Admin::MULTI_BRANDED_PAGE_SLUG ),
'adminURL' => admin_url( 'admin.php?page=' . $page_slug ),
'taxonomySlug' => Taxonomy::SLUG,
'metaKey' => Taxonomy::PRIMARY_META_KEY,
'postTypesWithPrimaryBrand' => Meta::get_post_types(),
Expand Down
55 changes: 32 additions & 23 deletions includes/class-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,42 @@ public static function init() {
}

/**
* Adds the admin page
* Redirects the admin page to the Newspack settings page if Newspack plugin is installed.
*
* @return void
*/
public static function redirect_admin_page() {
global $pagenow;
if ( class_exists( 'Newspack\Newspack' ) && 'admin.php' === $pagenow && isset( $_GET['page'] ) && 0 === strpos( wp_unslash( $_GET['page'] ), self::MULTI_BRANDED_PAGE_SLUG ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
wp_safe_redirect( admin_url( 'admin.php?page=newspack-settings#/additional-brands' ) );
exit;
}
}

/**
* Add or redirect the admin page.
*
* @return void
*/
public static function add_admin_menu() {
// If using with the Newspack plugin, redirect to the Newspack settings page.
if ( class_exists( 'Newspack\Newspack' ) ) {
$page_suffix = add_submenu_page(
'newspack',
__( 'Multibranded site', 'newspack-multibranded-site' ),
__( 'Multibranded site', 'newspack-multibranded-site' ),
'manage_options',
self::MULTI_BRANDED_PAGE_SLUG,
array( __CLASS__, 'render_page' )
);
} else {
$icon = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjE4cHgiIGhlaWdodD0iNjE4cHgiIHZpZXdCb3g9IjAgMCA2MTggNjE4IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPHBhdGggZD0iTTMwOSwwIEM0NzkuNjU2NDk1LDAgNjE4LDEzOC4zNDQyOTMgNjE4LDMwOS4wMDE3NTkgQzYxOCw0NzkuNjU5MjI2IDQ3OS42NTY0OTUsNjE4IDMwOSw2MTggQzEzOC4zNDM1MDUsNjE4IDAsNDc5LjY1OTIyNiAwLDMwOS4wMDE3NTkgQzAsMTM4LjM0NDI5MyAxMzguMzQzNTA1LDAgMzA5LDAgWiBNMTc0LDE3MSBMMTc0LDI2Mi42NzEzNTYgTDE3NS4zMDUsMjY0IEwxNzQsMjY0IEwxNzQsNDQ2IEwyNDEsNDQ2IEwyNDEsMzMwLjkxMyBMMzUzLjk5Mjk2Miw0NDYgTDQ0NCw0NDYgTDE3NCwxNzEgWiBNNDQ0LDI5OSBMMzg5LDI5OSBMNDEwLjQ3NzYxLDMyMSBMNDQ0LDMyMSBMNDQ0LDI5OSBaIE00NDQsMjM1IEwzMjcsMjM1IEwzNDguMjQ1OTE5LDI1NyBMNDQ0LDI1NyBMNDQ0LDIzNSBaIE00NDQsMTcxIEwyNjQsMTcxIEwyODUuMjkwNTEyLDE5MyBMNDQ0LDE5MyBMNDQ0LDE3MSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiIGZpbGw9IiMyQTdERTEiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+';
$page_suffix = add_menu_page(
__( 'Multibranded site', 'newspack-multibranded-site' ),
__( 'Multibranded site', 'newspack-multibranded-site' ),
'manage_options',
self::MULTI_BRANDED_PAGE_SLUG,
array( __CLASS__, 'render_page' ),
$icon
);
self::redirect_admin_page();
return;
}

add_action( 'load-' . $page_suffix, array( __CLASS__, 'admin_init' ) );
// Otherwise, add the standalone admin page.
$icon = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjE4cHgiIGhlaWdodD0iNjE4cHgiIHZpZXdCb3g9IjAgMCA2MTggNjE4IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPHBhdGggZD0iTTMwOSwwIEM0NzkuNjU2NDk1LDAgNjE4LDEzOC4zNDQyOTMgNjE4LDMwOS4wMDE3NTkgQzYxOCw0NzkuNjU5MjI2IDQ3OS42NTY0OTUsNjE4IDMwOSw2MTggQzEzOC4zNDM1MDUsNjE4IDAsNDc5LjY1OTIyNiAwLDMwOS4wMDE3NTkgQzAsMTM4LjM0NDI5MyAxMzguMzQzNTA1LDAgMzA5LDAgWiBNMTc0LDE3MSBMMTc0LDI2Mi42NzEzNTYgTDE3NS4zMDUsMjY0IEwxNzQsMjY0IEwxNzQsNDQ2IEwyNDEsNDQ2IEwyNDEsMzMwLjkxMyBMMzUzLjk5Mjk2Miw0NDYgTDQ0NCw0NDYgTDE3NCwxNzEgWiBNNDQ0LDI5OSBMMzg5LDI5OSBMNDEwLjQ3NzYxLDMyMSBMNDQ0LDMyMSBMNDQ0LDI5OSBaIE00NDQsMjM1IEwzMjcsMjM1IEwzNDguMjQ1OTE5LDI1NyBMNDQ0LDI1NyBMNDQ0LDIzNSBaIE00NDQsMTcxIEwyNjQsMTcxIEwyODUuMjkwNTEyLDE5MyBMNDQ0LDE5MyBMNDQ0LDE3MSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiIGZpbGw9IiMyQTdERTEiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+';
$page_suffix = add_menu_page(
__( 'Multibranded site', 'newspack-multibranded-site' ),
__( 'Multibranded site', 'newspack-multibranded-site' ),
'manage_options',
self::MULTI_BRANDED_PAGE_SLUG,
array( __CLASS__, 'render_page' ),
$icon
);

add_action( 'load-' . $page_suffix, array( __CLASS__, 'admin_init' ) );
}

/**
Expand Down Expand Up @@ -116,7 +125,7 @@ public static function enqueue_scripts( $handler ) {
);

$menus = array_map(
function( $menu ) {
function ( $menu ) {
return array(
'value' => $menu->term_id,
'label' => $menu->name,
Expand All @@ -135,10 +144,10 @@ function( $menu ) {
wp_localize_script(
self::MULTI_BRANDED_PAGE_SLUG,
'newspack_urls',
[
array(
'dashboard' => esc_url( admin_url( 'admin.php?page=' . self::MULTI_BRANDED_PAGE_SLUG ) ),
'support' => esc_url( 'https://help.newspack.com/' ),
]
)
);
wp_localize_script( self::MULTI_BRANDED_PAGE_SLUG, 'newspack_aux_data', $aux_data );

Expand Down
Loading