Skip to content

Commit 39b01f0

Browse files
TobbeTobbe
authored
Merge branch 'main' into renovate/rollup-4.x
2 parents dc847b9 + 389e2f4 commit 39b01f0

File tree

49 files changed

+4845
-648
lines changed

Some content is hidden

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

49 files changed

+4845
-648
lines changed

‎.changesets/12093.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- [Dev environment] Migrate from Gitpod Classic to Ona (#12093) by @Siddhant-K-code
2+
3+
# Migration from Gitpod Classic to Ona
4+
5+
Gitpod has been renamed to Ona. This PR updates the Redwood documentation and
6+
Ona/Gitpod integration files

‎.changesets/12102.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- fix(supabase): Preserve extra search parameters (#12102) by @Tobbe
2+
3+
We call the `restoreAuthState()` function in the Supabase auth integration when
4+
the user gets redirected back to the app. The problem was that this would
5+
completely wipe out all search parameters, including user-defined ones.
6+
7+
With this PR we only delete the parameters that Supabase manages.

‎.devcontainer/devcontainer.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "RedwoodGraphQL",
3+
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-20-bullseye",
4+
"features": {
5+
"ghcr.io/devcontainers/features/github-cli:1": {}
6+
},
7+
"workspaceFolder": "/workspaces/RedwoodGraphQL",
8+
"forwardPorts": [8910, 8911],
9+
"portsAttributes": {
10+
"8910": {
11+
"label": "RedwoodJS Web",
12+
"onAutoForward": "notify"
13+
},
14+
"8911": {
15+
"label": "RedwoodJS API",
16+
"onAutoForward": "ignore"
17+
}
18+
},
19+
"postCreateCommand": "npm i -g corepack --force && corepack enable"
20+
}

‎.gitpod.yml‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎.ona/automations.yaml‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
services:
2+
dev-server:
3+
name: RedwoodJS Development Server
4+
description: Runs the RedwoodJS development server for both web and api sides
5+
commands:
6+
start: |
7+
# Ensure corepack is enabled in service environment
8+
corepack enable
9+
cd /workspaces/rw-test-app
10+
NODE_ENV=development corepack yarn rw dev
11+
12+
tasks:
13+
setup-environment:
14+
name: Setup RedwoodJS Environment
15+
description: Setup RedwoodJS development environment (runs automatically after devcontainer starts)
16+
triggeredBy:
17+
- postDevcontainerStart
18+
command: |
19+
export RWFW_PATH="/workspaces/RedwoodGraphQL"
20+
export REDWOOD_DISABLE_TELEMETRY=1
21+
echo "Setting up RedwoodJS development environment..."
22+
mkdir -p /workspaces/rw-test-app
23+
cd /workspaces/RedwoodGraphQL
24+
echo "Cleaning up existing symlinks and cache..."
25+
rm -rf node_modules/@redwoodjs
26+
rm -rf node_modules/.cache
27+
rm -f yarn.lock
28+
corepack yarn cache clean --all 2>/dev/null || true
29+
echo "Installing framework dependencies..."
30+
corepack yarn install
31+
echo "Building test project..."
32+
corepack yarn run build:test-project ../rw-test-app --typescript --link --verbose
33+
cd /workspaces/rw-test-app
34+
sed -i "s/\(open *= *\).*/\1false/" redwood.toml
35+
echo -e "\n\n\033[94m ======================================================\n\033[33m ⌛ RedwoodJS development environment is ready!\n Test app \"rw-test-app\" has been generated & linked with framework code.\n\n If you make changes to the framework:\n 1. \033[33mEnsure env vars are set \033[92mexport RWFW_PATH=\"/workspaces/RedwoodGraphQL\"\033[33m\n 2. \033[33mRun \033[92mcorepack yarn rwfw project:sync\033[33m to sync changes\n 3. \033[33mOr use the \033[92mSync Framework Changes\033[33m task from Ona dashboard\n\033[94m ======================================================\n\n"
36+
# Open ports for RedwoodJS development servers
37+
echo "Opening ports for development servers..."
38+
gitpod environment port open 8910 --name "RedwoodJS Web Server" --protocol https
39+
gitpod environment port open 8911 --name "RedwoodJS API Server" --protocol https
40+
echo "✅ Ports 8910 (Web) and 8911 (API) are now open with HTTPS"
41+
# Signal completion
42+
touch /tmp/redwood-setup-complete
43+
echo "✅ Setup task completed successfully"
44+
45+
start-dev-after-setup:
46+
name: Start Development Server After Setup
47+
description: Automatically start the development server after setup completes
48+
triggeredBy:
49+
- postDevcontainerStart
50+
command: |
51+
# Wait for setup to complete
52+
echo "Waiting for setup to complete..."
53+
while [ ! -f /tmp/redwood-setup-complete ]; do
54+
sleep 2
55+
done
56+
echo "Setup completed, starting development server..."
57+
# Ensure ports are open before starting service
58+
gitpod environment port open 8910 --name "RedwoodJS Web Server" --protocol https 2>/dev/null || true
59+
gitpod environment port open 8911 --name "RedwoodJS API Server" --protocol https 2>/dev/null || true
60+
gitpod automations service start dev-server
61+
echo "✅ Development server started"
62+
63+
sync-framework-changes:
64+
name: Sync Framework Changes
65+
description: Manually sync framework changes to test project
66+
triggeredBy:
67+
- manual
68+
command: |
69+
export RWFW_PATH="/workspaces/RedwoodGraphQL"
70+
cd /workspaces/rw-test-app
71+
corepack yarn rwfw project:sync
72+
echo "Framework changes synced to test project"
73+
74+
start-dev-server:
75+
name: Start Development Server
76+
description: Start the RedwoodJS development server
77+
triggeredBy:
78+
- manual
79+
command: |
80+
gitpod automations service start dev-server
81+
82+
stop-dev-server:
83+
name: Stop Development Server
84+
description: Stop the RedwoodJS development server
85+
triggeredBy:
86+
- manual
87+
command: |
88+
gitpod automations service stop dev-server
89+
90+
restart-dev-server:
91+
name: Restart Development Server
92+
description: Restart the RedwoodJS development server
93+
triggeredBy:
94+
- manual
95+
command: |
96+
gitpod automations service stop dev-server
97+
sleep 2
98+
gitpod automations service start dev-server
99+
100+
open-ports:
101+
name: Open Development Ports
102+
description: Open ports 8910 (Web) and 8911 (API) for external access with HTTPS
103+
triggeredBy:
104+
- manual
105+
command: |
106+
echo "Opening RedwoodJS development ports with HTTPS..."
107+
gitpod environment port open 8910 --name "RedwoodJS Web Server" --protocol https
108+
gitpod environment port open 8911 --name "RedwoodJS API Server" --protocol https
109+
echo "✅ Ports opened successfully with HTTPS protocol"
110+
gitpod environment port list
111+
112+
close-ports:
113+
name: Close Development Ports
114+
description: Close ports 8910 (Web) and 8911 (API)
115+
triggeredBy:
116+
- manual
117+
command: |
118+
echo "Closing RedwoodJS development ports..."
119+
gitpod environment port close 8910
120+
gitpod environment port close 8911
121+
echo "✅ Ports closed successfully"
122+
123+
list-ports:
124+
name: List Port Status
125+
description: Show current status of all ports
126+
triggeredBy:
127+
- manual
128+
command: |
129+
echo "Current port status:"
130+
gitpod environment port list

‎CONTRIBUTING.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,12 @@ You can use the button below to start a developer environment in the cloud and a
183183

184184
This generates a functional test project and links it with the Redwood Framework code in `main`, giving you an easy playground to try out your fixes and contributions.
185185

186-
> Note: if you make changes to the framework, you will need to run `yarn rwfw project:sync` in the terminal, so that your changes are watched and reflected in the test project
186+
> Note: if you make changes to the framework, you will need to sync your changes to the test project. You can either:
187+
>
188+
> - Run `yarn rwfw project:sync` in the terminal, or
189+
> - Use the **"Sync Framework Changes"** task directly from the Ona dashboard
187190
188-
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/redwoodjs/redwood)
191+
[![Open in Ona](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/redwoodjs/redwood)
189192

190193
## Local QA and Integration Tests
191194

@@ -307,17 +310,17 @@ If needed, there's more information in [this PR #3154 comment](https://github.co
307310

308311
# Creating a Reproduction to Include with Issues
309312

310-
Are you about to open an issue? Including a reproduction, either as a series of steps, as a public GitHub repo, or as a Gitpod snapshot, will definitely let us help you faster!
313+
Are you about to open an issue? Including a reproduction, either as a series of steps, as a public GitHub repo, or as an Ona snapshot, will definitely let us help you faster!
311314

312-
## Option 1: Create a Gitpod Snapshot
315+
## Option 1: Create an Ona Snapshot
313316

314-
This is a great option when the issue you're reporting is cross-platform. I.e., it isn't a Windows-specific issue. Here's a video walkthrough on how to create a snapshot of the [Redwood-Gitpod starter repo](https://github.com/redwoodjs/starter):
317+
This is a great option when the issue you're reporting is cross-platform. I.e., it isn't a Windows-specific issue. You can create a snapshot of the [Redwood starter repo](https://github.com/redwoodjs/starter) using Ona's cloud development environment.
315318

316319
https://user-images.githubusercontent.com/1521877/176033049-d3c57b92-3ee6-4c60-918b-fdbcfa83fd0f.mp4
317320

318321
## Option 2: Fork the Starter Repo
319322

320-
You can always fork the [Redwood-Gitpod starter repo](https://github.com/redwoodjs/starter) which is a brand new project with the latest stable version of Redwood.
323+
You can always fork the [Redwood starter repo](https://github.com/redwoodjs/starter) which is a brand new project with the latest stable version of Redwood.
321324
Once you make your changes in your fork, include the link to your repo in your issue. This'll make it much easier for us to understand what's going on.
322325

323326
# Release Publishing

‎README.md‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,66 @@
66
_by Tom Preston-Werner, Peter Pistorius, Rob Cameron, David Price, and more than
77
250 amazing contributors (see end of file for a full list)._
88

9+
**NOTE**
10+
11+
> ⚡ **Big News** — We’ve launched **[RedwoodSDK](https://github.com/redwoodjs/sdk)**, a modern React framework for building full-stack web apps on Cloudflare.
12+
13+
---
14+
15+
## 🌲 RedwoodSDK — React on Cloudflare
16+
17+
RedwoodSDK starts as a **Vite plugin** and unlocks:
18+
19+
- **SSR** (Server-Side Rendering)
20+
- **React Server Components**
21+
- **Server Functions**
22+
- **Streaming + Realtime**
23+
- Local dev parity with **Miniflare**
24+
- First-class Cloudflare services: **Workers**, **D1**, **Durable Objects**, **R2**, **Queues**, and more
25+
26+
All while keeping to **web standards** — you write with native `Request`/`Response` and the modern Web APIs you already know.
27+
28+
---
29+
30+
### 🚀 Try it in seconds
31+
32+
```bash
33+
npx create-rwsdk my-project-name
34+
cd my-project-name
35+
npm run dev
36+
```
37+
38+
📚 [Read the docs](https://docs.rwsdk.com)
39+
⚡ [Quick Start Guide](https://docs.rwsdk.com/getting-started/quick-start)
40+
41+
---
42+
43+
## 🙌 How You Can Help
44+
45+
We’d love for the Redwood community to be part of this from day one:
46+
47+
1. **Try it out** — Follow the Quick Start and build something small.
48+
2. **Give feedback** — Tell us what works, what’s confusing, and what could be better.
49+
3. **Spread the word** — Share RedwoodSDK with your friends, coworkers, and followers.
50+
4. **Star the repo** — Stars help more developers discover RedwoodSDK.
51+
52+
---
53+
54+
## 📌 Links
55+
56+
- ⭐ **Star RedwoodSDK**: [https://github.com/redwoodjs/sdk](https://github.com/redwoodjs/sdk)
57+
- 📚 Docs: [https://docs.rwsdk.com](https://docs.rwsdk.com)
58+
- 💬 Discord: [https://discord.gg/redwoodjs](https://discord.gg/redwoodjs)
59+
- 🌐 Website: [https://rwsdk.com](https://rwsdk.com)
60+
61+
---
62+
63+
Thank you for being part of the Redwood journey — we can’t wait to see what you build with **RedwoodSDK**! ❤️
64+
65+
---
66+
67+
# RedwoodJS GraphQL
68+
969
## Bighorn Epoch (current development epoch)
1070

1171
> **NOTE:** This section of the Readme is aspirational for the current development

‎__fixtures__/test-project/web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@types/react-dom": "^18.2.19",
2626
"autoprefixer": "^10.4.21",
2727
"postcss": "^8.5.6",
28-
"postcss-loader": "^8.1.1",
28+
"postcss-loader": "^8.2.0",
2929
"prettier-plugin-tailwindcss": "^0.5.12",
3030
"tailwindcss": "^3.4.17"
3131
}

‎docs/babel.config.js‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)