@quilted/preact-localize 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @quilted/react-localize
 
+## 0.4.1
+
+### Patch Changes
+
+- [`e6fa47e`](https://github.com/lemonmade/quilt/commit/e6fa47e93981ce0eaebbe1546659aaa08cc22689) Thanks [@lemonmade](https://github.com/lemonmade)! - Update Preact and Signal dependencies
+
+- Updated dependencies [[`b1df5da`](https://github.com/lemonmade/quilt/commit/b1df5daff8441f8435a62b02b4ad3676d3ddcc3b), [`06b43bc`](https://github.com/lemonmade/quilt/commit/06b43bc44d271ce30798dc0b582870208bae1572), [`e6fa47e`](https://github.com/lemonmade/quilt/commit/e6fa47e93981ce0eaebbe1546659aaa08cc22689)]:
+  - @quilted/preact-browser@0.2.6
+  - @quilted/preact-router@0.2.15
+  - @quilted/preact-context@0.1.4
+  - @quilted/localize@0.2.2
+  - @quilted/signals@0.2.4
+
 ## 0.4.0
 
 ### Minor Changes

package/build/esm/hooks/formatting.mjs

@@ -1,5 +1,7 @@
-import { LocalizedFormattingContext } from '../context.mjs';
+import { useQuiltContext } from '@quilted/preact-context';
 
-const useLocalizedFormatting = LocalizedFormattingContext.use;
+function useLocalizedFormatting() {
+  return useQuiltContext('localization');
+}
 
 export { useLocalizedFormatting };

package/build/esm/hooks/locale.mjs

@@ -1,5 +1,7 @@
-import { LocaleContext } from '../context.mjs';
+import { useQuiltContext } from '@quilted/preact-context';
 
-const useLocale = LocaleContext.use;
+function useLocale() {
+  return useQuiltContext('localization').locale;
+}
 
 export { useLocale };

package/build/esm/index.mjs

@@ -1,13 +1,10 @@
-export { MissingTranslationError, MissingTranslationPlaceholderError, createLocalizedFormatting, createTranslate, parseAcceptLanguageHeader } from '@quilted/localize';
-export { Localization } from './Localization.mjs';
+export { Localization, MissingTranslationError, MissingTranslationPlaceholderError, createTranslate, parseAcceptLanguageHeader } from '@quilted/localize';
 export { useLocalizedFormatting } from './hooks/formatting.mjs';
 export { useLocale } from './hooks/locale.mjs';
 export { useAlternateURL } from './hooks/alternate-url.mjs';
 export { AlternateURL } from './components/AlternateURL.mjs';
-export { LocalizedFormattingContext } from './context.mjs';
 export { LocalizedLink } from './routing/LocalizedLink.mjs';
 export { LocalizedNavigation } from './routing/LocalizedNavigation.mjs';
-export { LocalizedRouter } from './routing/LocalizedRouter.mjs';
 export { useRouteLocalization } from './routing/context.mjs';
 export { createRouteLocalization } from './routing/localization/by-locale.mjs';
 export { createRoutePathLocalization } from './routing/localization/by-path.mjs';

package/build/esm/routing/LocalizedLink.mjs

@@ -1,5 +1,5 @@
 import { useMemo } from 'preact/hooks';
-import { useRouter, useCurrentURL, Link } from '@quilted/preact-router';
+import { useNavigation, useCurrentURL, Link } from '@quilted/preact-router';
 import { useRouteLocalization } from './context.mjs';
 import { jsx } from 'preact/jsx-runtime';
 
@@ -8,14 +8,14 @@ function LocalizedLink({
   locale,
   ...props
 }) {
-  const router = useRouter();
+  const navigation = useNavigation();
   const url = useCurrentURL();
   const {
     redirectURL
   } = useRouteLocalization();
-  const resolvedURL = useMemo(() => redirectURL(to ? router.resolve(to).url : url, {
+  const resolvedURL = useMemo(() => redirectURL(to ? navigation.resolve(to).url : url, {
     to: locale
-  }), [to, url, locale, redirectURL, router]);
+  }), [to, url, locale, redirectURL, navigation]);
   return jsx(Link, {
     hrefLang: locale,
     to: resolvedURL,

package/build/esm/routing/LocalizedNavigation.mjs

@@ -1,47 +1,38 @@
-import { useMemo } from 'preact/hooks';
-import { useBrowserDetails } from '@quilted/preact-browser';
 import { Navigation } from '@quilted/preact-router';
-import { Localization } from '../Localization.mjs';
-import { LocalizedRouter } from './LocalizedRouter.mjs';
-import { RouteLocalizationContext } from './context.mjs';
-import { jsx } from 'preact/jsx-runtime';
 
-function LocalizedNavigation({
-  locale: explicitLocale,
-  router,
-  routes,
-  context,
-  localization,
-  children
-}) {
-  const browser = useBrowserDetails({
-    optional: true
-  });
-  const resolvedRouter = useMemo(() => router ?? new LocalizedRouter(browser?.request.url, {
-    localization: localization
-  }), [router]);
-  const resolvedLocalization = resolvedRouter.localization;
-  const localeFromEnvironment = browser?.locale.value;
-  let resolvedLocale;
-  if (explicitLocale) {
-    resolvedLocale = explicitLocale;
-  } else if (localeFromEnvironment != null && localeFromEnvironment.toLowerCase().startsWith(resolvedLocalization.locale.toLowerCase())) {
-    resolvedLocale = localeFromEnvironment;
-  } else {
-    resolvedLocale = resolvedLocalization.locale;
+class LocalizedNavigation extends Navigation {
+  get locale() {
+    return this.routes.locale;
+  }
+  constructor(initial, {
+    routes,
+    isExternal: explicitIsExternal
+  }) {
+    const {
+      localeFromURL
+    } = routes;
+    let matchedLocale;
+    super(initial, {
+      isExternal(url, currentURL) {
+        return matchedLocale !== localeFromURL(url) || (explicitIsExternal?.(url, currentURL) ?? false);
+      }
+    });
+    const currentURL = this.currentRequest.url;
+    matchedLocale = localeFromURL(currentURL);
+    const resolvedLocalization = {
+      locale: matchedLocale ?? routes.defaultLocale,
+      ...routes
+    };
+    this.routes = resolvedLocalization;
+    const {
+      pathname: rootPath
+    } = routes.redirectURL(new URL('/', currentURL), {
+      to: resolvedLocalization.locale
+    });
+    if (rootPath.length > 1) Object.assign(this, {
+      base: rootPath
+    });
   }
-  return jsx(Localization, {
-    locale: resolvedLocale,
-    children: jsx(RouteLocalizationContext.Provider, {
-      value: resolvedLocalization,
-      children: jsx(Navigation, {
-        router: resolvedRouter,
-        routes: routes,
-        context: context,
-        children: children
-      })
-    })
-  });
 }
 
 export { LocalizedNavigation };

package/build/esm/routing/context.mjs

@@ -1,6 +1,12 @@
-import { createOptionalContext } from '@quilted/preact-context';
+import { useNavigation } from '@quilted/preact-router';
+import { LocalizedNavigation } from './LocalizedNavigation.mjs';
 
-const RouteLocalizationContext = createOptionalContext();
-const useRouteLocalization = RouteLocalizationContext.use;
+function useRouteLocalization() {
+  const navigation = useNavigation();
+  if (!(navigation instanceof LocalizedNavigation)) {
+    throw new Error('useRouteLocalization() requires a LocalizedNavigation instance to be provided in context. ' + 'Make sure you are passing a LocalizedNavigation to QuiltFrameworkContext.');
+  }
+  return navigation.routes;
+}
 
-export { RouteLocalizationContext, useRouteLocalization };
+export { useRouteLocalization };

package/build/esnext/hooks/formatting.esnext

@@ -1,5 +1,7 @@
-import { LocalizedFormattingContext } from '../context.esnext';
+import { useQuiltContext } from '@quilted/preact-context';
 
-const useLocalizedFormatting = LocalizedFormattingContext.use;
+function useLocalizedFormatting() {
+  return useQuiltContext("localization");
+}
 
 export { useLocalizedFormatting };

package/build/esnext/hooks/locale.esnext

@@ -1,5 +1,7 @@
-import { LocaleContext } from '../context.esnext';
+import { useQuiltContext } from '@quilted/preact-context';
 
-const useLocale = LocaleContext.use;
+function useLocale() {
+  return useQuiltContext("localization").locale;
+}
 
 export { useLocale };

package/build/esnext/index.esnext

@@ -1,13 +1,10 @@
-export { MissingTranslationError, MissingTranslationPlaceholderError, createLocalizedFormatting, createTranslate, parseAcceptLanguageHeader } from '@quilted/localize';
-export { Localization } from './Localization.esnext';
+export { Localization, MissingTranslationError, MissingTranslationPlaceholderError, createTranslate, parseAcceptLanguageHeader } from '@quilted/localize';
 export { useLocalizedFormatting } from './hooks/formatting.esnext';
 export { useLocale } from './hooks/locale.esnext';
 export { useAlternateURL } from './hooks/alternate-url.esnext';
 export { AlternateURL } from './components/AlternateURL.esnext';
-export { LocalizedFormattingContext } from './context.esnext';
 export { LocalizedLink } from './routing/LocalizedLink.esnext';
 export { LocalizedNavigation } from './routing/LocalizedNavigation.esnext';
-export { LocalizedRouter } from './routing/LocalizedRouter.esnext';
 export { useRouteLocalization } from './routing/context.esnext';
 export { createRouteLocalization } from './routing/localization/by-locale.esnext';
 export { createRoutePathLocalization } from './routing/localization/by-path.esnext';

package/build/esnext/routing/LocalizedLink.esnext

@@ -1,6 +1,6 @@
 import { jsx } from 'preact/jsx-runtime';
 import { useMemo } from 'preact/hooks';
-import { useRouter, useCurrentURL, Link } from '@quilted/preact-router';
+import { useNavigation, useCurrentURL, Link } from '@quilted/preact-router';
 import { useRouteLocalization } from './context.esnext';
 
 function LocalizedLink({
@@ -8,12 +8,12 @@ function LocalizedLink({
   locale,
   ...props
 }) {
-  const router = useRouter();
+  const navigation = useNavigation();
   const url = useCurrentURL();
   const { redirectURL } = useRouteLocalization();
   const resolvedURL = useMemo(
-    () => redirectURL(to ? router.resolve(to).url : url, { to: locale }),
-    [to, url, locale, redirectURL, router]
+    () => redirectURL(to ? navigation.resolve(to).url : url, { to: locale }),
+    [to, url, locale, redirectURL, navigation]
   );
   return /* @__PURE__ */ jsx(Link, { hrefLang: locale, to: resolvedURL, ...props });
 }

package/build/esnext/routing/LocalizedNavigation.esnext

@@ -1,35 +1,33 @@
-import { jsx } from 'preact/jsx-runtime';
-import { useMemo } from 'preact/hooks';
-import { useBrowserDetails } from '@quilted/preact-browser';
 import { Navigation } from '@quilted/preact-router';
-import { Localization } from '../Localization.esnext';
-import { LocalizedRouter } from './LocalizedRouter.esnext';
-import { RouteLocalizationContext } from './context.esnext';
 
-function LocalizedNavigation({
-  locale: explicitLocale,
-  router,
-  routes,
-  context,
-  localization,
-  children
-}) {
-  const browser = useBrowserDetails({ optional: true });
-  const resolvedRouter = useMemo(
-    () => router ?? new LocalizedRouter(browser?.request.url, { localization }),
-    [router]
-  );
-  const resolvedLocalization = resolvedRouter.localization;
-  const localeFromEnvironment = browser?.locale.value;
-  let resolvedLocale;
-  if (explicitLocale) {
-    resolvedLocale = explicitLocale;
-  } else if (localeFromEnvironment != null && localeFromEnvironment.toLowerCase().startsWith(resolvedLocalization.locale.toLowerCase())) {
-    resolvedLocale = localeFromEnvironment;
-  } else {
-    resolvedLocale = resolvedLocalization.locale;
+class LocalizedNavigation extends Navigation {
+  routes;
+  get locale() {
+    return this.routes.locale;
+  }
+  constructor(initial, {
+    routes,
+    isExternal: explicitIsExternal
+  }) {
+    const { localeFromURL } = routes;
+    let matchedLocale;
+    super(initial, {
+      isExternal(url, currentURL2) {
+        return matchedLocale !== localeFromURL(url) || (explicitIsExternal?.(url, currentURL2) ?? false);
+      }
+    });
+    const currentURL = this.currentRequest.url;
+    matchedLocale = localeFromURL(currentURL);
+    const resolvedLocalization = {
+      locale: matchedLocale ?? routes.defaultLocale,
+      ...routes
+    };
+    this.routes = resolvedLocalization;
+    const { pathname: rootPath } = routes.redirectURL(new URL("/", currentURL), {
+      to: resolvedLocalization.locale
+    });
+    if (rootPath.length > 1) Object.assign(this, { base: rootPath });
   }
-  return /* @__PURE__ */ jsx(Localization, { locale: resolvedLocale, children: /* @__PURE__ */ jsx(RouteLocalizationContext.Provider, { value: resolvedLocalization, children: /* @__PURE__ */ jsx(Navigation, { router: resolvedRouter, routes, context, children }) }) });
 }
 
 export { LocalizedNavigation };

package/build/esnext/routing/context.esnext

@@ -1,6 +1,14 @@
-import { createOptionalContext } from '@quilted/preact-context';
+import { useNavigation } from '@quilted/preact-router';
+import { LocalizedNavigation } from './LocalizedNavigation.esnext';
 
-const RouteLocalizationContext = createOptionalContext();
-const useRouteLocalization = RouteLocalizationContext.use;
+function useRouteLocalization() {
+  const navigation = useNavigation();
+  if (!(navigation instanceof LocalizedNavigation)) {
+    throw new Error(
+      "useRouteLocalization() requires a LocalizedNavigation instance to be provided in context. Make sure you are passing a LocalizedNavigation to QuiltFrameworkContext."
+    );
+  }
+  return navigation.routes;
+}
 
-export { RouteLocalizationContext, useRouteLocalization };
+export { useRouteLocalization };