From 3991c7edf2e662a49fc284bf6d46aa5339409fff Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Fri, 19 Jul 2024 14:50:32 +0100 Subject: [PATCH 01/14] Add JSX runtime polyfill to prevent breakages on sites running < WP 6.6. --- projects/packages/assets/package.json | 3 +++ projects/packages/assets/src/class-assets.php | 14 ++++++++++---- projects/packages/assets/webpack.config.js | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/projects/packages/assets/package.json b/projects/packages/assets/package.json index 71fc967d70e21..54c5a27706d89 100644 --- a/projects/packages/assets/package.json +++ b/projects/packages/assets/package.json @@ -10,6 +10,9 @@ "test": "jest tests", "validate": "pnpm exec validate-es build/" }, + "dependencies": { + "react": "18.3.1" + }, "devDependencies": { "@automattic/jetpack-webpack-config": "workspace:*", "@wordpress/browserslist-config": "6.2.0", diff --git a/projects/packages/assets/src/class-assets.php b/projects/packages/assets/src/class-assets.php index dab45354ee26e..b0306bfa491a2 100644 --- a/projects/packages/assets/src/class-assets.php +++ b/projects/packages/assets/src/class-assets.php @@ -498,14 +498,16 @@ public static function wp_default_scripts_hook( $wp_scripts ) { // Can't use self::register_script(), this action is called too early. if ( file_exists( __DIR__ . '/../build/i18n-loader.asset.php' ) ) { - $path = '../build/i18n-loader.js'; - $asset = require __DIR__ . '/../build/i18n-loader.asset.php'; + $path = '../build/i18n-loader.js'; + $asset = require __DIR__ . '/../build/i18n-loader.asset.php'; + $jsx_path = '../build/react-jsx-runtime.js'; } else { - $path = 'js/i18n-loader.js'; - $asset = array( + $path = 'js/i18n-loader.js'; + $asset = array( 'dependencies' => array( 'wp-i18n' ), 'version' => filemtime( __DIR__ . "/$path" ), ); + $jsx_path = '.js/react-jsx-runtime.js'; } $url = self::normalize_path( plugins_url( $path, __FILE__ ) ); $url = add_query_arg( 'minify', 'true', $url ); @@ -529,6 +531,10 @@ public static function wp_default_scripts_hook( $wp_scripts ) { $wp_scripts->add( 'wp-jp-i18n-state', false, array( 'wp-deprecated', 'wp-jp-i18n-loader' ) ); $wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.deprecated( "wp-jp-i18n-state", { alternative: "wp-jp-i18n-loader" } );' ); $wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' ); + + // Register the React JSX runtime script - used as a polyfill until we can update JSX transforms. See https://github.com/Automattic/jetpack/issues/38424. + $jsx_url = self::normalize_path( plugins_url( $jsx_path, __FILE__ ) ); + $wp_scripts->add( 'react-jsx-runtime', $jsx_url, array( 'react' ), '18.3.1', true ); } // endregion . diff --git a/projects/packages/assets/webpack.config.js b/projects/packages/assets/webpack.config.js index df39af1d2683b..541c5afc44a06 100644 --- a/projects/packages/assets/webpack.config.js +++ b/projects/packages/assets/webpack.config.js @@ -34,4 +34,23 @@ module.exports = [ ], }, }, + { + entry: { + 'react-jsx-runtime': { + import: 'react/jsx-runtime', + }, + }, + output: { + ...jetpackWebpackConfig.output, + path: path.resolve( './build' ), + filename: 'react-jsx-runtime.js', + library: { + name: 'ReactJSXRuntime', + type: 'window', + }, + }, + externals: { + react: 'React', + }, + }, ]; From f9432f1248ccc67d0a0d81aaceb675f6e905a0f7 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Fri, 19 Jul 2024 14:51:18 +0100 Subject: [PATCH 02/14] Add changes to .pnpmfile.cjs to allow updating the dependency-extraction-webpack-plugin again --- .pnpmfile.cjs | 13 ------------- pnpm-lock.yaml | 38 +++++++++++++++++++++----------------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs index 05d761988e87d..56644644bfeeb 100644 --- a/.pnpmfile.cjs +++ b/.pnpmfile.cjs @@ -190,19 +190,6 @@ function afterAllResolved( lockfile ) { return lockfile; } - // eslint-disable-next-line no-unused-vars -- Don't care. - for ( const [ k, v ] of Object.entries( lockfile.packages ) ) { - // Forbid `@wordpress/dependency-extraction-webpack-plugin` v6 until WP 6.5 support is dropped. - // https://github.com/WordPress/gutenberg/issues/62202 - if ( - k.startsWith( '@wordpress/dependency-extraction-webpack-plugin@' ) && - ! k.startsWith( '@wordpress/dependency-extraction-webpack-plugin@5.' ) - ) { - throw new Error( - '@wordpress/dependency-extraction-webpack-plugin >= 6.0.0 is not allowed until we drop WordPress 6.5 support.\nSee https://github.com/WordPress/gutenberg/issues/62202 for details.' - ); - } - } return lockfile; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 52649aa1737e6..78e8805889755 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false -pnpmfileChecksum: bjkzupj7mgxhpr4jv54264ts6e +pnpmfileChecksum: o3qnhhclw7iwzy4hibw5ivce5q importers: @@ -585,8 +585,8 @@ importers: version: 4.3.4 devDependencies: '@wordpress/dependency-extraction-webpack-plugin': - specifier: 5.9.0 - version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 6.0.0 + version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) '@wordpress/i18n': specifier: 5.2.0 version: 5.2.0 @@ -1533,8 +1533,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 5.9.0 - version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 6.0.0 + version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) babel-loader: specifier: 9.1.2 version: 9.1.2(@babel/core@7.24.7)(webpack@5.76.0(webpack-cli@4.9.1)) @@ -1579,6 +1579,10 @@ importers: projects/packages/admin-ui: {} projects/packages/assets: + dependencies: + react: + specifier: 18.3.1 + version: 18.3.1 devDependencies: '@automattic/jetpack-webpack-config': specifier: workspace:* @@ -1813,8 +1817,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 5.9.0 - version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 6.0.0 + version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) autoprefixer: specifier: 10.4.14 version: 10.4.14(postcss@8.4.31) @@ -2289,8 +2293,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 5.9.0 - version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 6.0.0 + version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) autoprefixer: specifier: 10.4.14 version: 10.4.14(postcss@8.4.31) @@ -2640,8 +2644,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 5.9.0 - version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 6.0.0 + version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) autoprefixer: specifier: 10.4.14 version: 10.4.14(postcss@8.4.31) @@ -2997,8 +3001,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 5.9.0 - version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 6.0.0 + version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) babel-jest: specifier: 29.4.3 version: 29.4.3(@babel/core@7.24.7) @@ -7806,9 +7810,9 @@ packages: resolution: {integrity: sha512-k9gFs74hg9yvrWhoUrNrCf95VIqvPkv2AysRxTxSfEZjTyMBuxNNa3amr295hCeoqcjT9mw5bptmLntawmg7nA==} engines: {node: '>=18.12.0', npm: '>=8.19.2'} - '@wordpress/dependency-extraction-webpack-plugin@5.9.0': - resolution: {integrity: sha512-hXbCkbG1XES47t7hFSETRrLfaRSPyQPlCnhlCx7FfhYFD0wh1jVArApXX5dD+A6wTrayXX/a16MpfaNqE662XA==} - engines: {node: '>=18'} + '@wordpress/dependency-extraction-webpack-plugin@6.0.0': + resolution: {integrity: sha512-U7ho6J8HatzpVtjXy3/m+8H3eDSMOXuhtVI/TxW+647fFBLrY7YCpprtRZgCs5p6KtT5QNOU+IcastxHCtNTTA==} + engines: {node: '>=18.12.0', npm: '>=8.19.2'} peerDependencies: webpack: ^5.0.0 @@ -19529,7 +19533,7 @@ snapshots: moment: 2.29.4 moment-timezone: 0.5.45 - '@wordpress/dependency-extraction-webpack-plugin@5.9.0(webpack@5.76.0(webpack-cli@4.9.1))': + '@wordpress/dependency-extraction-webpack-plugin@6.0.0(webpack@5.76.0(webpack-cli@4.9.1))': dependencies: json2php: 0.0.7 webpack: 5.76.0(webpack-cli@4.9.1) From 4bdf549b811fa9cc633d22b837e2df5b06c562a9 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Fri, 19 Jul 2024 14:55:30 +0100 Subject: [PATCH 03/14] changelog --- .../assets/changelog/fix-jsx-runtime-react-19-polyfill | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill diff --git a/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill b/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..e2cd7f59ec901 --- /dev/null +++ b/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Assets: Add JSX runtime polyfill here so that it applies to all relevant plugins in the monorepo, preventing site breakages when WP < 6.6 and packages are included that use React's automatic runtime to transform JSX. From ef5b1b2ec278f4bfc194236f3ad5de65f64b5003 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Fri, 19 Jul 2024 15:05:38 +0100 Subject: [PATCH 04/14] Updating lockfile --- pnpm-lock.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 78e8805889755..6907ad7e99e98 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false -pnpmfileChecksum: o3qnhhclw7iwzy4hibw5ivce5q +pnpmfileChecksum: hogs2xjgnkyiea7znn3abfx4o4 importers: @@ -585,8 +585,8 @@ importers: version: 4.3.4 devDependencies: '@wordpress/dependency-extraction-webpack-plugin': - specifier: 6.0.0 - version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 5.9.0 + version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) '@wordpress/i18n': specifier: 5.2.0 version: 5.2.0 @@ -1533,8 +1533,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 6.0.0 - version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 5.9.0 + version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) babel-loader: specifier: 9.1.2 version: 9.1.2(@babel/core@7.24.7)(webpack@5.76.0(webpack-cli@4.9.1)) @@ -1817,8 +1817,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 6.0.0 - version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 5.9.0 + version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) autoprefixer: specifier: 10.4.14 version: 10.4.14(postcss@8.4.31) @@ -2293,8 +2293,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 6.0.0 - version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 5.9.0 + version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) autoprefixer: specifier: 10.4.14 version: 10.4.14(postcss@8.4.31) @@ -2644,8 +2644,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 6.0.0 - version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 5.9.0 + version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) autoprefixer: specifier: 10.4.14 version: 10.4.14(postcss@8.4.31) @@ -3001,8 +3001,8 @@ importers: specifier: 6.2.0 version: 6.2.0 '@wordpress/dependency-extraction-webpack-plugin': - specifier: 6.0.0 - version: 6.0.0(webpack@5.76.0(webpack-cli@4.9.1)) + specifier: 5.9.0 + version: 5.9.0(webpack@5.76.0(webpack-cli@4.9.1)) babel-jest: specifier: 29.4.3 version: 29.4.3(@babel/core@7.24.7) @@ -7810,9 +7810,9 @@ packages: resolution: {integrity: sha512-k9gFs74hg9yvrWhoUrNrCf95VIqvPkv2AysRxTxSfEZjTyMBuxNNa3amr295hCeoqcjT9mw5bptmLntawmg7nA==} engines: {node: '>=18.12.0', npm: '>=8.19.2'} - '@wordpress/dependency-extraction-webpack-plugin@6.0.0': - resolution: {integrity: sha512-U7ho6J8HatzpVtjXy3/m+8H3eDSMOXuhtVI/TxW+647fFBLrY7YCpprtRZgCs5p6KtT5QNOU+IcastxHCtNTTA==} - engines: {node: '>=18.12.0', npm: '>=8.19.2'} + '@wordpress/dependency-extraction-webpack-plugin@5.9.0': + resolution: {integrity: sha512-hXbCkbG1XES47t7hFSETRrLfaRSPyQPlCnhlCx7FfhYFD0wh1jVArApXX5dD+A6wTrayXX/a16MpfaNqE662XA==} + engines: {node: '>=18'} peerDependencies: webpack: ^5.0.0 @@ -19533,7 +19533,7 @@ snapshots: moment: 2.29.4 moment-timezone: 0.5.45 - '@wordpress/dependency-extraction-webpack-plugin@6.0.0(webpack@5.76.0(webpack-cli@4.9.1))': + '@wordpress/dependency-extraction-webpack-plugin@5.9.0(webpack@5.76.0(webpack-cli@4.9.1))': dependencies: json2php: 0.0.7 webpack: 5.76.0(webpack-cli@4.9.1) From cd6789e1ae3c3d90c5e07978355d35693d7004c0 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 13:45:39 +0100 Subject: [PATCH 05/14] Fix tests to make sure react-jsx-runtime script is also expected when testing wp_default_scripts_hook --- projects/packages/assets/tests/php/test-assets.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/packages/assets/tests/php/test-assets.php b/projects/packages/assets/tests/php/test-assets.php index 09255c174a3ab..f6d3a0ef32c95 100644 --- a/projects/packages/assets/tests/php/test-assets.php +++ b/projects/packages/assets/tests/php/test-assets.php @@ -757,7 +757,7 @@ function ( $value ) use ( $value_sets, $i ) { return $funcs; }; - $mock->expects( $this->exactly( 2 ) )->method( 'add' ) + $mock->expects( $this->exactly( 3 ) )->method( 'add' ) ->with( ...$with_consecutive( array( @@ -768,7 +768,15 @@ function ( $value ) use ( $value_sets, $i ) { ), array( 'wp-i18n' ), ), - array( 'wp-jp-i18n-state', false, array( 'wp-deprecated', 'wp-jp-i18n-loader' ) ) + array( 'wp-jp-i18n-state', false, array( 'wp-deprecated', 'wp-jp-i18n-loader' ) ), + array( + 'react-jsx-runtime', + $this->logicalOr( + 'http://www.example.com/wp-content/plugins/jetpack/packages/assets/build/react-jsx-runtime.js', + 'http://www.example.com/wp-content/plugins/jetpack/packages/assets/src/js/react-jsx-runtime.js' + ), + array( 'react' ), + ) ) ); $mock->expects( $this->exactly( 3 ) )->method( 'add_inline_script' ) @@ -779,7 +787,7 @@ function ( $value ) use ( $value_sets, $i ) { array( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' ) ) ); - + // // @phan-suppress-next-line PhanTypeMismatchArgument -- We don't have a WP_Scripts definition to create a mock from. 🤷 Assets::wp_default_scripts_hook( $mock ); } From 1c16230e420e0311043290823387fe7d70ac6d33 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 14:08:17 +0100 Subject: [PATCH 06/14] Fixing a path typo, spotted by PR tests --- projects/packages/assets/src/class-assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/packages/assets/src/class-assets.php b/projects/packages/assets/src/class-assets.php index b0306bfa491a2..37d20136d851b 100644 --- a/projects/packages/assets/src/class-assets.php +++ b/projects/packages/assets/src/class-assets.php @@ -507,7 +507,7 @@ public static function wp_default_scripts_hook( $wp_scripts ) { 'dependencies' => array( 'wp-i18n' ), 'version' => filemtime( __DIR__ . "/$path" ), ); - $jsx_path = '.js/react-jsx-runtime.js'; + $jsx_path = 'js/react-jsx-runtime.js'; } $url = self::normalize_path( plugins_url( $path, __FILE__ ) ); $url = add_query_arg( 'minify', 'true', $url ); From 0cc9e871daf3e3411357953291d4e28e927c870a Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 14:39:12 +0100 Subject: [PATCH 07/14] Adding an additional comment where react-jsx-runtime is added to notify whoever removes this to also clean up the related test --- projects/packages/assets/src/class-assets.php | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/packages/assets/src/class-assets.php b/projects/packages/assets/src/class-assets.php index 37d20136d851b..a2a8c02044d4c 100644 --- a/projects/packages/assets/src/class-assets.php +++ b/projects/packages/assets/src/class-assets.php @@ -533,6 +533,7 @@ public static function wp_default_scripts_hook( $wp_scripts ) { $wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' ); // Register the React JSX runtime script - used as a polyfill until we can update JSX transforms. See https://github.com/Automattic/jetpack/issues/38424. + // Note: when removing this, also remove the inclusion of `react-jsx-runtime` from test_wp_default_scripts_hook where it is expected to be returned when the $mock calls the 'add' method. $jsx_url = self::normalize_path( plugins_url( $jsx_path, __FILE__ ) ); $wp_scripts->add( 'react-jsx-runtime', $jsx_url, array( 'react' ), '18.3.1', true ); } From fcd933ed3c44d8a8b2dff04238302441e9364199 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 15:30:17 +0100 Subject: [PATCH 08/14] Removed a blank comment --- projects/packages/assets/tests/php/test-assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/packages/assets/tests/php/test-assets.php b/projects/packages/assets/tests/php/test-assets.php index f6d3a0ef32c95..3c6e9287daacc 100644 --- a/projects/packages/assets/tests/php/test-assets.php +++ b/projects/packages/assets/tests/php/test-assets.php @@ -787,7 +787,7 @@ function ( $value ) use ( $value_sets, $i ) { array( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' ) ) ); - // + // @phan-suppress-next-line PhanTypeMismatchArgument -- We don't have a WP_Scripts definition to create a mock from. 🤷 Assets::wp_default_scripts_hook( $mock ); } From f6327deeec254afedc5df987982fa583a1ffeda9 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 19:02:52 +0100 Subject: [PATCH 09/14] Update projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill Co-authored-by: Brad Jorsch --- .../packages/assets/changelog/fix-jsx-runtime-react-19-polyfill | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill b/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill index e2cd7f59ec901..3e994ad0a8c7e 100644 --- a/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill +++ b/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill @@ -1,4 +1,4 @@ Significance: patch Type: added -Assets: Add JSX runtime polyfill here so that it applies to all relevant plugins in the monorepo, preventing site breakages when WP < 6.6 and packages are included that use React's automatic runtime to transform JSX. +Assets: Add JSX runtime polyfill `react-jsx-runtime` for WordPress < 6.6. From e39ea822aa26bdf5c89fa4b7b1aa02030751f438 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 19:03:08 +0100 Subject: [PATCH 10/14] Update projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill Co-authored-by: Brad Jorsch --- .../packages/assets/changelog/fix-jsx-runtime-react-19-polyfill | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill b/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill index 3e994ad0a8c7e..8d0a67c0dd702 100644 --- a/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill +++ b/projects/packages/assets/changelog/fix-jsx-runtime-react-19-polyfill @@ -1,4 +1,4 @@ -Significance: patch +Significance: minor Type: added Assets: Add JSX runtime polyfill `react-jsx-runtime` for WordPress < 6.6. From ce92f212609042604a13cb00a565e0089306fa31 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 19:08:38 +0100 Subject: [PATCH 11/14] Adding todos in comments related to removing the relevant code --- projects/packages/assets/src/class-assets.php | 2 +- projects/packages/assets/tests/php/test-assets.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/packages/assets/src/class-assets.php b/projects/packages/assets/src/class-assets.php index a2a8c02044d4c..825f00a961cb5 100644 --- a/projects/packages/assets/src/class-assets.php +++ b/projects/packages/assets/src/class-assets.php @@ -533,7 +533,7 @@ public static function wp_default_scripts_hook( $wp_scripts ) { $wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' ); // Register the React JSX runtime script - used as a polyfill until we can update JSX transforms. See https://github.com/Automattic/jetpack/issues/38424. - // Note: when removing this, also remove the inclusion of `react-jsx-runtime` from test_wp_default_scripts_hook where it is expected to be returned when the $mock calls the 'add' method. + // @todo Remove this when we drop support for WordPress 6.5, as well as the script inclusion in test_wp_default_scripts_hook. $jsx_url = self::normalize_path( plugins_url( $jsx_path, __FILE__ ) ); $wp_scripts->add( 'react-jsx-runtime', $jsx_url, array( 'react' ), '18.3.1', true ); } diff --git a/projects/packages/assets/tests/php/test-assets.php b/projects/packages/assets/tests/php/test-assets.php index 3c6e9287daacc..11351cfcc4bfe 100644 --- a/projects/packages/assets/tests/php/test-assets.php +++ b/projects/packages/assets/tests/php/test-assets.php @@ -757,6 +757,7 @@ function ( $value ) use ( $value_sets, $i ) { return $funcs; }; + // @todo: Remove `react-jsx-runtime` from the list of dependencies once we drop support for WordPress 6.5 and remove the dependency from wp_default_scripts_hook. $mock->expects( $this->exactly( 3 ) )->method( 'add' ) ->with( ...$with_consecutive( From ab51d247bd562c505255199d237f80e18fba9b4f Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 19:14:18 +0100 Subject: [PATCH 12/14] Only use the existing built react-jsx-runtime file path --- projects/packages/assets/src/class-assets.php | 12 +++++------- projects/packages/assets/tests/php/test-assets.php | 5 +---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/projects/packages/assets/src/class-assets.php b/projects/packages/assets/src/class-assets.php index 825f00a961cb5..d06fa6a144816 100644 --- a/projects/packages/assets/src/class-assets.php +++ b/projects/packages/assets/src/class-assets.php @@ -498,16 +498,14 @@ public static function wp_default_scripts_hook( $wp_scripts ) { // Can't use self::register_script(), this action is called too early. if ( file_exists( __DIR__ . '/../build/i18n-loader.asset.php' ) ) { - $path = '../build/i18n-loader.js'; - $asset = require __DIR__ . '/../build/i18n-loader.asset.php'; - $jsx_path = '../build/react-jsx-runtime.js'; + $path = '../build/i18n-loader.js'; + $asset = require __DIR__ . '/../build/i18n-loader.asset.php'; } else { - $path = 'js/i18n-loader.js'; - $asset = array( + $path = 'js/i18n-loader.js'; + $asset = array( 'dependencies' => array( 'wp-i18n' ), 'version' => filemtime( __DIR__ . "/$path" ), ); - $jsx_path = 'js/react-jsx-runtime.js'; } $url = self::normalize_path( plugins_url( $path, __FILE__ ) ); $url = add_query_arg( 'minify', 'true', $url ); @@ -534,7 +532,7 @@ public static function wp_default_scripts_hook( $wp_scripts ) { // Register the React JSX runtime script - used as a polyfill until we can update JSX transforms. See https://github.com/Automattic/jetpack/issues/38424. // @todo Remove this when we drop support for WordPress 6.5, as well as the script inclusion in test_wp_default_scripts_hook. - $jsx_url = self::normalize_path( plugins_url( $jsx_path, __FILE__ ) ); + $jsx_url = self::normalize_path( plugins_url( '../build/react-jsx-runtime.js', __FILE__ ) ); $wp_scripts->add( 'react-jsx-runtime', $jsx_url, array( 'react' ), '18.3.1', true ); } diff --git a/projects/packages/assets/tests/php/test-assets.php b/projects/packages/assets/tests/php/test-assets.php index 11351cfcc4bfe..c3a53b0660fa0 100644 --- a/projects/packages/assets/tests/php/test-assets.php +++ b/projects/packages/assets/tests/php/test-assets.php @@ -772,10 +772,7 @@ function ( $value ) use ( $value_sets, $i ) { array( 'wp-jp-i18n-state', false, array( 'wp-deprecated', 'wp-jp-i18n-loader' ) ), array( 'react-jsx-runtime', - $this->logicalOr( - 'http://www.example.com/wp-content/plugins/jetpack/packages/assets/build/react-jsx-runtime.js', - 'http://www.example.com/wp-content/plugins/jetpack/packages/assets/src/js/react-jsx-runtime.js' - ), + 'http://www.example.com/wp-content/plugins/jetpack/packages/assets/build/react-jsx-runtime.js', array( 'react' ), ) ) From 3fe21a4dc15c237002004439554406a75d5e1279 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 19:16:02 +0100 Subject: [PATCH 13/14] Update renovate.json5 to remove snippet preventing ut-update of @wordpress/dependency-extraction-webpack-plugin --- .github/renovate.json5 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 581a671c157c0..1af344c2f1573 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -42,13 +42,6 @@ rangeStrategy: 'widen', }, - // Forbid `@wordpress/dependency-extraction-webpack-plugin` v6 until WP 6.5 support is dropped. - // https://github.com/WordPress/gutenberg/issues/62202 - { - matchPackageNames: [ '@wordpress/dependency-extraction-webpack-plugin' ], - allowedVersions: '<6.0.0', - }, - // Various other monorepos and package groupings. { extends: [ 'monorepo:wordpress' ], From 037329cdc164c8aea521c04411989b3624b4ee19 Mon Sep 17 00:00:00 2001 From: Karen Attfield Date: Mon, 22 Jul 2024 19:18:20 +0100 Subject: [PATCH 14/14] Updating versions due to patch to minor version bump --- projects/packages/assets/composer.json | 2 +- .../changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ .../plugins/automattic-for-agencies-client/composer.lock | 4 ++-- .../backup/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/backup/composer.lock | 4 ++-- .../boost/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/boost/composer.lock | 4 ++-- .../changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/classic-theme-helper-plugin/composer.lock | 4 ++-- .../plugins/crm/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/crm/composer.lock | 4 ++-- .../inspect/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/inspect/composer.lock | 4 ++-- .../jetpack/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/jetpack/composer.lock | 4 ++-- .../migration/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/migration/composer.lock | 4 ++-- .../changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/mu-wpcom-plugin/composer.lock | 4 ++-- .../protect/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/protect/composer.lock | 4 ++-- .../search/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/search/composer.lock | 4 ++-- .../social/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/social/composer.lock | 4 ++-- .../changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/starter-plugin/composer.lock | 4 ++-- .../videopress/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/videopress/composer.lock | 4 ++-- .../wpcomsh/changelog/fix-jsx-runtime-react-19-polyfill | 5 +++++ projects/plugins/wpcomsh/composer.lock | 4 ++-- 31 files changed, 106 insertions(+), 31 deletions(-) create mode 100644 projects/plugins/automattic-for-agencies-client/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/backup/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/boost/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/classic-theme-helper-plugin/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/crm/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/inspect/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/jetpack/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/migration/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/protect/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/search/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/social/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/starter-plugin/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/videopress/changelog/fix-jsx-runtime-react-19-polyfill create mode 100644 projects/plugins/wpcomsh/changelog/fix-jsx-runtime-react-19-polyfill diff --git a/projects/packages/assets/composer.json b/projects/packages/assets/composer.json index eb0547bfe1cd3..57987fec7a97a 100644 --- a/projects/packages/assets/composer.json +++ b/projects/packages/assets/composer.json @@ -60,7 +60,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } } } diff --git a/projects/plugins/automattic-for-agencies-client/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/automattic-for-agencies-client/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/automattic-for-agencies-client/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/automattic-for-agencies-client/composer.lock b/projects/plugins/automattic-for-agencies-client/composer.lock index 500858788c761..108b3c29ee068 100644 --- a/projects/plugins/automattic-for-agencies-client/composer.lock +++ b/projects/plugins/automattic-for-agencies-client/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/backup/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/backup/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/backup/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index 39055a295760c..85d9e42703479 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/boost/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/boost/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/boost/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index 644bba920c611..7ef5d2e6df776 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/classic-theme-helper-plugin/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/classic-theme-helper-plugin/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/classic-theme-helper-plugin/composer.lock b/projects/plugins/classic-theme-helper-plugin/composer.lock index d795d23299f56..2a1362a0fad1e 100644 --- a/projects/plugins/classic-theme-helper-plugin/composer.lock +++ b/projects/plugins/classic-theme-helper-plugin/composer.lock @@ -62,7 +62,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -86,7 +86,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/crm/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/crm/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/crm/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/crm/composer.lock b/projects/plugins/crm/composer.lock index 62b17eed893dc..5f341c00431b5 100644 --- a/projects/plugins/crm/composer.lock +++ b/projects/plugins/crm/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -36,7 +36,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/inspect/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/inspect/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/inspect/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/inspect/composer.lock b/projects/plugins/inspect/composer.lock index 13d0f325e4eb2..9aa6b5c472609 100644 --- a/projects/plugins/inspect/composer.lock +++ b/projects/plugins/inspect/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/jetpack/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/jetpack/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..a1c1831fa1ef7 --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Updated composer.lock. + + diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 0ab67ec2d1607..7f1ac10847554 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/migration/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/migration/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/migration/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock index f39c46f368486..880c5f94082df 100644 --- a/projects/plugins/migration/composer.lock +++ b/projects/plugins/migration/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/mu-wpcom-plugin/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index ad5c3fd31d7d8..25c45de4fbc1e 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/protect/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/protect/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index 923e8f742a6ec..b2d86b6366e9e 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/search/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/search/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock index 3a51d7c4d8f6c..a52e885882601 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/social/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/social/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock index dcfa5275f2ac8..1fce5e9b8540f 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/starter-plugin/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/starter-plugin/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock index 9f6f6bb163b2b..d3ea3b52c1c24 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/videopress/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/videopress/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock index ae2537f9642ef..1ea684cfbf76f 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -148,7 +148,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": { diff --git a/projects/plugins/wpcomsh/changelog/fix-jsx-runtime-react-19-polyfill b/projects/plugins/wpcomsh/changelog/fix-jsx-runtime-react-19-polyfill new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/fix-jsx-runtime-react-19-polyfill @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock index 9b295f462cd97..9043c617cfba2 100644 --- a/projects/plugins/wpcomsh/composer.lock +++ b/projects/plugins/wpcomsh/composer.lock @@ -189,7 +189,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "d5648e0a4f0a8bffbbc805d0f6a5ed0f3cedd521" + "reference": "f5fd9602849fa481571e1bb6c46b3460dad33095" }, "require": { "automattic/jetpack-constants": "@dev", @@ -213,7 +213,7 @@ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.1.x-dev" + "dev-trunk": "2.2.x-dev" } }, "autoload": {