Skip to content

Commit 3ea3f9d

Browse files
committed
Merge branch 'miho-wasp-app-runner' into miho-example-apps-headless-tests
2 parents 6c2ac7d + e970187 commit 3ea3f9d

File tree

457 files changed

+2504
-1675
lines changed

Some content is hidden

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

457 files changed

+2504
-1675
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"label": "NodeJS Server"
2222
}
2323
},
24-
"onCreateCommand": "curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s",
24+
"onCreateCommand": "curl -sSL https://get.wasp.sh/installer.sh | sh -s",
2525
"postCreateCommand": "printf 'export WASP_WEB_CLIENT_URL=https://$CODESPACE_NAME-3000.app.github.dev\n' >> $HOME/.bashrc && printf 'export REACT_APP_API_URL=https://$CODESPACE_NAME-3001.app.github.dev\n' >> $HOME/.bashrc && echo 'gh codespace ports visibility 3000:public -c $CODESPACE_NAME\n' >> $HOME/.bashrc && echo 'gh codespace ports visibility 3001:public -c $CODESPACE_NAME\n' >> $HOME/.bashrc",
2626
"workspaceFolder": "/workspaces/wasp/examples/tutorials/TodoApp"
2727
}

CONTRIBUTING.md

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
# Contributing to Wasp
22

3-
Wasp's compiler is built with Haskell and under the hood it generates a web application in React and NodeJS. Given that, there are several ways in which you can contribute:
3+
Wasp's compiler is built with Haskell and under the hood it generates a web application in React and NodeJS. Given that, there are several ways in which you can contribute:
4+
45
- [Wasp compiler/CLI/LSP internals](#wasp-compilerclilsp-internals) (Haskell)
56
- [Wasp as a web framework](#wasp-as-a-web-framework) (React, Node, HTML/CSS, database and so on)
67
- [Tutorials or Example apps](#tutorials-or-example-apps)
78
- [Documentation](#documentation)
89

9-
## Before you begin
10+
## Before you begin
1011

11-
- Check out the [**Getting Started**](https://wasp-lang.dev/docs) guide to get familiar with Wasp's fundamentals. Ideally, you'd also build an app from the [**Pick a Tutorial**](https://wasp-lang.dev/docs/tutorials/todo-app) page to really get a feel for it!
12+
- Check out the [**Getting Started**](https://wasp.sh/docs) guide to get familiar with Wasp's fundamentals. Ideally, you'd also build an app from the [**Pick a Tutorial**](https://wasp.sh/docs/tutorials/todo-app) page to really get a feel for it!
1213
- Figure out what you'd like to help with. It can be code, documentation, tutorials, etc. More on this is below.
1314
- Join our Discord [![**Discord**](https://img.shields.io/discord/686873244791210014?label=chat%20on%20discord)](https://discord.gg/rzdnErX) for faster communication and feedback. We'd be happy to help you find the issue you'll enjoy working on, depending on your interests and skill set!
1415
- Below you can find links to the good first issues. If you'd like to filter the issues on your own — please, use [this link](https://github.com/wasp-lang/wasp/issues)
@@ -23,32 +24,32 @@ While you will need to know some Haskell, you don't have to be an expert in Hask
2324

2425
Check the [**Wasp compiler README**](https://github.com/wasp-lang/wasp/blob/main/waspc/README.md) for all the detailed instructions and guides.
2526

26-
[**Haskell-related issues for beginners can be found here.**](https://github.com/wasp-lang/wasp/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3Ahaskell)
27+
[**Haskell-related issues for beginners can be found here.**](https://github.com/wasp-lang/wasp/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3Ahaskell)
2728

2829
Feel free to contact us via Discord to ask for an appropriate issue for yourself, or just open a new one if you have something specific in mind and it isn't already there!
2930

3031
## Wasp as a web framework
3132

32-
Wasp is a language for developing full-stack web apps. This means there are plenty of tasks related to web development itself.
33+
Wasp is a language for developing full-stack web apps. This means there are plenty of tasks related to web development itself.
3334

3435
[**Web dev issues for beginners can be found here.**](https://github.com/wasp-lang/wasp/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3Awebdev)
3536

3637
## Tutorials or Example apps
3738

38-
Another great way to help is to create an app with Wasp! We have an [Examples](https://wasp-lang.dev/docs/examples) section on our website, as well as the [Tutorials](https://wasp-lang.dev/docs/tutorials/todo-app) page. Both of them can be improved and updated with your projects.
39+
Another great way to help is to create an app with Wasp! We have an [Examples](https://wasp.sh/docs/examples) section on our website, as well as the [Tutorials](https://wasp.sh/docs/tutorials/todo-app) page. Both of them can be improved and updated with your projects.
3940

40-
All that's required is to create an app. And make a tutorial or a blog post to help other people reproduce your work. Some prominent examples are: [Waspello](https://wasp-lang.dev/blog/2021/12/02/waspello), [Waspleau](https://wasp-lang.dev/blog/2022/01/27/waspleau), [It Wasps on My Machine](https://wasp-lang.dev/blog/2022/09/05/dev-excuses-app-tutrial) and [To-Do app](https://wasp-lang.dev/docs/tutorials/todo-app).
41+
All that's required is to create an app. And make a tutorial or a blog post to help other people reproduce your work. Some prominent examples are: [Waspello](https://wasp.sh/blog/2021/12/02/waspello), [Waspleau](https://wasp.sh/blog/2022/01/27/waspleau), [It Wasps on My Machine](https://wasp.sh/blog/2022/09/05/dev-excuses-app-tutrial) and [To-Do app](https://wasp.sh/docs/tutorials/todo-app).
4142

4243
Or you can re-build your existing pet project with Wasp. That would be cool!
4344

4445
## Documentation & Blog
4546

46-
It may sound like the simplest one, but it's super valuable! If you've found an issue, a broken link or if something was unclear on our [website](https://wasp-lang.dev/) - please, feel free to fix it :)
47+
It may sound like the simplest one, but it's super valuable! If you've found an issue, a broken link or if something was unclear on our [website](https://wasp.sh/) - please, feel free to fix it :)
4748

4849
Please make sure to **base your feature branches and PRs on the `release` branch** instead of `main`, since that's the one that is deployed to the website.
4950

5051
[**Documentation issues for beginners can be found here.**](https://github.com/wasp-lang/wasp/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3Adocumentation)
5152

5253
If you'd like to write a blog post about Wasp, please contact us via [Discord](https://discord.gg/zKFDFrsHa9) to discuss the topic and the details.
5354

54-
Happy hacking!
55+
Happy hacking!

README.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
---
1515

1616
<p align="center">
17-
<a href="https://wasp-lang.dev">Web page</a> | <a href="https://wasp-lang.dev/docs">Docs</a>
17+
<a href="https://wasp.sh">Web page</a> | <a href="https://wasp.sh/docs">Docs</a> | <a href="https://e44cy1h4s0q.typeform.com/to/EPJCwsMi">Deployed? Get swag! 👕</a>
1818
</p>
1919

2020
<br>
@@ -79,19 +79,23 @@ Given a simple .wasp configuration file that describes the high-level details of
7979

8080
This unique approach is what makes Wasp "smart" and gives it its superpowers!
8181

82-
For more information about Wasp, check [**docs**](https://wasp-lang.dev/docs).
82+
For more information about Wasp, check [**docs**](https://wasp.sh/docs).
83+
84+
# Have a Wasp app deployed? - we will send you swag!
85+
86+
If you have a Wasp application running in production, we'd love to send some swag your way! Fill out [this form](https://e44cy1h4s0q.typeform.com/to/EPJCwsMi), and we'll make it happen.
8387

8488
# Get started
8589

8690
Run
8791

8892
```
89-
curl -sSL https://get.wasp-lang.dev/installer.sh | sh
93+
curl -sSL https://get.wasp.sh/installer.sh | sh
9094
```
9195

9296
to install Wasp on OSX/Linux/WSL(Win). From there, just follow the instructions to run your first app in less than a minute!
9397

94-
For more details, check out [the docs](https://wasp-lang.dev/docs).
98+
For more details, check out [the docs](https://wasp.sh/docs).
9599

96100
# Wasp AI / Mage
97101

@@ -121,7 +125,7 @@ Even if you don't plan to submit any code, just joining the discussion on discor
121125
You can also:
122126

123127
- :star: Star this repo to show your interest/support.
124-
- :mailbox: Stay updated by subscribing to our [email list](https://wasp-lang.dev#signup).
128+
- :mailbox: Stay updated by subscribing to our [email list](https://wasp.sh#signup).
125129
- :speech_balloon: Join the discussion at https://github.com/wasp-lang/wasp/discussions .
126130

127131
# Careers

SECURITY.md

+2
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ We are currently in pre-production stage so only the latest major release is rec
88

99
## Reporting a Vulnerability
1010

11+
<!-- TODO: update the email once we have the @wasp.sh email setup -->
12+
1113
Please report any vulnerabilities at hi@wasp-lang.dev !

examples/README.md

+20-15
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
1-
Example Wasp apps
2-
=================
1+
# Example Wasp apps
32

43
Here's a list of all officially maintained Wasp example apps!
54
Most of these apps are relatively small, and each one demonstrates several of Wasp's interesting features.
65

7-
The **tutorials** directory contains [Wasp tutorial](https://wasp-lang.dev/docs/tutorial/create) apps.
6+
The **tutorials** directory contains [Wasp tutorial](https://wasp.sh/docs/tutorial/create) apps.
87

98
1. **todo-typescript**
10-
- A simple task-tracking app implemented in TypeScript.
11-
- Demonstrates: **full-stack type safety in Wasp via TypeScript**, [auth](https://wasp-lang.dev/docs/auth/overview), [rpc](https://wasp-lang.dev/docs/data-model/operations/overview)
9+
10+
- A simple task-tracking app implemented in TypeScript.
11+
- Demonstrates: **full-stack type safety in Wasp via TypeScript**, [auth](https://wasp.sh/docs/auth/overview), [rpc](https://wasp.sh/docs/data-model/operations/overview)
1212

1313
1. **waspello**
14-
- A simple Trello clone.
15-
- Demonstrates: [auth](https://wasp-lang.dev/docs/auth/overview), [rpc](https://wasp-lang.dev/docs/data-model/operations/overview)
14+
15+
- A simple Trello clone.
16+
- Demonstrates: [auth](https://wasp.sh/docs/auth/overview), [rpc](https://wasp.sh/docs/data-model/operations/overview)
1617

1718
1. **hackaton-submissions**
18-
- An app for organizing your own hackaton.
19-
- Demonstrates: [tailwind](https://wasp-lang.dev/docs/project/css-frameworks#tailwind), [rpc](https://wasp-lang.dev/docs/data-model/operations/overview)
19+
20+
- An app for organizing your own hackaton.
21+
- Demonstrates: [tailwind](https://wasp.sh/docs/project/css-frameworks#tailwind), [rpc](https://wasp.sh/docs/data-model/operations/overview)
2022

2123
1. **waspleau**
22-
- A simple clone of Tableau. The app regularly pulls in external data and shows it on a nice dashboard.
23-
- Demonstrates: **[jobs](https://wasp-lang.dev/docs/advanced/jobs)**, analytics
24+
25+
- A simple clone of Tableau. The app regularly pulls in external data and shows it on a nice dashboard.
26+
- Demonstrates: **[jobs](https://wasp.sh/docs/advanced/jobs)**, analytics
2427

2528
1. **thoughts**
26-
- A simple note-taking app organized around the concept of hashtags.
27-
- Demonstrates: [db seeding](https://wasp-lang.dev/docs/data-model/backends#seeding-the-database), [auth](https://wasp-lang.dev/docs/auth/overview), [rpc](https://wasp-lang.dev/docs/data-model/operations/overview), [Wasp TS config](https://wasp-lang.dev/docs/general/wasp-ts-config) .
29+
30+
- A simple note-taking app organized around the concept of hashtags.
31+
- Demonstrates: [db seeding](https://wasp.sh/docs/data-model/backends#seeding-the-database), [auth](https://wasp.sh/docs/auth/overview), [rpc](https://wasp.sh/docs/data-model/operations/overview), [Wasp TS config](https://wasp.sh/docs/general/wasp-ts-config) .
2832

2933
1. **streaming**
30-
- Demonstrates: **http streaming**, [api](https://wasp-lang.dev/docs/advanced/apis)
34+
35+
- Demonstrates: **http streaming**, [api](https://wasp.sh/docs/advanced/apis)
3136

3237
1. **websockets-realtime-voting**
33-
- Demonstrates: **[web sockets](https://wasp-lang.dev/docs/advanced/web-sockets)**, [auth](https://wasp-lang.dev/docs/auth/overview), voting system
38+
- Demonstrates: **[web sockets](https://wasp.sh/docs/advanced/web-sockets)**, [auth](https://wasp.sh/docs/auth/overview), voting system
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"semi": true,
3+
"singleQuote": true,
4+
"trailingComma": "all",
5+
"printWidth": 100
6+
}

examples/hackathon-submissions/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
# 🐝🚀 Wasp Hackathon Submission App
66

7-
This app was created for Wasp's Beta Hackathon (aka Betathon), so that participants would have a central place to learn about the hackathon and submit their projects. The app was deployed to Railway.app and is live [here](https://betathon-production.up.railway.app/).
7+
This app was created for Wasp's Beta Hackathon (aka Betathon), so that participants would have a central place to learn about the hackathon and submit their projects. The app was deployed to Railway.app and is live [here](https://betathon-production.up.railway.app/).
88

9-
Visit the homepage to get started with [Wasp](https://wasp-lang.dev).
9+
Visit the homepage to get started with [Wasp](https://wasp.sh).
1010

11-
Feel free to use this as a template for your own Hackathons!
11+
Feel free to use this as a template for your own Hackathons!

examples/hackathon-submissions/package-lock.json

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/hackathon-submissions/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
2-
"name": "hackathonSubmissions",
2+
"name": "hackathon-submissions",
33
"type": "module",
44
"dependencies": {
55
"@playwright/test": "^1.50.0",
66
"react": "^18.2.0",
77
"react-dom": "^18.2.0",
88
"react-feather": "2.0.10",
99
"react-router-dom": "^6.26.2",
10-
"wasp": "file:.wasp/out/sdk/wasp"
10+
"wasp": "file:.wasp/out/sdk/wasp",
11+
"zod": "^3.23.8"
1112
},
1213
"devDependencies": {
1314
"@types/react": "^18.0.37",

examples/hackathon-submissions/src/Main.css

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
-webkit-font-smoothing: antialiased;
99
-moz-osx-font-smoothing: grayscale;
1010
box-sizing: border-box;
11-
1211
}
1312

14-
html, body {
13+
html,
14+
body {
1515
margin: 0;
1616
padding: 0;
1717
}
@@ -108,8 +108,8 @@ code {
108108
.gradient-text {
109109
background-image:
110110
linear-gradient(90deg, #bf9900 30%, #646464 100%);
111-
background-clip: text;
112-
color: transparent;
111+
background-clip: text;
112+
color: transparent;
113113
}
114114

115115
:focus {

examples/hackathon-submissions/src/MainPage.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import React from "react";
2-
import betathonLogo from "./betathonLogo.png";
3-
import "./Main.css";
4-
import Nav from "./components/Navbar";
5-
import Form from "./components/SubmissionForm";
6-
import Projects from "./components/Projects";
1+
import React from 'react';
2+
import betathonLogo from './betathonLogo.png';
3+
import './Main.css';
4+
import Nav from './components/Navbar';
5+
import Form from './components/SubmissionForm';
6+
import Projects from './components/Projects';
77

88
const MainPage = () => {
99
return (
@@ -13,7 +13,7 @@ const MainPage = () => {
1313
<img
1414
alt="betathon logo"
1515
src={betathonLogo}
16-
className=" mb-16 shadow-lg border-2 rounded-md border-yellow-500/25"
16+
className="mb-16 shadow-lg border-2 rounded-md border-yellow-500/25"
1717
width={600}
1818
height={600}
1919
/>

0 commit comments

Comments
 (0)