@akinon/next 2.0.0-beta.2 → 2.0.0-beta.20

package/hooks/use-pz-params.ts

@@ -0,0 +1,37 @@
+'use client';
+
+import { useParams } from 'next/navigation';
+import settings from 'settings';
+import {
+  decodePzValue,
+  getPzSegmentsConfig,
+  getBuiltInSegments,
+  isLegacyMode
+} from '../utils/pz-segments';
+
+export function usePzParams(): {
+  locale: string;
+  currency: string;
+  [key: string]: string;
+} {
+  const params = useParams() as Record<string, string>;
+
+  if (isLegacyMode(settings)) {
+    return {
+      locale:
+        params.locale ?? settings.localization.defaultLocaleValue,
+      currency:
+        params.currency ?? settings.localization.defaultCurrencyCode
+    };
+  }
+
+  const pzValue = params.pz ?? '';
+  const config = getPzSegmentsConfig(settings);
+  const parsed = decodePzValue(pzValue, config);
+  const builtIn = getBuiltInSegments(parsed, settings);
+
+  return {
+    ...parsed,
+    ...builtIn
+  };
+}

package/hooks/use-router.ts

@@ -5,6 +5,24 @@ import { urlLocaleMatcherRegex } from '../utils';
 import { useLocalization } from './use-localization';
 import { LocaleUrlStrategy } from '../localization';
 
+const isNavigableHref = (href: string) => {
+  if (!href || typeof href !== 'string') return false;
+
+  const trimmedHref = href.trim();
+  if (!trimmedHref) return false;
+  if (trimmedHref === '#') return true;
+  if (trimmedHref.startsWith('mailto:') || trimmedHref.startsWith('tel:')) {
+    return true;
+  }
+
+  try {
+    new URL(trimmedHref, 'http://localhost');
+    return true;
+  } catch {
+    return false;
+  }
+};
+
 export const useRouter = () => {
   const { locale, locales, localeUrlStrategy, defaultLocaleValue } =
     useLocalization();
@@ -16,24 +34,43 @@ export const useRouter = () => {
     href: string,
     options?
   ) => {
-    if (href.startsWith('http')) {
-      return fn(href, options);
+    if (!isNavigableHref(href)) {
+      return fn('#', options);
     }
 
-    const url = new URL(href, window.location.origin);
-    const pathnameWithoutLocale = url.pathname.replace(
-      urlLocaleMatcherRegex,
-      ''
-    );
+    const trimmedHref = href.trim();
 
-    url.pathname = `${
-      locale === defaultLocale?.value &&
-      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale
-        ? ''
-        : `/${locale}`
-    }${pathnameWithoutLocale}`;
+    if (
+      trimmedHref.startsWith('http') ||
+      trimmedHref.startsWith('//') ||
+      trimmedHref.startsWith('mailto:') ||
+      trimmedHref.startsWith('tel:') ||
+      trimmedHref.startsWith('#')
+    ) {
+      return fn(trimmedHref, options);
+    }
+
+    try {
+      const url = new URL(trimmedHref, window.location.origin);
+      const pathnameWithoutLocale = url.pathname.replace(
+        urlLocaleMatcherRegex,
+        ''
+      );
 
-    return fn(url.href, options);
+      url.pathname = `${
+        localeUrlStrategy === LocaleUrlStrategy.Subdomain ||
+        (locale === defaultLocale?.value &&
+          [LocaleUrlStrategy.HideDefaultLocale].includes(
+            localeUrlStrategy as LocaleUrlStrategy
+          ))
+          ? ''
+          : `/${locale}`
+      }${pathnameWithoutLocale}`;
+
+      return fn(url.href, options);
+    } catch {
+      return fn('#', options);
+    }
   };
 
   return {

package/hooks/use-sentry-uncaught-errors.ts

@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+import * as Sentry from '@sentry/nextjs';
+import { ClientLogType } from '@akinon/next/sentry';
+
+export const useSentryUncaughtErrors = (error: Error & { digest?: string }) => {
+  useEffect(() => {
+    Sentry.withScope(function (scope) {
+      scope.setLevel('fatal');
+      scope.setTags({
+        APP_TYPE: 'ProjectZeroNext',
+        TYPE: 'Client',
+        LOG_TYPE: ClientLogType.UNCAUGHT_ERROR_PAGE
+      });
+      scope.setExtra('error', error);
+
+      const error_ = new Error('FATAL: Uncaught client error');
+      error_.name = 'UNCAUGHT_ERROR_PAGE';
+
+      Sentry.captureException(error_, {
+        fingerprint: ['UNCAUGHT_ERROR_PAGE', error.digest]
+      });
+    });
+  }, [error]);
+};

package/instrumentation/index.ts

@@ -1,5 +1,14 @@
+import { initSentry } from '../sentry';
+import * as Sentry from '@sentry/nextjs';
+
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
-    await import('./node');
+    initSentry('Server');
+  }
+
+  if (process.env.NEXT_RUNTIME === 'edge') {
+    initSentry('Edge');
   }
 }
+
+export const onRequestError = Sentry.captureRequestError;

package/instrumentation/node.ts

@@ -1,20 +1,2 @@
-import { NodeSDK } from '@opentelemetry/sdk-node';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
-import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
-
-const sdk = new NodeSDK({
-  resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
-  }),
-  spanProcessor: new SimpleSpanProcessor(
-    new OTLPTraceExporter({
-      url: `${
-        process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
-      }/api/traces`
-    })
-  )
-});
-
-sdk.start();
+// OpenTelemetry tracing is handled by Sentry.
+// Custom NodeSDK setup removed due to version incompatibility with Sentry 10's OpenTelemetry v2.x requirements.

package/jest.config.js

@@ -0,0 +1,25 @@
+const path = require('path');
+const findBaseDir = require('./utils/find-base-dir');
+
+const baseDir = findBaseDir();
+
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  rootDir: path.resolve(__dirname),
+  testMatch: ['**/*.test.ts'],
+  testPathIgnorePatterns: [],
+  roots: [path.resolve(__dirname)],
+  transformIgnorePatterns: [],
+  moduleNameMapper: {
+    '^settings$': path.resolve(baseDir, 'src/settings.js')
+  },
+  transform: {
+    '^.+\\.(tsx?|jsx?|mjs?)$': [
+      'ts-jest',
+      {
+        tsconfig: path.resolve(__dirname, '__tests__/tsconfig.json')
+      }
+    ]
+  }
+};