Merge pull request #1 from wasp-lang/main

Genyus · web-flow · commit 96580349f32e · 2025-08-22T02:28:43.000-04:00
Pull changes from upstream
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -24,7 +24,7 @@ jobs:
         id: setup-node
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
 
       - name: Docker setup
         uses: docker/setup-buildx-action@v3
diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ The template itself is built on top of some very powerful tools and frameworks,
 - 🚀 [Astro](https://starlight.astro.build/) - Astro's lightweight "Starlight" template for documentation and blog
 - 💸 [Stripe](https://stripe.com) or [Lemon Squeezy](https://lemonsqueezy.com/) (with Polar.sh and Paddle coming soon!) - for products and payments
 - 💅 [ShadCN UI](https://tailwindcss.com) - for components & styling (plus admin dashboard!)
+- 🤖 [AI-Ready](https://docs.opensaas.sh/) - full set of Cursor rules & llms-full.txt for ai-assisted coding
 - 📈 [Plausible](https://plausible.io) or [Google](https://analytics.google.com/) Analytics
 - 🤖 [OpenAI](https://openai.com) - OpenAI API w/ function calling example
 - 📦 [AWS S3](https://aws.amazon.com/s3/) - for file uploads
diff --git a/opensaas-sh/app_diff/main.wasp.diff b/opensaas-sh/app_diff/main.wasp.diff
@@ -28,7 +28,7 @@
 -    "<meta name='twitter:image' content='https://your-saas-app.com/public-banner.webp' />",
 +    "<meta property='og:title' content='Open SaaS' />",
 +    "<meta property='og:url' content='https://opensaas.sh' />",
-+    "<meta property='og:description' content='Free, open-source SaaS boilerplate starter for React & NodeJS.' />",
++    "<meta property='og:description' content='Free, open-source SaaS boilerplate starter for React & NodeJS. Powered by Wasp.' />",
 +    "<meta property='og:image' content='https://opensaas.sh/public-banner.webp' />",
 +
 +    "<meta name=\"twitter:title\" content=\"Open SaaS\" />",
diff --git a/opensaas-sh/app_diff/src/landing-page/components/Hero/Hero.tsx.diff b/opensaas-sh/app_diff/src/landing-page/components/Hero/Hero.tsx.diff
@@ -1,12 +1,12 @@
 --- template/app/src/landing-page/components/Hero/Hero.tsx
 +++ opensaas-sh/app/src/landing-page/components/Hero/Hero.tsx
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,85 @@
 +import { ArrowRight } from 'lucide-react';
 +import { Link as ReactRouterLink } from 'react-router-dom';
 +import { useAuth } from 'wasp/client/auth';
 +import { Link as WaspRouterLink, routes } from 'wasp/client/router';
 +import { Button } from '../../../components/ui/button';
-+import { DocsUrl } from '../../../shared/common';
++import { DocsUrl, WaspUrl } from '../../../shared/common';
 +import Orbit from './Orbit';
 +
 +export default function Hero() {
@@ -16,17 +16,20 @@
 +    <div className='relative pt-32 w-full'>
 +      <TopGradient />
 +      <BottomGradient />
-+      <div className='flex flex-col lg:flex-row max-w-7xl mx-auto'>
++      <div className='flex flex-col lg:flex-row max-w-7xl mx-auto overflow-x-hidden'>
 +        <div className='py-24 sm:py-32'>
 +          <div className='max-w-8xl px-6 lg:px-8'>
 +            <div className='lg:mb-18 mx-auto max-w-3xl text-center md:text-left'>
 +              <h1 className='text-5xl font-extrabold text-foreground md:text-6xl'>
 +                The <span className='italic'>free</span> SaaS template with{' '}
 +                <span className='text-gradient-primary font-black'>superpowers</span>
 +              </h1>
-+              <p className='mt-6 max-w-2xl text-lg leading-8 text-muted-foreground font-mono'>
-+                An open-source, feature-rich, full-stack React + NodeJS template that manages features for
-+                you.
++              <p className='mt-6 max-w-2xl text-md leading-8 text-muted-foreground font-mono'>
++                An open-source, feature-rich, full-stack React + NodeJS starter kit that manages boilerplate
++                for you. Powered by
++                <a href={WaspUrl} className='group font-bold transition-all duration-300'>
++                  {' Wasp =}'}
++                </a>
 +              </p>
 +              <div className='mt-10 flex items-center justify-center md:justify-start gap-x-6'>
 +                <Button size='lg' variant='outline' asChild>
diff --git a/opensaas-sh/app_diff/src/landing-page/contentSections.tsx.diff b/opensaas-sh/app_diff/src/landing-page/contentSections.tsx.diff
@@ -1,6 +1,6 @@
 --- template/app/src/landing-page/contentSections.tsx
 +++ opensaas-sh/app/src/landing-page/contentSections.tsx
-@@ -0,0 +1,247 @@
+@@ -0,0 +1,244 @@
 +import { routes } from 'wasp/client/router';
 +import type { NavigationItem } from '../client/components/NavBar/NavBar';
 +import blog from '../client/static/assets/blog.webp';
@@ -15,7 +15,7 @@
 +import scribeist from '../client/static/examples/scribeist.webp';
 +import searchcraft from '../client/static/examples/searchcraft.webp';
 +import logo from '../client/static/logo.webp';
-+import { BlogUrl, DocsUrl, GithubUrl } from '../shared/common';
++import { BlogUrl, DocsUrl, GithubUrl, WaspUrl } from '../shared/common';
 +import { GridFeature } from './components/FeaturesGrid';
 +
 +export const landingPageNavigationItems: NavigationItem[] = [
@@ -115,7 +115,7 @@
 +  {
 +    name: 'Jonathan Cocharan',
 +    role: 'Entrepreneur',
-+    avatarSrc: 'https://pbs.twimg.com/profile_images/1910056203863883776/jtfVWaEG_400x400.jpg',
++    avatarSrc: 'https://pbs.twimg.com/profile_images/1950172296376639488/sZ0JIqfR_400x400.jpg',
 +    socialUrl: 'https://twitter.com/JonathanCochran',
 +    quote:
 +      'In just 6 nights... my SaaS app is live 🎉! Huge thanks to the amazing @wasplang community 🙌 for their guidance along the way. These tools are incredibly efficient 🤯!',
@@ -175,7 +175,6 @@
 +      "This is exactly the framework I've been dreaming of ever since I've been waiting to fully venture into the JS Backend Dev world. I believe Wasp will go above 50k stars this year. The documentation alone gives me the confidence that this is my permanent Nodejs framework and I'm staying with Wasp. Phenomenal work by the team...  Please keep up your amazing spirits. Thank you",
 +  },
 +];
-+
 +export const faqs = [
 +  {
 +    id: 1,
@@ -198,12 +197,10 @@
 +    { name: 'Blog', href: BlogUrl },
 +  ],
 +  company: [
-+    { name: 'About', href: 'https://wasp.sh' },
-+    { name: 'Privacy', href: '#' },
-+    { name: 'Terms of Service', href: '#' },
++    { name: 'Terms of Service', href: GithubUrl + '/blob/main/LICENSE' },
++    { name: 'Made by the Wasp team = }', href: WaspUrl },
 +  ],
 +};
-+
 +export const examples = [
 +  {
 +    name: 'Microinfluencers',
diff --git a/opensaas-sh/app_diff/src/shared/common.ts.diff b/opensaas-sh/app_diff/src/shared/common.ts.diff
@@ -1,6 +1,7 @@
 --- template/app/src/shared/common.ts
 +++ opensaas-sh/app/src/shared/common.ts
-@@ -1,2 +1,3 @@
+@@ -1,2 +1,4 @@
  export const DocsUrl = 'https://docs.opensaas.sh';
  export const BlogUrl = 'https://docs.opensaas.sh/blog';
 +export const GithubUrl = 'https://github.com/wasp-lang/opensaas';
++export const WaspUrl = 'https://wasp.sh';
diff --git a/opensaas-sh/blog/src/content/docs/start/getting-started.mdx b/opensaas-sh/blog/src/content/docs/start/getting-started.mdx
@@ -17,7 +17,7 @@ If you prefer video tutorials, you can watch this walkthrough below which will g
 ### Pre-requisites
 
 You must have Node.js (and NPM) installed on your machine and available in `PATH` to use Wasp.
-Your version of Node.js must be >= 20.
+Your version of Node.js must be >= 22.12.
 
 To switch easily between Node.js versions, we recommend using [nvm](https://github.com/nvm-sh/nvm).
 
@@ -81,7 +81,7 @@ Once Rosetta is installed, you should be able to run Wasp without any issues.
 
 ### Windows
 
-In order to use Wasp on Windows, you need to install WSL2 (Windows Subsystem for Linux) and a Linux distribution of your choice. We recommend using Ubuntu. 
+In order to use Wasp on Windows, you need to install WSL2 (Windows Subsystem for Linux) and a Linux distribution of your choice. We recommend using Ubuntu.
 
 **You can refer to this [article](https://wasp.sh/blog/2023/11/21/guide-windows-development-wasp-wsl) for a step by step guide to using Wasp in the WSL environment.** If you need further help, reach out to us on [Discord](https://discord.gg/rzdnErX).
 
@@ -127,7 +127,7 @@ curl -sSL https://get.wasp.sh/installer.sh | sh
   </summary>
 If you are using WSL2, make sure that your Wasp project is not on the Windows file system, <b>but instead on the Linux file system</b>. Otherwise, Wasp won't be able to detect file changes, due to this <a href='https://github.com/microsoft/WSL/issues/4739'>issue in WSL2</a>.
 </details>
-:::  
+:::
 
 ### Finalize Installation
 
diff --git a/template/app/src/client/Main.css b/template/app/src/client/Main.css
@@ -158,7 +158,7 @@
     --muted-foreground: 0 0% 63.9%;
     --accent: 31 57% 93%;
     --accent-foreground: 210 100% 13%;
-    --destructive: 0 62.8% 30.6%;
+    --destructive: 0 62.8% 63%;
     --destructive-foreground: 0 0% 98%;
     --success: 141 71% 48%;
     --success-foreground: 0 0% 98%;
diff --git a/template/app/src/demo-ai-app/DemoAppPage.tsx b/template/app/src/demo-ai-app/DemoAppPage.tsx
@@ -336,7 +336,7 @@ function Schedule({ schedule }: { schedule: GeneratedSchedule }) {
 
 function TaskCard({ task, taskItems }: { task: ScheduleTask; taskItems: TaskItem[] }) {
   const taskPriorityToColorMap: Record<TaskPriority, string> = {
-    high: 'bg-destructive/20 border-destructive/40 text-red-500',
+    high: 'bg-destructive/10 border-destructive/20 text-red-500',
     medium: 'bg-warning/10 border-warning/20 text-warning',
     low: 'bg-success/10 border-success/20 text-success',
   };
diff --git a/template/e2e-tests/ci-start-app-and-db.js b/template/e2e-tests/ci-start-app-and-db.js
diff --git a/template/e2e-tests/package-lock.json b/template/e2e-tests/package-lock.json
diff --git a/template/e2e-tests/package.json b/template/e2e-tests/package.json
@@ -7,12 +7,6 @@
     "test": "tests"
   },
   "scripts": {
-    "ci:e2e:start": "npm run ci:e2e:cleanup-db && node ci-start-app-and-db.js",
-    "ci:e2e:start-db": "cd ../app && wasp start db",
-    "ci:e2e:start-app": "npm run ci:e2e:wait-for-db && cd ../app && wasp db migrate-dev && cd ../e2e-tests && cd ../app && wasp start",
-    "ci:e2e:wait-for-db": "npx wait-port 5432",
-    "_comment-on-ci:e2e:cleanup-db": "NOTE: the name of the DB container, e.g. name=^wasp-dev-db-OpenSaaS-, is generated by wasp and will match the name of the app definition in your `main.wasp` file, e.g. `app OpenSaaS { }`",
-    "ci:e2e:cleanup-db": "(docker container rm $(docker container ls -f name=^wasp-dev-db-OpenSaaS- -q) -f || true) && docker volume rm $(docker volume ls -f name=^wasp-dev-db-OpenSaaS- -q) -f || true",
     "e2e:playwright": "DEBUG=pw:webserver npx playwright test",
     "_comment-on-local:e2e:cleanup-stripe": "NOTE: because we are running the stripe webhook listener in the background, we want to make sure we kill the previous processes before starting a new one.",
     "local:e2e:cleanup-stripe": "PID=$(ps -ef | grep 'stripe listen' | grep -v grep | awk '{print $2}') || true && kill -9 $PID || true",
@@ -25,10 +19,10 @@
   "dependencies": {
     "@playwright/test": "^1.42.1",
     "@prisma/client": "5.19.1",
-    "linebyline": "^1.3.0",
+    "@wasp.sh/wasp-app-runner": "0.0.7",
     "prisma": "5.19.1"
   },
   "devDependencies": {
-    "@types/node": "^20.14.8"
+    "@types/node": "^22.12.0"
   }
 }
diff --git a/template/e2e-tests/playwright.config.ts b/template/e2e-tests/playwright.config.ts
@@ -39,7 +39,7 @@ export default defineConfig({
    * For local development, where this does pose a nuisance, we start the app / web server manually with `wasp db start` and `wasp start` and then start tests with `npm run local:e2e:start`.
    */
   webServer: {
-    command: 'npm run ci:e2e:start',
+    command: 'run-wasp-app dev --path-to-app=../app --wasp-cli-cmd=wasp',
     // Wait for the backend to start
     url: 'http://localhost:3001',
     reuseExistingServer: !process.env.CI,

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`- "<meta name='twitter:image' content='https://your-saas-app.com/public-banner.webp' />",`
`29`	`29`	`+ "<meta property='og:title' content='Open SaaS' />",`
`30`	`30`	`+ "<meta property='og:url' content='https://opensaas.sh' />",`
`31`		`-+ "<meta property='og:description' content='Free, open-source SaaS boilerplate starter for React & NodeJS.' />",`
	`31`	`++ "<meta property='og:description' content='Free, open-source SaaS boilerplate starter for React & NodeJS. Powered by Wasp.' />",`
`32`	`32`	`+ "<meta property='og:image' content='https://opensaas.sh/public-banner.webp' />",`
`33`	`33`	`+`
`34`	`34`	`+ "<meta name=\"twitter:title\" content=\"Open SaaS\" />",`