Skip to content

Commit

Permalink
Merge branch 'main' into add-support-for-react-19
Browse files Browse the repository at this point in the history
# Conflicts:
#	pnpm-lock.yaml
  • Loading branch information
marcalexiei committed Jan 2, 2025
2 parents c8086a7 + 1dc77fc commit 85cf633
Show file tree
Hide file tree
Showing 13 changed files with 234 additions and 267 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Install tuono
run: cargo install [email protected].4
run: cargo install [email protected].9

- name: Build project
working-directory: ./apps/documentation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Install tuono
run: cargo install [email protected].4
run: cargo install [email protected].9

- name: Build project
working-directory: ./apps/documentation
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ pnpm-lock.yaml
dist
.tuono

vite.config.ts.timestamp-*

packages/tuono-lazy-fn-vite-plugin/tests/sources/*
17 changes: 17 additions & 0 deletions apps/documentation/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Documentation Contributing

## Update `tuono` version in `apps/documentation`

Update `tuono` version in the following files

- `.github/workflows/ci-documentation.yml`
- `.github/workflows/deploy-documentation.yml`
- `apps/documentation/Cargo.toml`
- `apps/documentation/package.json`

[Refer to this PR for additional information](https://github.com/tuono-labs/tuono/pull/236/files)

In the future we might:

- move the documentation in a separate repo
- make a script to perform this operation
2 changes: 1 addition & 1 deletion apps/documentation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name = "tuono"
path = ".tuono/main.rs"

[dependencies]
tuono_lib = "0.16.4"
tuono_lib = "0.16.9"
glob = "0.3.1"
time = { version = "0.3", features = ["macros"] }
serde = { version = "1.0.202", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion apps/documentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"clsx": "2.1.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"tuono": "npm:[email protected].4"
"tuono": "npm:[email protected].9"
},
"devDependencies": {
"@mdx-js/rollup": "3.1.0",
Expand Down
2 changes: 2 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ export default tseslint.config(
ignores: [
// #region shared
'**/dist',
'**/out',
'**/.tuono',
'**/vite.config.ts.timestamp**',
// #endregion shared

// #region package-specific
'packages/tuono-fs-router-vite-plugin/tests/generator/**',

'packages/tuono-lazy-fn-vite-plugin/tests/sources/**',

'packages/tuono/bin/**',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"license": "MIT",
"devDependencies": {
"@eslint/js": "9.15.0",
"@types/node": "22.10.0",
"@types/node": "22.10.3",
"eslint": "9.15.0",
"eslint-import-resolver-typescript": "3.6.3",
"eslint-plugin-import": "2.31.0",
Expand Down
2 changes: 0 additions & 2 deletions packages/tuono-fs-router-vite-plugin/.prettierignore

This file was deleted.

4 changes: 2 additions & 2 deletions packages/tuono-fs-router-vite-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"dev": "vite build --watch",
"build": "vite build",
"lint": "eslint .",
"format": "prettier -u --write --ignore-unknown '**/*'",
"format:check": "prettier --check --ignore-unknown '**/*'",
"format": "prettier --write --ignore-unknown --ignore-path ../../.prettierignore .",
"format:check": "prettier --check --ignore-unknown --ignore-path ../../.prettierignore .",
"types": "tsc --noEmit",
"test:watch": "vitest",
"test": "vitest run"
Expand Down
2 changes: 1 addition & 1 deletion packages/tuono/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"@tanstack/config": "0.7.13",
"@types/babel__core": "7.20.5",
"@types/babel__traverse": "7.20.6",
"@types/node": "22.10.0",
"@types/node": "22.10.3",
"@types/react": "19.0.2",
"@types/react-dom": "19.0.2",
"react": "19.0.0",
Expand Down
Loading

0 comments on commit 85cf633

Please sign in to comment.