Remove deprecated useLoc (#359)

* remove deprecated useLoc * fix in create-wmr and examle * add changeset for create-wmr * correctly name the export * remove useLoc export
preactjs · Feb 22, 2021 · c681137 · c681137
1 parent a735d19
commit c681137
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 15 deletions.
diff --git a/.changeset/orange-eels-smoke.md b/.changeset/orange-eels-smoke.md
@@ -0,0 +1,5 @@
+---
+'preact-iso': major
+---
+
+Remove deprecated `useLoc` export
diff --git a/.changeset/tall-apes-agree.md b/.changeset/tall-apes-agree.md
@@ -0,0 +1,5 @@
+---
+'create-wmr': patch
+---
+
+Bump `preact-iso` and use `useLocation`
diff --git a/packages/create-wmr/tpl/package.json b/packages/create-wmr/tpl/package.json
@@ -12,7 +12,7 @@
 		"react-dom": "preact/compat"
 	},
 	"dependencies": {
-		"preact-iso": "^0.2.0"
+		"preact-iso": "^1.0.0"
 	},
 	"devDependencies": {
 		"wmr": "^1.0.0"

diff --git a/packages/create-wmr/tpl/public/header.js b/packages/create-wmr/tpl/public/header.js
@@ -1,7 +1,7 @@
-import { useLoc } from 'preact-iso/router';
+import { useLocation } from 'preact-iso/router';
 
 export default function Header() {
-	const { url } = useLoc();
+	const { url } = useLocation();
 	return (
 		<header>
 			<nav>

diff --git a/packages/preact-iso/index.js b/packages/preact-iso/index.js
@@ -1,4 +1,4 @@
-export { Router, LocationProvider, useLoc, useLocation } from './router.js';
+export { Router, LocationProvider, useLocation } from './router.js';
 export { default as lazy, ErrorBoundary } from './lazy.js';
 export { default as hydrate } from './hydrate.js';
 

diff --git a/packages/preact-iso/router.d.ts b/packages/preact-iso/router.d.ts
@@ -11,8 +11,6 @@ interface LocationHook {
 	route: (url: string) => void;
 };
 export const useLocation: () => LocationHook;
-/** @deprecated renamed to useLocation() */
-export const useLoc: () => LocationHook;
 
 export const useRoute: () => { [key: string]: string };
 

diff --git a/packages/preact-iso/router.js b/packages/preact-iso/router.js
@@ -1,4 +1,4 @@
-import { h, createContext, Fragment, cloneElement } from 'preact';
+import { h, createContext, cloneElement } from 'preact';
 import { useContext, useMemo, useReducer, useEffect, useLayoutEffect, useRef } from 'preact/hooks';
 
 const UPDATE = (state, url, push) => {
@@ -67,7 +67,7 @@ export function LocationProvider(props) {
 export function Router(props) {
 	const [, update] = useReducer(c => c + 1, 0);
 
-	const loc = useLoc();
+	const loc = useLocation();
 
 	const { url, path, query } = loc;
 
@@ -133,6 +133,5 @@ Router.Provider = LocationProvider;
 LocationProvider.ctx = createContext(/** @type {{ url: string, path: string, query: object, route }} */ ({}));
 const RouteContext = createContext({});
 
-export const useLoc = () => useContext(LocationProvider.ctx);
-export const useLocation = useLoc;
+export const useLocation = () => useContext(LocationProvider.ctx);
 export const useRoute = () => useContext(RouteContext);
diff --git a/packages/wmr/demo/public/header.tsx b/packages/wmr/demo/public/header.tsx
@@ -1,7 +1,7 @@
-import { useLoc } from './lib/loc.js';
+import { useLocation } from './lib/loc.js';
 
 export default function Header() {
-	const { url }: { url: string } = useLoc();
+	const { url }: { url: string } = useLocation();
 	return (
 		<header>
 			<nav>

diff --git a/packages/wmr/demo/public/lib/loc.js b/packages/wmr/demo/public/lib/loc.js
@@ -67,7 +67,7 @@ export function LocationProvider(props) {
 export function Router(props) {
 	const [, update] = useReducer(c => c + 1, 0);
 
-	const loc = useLoc();
+	const loc = useLocation();
 
 	const { url, path, query } = loc;
 
@@ -130,6 +130,5 @@ LocationProvider.ctx = createContext(/** @type {{ url: string, path: string, que
 
 const RouteContext = createContext({});
 
-export const useLoc = () => useContext(LocationProvider.ctx);
-export const useLocation = useLoc;
+export const useLocation = () => useContext(LocationProvider.ctx);
 export const useRoute = () => useContext(RouteContext);