Skip to content

Commit 7d068e8

Browse files
authored
Merge branch 'main' into feat/better-auth-add-on
2 parents f2e78a3 + 0d352b8 commit 7d068e8

216 files changed

Lines changed: 8099 additions & 1474 deletions

File tree

Some content is hidden

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

.changeset/config.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json",
3+
"changelog": [
4+
"@svitejs/changesets-changelog-github-compact",
5+
{ "repo": "TanStack/create-tsrouter-app" }
6+
],
7+
"commit": false,
8+
"access": "public",
9+
"baseBranch": "main",
10+
"updateInternalDependencies": "patch",
11+
"fixed": [],
12+
"linked": [],
13+
"ignore": [],
14+
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
15+
"onlyUpdatePeerDependentsWhenOutOfRange": true
16+
}
17+
}

.github/workflows/pr.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: PR
2+
3+
on:
4+
pull_request:
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
8+
cancel-in-progress: true
9+
10+
env:
11+
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
12+
13+
permissions:
14+
contents: read
15+
16+
jobs:
17+
test:
18+
name: Test
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v6.0.1
23+
with:
24+
fetch-depth: 0
25+
- name: Setup Tools
26+
uses: tanstack/config/.github/setup@main
27+
- name: Build
28+
run: pnpm build
29+
- name: Test
30+
run: pnpm test
31+
preview:
32+
provenance:
33+
name: Provenance
34+
runs-on: ubuntu-latest
35+
steps:
36+
- name: Checkout
37+
uses: actions/checkout@v6.0.1
38+
with:
39+
fetch-depth: 0
40+
- name: Check Provenance
41+
uses: danielroe/provenance-action@v0.1.1
42+
with:
43+
fail-on-downgrade: true

.github/workflows/release.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
name: Release
22

33
on:
4-
workflow_dispatch:
5-
inputs:
6-
tag:
7-
description: override release tag
8-
required: false
94
push:
10-
branches: [main, alpha, beta]
5+
branches: [main, alpha, beta, rc]
116

127
concurrency:
138
group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
149
cancel-in-progress: true
1510

11+
env:
12+
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
13+
1614
permissions:
1715
contents: write
1816
id-token: write
@@ -34,11 +32,17 @@ jobs:
3432
run: pnpm build
3533
- name: Test
3634
run: pnpm test
37-
- name: Publish
38-
run: |
39-
git config --global user.name 'Tanner Linsley'
40-
git config --global user.email 'tannerlinsley@users.noreply.github.com'
41-
pnpm run cipublish
35+
- name: Run Changesets (version or publish)
36+
uses: changesets/action@v1.5.3
37+
with:
38+
version: pnpm run changeset:version
39+
publish: pnpm run changeset:publish
40+
commit: "ci: Version Packages"
41+
title: "ci: Version Packages"
4242
env:
43-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
TAG: ${{ inputs.tag }}
43+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
- name: Comment on PRs about release
45+
if: steps.changesets.outputs.published == 'true'
46+
uses: tanstack/config/.github/comment-on-release@main
47+
with:
48+
published-packages: ${{ steps.changesets.outputs.publishedPackages }}

CONTRIBUTING.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,38 @@ npm_config_user_agent=pnpm node ../create-tsrouter-app/cli/create-start-app/dist
4040

4141
If you want to specify a package manager.
4242

43+
# Framework Development with --dev-watch
44+
45+
The `--dev-watch` command provides real-time feedback while developing frameworks, add-ons, and starters. It watches for changes in your framework files and automatically rebuilds them.
46+
47+
## Using --dev-watch
48+
49+
To start developing a framework with live rebuilding:
50+
51+
```bash
52+
node [root of the monorepo]/cli/create-tsrouter-app/dist/index.js --dev-watch ./frameworks/react-cra test-app --template typescript --package-manager bun --tailwind --add-ons shadcn
53+
```
54+
55+
This command will:
56+
57+
- Watch the selected folder for changes (the folder with the add-ons in it)
58+
- Automatically rebuild your app / install packages in the target folder when changes are detected (in this case it will install the shadcn addon)
59+
- Show build output, diffs detected and any errors in real-time
60+
61+
## Example Workflow
62+
63+
1. Start the dev watch mode:
64+
65+
```bash
66+
pnpm dev # Build in watch mode
67+
rm -rf test-app && node cli/create-tsrouter-app/dist/index.js --dev-watch ./frameworks/react-cra test-app --template typescript --package-manager bun --tailwind --add-ons shadcn
68+
cd my-test-app && pnpm run dev # run the tsrouter vite app
69+
```
70+
71+
2. Select the framework you want to work on from the displayed list
72+
73+
3. Make changes to the add-ons - they will be automatically rebuilt and your vite app will reflect the changes
74+
4375
# Testing Add-ons and Starters
4476

4577
Create the add-on or starter using the CLI. Then serve it locally from the project directory using `npx static-server`.

cli/create-start-app/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# create-start-app
2+
3+
## 0.47.0
4+
5+
### Minor Changes
6+
7+
- Smakll content fixes ([`7647683`](https://github.com/TanStack/create-tsrouter-app/commit/76476838fc427d71535881b959530307ca4664a2))
8+
9+
- allowing for no tailwind ([#151](https://github.com/TanStack/create-tsrouter-app/pull/151))
10+
11+
### Patch Changes
12+
13+
- Updated dependencies [[`7647683`](https://github.com/TanStack/create-tsrouter-app/commit/76476838fc427d71535881b959530307ca4664a2), [`f1f58fe`](https://github.com/TanStack/create-tsrouter-app/commit/f1f58feed7d7df1e0c5e0fc4dd3af02e11df09e5)]:
14+
- @tanstack/cta-framework-react-cra@0.47.0
15+
- @tanstack/cta-framework-solid@0.47.0
16+
- @tanstack/cta-cli@0.47.0

cli/create-start-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-start-app",
3-
"version": "0.44.1",
3+
"version": "0.47.0",
44
"description": "Tanstack Start Builder",
55
"bin": "./dist/index.js",
66
"type": "module",

cli/create-start-app/src/index.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
#!/usr/bin/env node
22
import { cli } from '@tanstack/cta-cli'
33

4-
import { register as registerReactCra } from '@tanstack/cta-framework-react-cra'
5-
import { register as registerSolid } from '@tanstack/cta-framework-solid'
4+
import {
5+
createFrameworkDefinition as createReactCraFrameworkDefinitionInitalizer,
6+
register as registerReactCra,
7+
} from '@tanstack/cta-framework-react-cra'
8+
import {
9+
createFrameworkDefinition as createSolidFrameworkDefinitionInitalizer,
10+
register as registerSolid,
11+
} from '@tanstack/cta-framework-solid'
612

713
registerReactCra()
814
registerSolid()
@@ -15,4 +21,8 @@ cli({
1521
showDeploymentOptions: true,
1622
forcedDeployment: 'nitro',
1723
craCompatible: true,
24+
frameworkDefinitionInitializers: [
25+
createReactCraFrameworkDefinitionInitalizer,
26+
createSolidFrameworkDefinitionInitalizer,
27+
],
1828
})
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# create-tanstack-app
2+
3+
## 0.42.0
4+
5+
### Minor Changes
6+
7+
- Smakll content fixes ([`7647683`](https://github.com/TanStack/create-tsrouter-app/commit/76476838fc427d71535881b959530307ca4664a2))
8+
9+
- allowing for no tailwind ([#151](https://github.com/TanStack/create-tsrouter-app/pull/151))
10+
11+
### Patch Changes
12+
13+
- Updated dependencies [[`7647683`](https://github.com/TanStack/create-tsrouter-app/commit/76476838fc427d71535881b959530307ca4664a2), [`f1f58fe`](https://github.com/TanStack/create-tsrouter-app/commit/f1f58feed7d7df1e0c5e0fc4dd3af02e11df09e5)]:
14+
- @tanstack/cta-framework-react-cra@0.47.0
15+
- @tanstack/cta-framework-solid@0.47.0
16+
- @tanstack/cta-cli@0.47.0

cli/create-tanstack-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-tanstack-app",
3-
"version": "0.41.2",
3+
"version": "0.42.0",
44
"description": "Tanstack Application Builder",
55
"bin": "./dist/index.js",
66
"type": "module",

cli/create-tanstack/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# create-tanstack
2+
3+
## 0.42.0
4+
5+
### Minor Changes
6+
7+
- Smakll content fixes ([`7647683`](https://github.com/TanStack/create-tsrouter-app/commit/76476838fc427d71535881b959530307ca4664a2))
8+
9+
- allowing for no tailwind ([#151](https://github.com/TanStack/create-tsrouter-app/pull/151))
10+
11+
### Patch Changes
12+
13+
- Updated dependencies [[`7647683`](https://github.com/TanStack/create-tsrouter-app/commit/76476838fc427d71535881b959530307ca4664a2), [`f1f58fe`](https://github.com/TanStack/create-tsrouter-app/commit/f1f58feed7d7df1e0c5e0fc4dd3af02e11df09e5)]:
14+
- @tanstack/cta-framework-react-cra@0.47.0
15+
- @tanstack/cta-framework-solid@0.47.0
16+
- @tanstack/cta-cli@0.47.0

0 commit comments

Comments
 (0)