Merge from upstream

.github/workflows/blog-deployment.yml

@@ -29,10 +29,6 @@ jobs:
         working-directory: ./opensaas-sh/blog
         run: npm install
 
-      - name: Generate LLM files
-        working-directory: ./opensaas-sh/blog
-        run: npm run generate-llm-files
-
       - name: Build site
         working-directory: ./opensaas-sh/blog
         run: npm run build
@@ -53,10 +49,6 @@ jobs:
         working-directory: ./opensaas-sh/blog
         run: npm install
 
-      - name: Generate LLM files
-        working-directory: ./opensaas-sh/blog
-        run: npm run generate-llm-files
-
       - name: Build site
         working-directory: ./opensaas-sh/blog
         run: npm run build

.github/workflows/check-opensaas-diffs.yml

@@ -0,0 +1,28 @@
+name: Check `opensaas-sh` diffs are up to date
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  check-diffs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Generate diffs
+        run: |
+          ./opensaas-sh/tools/patch.sh
+          ./opensaas-sh/tools/diff.sh
+
+      - name: Check for uncommitted changes
+        run: |
+          if [[ -n $(git status --porcelain) ]]; then
+            echo "Error: There are uncommitted diff changes"
+            echo "Please run './opensaas-sh/tools/patch.sh' and './opensaas-sh/tools/diff.sh' locally and commit the changes"
+            git status
+            exit 1
+          fi

.github/workflows/e2e-tests.yml

@@ -5,12 +5,12 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 env:
   WASP_TELEMETRY_DISABLE: 1
-  WASP_VERSION: 0.18.0
+  WASP_VERSION:
+    # If you're copying this workflow to your own project, set this to your app's Wasp version:
+    main
 
 jobs:
   test:
@@ -29,9 +29,16 @@ jobs:
       - name: Docker setup
         uses: docker/setup-buildx-action@v3
 
-      - name: Install Wasp
+      - name: Install Wasp ${{ env.WASP_VERSION }}
+        if: env.WASP_VERSION != 'main'
         run: curl -sSL https://get.wasp.sh/installer.sh | sh -s -- -v ${{ env.WASP_VERSION }}
 
+      # If you're copying this workflow to your own project, you can remove this step:
+      - name: Install latest development Wasp
+        if: env.WASP_VERSION == 'main'
+        # Installs the latest published build of the CLI from the `main` branch.
+        run: npm i -g https://pkg.pr.new/@wasp.sh/wasp-cli@main
+
       - name: Cache global node modules
         uses: actions/cache@v4
         with:
@@ -108,7 +115,6 @@ jobs:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           STRIPE_API_KEY: ${{ secrets.STRIPE_KEY }}
           STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
-          STRIPE_CUSTOMER_PORTAL_URL: https://billing.stripe.com/p/login/test_8wM8x17JN7DT4zC000
           PAYMENTS_HOBBY_SUBSCRIPTION_PLAN_ID: ${{ secrets.STRIPE_HOBBY_SUBSCRIPTION_PRICE_ID }}
           PAYMENTS_PRO_SUBSCRIPTION_PLAN_ID: ${{ secrets.STRIPE_PRO_SUBSCRIPTION_PRICE_ID }}
           PAYMENTS_CREDITS_10_PLAN_ID: ${{ secrets.STRIPE_CREDITS_PRICE_ID }}

.github/workflows/template-release.yml

@@ -0,0 +1,48 @@
+---
+name: Template Release
+
+"on":
+  push:
+    tags:
+      - "wasp-v*-template"
+
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Tag to release (e.g., wasp-v0.18-template)"
+        required: true
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    env:
+      tag_name: ${{ inputs.tag || github.ref_name }}
+      archive_name: template.tar.gz
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ env.tag_name}}
+
+      - name: Create template archive
+        # The Wasp CLI expects the template contents to be in the root of the archive.
+        working-directory: template
+        run: tar -czf "../$archive_name" .
+
+      - name: Create release if it doesn't exist
+        run: |
+          if ! gh release view "$tag_name"; then
+            gh release create "$tag_name"
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload release asset
+        run: gh release upload "$tag_name" "$archive_name" --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,7 +1,7 @@
 # Dependencies
 node_modules/
 
-# MacOS-specific files.
+# macOS-specific files.
 .DS_Store
 
 # We want to keep the template clean from the usual build artifacts.

CONTRIBUTING.md

@@ -17,6 +17,10 @@ Repo is divided into two main parts: [template](/template) dir and [opensaas-sh]
 
 ## How to Contribute
 
+> [!IMPORTANT]
+> The in-development version of the template uses the in-development version of Wasp. We've set up the `./tools/wasp` script.
+> To use it, whenever you would normally run `wasp <command>`, run `<path-to-repo>/tools/wasp <command>` instead.
+
 1. Make sure you understand the basics of how open-saas works (check out [docs](https://docs.opensaas.sh)).
 2. Check out this repo (`main` branch) and make sure you are able to get the app in [template/app/](/template/app) running (to set it up, follow the same steps as for running a new open-saas app, as explained in the open-saas docs).
 3. Create a new git branch for your work (aka feature branch) and do your changes on it.

README.md

@@ -1,6 +1,13 @@
 ## Welcome to your new SaaS App! 🎉
 
-<a href="https://www.producthunt.com/products/open-saas?embed=true&utm_source=badge-featured&utm_medium=badge&utm_source=badge-open&#0045;saas&#0045;2" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=991058&theme=neutral&t=1753776395137" alt="Open&#0032;SaaS - The&#0032;open&#0045;source&#0032;SaaS&#0032;boilerplate&#0032;with&#0032;superpowers&#0033; | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+<div style="display: flex; gap: 16px; align-items: center;">
+  <a href="https://www.producthunt.com/products/open-saas?embed=true&utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_source=badge-open&#0045;saas&#0045;2&#0045;0" target="_blank">
+    <img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=1023519&theme=neutral&period=weekly&topic_id=237&t=1760520428563" alt="Open&#0032;SaaS&#0032;2&#0046;0 - Free&#0044;&#0032;open&#0045;source&#0032;SaaS&#0032;starter&#0032;kit&#0032;with&#0032;superpowers | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" />
+  </a>
+  <a href="https://www.producthunt.com/products/open-saas?embed=true&utm_source=badge-top-post-badge&utm_medium=badge&utm_source=badge-open&#0045;saas&#0045;2&#0045;0" target="_blank">
+    <img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=1023519&theme=neutral&period=daily&t=1760520428563" alt="Open&#0032;SaaS&#0032;2&#0046;0 - Free&#0044;&#0032;open&#0045;source&#0032;SaaS&#0032;starter&#0032;kit&#0032;with&#0032;superpowers | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" />
+  </a>
+</div>
 
 https://github.com/user-attachments/assets/3856276b-23e9-455e-a564-b5f26f4f0e98
 
@@ -73,6 +80,10 @@ There are two ways to get help or provide feedback (and we try to always respond
 1. [Open an issue](https://github.com/wasp-lang/open-saas/issues)
 2. [Wasp Discord](https://discord.gg/aCamt5wCpS) -- please direct questions to the #🙋questions forum channel
 
+## Development Tools
+
+For information about the development tools used to maintain derived projects (like opensaas.sh and template-test), see [tools/README.md](./tools/README.md).
+
 ## Contributing
 
 Note that we've tried to get as many of the core features of a SaaS app into this template as possible, but there still might be some missing features or functionality.

opensaas-sh/README.md

@@ -10,29 +10,18 @@ Inception :)!
 
 ### Demo app (app_diff/)
 
-Since the demo app is just the open saas template with some small tweaks, and we want to be able to easily keep it up to date as the template changes, we don't version (in git) the actual demo app code, instead we version the diffs between it and the template: `app_diff/`.
-
-So because we don't version the actual demo app (`app/`) but its diffs instead (`app_diff`), the typical workflow is as follows:
-
-1. Run `./tools/patch.sh` to generate `app/` from `../template/` and `app_diff/`.
-2. If there are any conflicts (normally due to updates to the template), modify `app/` till you resolve them. Do any additional changes also if you wish.
-3. Generate new `app_diff/`, based on the current updated `app/`, by running `./tools/diff.sh`.
+> [!IMPORTANT]
+> The in-development version of the template uses the in-development version of Wasp. We've set up the `./tools/wasp` script.
+> To use it, whenever you would normally run `wasp <command>`, run `<path-to-repo>/tools/wasp <command>` instead.
 
-**Running on MacOS**
-
-If you're running the `patch.sh` or `diff.sh` scripts on Mac, you need to install:
+Since the demo app is just the open saas template with some small tweaks, and we want to be able to easily keep it up to date as the template changes, we don't version (in git) the actual demo app code, instead we version the diffs between it and the template: `app_diff/`.
 
-- `grealpath` (packaged within `coreutils`),
-- `gpatch`,
-- and `diffutils`.
+#### Workflow
 
-```sh
-brew install coreutils # contains grealpath
-brew install gpatch
-brew install diffutils
-```
+- Generate `app/` from template and diffs: `./tools/patch.sh`
+- Update diffs after modifying `app/`: `./tools/diff.sh`
 
-Make sure not to commit `app/` to git. It is currently (until we resolve this) not added to .gitignore because that messes up diffing for us.
+For detailed information about the diff/patch workflow and macOS setup requirements, see [../tools/README.md](../tools/README.md).
 
 ### Blog (blog/)