From ef84f40eb7db12300c75d27bb1b0468d6971f1be Mon Sep 17 00:00:00 2001 From: Christian Gastrell Date: Wed, 20 May 2026 11:46:44 -0300 Subject: [PATCH 1/2] Newsletter: Drop dead admin-ui build-style import; pin admin-ui 2.1.0 --- pnpm-lock.yaml | 104 ++++++++++++++++-- .../fix-newsletter-admin-ui-scss-import | 4 + projects/packages/newsletter/package.json | 2 +- .../newsletter/routes/dashboard/route.scss | 3 +- 4 files changed, 103 insertions(+), 10 deletions(-) create mode 100644 projects/packages/newsletter/changelog/fix-newsletter-admin-ui-scss-import diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e45f29a824fb..67f10f6ba2b9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3351,8 +3351,8 @@ importers: specifier: 5.90.8 version: 5.90.8(react@18.3.1) '@wordpress/admin-ui': - specifier: 1.12.0 - version: 1.12.0(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 2.1.0 + version: 2.1.0(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/api-fetch': specifier: 7.46.0 version: 7.46.0 @@ -10257,16 +10257,32 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/project-service@8.59.2': + resolution: {integrity: sha512-+2hqvEkeyf/0FBor67duF0Ll7Ot8jyKzDQOSrxazF/danillRq2DwR9dLptsXpoZQqxE1UisSmoZewrlPas9Vw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/project-service@8.59.4': resolution: {integrity: sha512-Ly00Vu4oAacfDeHp2Zg85ioNG6l8HG+tN1D7J+xTHSxu9y0awYKJ2zH1rFBn8ZSfuGK+7FxK3Cgl3uAz0aZZLg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/scope-manager@8.59.2': + resolution: {integrity: sha512-JzfyEpEtOU89CcFSwyNS3mu4MLvLSXqnmX05+aKBDM+TdR5jzcGOEBwxwGNxrEQ7p/z6kK2WyioCGBf2zZBnvg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/scope-manager@8.59.4': resolution: {integrity: sha512-mUeR/3H1WrTAddJrwut8OoPjfauaztMQmRwV5fQTUyNVJCLiUXXe4lGEyYIL2oFDpP7UtgbGJXCt72wT0z2S3Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/tsconfig-utils@8.59.2': + resolution: {integrity: sha512-BKK4alN7oi4C/zv4VqHQ+uRU+lTa6JGIZ7s1juw7b3RHo9OfKB+bKX3u0iVZetdsUCBBkSbdWbarJbmN0fTeSw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/tsconfig-utils@8.59.4': resolution: {integrity: sha512-DLCpnKgD4alVxTBSKulK+gU1KCqOgUXfDRDXh2mZgzokQKa/70ax93I2uVO3m/LLvIAtWZIFoiifudmIqAxpMA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -10280,16 +10296,33 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/types@8.59.2': + resolution: {integrity: sha512-e82GVOE8Ps3E++Egvb6Y3Dw0S10u8NkQ9KXmtRhCWJJ8kDhOJTvtMAWnFL16kB1583goCWXsr0NieKCZMs2/0Q==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/types@8.59.4': resolution: {integrity: sha512-F1o7WJcCq+bc8dwcO/YsSEOudAH8RDtaOhM6wcAQhcUsFhnWQl81JKy48q1hoxAU0qrzM89+31GYh1515Zde3Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/typescript-estree@8.59.2': + resolution: {integrity: sha512-o0XPGNwcWw+FIwStOWn+BwBuEmL6QXP0rsvAFg7ET1dey1Nr6Wb1ac8p5HEsK0ygO/6mUxlk+YWQD9xcb/nnXg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/typescript-estree@8.59.4': resolution: {integrity: sha512-F+RuOmcDXo4+TPdfd/TCLS3m2nw8gE9XXyZLrA3JBfaA5tz9TtdkyD3YJFmPxulyc2cKbEok/CvFE3MgSLWnag==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/utils@8.59.2': + resolution: {integrity: sha512-Juw3EinkXqjaffxz6roowvV7GZT/kET5vSKKZT6upl5TXdWkLkYmNPXwDDL2Vkt2DPn0nODIS4egC/0AGxKo/Q==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 + typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/utils@8.59.4': resolution: {integrity: sha512-cYXeNAUsG4lJo5dbc1FcKm+JwIWrj1/UpTORsC6tGMjEZ81DYcvIr9/ueikhMa/Y/gDQYGp+YX9/xQrXje5BJw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -10297,6 +10330,10 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/visitor-keys@8.59.2': + resolution: {integrity: sha512-NwjLUnGy8/Zfx23fl50tRC8rYaYnM52xNRYFAXvmiil9yh1+K6aRVQMnzW6gQB/1DLgWt977lYQn7C+wtgXZiA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/visitor-keys@8.59.4': resolution: {integrity: sha512-U3gxVaDVnuZKhSspW/MzMxE1kq7zOdc072FcSNoqA1I9p8HyKbBFfEHoWckBAMgNMph4MamwS5iTVzFmrnt8TQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -20098,7 +20135,7 @@ snapshots: '@es-joy/jsdoccomment@0.86.0': dependencies: '@types/estree': 1.0.9 - '@typescript-eslint/types': 8.59.4 + '@typescript-eslint/types': 8.59.2 comment-parser: 1.4.6 esquery: 1.7.0 jsdoc-type-pratt-parser: 7.2.0 @@ -22480,7 +22517,7 @@ snapshots: '@tanstack/eslint-plugin-query@5.91.2(eslint@9.39.4)(typescript@5.9.3)': dependencies: - '@typescript-eslint/utils': 8.59.4(eslint@9.39.4)(typescript@5.9.3) + '@typescript-eslint/utils': 8.59.2(eslint@9.39.4)(typescript@5.9.3) eslint: 9.39.4 transitivePeerDependencies: - supports-color @@ -22972,6 +23009,15 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/project-service@8.59.2(typescript@5.9.3)': + dependencies: + '@typescript-eslint/tsconfig-utils': 8.59.2(typescript@5.9.3) + '@typescript-eslint/types': 8.59.2 + debug: 4.4.3 + typescript: 5.9.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/project-service@8.59.4(typescript@5.9.3)': dependencies: '@typescript-eslint/tsconfig-utils': 8.59.4(typescript@5.9.3) @@ -22981,11 +23027,20 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/scope-manager@8.59.2': + dependencies: + '@typescript-eslint/types': 8.59.2 + '@typescript-eslint/visitor-keys': 8.59.2 + '@typescript-eslint/scope-manager@8.59.4': dependencies: '@typescript-eslint/types': 8.59.4 '@typescript-eslint/visitor-keys': 8.59.4 + '@typescript-eslint/tsconfig-utils@8.59.2(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 + '@typescript-eslint/tsconfig-utils@8.59.4(typescript@5.9.3)': dependencies: typescript: 5.9.3 @@ -23002,8 +23057,25 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/types@8.59.2': {} + '@typescript-eslint/types@8.59.4': {} + '@typescript-eslint/typescript-estree@8.59.2(typescript@5.9.3)': + dependencies: + '@typescript-eslint/project-service': 8.59.2(typescript@5.9.3) + '@typescript-eslint/tsconfig-utils': 8.59.2(typescript@5.9.3) + '@typescript-eslint/types': 8.59.2 + '@typescript-eslint/visitor-keys': 8.59.2 + debug: 4.4.3 + minimatch: 10.2.4 + semver: 7.7.3 + tinyglobby: 0.2.16 + ts-api-utils: 2.5.0(typescript@5.9.3) + typescript: 5.9.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/typescript-estree@8.59.4(typescript@5.9.3)': dependencies: '@typescript-eslint/project-service': 8.59.4(typescript@5.9.3) @@ -23019,6 +23091,17 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/utils@8.59.2(eslint@9.39.4)(typescript@5.9.3)': + dependencies: + '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4) + '@typescript-eslint/scope-manager': 8.59.2 + '@typescript-eslint/types': 8.59.2 + '@typescript-eslint/typescript-estree': 8.59.2(typescript@5.9.3) + eslint: 9.39.4 + typescript: 5.9.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/utils@8.59.4(eslint@9.39.4)(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4) @@ -23030,6 +23113,11 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/visitor-keys@8.59.2': + dependencies: + '@typescript-eslint/types': 8.59.2 + eslint-visitor-keys: 5.0.1 + '@typescript-eslint/visitor-keys@8.59.4': dependencies: '@typescript-eslint/types': 8.59.4 @@ -28427,7 +28515,7 @@ snapshots: eslint-plugin-jest@29.15.2(eslint@9.39.4)(jest@30.4.2)(typescript@5.9.3): dependencies: - '@typescript-eslint/utils': 8.59.4(eslint@9.39.4)(typescript@5.9.3) + '@typescript-eslint/utils': 8.59.2(eslint@9.39.4)(typescript@5.9.3) eslint: 9.39.4 optionalDependencies: jest: 30.4.2 @@ -28560,7 +28648,7 @@ snapshots: eslint-plugin-storybook@10.3.6(eslint@9.39.4)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(wp-prettier@3.0.3))(typescript@5.9.3): dependencies: - '@typescript-eslint/utils': 8.59.4(eslint@9.39.4)(typescript@5.9.3) + '@typescript-eslint/utils': 8.59.2(eslint@9.39.4)(typescript@5.9.3) eslint: 9.39.4 storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(wp-prettier@3.0.3) transitivePeerDependencies: @@ -28587,8 +28675,8 @@ snapshots: eslint-plugin-testing-library@7.16.2(eslint@9.39.4)(typescript@5.9.3): dependencies: - '@typescript-eslint/scope-manager': 8.59.4 - '@typescript-eslint/utils': 8.59.4(eslint@9.39.4)(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.59.2 + '@typescript-eslint/utils': 8.59.2(eslint@9.39.4)(typescript@5.9.3) eslint: 9.39.4 transitivePeerDependencies: - supports-color diff --git a/projects/packages/newsletter/changelog/fix-newsletter-admin-ui-scss-import b/projects/packages/newsletter/changelog/fix-newsletter-admin-ui-scss-import new file mode 100644 index 000000000000..3e5024acd6be --- /dev/null +++ b/projects/packages/newsletter/changelog/fix-newsletter-admin-ui-scss-import @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Drop dead @wordpress/admin-ui build-style import that no longer exists in 2.x; bump the package's admin-ui pin to 2.1.0. diff --git a/projects/packages/newsletter/package.json b/projects/packages/newsletter/package.json index cf07f0d05b95..993928035aa5 100644 --- a/projects/packages/newsletter/package.json +++ b/projects/packages/newsletter/package.json @@ -45,7 +45,7 @@ "@automattic/jetpack-script-data": "workspace:*", "@automattic/jetpack-shared-extension-utils": "workspace:*", "@tanstack/react-query": "5.90.8", - "@wordpress/admin-ui": "1.12.0", + "@wordpress/admin-ui": "2.1.0", "@wordpress/api-fetch": "7.46.0", "@wordpress/base-styles": "8.0.0", "@wordpress/components": "33.1.0", diff --git a/projects/packages/newsletter/routes/dashboard/route.scss b/projects/packages/newsletter/routes/dashboard/route.scss index a0a2d83932f6..bac2ce4389c7 100644 --- a/projects/packages/newsletter/routes/dashboard/route.scss +++ b/projects/packages/newsletter/routes/dashboard/route.scss @@ -1,5 +1,6 @@ @use "sass:meta"; -@include meta.load-css("@wordpress/admin-ui/build-style/style.css"); +// `@wordpress/admin-ui` 2.x ships its CSS via runtime DOM injection from the +// JS module — there's no `build-style/style.css` to import anymore. @include meta.load-css("@wordpress/dataviews/build-style/style.css"); // Subscriber identity cell. From e01d7ffe817af2656ded883059dbd2189cfea0bd Mon Sep 17 00:00:00 2001 From: Christian Gastrell Date: Wed, 20 May 2026 12:47:48 -0300 Subject: [PATCH 2/2] Newsletter: drop now-stale comment from route.scss The 2-line explanatory comment described a removed @include line; with that line gone there is nothing for the comment to clarify. --- projects/packages/newsletter/routes/dashboard/route.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/packages/newsletter/routes/dashboard/route.scss b/projects/packages/newsletter/routes/dashboard/route.scss index bac2ce4389c7..aae4a89adbf8 100644 --- a/projects/packages/newsletter/routes/dashboard/route.scss +++ b/projects/packages/newsletter/routes/dashboard/route.scss @@ -1,6 +1,4 @@ @use "sass:meta"; -// `@wordpress/admin-ui` 2.x ships its CSS via runtime DOM injection from the -// JS module — there's no `build-style/style.css` to import anymore. @include meta.load-css("@wordpress/dataviews/build-style/style.css"); // Subscriber identity cell.