@astronox/core 0.4.8 → 0.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astronox/core",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "Reusable Astro components, patterns, styles, and infrastructure for AstroNox sites.",
   "license": "MIT",
   "keywords": [

package/src/ads/adsense/AdsenseHead.astro

@@ -8,22 +8,14 @@ type Props = {
 
 const { config }: Props = Astro.props;
 const clientId = toAdsenseClientId(config.publisherId);
-const runtimeConfig = JSON.stringify({
-  allowedHosts: config.allowedHosts,
-  clientId,
-}).replaceAll('<', '\\u003c');
+const scriptSource = `https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=${encodeURIComponent(clientId)}`;
 ---
 
 <meta name="google-adsense-account" content={clientId} />
-<script
-  is:inline
-  type="application/json"
-  data-astronox-adsense-config
-  set:html={runtimeConfig}
-/>
+<script is:inline async crossorigin="anonymous" src={scriptSource}></script>
 
 <script>
-  import { initAdsenseFromDocument } from './runtime';
+  import { initAdAnnotationProtection } from './runtime';
 
-  initAdsenseFromDocument();
+  initAdAnnotationProtection();
 </script>

package/src/ads/adsense/runtime.ts

@@ -1,45 +1,5 @@
-const adsenseScriptSelector =
-  'script[src^="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"]';
-
-type AdsenseRuntimeConfig = {
-  allowedHosts: readonly string[];
-  clientId: string;
-};
-
-export function initAdsenseFromDocument(): void {
-  const config = readRuntimeConfig();
-  if (!config || !isAllowedHost(config.allowedHosts)) {
-    return;
-  }
-
+export function initAdAnnotationProtection(): void {
   protectAdAnnotations();
-  loadAdsenseScript(config.clientId);
-}
-
-function readRuntimeConfig(): AdsenseRuntimeConfig | undefined {
-  const element = document.querySelector<HTMLScriptElement>(
-    'script[data-astronox-adsense-config]',
-  );
-  if (!element?.textContent) return undefined;
-
-  try {
-    return JSON.parse(element.textContent) as AdsenseRuntimeConfig;
-  } catch {
-    return undefined;
-  }
-}
-
-function isAllowedHost(allowedHosts: readonly string[]): boolean {
-  const hostname = window.location.hostname.toLowerCase();
-  if (
-    hostname === 'localhost' ||
-    hostname.endsWith('.localhost') ||
-    hostname === '127.0.0.1' ||
-    hostname === '::1'
-  ) {
-    return false;
-  }
-  return allowedHosts.some((host) => host.toLowerCase() === hostname);
 }
 
 function protectAdAnnotations(): void {
@@ -66,13 +26,3 @@ function protectAdAnnotations(): void {
     }
   }).observe(document.documentElement, { childList: true, subtree: true });
 }
-
-function loadAdsenseScript(clientId: string): void {
-  if (document.querySelector(adsenseScriptSelector)) return;
-
-  const script = document.createElement('script');
-  script.async = true;
-  script.crossOrigin = 'anonymous';
-  script.src = `https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=${encodeURIComponent(clientId)}`;
-  document.head.append(script);
-}

package/src/ads/contracts.ts

@@ -5,7 +5,6 @@ export type DisabledAdsConfig = {
 export type AdsenseAdsConfig = {
   enabled: true;
   provider: 'adsense';
-  allowedHosts: readonly string[];
   publisherId: string;
 };
 
@@ -20,34 +19,8 @@ export function defineAdsConfig<const TConfig extends AdsConfig>(
 ): TConfig {
   if (!config.enabled) return config;
 
-  if (config.allowedHosts.length === 0) {
-    throw new Error('Ad configuration requires at least one allowed hostname');
-  }
-  for (const host of config.allowedHosts) {
-    if (!isValidHostname(host)) {
-      throw new Error(`Invalid advertising hostname: ${host}`);
-    }
-  }
   if (!/^pub-\d+$/.test(config.publisherId)) {
     throw new Error('Invalid AdSense publisher id');
   }
   return config;
 }
-
-function isValidHostname(host: string): boolean {
-  if (!host || host !== host.trim() || host.includes('/')) return false;
-  if (
-    host.toLowerCase() === 'localhost' ||
-    host.toLowerCase().endsWith('.localhost') ||
-    host === '127.0.0.1' ||
-    host === '::1'
-  ) {
-    return false;
-  }
-
-  try {
-    return new URL(`https://${host}`).hostname === host.toLowerCase();
-  } catch {
-    return false;
-  }
-}

package/src/layouts/BaseLayout.astro

@@ -62,30 +62,32 @@ const resolvedTone = tone ?? dataTone;
     <slot name="head" />
   </head>
   <body>
-    <slot name="skip-link" />
-    <slot name="header" />
-    <div class="site-viewport" data-site-viewport>
-      <main id="content" class="site-main" tabindex="-1">
-        <div class="site-main__content">
-          {
-            breadcrumbs?.length ? (
-              <Breadcrumbs
-                {...adAnnotationExclusionAttributes}
-                items={breadcrumbs}
-                label={breadcrumbLabel}
-                tone={breadcrumbTone}
-              />
-            ) : null
-          }
+    <div class="site-shell">
+      <slot name="skip-link" />
+      <slot name="header" />
+      <div class="site-viewport" data-site-viewport>
+        <main id="content" class="site-main" tabindex="-1">
+          <div class="site-main__content">
+            {
+              breadcrumbs?.length ? (
+                <Breadcrumbs
+                  {...adAnnotationExclusionAttributes}
+                  items={breadcrumbs}
+                  label={breadcrumbLabel}
+                  tone={breadcrumbTone}
+                />
+              ) : null
+            }
 
-          <PageSurface {...pageSurfaceAttributes}>
-            <slot />
-            <slot name="page-end" />
-          </PageSurface>
-        </div>
-      </main>
-      <slot name="footer" />
+            <PageSurface {...pageSurfaceAttributes}>
+              <slot />
+              <slot name="page-end" />
+            </PageSurface>
+          </div>
+        </main>
+        <slot name="footer" />
+      </div>
+      {scrollToTopLabel ? <ScrollToTop label={scrollToTopLabel} /> : null}
     </div>
-    {scrollToTopLabel ? <ScrollToTop label={scrollToTopLabel} /> : null}
   </body>
 </html>

package/src/patterns/MapViewport/MapViewport.css

@@ -155,12 +155,12 @@
   --map-viewport-cell-surface: color-mix(
     in srgb,
     var(--map-viewport-cell-seed) 38%,
-    var(--nox-theme-surface-base)
+    var(--nox-mix-light)
   );
   --map-viewport-cell-surface-hover: color-mix(
     in srgb,
     var(--map-viewport-cell-seed) 52%,
-    var(--nox-theme-surface-base)
+    var(--nox-mix-light)
   );
   --map-viewport-cell-background: color-mix(
     in srgb,
@@ -175,7 +175,7 @@
   --map-viewport-cell-border: color-mix(
     in srgb,
     var(--map-viewport-cell-seed) 74%,
-    var(--nox-theme-text-base)
+    var(--nox-mix-dark)
   );
 
   fill: var(--map-viewport-cell-background);

package/src/styles/base.css

@@ -53,17 +53,23 @@ html {
 }
 
 body {
+  margin: 0;
+  overflow: hidden;
+  background: var(--nox-page-background);
+}
+
+.site-shell {
   display: grid;
+  width: 100vw;
   height: 100vh;
   min-height: 100vh;
   grid-template-rows: auto minmax(0, 1fr);
-  margin: 0;
   overflow: hidden;
   background: var(--nox-page-background);
 }
 
 @supports (height: 100dvh) {
-  body {
+  .site-shell {
     height: 100dvh;
     min-height: 100dvh;
   }

package/src/styles/tokens.css

@@ -14,7 +14,7 @@
   --nox-content-link-font-weight: var(--nox-font-weight-regular);
   --nox-content-link-emphasis-font-weight: var(--nox-font-weight-medium);
 
-  /* Public map seeds. Component states derive their full treatment from these. */
+  /* Public map palette. It stays stable across UI color themes. */
   --nox-source-map-available: #00b86b;
   --nox-source-map-unavailable: #f43f5e;
   --nox-source-map-field: #f59e0b;
@@ -48,14 +48,6 @@
   --nox-source-tone-warning: #f0ad55;
   --nox-source-tone-danger: #f47777;
 
-  --nox-source-map-available: #42d392;
-  --nox-source-map-unavailable: #fb7185;
-  --nox-source-map-field: #fbbf24;
-  --nox-source-map-grass: #84cc16;
-  --nox-source-map-mountain: #94a3b8;
-  --nox-source-map-water: #38bdf8;
-  --nox-source-map-range: #60a5fa;
-
   --nox-theme-page-base: #0f1218;
   --nox-theme-surface-base: #171b23;
   --nox-theme-text-base: #f8fafc;