Revert "Create @wordpress/interactivity-router package"

This reverts commit 7b9e112.
WordPress · Jan 24, 2024 · e551609 · e551609
1 parent 3e50a84
commit e551609
Show file tree

Hide file tree

Showing 24 changed files with 15 additions and 172 deletions.
diff --git a/docs/manifest.json b/docs/manifest.json
@@ -1673,12 +1673,6 @@
 		"markdown_source": "../packages/icons/README.md",
 		"parent": "packages"
 	},
-	{
-		"title": "@wordpress/interactivity-router",
-		"slug": "packages-interactivity-router",
-		"markdown_source": "../packages/interactivity-router/README.md",
-		"parent": "packages"
-	},
 	{
 		"title": "@wordpress/interactivity",
 		"slug": "packages-interactivity",

diff --git a/lib/experimental/interactivity-api/modules.php b/lib/experimental/interactivity-api/modules.php
@@ -17,7 +17,7 @@ function gutenberg_register_interactivity_modules() {
 		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
 	);
 	gutenberg_register_module(
-		'@wordpress/interactivity-router',
+		'@wordpress/interactivity/router',
 		gutenberg_url( '/build/interactivity/router.min.js' ),
 		array( '@wordpress/interactivity' ),
 		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
@@ -51,7 +51,6 @@
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/icons": "file:../icons",
 		"@wordpress/interactivity": "file:../interactivity",
-		"@wordpress/interactivity-router": "file:../interactivity-router",
 		"@wordpress/keycodes": "file:../keycodes",
 		"@wordpress/notices": "file:../notices",
 		"@wordpress/patterns": "file:../patterns",

diff --git a/packages/block-library/src/query/index.php b/packages/block-library/src/query/index.php
@@ -144,7 +144,7 @@ function register_block_core_query() {
 			array(
 				'@wordpress/interactivity',
 				array(
-					'id'   => '@wordpress/interactivity-router',
+					'id'   => '@wordpress/interactivity/router',
 					'type' => 'dynamic',
 				),
 			),

diff --git a/packages/block-library/src/query/view.js b/packages/block-library/src/query/view.js
@@ -47,7 +47,7 @@ store( 'core/query', {
 				}, 400 );
 
 				const { actions } = yield import(
-					'@wordpress/interactivity-router'
+					'@wordpress/interactivity/router'
 				);
 				yield actions.navigate( ref.href );
 
@@ -75,7 +75,7 @@ store( 'core/query', {
 				.wpNavigationDisabled;
 			if ( isValidLink( ref ) && ! isDisabled ) {
 				const { actions } = yield import(
-					'@wordpress/interactivity-router'
+					'@wordpress/interactivity/router'
 				);
 				yield actions.prefetch( ref.href );
 			}
@@ -87,7 +87,7 @@ store( 'core/query', {
 			const { ref } = getElement();
 			if ( url && isValidLink( ref ) ) {
 				const { actions } = yield import(
-					'@wordpress/interactivity-router'
+					'@wordpress/interactivity/router'
 				);
 				yield actions.prefetch( ref.href );
 			}

diff --git a/packages/block-library/tsconfig.json b/packages/block-library/tsconfig.json
@@ -27,7 +27,6 @@
 		{ "path": "../i18n" },
 		{ "path": "../icons" },
 		{ "path": "../interactivity" },
-		{ "path": "../interactivity-router" },
 		{ "path": "../notices" },
 		{ "path": "../keycodes" },
 		{ "path": "../primitives" },

diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
@@ -25,7 +25,6 @@
 	"dependencies": {
 		"@wordpress/e2e-test-utils": "file:../e2e-test-utils",
 		"@wordpress/interactivity": "file:../interactivity",
-		"@wordpress/interactivity-router": "file:../interactivity-router",
 		"@wordpress/jest-console": "file:../jest-console",
 		"@wordpress/jest-puppeteer-axe": "file:../jest-puppeteer-axe",
 		"@wordpress/scripts": "file:../scripts",

diff --git a/packages/e2e-tests/plugins/interactive-blocks.php b/packages/e2e-tests/plugins/interactive-blocks.php
@@ -27,7 +27,7 @@ function () {
 					array(
 						'@wordpress/interactivity',
 						array(
-							'id'   => '@wordpress/interactivity-router',
+							'id'   => '@wordpress/interactivity/router',
 							'type' => 'dynamic',
 						),
 					),

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
@@ -50,7 +50,7 @@ const { actions } = store( 'directive-context-navigate', {
 			ctx.newText = 'some new text';
 		},
 		navigate() {
-			return import( '@wordpress/interactivity-router' ).then(
+			return import( '@wordpress/interactivity/router' ).then(
 				( { actions: routerActions } ) =>
 					routerActions.navigate(
 						window.location,

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
@@ -180,7 +180,7 @@ store( 'directive-each', {
 	actions: {
 		*navigate() {
 			const { actions } = yield import(
-				"@wordpress/interactivity-router"
+				"@wordpress/interactivity/router"
 			);
 			return actions.navigate( window.location, {
 				force: true,

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
@@ -19,7 +19,7 @@ store( 'directive-key', {
 	actions: {
 		*navigate() {
 			const { actions } = yield import(
-				"@wordpress/interactivity-router"
+				"@wordpress/interactivity/router"
 			);
 			return actions.navigate( window.location, {
 				force: true,

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
@@ -59,7 +59,7 @@ const { state } = store( 'directive-run', {
 		},
 		*navigate() {
 			const { actions } = yield import(
-				"@wordpress/interactivity-router"
+				"@wordpress/interactivity/router"
 			);
 			return actions.navigate( window.location, {
 				force: true,

diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js
@@ -20,7 +20,7 @@ const { state } = store( 'router', {
 			const { timeout } = state;
 
 			const { actions } = yield import(
-				"@wordpress/interactivity-router"
+				"@wordpress/interactivity/router"
 			);
 			yield actions.navigate( e.target.href, { force, timeout } );
 

diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js b/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js
@@ -20,7 +20,7 @@ const { state } = store( 'router-regions', {
 			*navigate( e ) {
 				e.preventDefault();
 				const { actions } = yield import(
-					"@wordpress/interactivity-router"
+					"@wordpress/interactivity/router"
 				);
 				yield actions.navigate( e.target.href );
 			},

diff --git a/packages/interactivity-router/.npmrc b/packages/interactivity-router/.npmrc
diff --git a/packages/interactivity-router/CHANGELOG.md b/packages/interactivity-router/CHANGELOG.md
diff --git a/packages/interactivity-router/README.md b/packages/interactivity-router/README.md
diff --git a/packages/interactivity-router/package.json b/packages/interactivity-router/package.json
diff --git a/packages/interactivity-router/tsconfig.json b/packages/interactivity-router/tsconfig.json
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
@@ -19,7 +19,7 @@
 -   Remove `data-wp-slot` and `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
 -   Remove `wp-data-navigation-link` directive. ([#57853](https://github.com/WordPress/gutenberg/pull/57853))
 -   Remove unused `state` and rename `props` to `attributes` in `getElement()`. ([#57974](https://github.com/WordPress/gutenberg/pull/57974))
--   Convert `navigate` and `prefetch` function to actions of the new `core/router` store, available when importing the `@wordpress/interactivity-router` module. ([#57924](https://github.com/WordPress/gutenberg/pull/57924))
+-   Convert `navigate` and `prefetch` function to actions of the new `core/router` store, available when importing the `@wordpress/interactivity/router` module. ([#57924](https://github.com/WordPress/gutenberg/pull/57924))
 
 ### Bug Fix
 

diff --git a/packages/interactivity-router/src/index.js → packages/interactivity/router/index.js b/packages/interactivity-router/src/index.js → packages/interactivity/router/index.js
diff --git a/tools/webpack/interactivity.js b/tools/webpack/interactivity.js
@@ -19,7 +19,7 @@ module.exports = {
 	name: 'interactivity',
 	entry: {
 		index: `./packages/interactivity/src/index.js`,
-		router: `./packages/interactivity-router/src/index.js`,
+		router: `./packages/interactivity/router/index.js`,
 		navigation: './packages/block-library/src/navigation/view.js',
 		query: './packages/block-library/src/query/view.js',
 		image: './packages/block-library/src/image/view.js',
@@ -89,7 +89,7 @@ module.exports = {
 		} ),
 		new DependencyExtractionWebpackPlugin( {
 			requestToExternalModule: ( request ) =>
-				request === '@wordpress/interactivity-router',
+				request === '@wordpress/interactivity/router',
 		} ),
 	],
 	watchOptions: {

diff --git a/tsconfig.json b/tsconfig.json
@@ -28,7 +28,6 @@
 		{ "path": "packages/i18n" },
 		{ "path": "packages/icons" },
 		{ "path": "packages/interactivity" },
-		{ "path": "packages/interactivity-router" },
 		{ "path": "packages/is-shallow-equal" },
 		{ "path": "packages/keycodes" },
 		{ "path": "packages/lazy-import" },