@wordpress/boot 0.2.0 → 0.2.1-next.16d95556a.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/boot",
-	"version": "0.2.0",
+	"version": "0.2.1-next.16d95556a.0",
 	"description": "Minimal boot package for WordPress admin pages.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -34,26 +34,25 @@
 	"wpScriptModuleExports": "./build-module/index.js",
 	"types": "build-types",
 	"dependencies": {
-		"@tanstack/history": "^1.133.28",
-		"@tanstack/react-router": "^1.120.5",
-		"@wordpress/admin-ui": "^1.3.0",
-		"@wordpress/commands": "^1.35.0",
-		"@wordpress/components": "^30.8.0",
-		"@wordpress/compose": "^7.35.0",
-		"@wordpress/core-data": "^7.35.0",
-		"@wordpress/data": "^10.35.0",
-		"@wordpress/editor": "^14.35.0",
-		"@wordpress/element": "^6.35.0",
-		"@wordpress/html-entities": "^4.35.0",
-		"@wordpress/i18n": "^6.8.0",
-		"@wordpress/icons": "^11.2.0",
-		"@wordpress/keyboard-shortcuts": "^5.35.0",
-		"@wordpress/keycodes": "^4.35.0",
-		"@wordpress/lazy-editor": "^1.1.0",
-		"@wordpress/primitives": "^4.35.0",
-		"@wordpress/private-apis": "^1.35.0",
-		"@wordpress/theme": "^0.2.0",
-		"@wordpress/url": "^4.35.0",
+		"@wordpress/admin-ui": "^1.3.1-next.16d95556a.0",
+		"@wordpress/commands": "^1.35.1-next.16d95556a.0",
+		"@wordpress/components": "^30.8.1-next.16d95556a.0",
+		"@wordpress/compose": "^7.35.1-next.16d95556a.0",
+		"@wordpress/core-data": "^7.35.1-next.16d95556a.0",
+		"@wordpress/data": "^10.35.1-next.16d95556a.0",
+		"@wordpress/editor": "^14.35.1-next.16d95556a.0",
+		"@wordpress/element": "^6.35.1-next.16d95556a.0",
+		"@wordpress/html-entities": "^4.35.1-next.16d95556a.0",
+		"@wordpress/i18n": "^6.8.1-next.16d95556a.0",
+		"@wordpress/icons": "^11.2.1-next.16d95556a.0",
+		"@wordpress/keyboard-shortcuts": "^5.35.1-next.16d95556a.0",
+		"@wordpress/keycodes": "^4.35.1-next.16d95556a.0",
+		"@wordpress/lazy-editor": "^1.1.1-next.16d95556a.0",
+		"@wordpress/primitives": "^4.35.1-next.16d95556a.0",
+		"@wordpress/private-apis": "^1.35.1-next.16d95556a.0",
+		"@wordpress/route": "^0.1.1-next.16d95556a.0",
+		"@wordpress/theme": "^0.2.1-next.16d95556a.0",
+		"@wordpress/url": "^4.35.1-next.16d95556a.0",
 		"clsx": "^2.1.1"
 	},
 	"peerDependencies": {
@@ -63,5 +62,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "77aa1f194edceafe8ac2a1b9438bf84b557e76e3"
+	"gitHead": "59a9383612bbe16e21af84d13b035bfbca7fe833"
 }

package/src/components/app/router.tsx

@@ -1,16 +1,6 @@
 /**
  * External dependencies
  */
-import {
-	createRouter,
-	createRootRoute,
-	createRoute,
-	RouterProvider,
-	createBrowserHistory,
-	type AnyRoute,
-	redirect,
-} from '@tanstack/react-router';
-import { parseHref } from '@tanstack/history';
 import type { ComponentType } from 'react';
 
 /**
@@ -19,12 +9,26 @@ import type { ComponentType } from 'react';
 import { __ } from '@wordpress/i18n';
 import { lazy, useState, useEffect } from '@wordpress/element';
 import { Page } from '@wordpress/admin-ui';
+import {
+	privateApis as routePrivateApis,
+	type AnyRoute,
+} from '@wordpress/route';
 
 /**
  * Internal dependencies
  */
 import Root from '../root';
 import type { Route, RouteLoaderContext } from '../../store/types';
+import { unlock } from '../../lock-unlock';
+
+const {
+	createRouter,
+	createRootRoute,
+	createRoute,
+	RouterProvider,
+	createBrowserHistory,
+	parseHref,
+} = unlock( routePrivateApis );
 
 // Not found component
 function NotFoundComponent() {
@@ -89,9 +93,7 @@ async function createRouteFromDefinition(
 
 	// Load route module for lifecycle functions if specified
 	let routeConfig: {
-		beforeLoad?: (
-			context: RouteLoaderContext & { redirect: Function }
-		) => void | Promise< void >;
+		beforeLoad?: ( context: RouteLoaderContext ) => void | Promise< void >;
 		loader?: ( context: RouteLoaderContext ) => Promise< unknown >;
 		canvas?: ( context: RouteLoaderContext ) => Promise< any >;
 	} = {};
@@ -109,7 +111,6 @@ async function createRouteFromDefinition(
 					routeConfig.beforeLoad!( {
 						params: opts.params || {},
 						search: opts.search || {},
-						redirect,
 					} )
 			: undefined,
 		loader: async ( opts: any ) => {
@@ -171,7 +172,7 @@ function createPathHistory() {
 			const pathHref = `${ path }${ url.hash }`;
 			return parseHref( pathHref, window.history.state );
 		},
-		createHref: ( href ) => {
+		createHref: ( href: string ) => {
 			const searchParams = new URLSearchParams( window.location.search );
 			searchParams.set( 'p', href );
 			return `${ window.location.pathname }?${ searchParams }`;

package/src/components/navigation/router-link-item.tsx

@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import { createLink } from '@tanstack/react-router';
 import type { ForwardedRef } from 'react';
 
 /**
@@ -9,6 +8,14 @@ import type { ForwardedRef } from 'react';
  */
 import { forwardRef } from '@wordpress/element';
 import { __experimentalItem as Item } from '@wordpress/components';
+import { privateApis as routePrivateApis } from '@wordpress/route';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { createLink } = unlock( routePrivateApis );
 
 function AnchorOnlyItem(
 	props: React.ComponentProps< typeof Item >,

package/src/components/navigation/use-sidebar-parent.ts

@@ -1,14 +1,17 @@
-/**
- * External dependencies
- */
-import { useRouter, useMatches } from '@tanstack/react-router';
-
 /**
  * WordPress dependencies
  */
+import { privateApis as routePrivateApis } from '@wordpress/route';
 import { useEffect, useState } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { useRouter, useMatches } = unlock( routePrivateApis );
+
 /**
  * Internal dependencies
  */

package/src/components/root/index.tsx

@@ -1,12 +1,12 @@
 /**
  * External dependencies
  */
-import { Outlet, useMatches } from '@tanstack/react-router';
 import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
+import { privateApis as routePrivateApis } from '@wordpress/route';
 // @ts-expect-error Commands is not typed properly.
 import { CommandMenu } from '@wordpress/commands';
 import { privateApis as themePrivateApis } from '@wordpress/theme';
@@ -22,6 +22,7 @@ import type { CanvasData } from '../../store/types';
 import './style.scss';
 
 const { ThemeProvider } = unlock( themePrivateApis );
+const { useMatches, Outlet } = unlock( routePrivateApis );
 
 export default function Root() {
 	const matches = useMatches();

package/src/components/root/single-page.tsx

@@ -1,12 +1,12 @@
 /**
  * External dependencies
  */
-import { Outlet, useMatches } from '@tanstack/react-router';
 import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
+import { privateApis as routePrivateApis } from '@wordpress/route';
 // @ts-expect-error Commands is not typed properly.
 import { CommandMenu } from '@wordpress/commands';
 import { privateApis as themePrivateApis } from '@wordpress/theme';
@@ -20,6 +20,7 @@ import { unlock } from '../../lock-unlock';
 import type { CanvasData } from '../../store/types';
 import './style.scss';
 
+const { useMatches, Outlet } = unlock( routePrivateApis );
 const { ThemeProvider } = unlock( themePrivateApis );
 
 /**

package/src/components/site-icon-link/index.tsx

@@ -1,14 +1,17 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import { Link, useCanGoBack, useRouter } from '@tanstack/react-router';
+import { Link, privateApis as routePrivateApis } from '@wordpress/route';
 
 /**
  * Internal dependencies
  */
+import { unlock } from '../../lock-unlock';
 import SiteIcon from '../site-icon';
 import './style.scss';
 
+const { useCanGoBack, useRouter } = unlock( routePrivateApis );
+
 function SiteIconLink( {
 	to,
 	isBackButton,

package/tsconfig.json

@@ -19,6 +19,7 @@
 		{ "path": "../lazy-editor" },
 		{ "path": "../primitives" },
 		{ "path": "../private-apis" },
+		{ "path": "../route" },
 		{ "path": "../theme" },
 		{ "path": "../url" }
 	]