Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ node_modules/
test-results/
end2end/playwright-report/
playwright/.cache/
pnpm-lock.yaml
.idea/
settings.json
style/
Expand Down
56 changes: 0 additions & 56 deletions Makefile

This file was deleted.

10 changes: 6 additions & 4 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ alias = "serve"
[tasks.setup]
script = '''
git submodule update --init --recursive
cd design-system-components && pnpm install --ignore-scripts && cd styles && pnpm run build && cd ../..
pnpm run postinstall
pnpm install --ignore-scripts
cd design-system-components && pnpm install --ignore-scripts
cd styles && pnpm run build
cd ../.. && pnpm run postinstall
'''

[tasks.cargo-format]
Expand Down Expand Up @@ -63,7 +65,7 @@ dependencies = ["prebuild"]
install_crate = { crate_name = "cargo-leptos", binary = "cargo", test_arg = [
"leptos",
"--version",
], version = "0.3.2" }
], version = "0.3.6" }
command = "cargo"
args = ["leptos", "serve", "-r", "--split"]

Expand All @@ -72,7 +74,7 @@ dependencies = ["prebuild"]
install_crate = { crate_name = "cargo-leptos", binary = "cargo", test_arg = [
"leptos",
"--version",
], version = "0.3.2" }
], version = "0.3.6" }
command = "cargo"
env = { LEPTOS_TAILWIND_VERSION="v4.1.14" }
args = ["leptos", "watch", "--features", "development", "--hot-reload"]
71 changes: 30 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,38 @@

Antes de empezar es necesario tener estos programas

- [Rust](https://rust-lang.org/tools/install)
- [NodeJs](https://nodejs.org)
- **[Rust](https://rust-lang.org/tools/install)**
- **Compilador de C/C++**
- **[NodeJs](https://nodejs.org/en/download) en la version 24**

**Rust:**

```bash
rustup toolchain install nightly
rustup default nightly
rustup target add wasm32-unknown-unknown

cargo install cargo-make
cargo install rusty-hook
cargo install leptosfmt --version 0.1.33
```

> [!IMPORTANT]
> Necesitas `wasm-bindgen-cli` en la versión `0.2.126` (la misma que fija
> `flake.nix`). Si no coincide con el `wasm-bindgen` del `Cargo.lock`,
> `cargo make serve`/`build` falla con un error de "schema version mismatch".
> ```bash
> cargo install -f wasm-bindgen-cli --version 0.2.126
> ```
>

Si usas NixOS

> [!NOTE]
> Asegúrate de tener los flakes activados.

```bash
direnv allow
```

### Requisitos Windows >= 10

Expand All @@ -50,18 +71,6 @@ Este proyecto usa `Makefile` para agilizar ciertos procesos y no tener que estar

Con estos comandos podrá empezar a desarrollar

Rust:

```bash
rustup toolchain install nightly
rustup default nightly
rustup target add wasm32-unknown-unknown

cargo install cargo-make
cargo install rusty-hook
cargo install leptosfmt --version 0.1.13
```

Para configurar el proyecto en general, se recomienda usar el siguiente comando, ya que este comando engloba todos los camandos listados más abajo:

```bash
Expand All @@ -71,45 +80,25 @@ cargo make setup
O si prefieres ejecutar cada uno de los comandos manualmente:

```bash
git submodule update --init --recursive

git submodule update --init --recursive
pnpm install --ignore-scripts
cd design-system-components && pnpm install --ignore-scripts

cd styles && pnpm run build

cd ../..

pnpm run postinstall
cd ../.. && pnpm run postinstall
```

Para ejecutar el proyecto:

Sin cargo make:
```bash
cargo leptos serve --hot-reload --features development
```

Con cargo make:
Ahora podemos iniciar el servidor con:

```bash
cargo make serve
```

---

Si usas nix

> [!NOTE]
> Asegúrate de tener los flakes activados.

```bash
direnv allow
```

Ahora podemos iniciar el servidor con:

Sin cargo make:
```bash
cargo make serve
cargo leptos serve --hot-reload --features development
```

## Configura tu VSCode
Expand Down
2 changes: 1 addition & 1 deletion design-system-components
Submodule design-system-components updated 53 files
+2 −6 crates/leptos/src/avatar.rs
+3 −5 crates/leptos/src/badge.rs
+1 −1 crates/leptos/src/button.rs
+14 −12 crates/leptos/src/card.rs
+10 −10 crates/leptos/src/flap.rs
+2 −2 crates/leptos/src/icons/alert.rs
+3 −6 crates/leptos/src/icons/arrow_down.rs
+3 −6 crates/leptos/src/icons/arrow_left.rs
+3 −6 crates/leptos/src/icons/arrow_right.rs
+2 −2 crates/leptos/src/icons/arrow_up.rs
+2 −2 crates/leptos/src/icons/book.rs
+3 −6 crates/leptos/src/icons/close.rs
+2 −2 crates/leptos/src/icons/discord.rs
+2 −2 crates/leptos/src/icons/ferris.rs
+2 −2 crates/leptos/src/icons/file.rs
+2 −2 crates/leptos/src/icons/filter.rs
+2 −2 crates/leptos/src/icons/github.rs
+2 −2 crates/leptos/src/icons/link.rs
+2 −2 crates/leptos/src/icons/linkedin.rs
+2 −2 crates/leptos/src/icons/location.rs
+2 −2 crates/leptos/src/icons/menu.rs
+2 −2 crates/leptos/src/icons/moon.rs
+2 −2 crates/leptos/src/icons/project.rs
+2 −2 crates/leptos/src/icons/roadmap.rs
+2 −2 crates/leptos/src/icons/search.rs
+2 −2 crates/leptos/src/icons/share.rs
+2 −2 crates/leptos/src/icons/star_bold.rs
+2 −2 crates/leptos/src/icons/sun_line.rs
+3 −6 crates/leptos/src/icons/sun_moon.rs
+2 −2 crates/leptos/src/icons/telegram.rs
+2 −2 crates/leptos/src/icons/twitter.rs
+2 −2 crates/leptos/src/icons/youtube.rs
+12 −9 crates/leptos/src/input.rs
+54 −36 crates/leptos/src/input/search.rs
+1 −5 crates/leptos/src/level.rs
+9 −8 crates/leptos/src/progress_bar.rs
+1 −3 crates/leptos/src/radio.rs
+1 −5 crates/leptos/src/tag.rs
+6 −2 js/react/eslint.config.ts
+1 −1 js/react/package.json
+3 −2 js/react/tsconfig.node.json
+8 −6 js/react/vite.config.ts
+5 −0 js/showcase/eslint.config.ts
+2 −2 js/showcase/package.json
+3 −2 js/showcase/tsconfig.node.json
+4 −4 js/showcase/vite.config.ts
+5 −0 js/vue/eslint.config.ts
+1 −1 js/vue/package.json
+8 −1 js/vue/tsconfig.node.json
+12 −12 js/vue/vite.config.ts
+2 −2 package.json
+426 −1,353 pnpm-lock.yaml
+1 −1 styles/package.json
41 changes: 0 additions & 41 deletions package-lock.json

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"homepage": "https://github.com/RustLangES/RustLangES.github.io",
"dependencies": {
"@rustlanges/styles": "file:../design-system-components/styles"
"@rustlanges/styles": "file:design-system-components/styles"
},
"devDependencies": {
"tailwindcss": "^4.1.14"
"tailwindcss": "^4.3.1"
}
}
35 changes: 35 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.