Skip to content

Commit b381af3

Browse files
committed
Merge branch 'main' into filip-transactions
2 parents 1cb0772 + 0af9f85 commit b381af3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3601
-2294
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
env:
1212
WASP_TELEMETRY_DISABLE: 1
13-
WASP_VERSION: 0.16.0
13+
WASP_VERSION: 0.16.3
1414

1515
jobs:
1616
test:
@@ -30,7 +30,7 @@ jobs:
3030
uses: docker/setup-buildx-action@v3
3131

3232
- name: Install Wasp
33-
run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s -- -v ${{ env.WASP_VERSION }}
33+
run: curl -sSL https://get.wasp.sh/installer.sh | sh -s -- -v ${{ env.WASP_VERSION }}
3434

3535
- name: Cache global node modules
3636
uses: actions/cache@v4

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You also get access to Wasp's diverse, helpful community if you get stuck or nee
4646

4747
First, to install the latest version of [Wasp](https://wasp.sh/) on macOS, Linux, or Windows with WSL, run the following command:
4848
```bash
49-
curl -sSL https://get.wasp-lang.dev/installer.sh | sh
49+
curl -sSL https://get.wasp.sh/installer.sh | sh
5050
```
5151

5252
Then, create a new SaaS app with the following command:

opensaas-sh/app_diff/main.wasp.diff

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- template/app/main.wasp
22
+++ opensaas-sh/app/main.wasp
3-
@@ -3,30 +3,29 @@
3+
@@ -3,30 +3,30 @@
44
version: "^0.16.0"
55
},
66

@@ -44,10 +44,11 @@
4444
- "<script defer data-domain='<your-site-id>' src='https://plausible.io/js/script.js'></script>", // for production
4545
- "<script defer data-domain='<your-site-id>' src='https://plausible.io/js/script.local.js'></script>", // for development
4646
+ "<script defer data-domain='opensaas.sh' data-api='/waspara/wasp/event' src='/waspara/wasp/script.js'></script>",
47+
+ "<script defer src='/piggy.js'></script>",
4748
],
4849

4950
// 🔐 Auth out of the box! https://wasp.sh/docs/auth/overview
50-
@@ -38,7 +37,7 @@
51+
@@ -38,7 +38,7 @@
5152
email: {
5253
fromField: {
5354
name: "Open SaaS App",
@@ -56,7 +57,7 @@
5657
},
5758
emailVerification: {
5859
clientRoute: EmailVerificationRoute,
59-
@@ -50,21 +49,18 @@
60+
@@ -50,21 +50,18 @@
6061
},
6162
userSignupFields: import { getEmailUserFields } from "@src/auth/userSignupFields",
6263
},
@@ -88,9 +89,9 @@
8889
+ configFn: import { getDiscordAuthConfig } from "@src/auth/userSignupFields"
8990
+ }
9091
},
91-
onAfterSignup: import { onAfterSignup } from "@src/auth/hooks",
9292
onAuthFailedRedirectTo: "/login",
93-
@@ -87,11 +83,11 @@
93+
onAuthSucceededRedirectTo: "/demo-app",
94+
@@ -86,11 +83,11 @@
9495
// NOTE: "Dummy" provider is just for local development purposes.
9596
// Make sure to check the server logs for the email confirmation url (it will not be sent to an address)!
9697
// Once you are ready for production, switch to e.g. "SendGrid" or "Mailgun" providers. Check out https://docs.opensaas.sh/guides/email-sending/ .
@@ -104,7 +105,7 @@
104105
},
105106
},
106107
}
107-
@@ -207,9 +203,9 @@
108+
@@ -206,9 +203,9 @@
108109
}
109110

110111
api paymentsWebhook {

0 commit comments

Comments
 (0)