Merge branch 'master' into v3-deployment

apps/marketing/src/components/page-header.astro

@@ -1,6 +1,5 @@
 ---
 import { cva } from 'class-variance-authority'
-
 import { cn } from '@/utils/cn'
 
 const pageHeaderVariants = cva('', {

apps/marketing/src/layouts/PublicLayout.astro

@@ -5,7 +5,7 @@ import { ThemeProvider } from 'next-themes'
 
 import { Footer } from '@prodkt/ui/prodkt-components/footer'
 import { Header } from '@prodkt/ui/prodkt-components/header'
-import { PageFooter } from '@prodkt/ui/prodkt-components/page-footer'
+import PageFooter from '@prodkt/ui/prodkt-components/page-footer'
 
 import BaseHead from '@/components/BaseHead.astro'
 import Plutio from '@/components/plutio/plutio.astro'

apps/marketing/src/styles/globals.css

@@ -1,7 +1,7 @@
 @import './codeblock.scss';
 /* @import '@prodkt/tailwind/color'; */
-@import '@prodkt/config/tailwind/src/color.css';
-@import '@prodkt/config/tailwind/src/ghost.css';
+@import '@prodkt/tailwind/color';
+@import '@prodkt/tailwind/ghost';
 @import '@prodkt/assets/fonts/stylesheet.css';
 @import './flow-board.css';
 

apps/marketing/tsconfig.json

@@ -1,14 +1,10 @@
 {
   "extends": ["astro/tsconfigs/strictest", "@prodkt/tsconfig/react.json"],
   "compilerOptions": {
-    "jsx": "react-jsx",
     "baseUrl": ".",
     "paths": {
       "@/*": ["src/*"],
-      "@/supabase/*": ["src/supabase/*"],
-      "@prodkt/assets/*": ["../../packages/assets/*"],
-      "@prodkt/config/tailwind/*": ["../../packages/config/tailwind/*"],
-      "@prodkt/ui/*": ["../../packages/ui/dist/*"]
+      "@/supabase/*": ["src/supabase/*"]
     }
   },
   "exclude": ["public/posthog.js", "dist"]

apps/web/package.json

@@ -7,7 +7,7 @@
   "author": "Bryan Funk",
   "type": "module",
   "scripts": {
-    "build:temporary": "next build",
+    "build:temp": "next build",
     "clean": "bun run rm -rf .next *.tsbuildinfo playwright-report test-results",
     "dev": "next dev",
     "lint": "eslint .  --max-warnings 0",

packages/blocks/astro.config.mjs

@@ -21,15 +21,15 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 // https://astro.build/config
 export default defineConfig({
-  build: {
-    rollupOptions: {
-      output: {
-        entryFileNames: 'client.js',
-        chunkFileNames: 'client.js',
-        assetFileNames: 'client.[ext]',
-      },
-    },
-  },
+  // build: {
+  //   rollupOptions: {
+  //     output: {
+  //       entryFileNames: 'client.js',
+  //       chunkFileNames: 'client.js',
+  //       assetFileNames: 'client.[ext]',
+  //     },
+  //   },
+  // },
   integrations: [
     react({
       experimentalReactChildren: true,

packages/blocks/src/component-map.ts

@@ -1,11 +1,7 @@
 import TemplateTresLayout from './templates/tres/layouts/TresLayout.astro'
-import AmpersandHero from './templates/unique/components/ampersand-hero.astro'
 import LevelnHero from './templates/unique/components/leveln-hero.astro'
-import RemixHero from './templates/unique/components/remix-hero.astro'
 import WarpLandingPage from './templates/unique/components/warp-landing-page.astro'
-import AmpersandLayout from './templates/unique/layouts/ampersand-hero-layout.astro'
 import LevelnLayout from './templates/unique/layouts/leveln-hero-layout.astro'
-import RemixLayout from './templates/unique/layouts/leveln-hero-layout.astro'
 import TemplateUnoAboutOne from './templates/uno/components/About_1.astro'
 import TemplateUnoComponentTest from './templates/uno/components/ComponentTest.astro'
 import TemplateTres404One from './templates/uno/components/Page404_1.astro'
@@ -26,11 +22,7 @@ const componentMap: ComponentMap = {
   WarpLandingPage,
   TemplateUnoComponentTest,
   LevelnLayout,
-  RemixLayout,
-  AmpersandLayout,
-  AmpersandHero,
   LevelnHero,
-  RemixHero,
 }
 
 export { componentMap }

packages/blocks/src/templates/dos/components/page-header-announcement.tsx

@@ -1,19 +1,12 @@
 import { ArrowRight } from 'lucide-react'
 
-import { Separator } from '@prodkt/ui/primitives/separator'
-
 export function DosAnnouncement() {
   return (
     <a
       href='/docs/changelog'
       className='inline-flex items-center rounded-lg border border-[var(--accent9)] bg-[var(-Accent-a2)] px-3 py-1.5 text-sm font-medium'
     >
-      🎉{' '}
-      <Separator
-        className='mx-2 h-4 bg-[var(--accentA8)]'
-        orientation='vertical'
-      />{' '}
-      <span className='sm:hidden'>Introducing Blocks</span>
+      🎉 <span className='sm:hidden'>Introducing Blocks</span>
       <span className='hidden sm:inline'>Introducing Blocks</span>
       <ArrowRight className='w-4 h-4 ml-1' />
     </a>

packages/blocks/tsconfig.json

@@ -1,17 +1,17 @@
 {
   "extends": "astro/tsconfigs/strict",
   "compilerOptions": {
-    "jsx": "react", // or "react-jsx" for React 17+
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "module": "ESNext",
-    "target": "ESNext",
-    "verbatimModuleSyntax": false,
-    "declarationMap": true,
-    "declaration": true,
+    // "jsx": "react", // or "react-jsx" for React 17+
+    // "esModuleInterop": true,
+    // "allowSyntheticDefaultImports": true,
+    // "module": "ESNext",
+    // "target": "ESNext",
+    // "verbatimModuleSyntax": false,
+    // "declarationMap": true,
+    // "declaration": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["src/*"]
     }
   }
 }

packages/blocks/vite.config.mjs

@@ -1,16 +1,16 @@
 import { defineConfig } from 'vite'
 
 export default defineConfig({
-  build: {
-    rollupOptions: {
-      output: {
-        // Set the main entry file to a fixed name
-        entryFileNames: '_astro/client.js',
-        // Keep chunk files with hashes to avoid conflicts with dynamic imports
-        chunkFileNames: '_astro/client-dynamic.js',
-        // Asset file names (for CSS, images, etc.) can also keep their hashed names
-        assetFileNames: '_astro/client-[hash].[ext]',
-      },
-    },
-  },
+  // build: {
+  //   rollupOptions: {
+  //     output: {
+  //       // Set the main entry file to a fixed name
+  //       entryFileNames: '_astro/client.js',
+  //       // Keep chunk files with hashes to avoid conflicts with dynamic imports
+  //       chunkFileNames: '_astro/client-dynamic.js',
+  //       // Asset file names (for CSS, images, etc.) can also keep their hashed names
+  //       assetFileNames: '_astro/client-[hash].[ext]',
+  //     },
+  //   },
+  // },
 })

packages/config/tailwind/package.json

@@ -8,7 +8,8 @@
   "type": "module",
   "exports": {
     ".": "./src/preset.ts",
-    "./color": "./src/ghost.css"
+    "./color": "./src/color.css",
+    "./ghost": "./src/ghost.css"
   },
   "scripts": {
     "clean": "bun run rm -rf *.tsbuildinfo",

packages/config/vite/src/build.ts

@@ -81,13 +81,7 @@ export function buildConfig({
             suppressPreserveModulesWarning: true,
           }),
         ],
-        external: [
-          'react',
-          'react-dom',
-          '@dnd-kit',
-          '@codesandbox/sandpack-react',
-          /node_modules/,
-        ],
+        external: [/node_modules/],
         output: {
           preserveModules: true,
           preserveModulesRoot: 'src',