fulldev-ui 0.5.0-beta.10 → 0.5.0-beta.12

package/.env.example

@@ -0,0 +1,3 @@
+SITE_URL=https://localhost:4321
+STRIPE_SECRET_KEY=
+STRIPE_RESTRICTED_KEY=

package/astro.config.ts

@@ -1,5 +1,3 @@
-import mdx from '@astrojs/mdx'
-import sitemap from '@astrojs/sitemap'
 // @ts-ignore
 import liveCode from 'astro-live-code'
 import { defineConfig } from 'astro/config'
@@ -7,17 +5,10 @@ import integration from 'fulldev-ui/integration'
 
 // https://astro.build/config
 export default defineConfig({
-  site: 'https://ui.full.dev',
   devToolbar: {
     enabled: false,
   },
-  experimental: {
-    contentIntellisense: false,
-    contentLayer: true,
-  },
   integrations: [
-    sitemap(),
-    mdx(),
     liveCode({
       layout: '/src/components/experimental/Window.astro',
     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fulldev-ui",
-  "version": "0.5.0-beta.10",
+  "version": "0.5.0-beta.12",
   "description": "A component library built for Astro",
   "homepage": "https://ui.full.dev",
   "bugs": "https://github.com/fulldotdev/ui/issues",
@@ -49,6 +49,7 @@
     "astro": "^4.16.6",
     "astro-favicons": "^2.0.2",
     "astro-live-code": "^0.0.3",
+    "astro-robots-txt": "^1.0.0",
     "astro-seo": "^0.8.4",
     "bezier-easing": "^2.1.0",
     "colorjs.io": "^0.5.2",
@@ -67,6 +68,7 @@
     "typescript": "^5.6.3",
     "unocss": "^0.63.4",
     "url": "^0.11.4",
+    "vite": "^5.4.10",
     "vite-plugin-virtual": "^0.3.0",
     "zod": "^3.23.8",
     "zod-to-ts": "^1.2.0"

package/pnpm-lock.yaml

@@ -41,6 +41,9 @@ dependencies:
   astro-live-code:
     specifier: ^0.0.3
     version: 0.0.3
+  astro-robots-txt:
+    specifier: ^1.0.0
+    version: 1.0.0
   astro-seo:
     specifier: ^0.8.4
     version: 0.8.4(prettier-plugin-astro@0.14.1)(prettier@3.3.3)(typescript@5.6.3)
@@ -91,13 +94,16 @@ dependencies:
     version: 5.6.3
   unocss:
     specifier: ^0.63.4
-    version: 0.63.4(postcss@8.4.45)(vite@5.4.9)
+    version: 0.63.4(postcss@8.4.45)(vite@5.4.10)
   url:
     specifier: ^0.11.4
     version: 0.11.4
+  vite:
+    specifier: ^5.4.10
+    version: 5.4.10(sass@1.80.2)
   vite-plugin-virtual:
     specifier: ^0.3.0
-    version: 0.3.0(vite@5.4.9)
+    version: 0.3.0(vite@5.4.10)
   zod:
     specifier: ^3.23.8
     version: 3.23.8
@@ -1796,7 +1802,7 @@ packages:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
     dev: false
 
-  /@unocss/astro@0.63.4(vite@5.4.9):
+  /@unocss/astro@0.63.4(vite@5.4.10):
     resolution: {integrity: sha512-qu1uMDUT8lXU3mm5EjZpnizvjSYtfY0TTDivR5QNm1i3Xd+ErHfdfOpXdJ2mYvxv+X7C570//KUugkTI3Mb3kQ==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
@@ -1806,8 +1812,8 @@ packages:
     dependencies:
       '@unocss/core': 0.63.4
       '@unocss/reset': 0.63.4
-      '@unocss/vite': 0.63.4(vite@5.4.9)
-      vite: 5.4.9(sass@1.80.2)
+      '@unocss/vite': 0.63.4(vite@5.4.10)
+      vite: 5.4.10(sass@1.80.2)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -1980,7 +1986,7 @@ packages:
       '@unocss/core': 0.63.4
     dev: false
 
-  /@unocss/vite@0.63.4(vite@5.4.9):
+  /@unocss/vite@0.63.4(vite@5.4.10):
     resolution: {integrity: sha512-YK0L177GD8Kx+JtfiCJy4YyBYckAXo4ogC8LZ+pYVNXDMN+F+XItpGI/ofLRaGIaewNg+MJgGY+CQZceABEAfg==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
@@ -1993,7 +1999,7 @@ packages:
       chokidar: 3.6.0
       magic-string: 0.30.11
       tinyglobby: 0.2.9
-      vite: 5.4.9(sass@1.80.2)
+      vite: 5.4.10(sass@1.80.2)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -2228,6 +2234,13 @@ packages:
       unist-util-visit-parents: 6.0.1
     dev: false
 
+  /astro-robots-txt@1.0.0:
+    resolution: {integrity: sha512-6JQSLid4gMhoWjOm85UHLkgrw0+hHIjnJVIUqxjU2D6feKlVyYukMNYjH44ZDZBK1P8hNxd33PgWlHzCASvedA==}
+    dependencies:
+      valid-filename: 4.0.0
+      zod: 3.23.8
+    dev: false
+
   /astro-seo@0.8.4(prettier-plugin-astro@0.14.1)(prettier@3.3.3)(typescript@5.6.3):
     resolution: {integrity: sha512-Ou1vzQSXAxa0K8rtNtXNvSpYqOGEgMhh0immMxJeXmbVZac3UKCNWAoXWyOQDFYsZvBugCRSg0N1phBqPMVgCw==}
     dependencies:
@@ -2297,8 +2310,8 @@ packages:
       tsconfck: 3.1.4(typescript@5.6.3)
       unist-util-visit: 5.0.0
       vfile: 6.0.3
-      vite: 5.4.9(sass@1.80.2)
-      vitefu: 1.0.3(vite@5.4.9)
+      vite: 5.4.10(sass@1.80.2)
+      vitefu: 1.0.3(vite@5.4.10)
       which-pm: 3.0.0
       xxhash-wasm: 1.0.2
       yargs-parser: 21.1.1
@@ -3055,6 +3068,11 @@ packages:
       picomatch: 4.0.2
     dev: false
 
+  /filename-reserved-regex@3.0.0:
+    resolution: {integrity: sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: false
+
   /fill-range@7.1.1:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
@@ -5824,7 +5842,7 @@ packages:
       unist-util-visit-parents: 6.0.1
     dev: false
 
-  /unocss@0.63.4(postcss@8.4.45)(vite@5.4.9):
+  /unocss@0.63.4(postcss@8.4.45)(vite@5.4.10):
     resolution: {integrity: sha512-MQ/ktuJ2MoXBsd117DEONFubJRQN6Og4mQJLbT+0nna2aTW4jYJESJ479mJYWq/ajonxEaM+zrf8M92VIWxzEw==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -5836,7 +5854,7 @@ packages:
       vite:
         optional: true
     dependencies:
-      '@unocss/astro': 0.63.4(vite@5.4.9)
+      '@unocss/astro': 0.63.4(vite@5.4.10)
       '@unocss/cli': 0.63.4
       '@unocss/core': 0.63.4
       '@unocss/postcss': 0.63.4(postcss@8.4.45)
@@ -5852,8 +5870,8 @@ packages:
       '@unocss/transformer-compile-class': 0.63.4
       '@unocss/transformer-directives': 0.63.4
       '@unocss/transformer-variant-group': 0.63.4
-      '@unocss/vite': 0.63.4(vite@5.4.9)
-      vite: 5.4.9(sass@1.80.2)
+      '@unocss/vite': 0.63.4(vite@5.4.10)
+      vite: 5.4.10(sass@1.80.2)
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -5883,6 +5901,13 @@ packages:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: false
 
+  /valid-filename@4.0.0:
+    resolution: {integrity: sha512-VEYTpTVPMgO799f2wI7zWf0x2C54bPX6NAfbZ2Z8kZn76p+3rEYCTYVYzMUcVSMvakxMQTriBf24s3+WeXJtEg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      filename-reserved-regex: 3.0.0
+    dev: false
+
   /vfile-location@5.0.3:
     resolution: {integrity: sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==}
     dependencies:
@@ -5904,16 +5929,16 @@ packages:
       vfile-message: 4.0.2
     dev: false
 
-  /vite-plugin-virtual@0.3.0(vite@5.4.9):
+  /vite-plugin-virtual@0.3.0(vite@5.4.10):
     resolution: {integrity: sha512-TOtrWw6jKrJNXfxhGRUiQzfAP1gRkYkVzMkJNjHUJ8idLuxf8eeeDKZKZHhdeYfaCc/87rv+KvWE2iCy1QInWA==}
     peerDependencies:
       vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
     dependencies:
-      vite: 5.4.9(sass@1.80.2)
+      vite: 5.4.10(sass@1.80.2)
     dev: false
 
-  /vite@5.4.9(sass@1.80.2):
-    resolution: {integrity: sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==}
+  /vite@5.4.10(sass@1.80.2):
+    resolution: {integrity: sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -5951,7 +5976,7 @@ packages:
       fsevents: 2.3.3
     dev: false
 
-  /vitefu@1.0.3(vite@5.4.9):
+  /vitefu@1.0.3(vite@5.4.10):
     resolution: {integrity: sha512-iKKfOMBHob2WxEJbqbJjHAkmYgvFDPhuqrO82om83S8RLk+17FtyMBfcyeH8GqD0ihShtkMW/zzJgiA51hCNCQ==}
     peerDependencies:
       vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0-beta.0
@@ -5959,7 +5984,7 @@ packages:
       vite:
         optional: true
     dependencies:
-      vite: 5.4.9(sass@1.80.2)
+      vite: 5.4.10(sass@1.80.2)
     dev: false
 
   /volar-service-css@0.0.61(@volar/language-service@2.4.4):

package/src/blocks/Product.astro

@@ -30,9 +30,9 @@ const {
 
 const slug = Astro.url.pathname.replace(/^\/|\/$/g, '') || 'index'
 const src = `/src/images/${images?.[0].id}`
-const gotImage = await getImage({ src, width: 200, height: 200 })
-
-console.log({ hoi: gotImage.src })
+const allImages = import.meta.glob<{ default: ImageMetadata }>('/src/images/*')
+const foundImage = allImages[src]
+const gotImage = await getImage({ src: foundImage ? foundImage() : src })
 ---
 
 <Section

package/src/components/CartForm.astro

@@ -41,10 +41,11 @@ const { title, slug, image, price, variants, ...rest } = Astro.props
     name="url"
     value={Astro.site ? Astro.site.href + slug : undefined}
   />
+
   <Input
     type="hidden"
     name="image"
-    value={Astro.url.origin ? Astro.url.origin + image : undefined}
+    value={image}
   />
   {
     Object.entries(variants ?? {}).map(([key, options]) => (

package/src/components/CartSummary.astro

@@ -66,8 +66,6 @@ const { ...rest } = Astro.props
   import { formatPrice } from 'fulldev-ui/utils/cart'
   import Stripe from 'stripe'
 
-  const stripe = new Stripe(import.meta.env.PUBLIC_STRIPE_CHECKOUT_KEY)
-
   function setPrice(items: any) {
     const price = document.querySelector('.cart-summary .price')
     if (price)
@@ -80,6 +78,8 @@ const { ...rest } = Astro.props
   }
 
   document.addEventListener('astro:page-load', () => {
+    const stripe = new Stripe(import.meta.env.STRIPE_RESTRICTED_KEY)
+    if (stripe) return
     setPrice($cart.get())
 
     $cart.subscribe((items: any) => {
@@ -128,7 +128,7 @@ const { ...rest } = Astro.props
             currency: 'eur',
             product_data: {
               name: item.name,
-              images: [window],
+              images: [Astro.site ? Astro.site.href + item.image : undefined],
             },
             unit_amount: Math.round(item.price * 100),
           },

package/src/integration/index.ts

@@ -1,8 +1,13 @@
+import mdx from '@astrojs/mdx'
+import sitemap from '@astrojs/sitemap'
 import viteYaml from '@rollup/plugin-yaml'
 import type { AstroIntegration } from 'astro'
 import favicons from 'astro-favicons'
+import robotsTxt from 'astro-robots-txt'
+import { envField } from 'astro/config'
 import type { CollectionEntry } from 'astro:content'
 import merge from 'deepmerge'
+import { loadEnv } from 'vite'
 import virtual from 'vite-plugin-virtual'
 import { generateRadixColors } from './generate-colors'
 
@@ -35,7 +40,6 @@ const defaultConfig: Config = {
       brand: '#000',
     },
   },
-  // generateImageEntries: false,
 }
 
 export default function fulldevIntegration(
@@ -53,12 +57,39 @@ export default function fulldevIntegration(
         injectRoute,
       }) => {
         // ----------------------
-        // Inject favicon integration
+        // Update config
         // ----------------------
         config.favicon &&
           config.company &&
           updateConfig({
+            experimental: {
+              contentLayer: true,
+              env: {
+                schema: {
+                  SITE_URL: envField.string({
+                    context: 'client',
+                    access: 'public',
+                  }),
+                  STRIPE_RESTRICTED_KEY: envField.string({
+                    context: 'client',
+                    access: 'public',
+                    optional: true,
+                  }),
+                  STRIPE_SECRET_KEY: envField.string({
+                    context: 'server',
+                    access: 'secret',
+                    optional: true,
+                  }),
+                },
+                validateSecrets: true,
+              },
+            },
+            site: loadEnv(process.env.NODE_ENV as any, process.cwd(), '')
+              .SITE_URL,
             integrations: [
+              sitemap(),
+              mdx(),
+              robotsTxt(),
               favicons({
                 path: 'favicon',
                 masterPicture: config.favicon,

package/src/utils/cart.ts

@@ -1,7 +1,3 @@
-// import Stripe from 'stripe'
-
-// const stripe = new Stripe(import.meta.env.STRIPE_SECRET_KEY)
-
 const slugify = (input: string): string => {
   return input
     .toLowerCase()