diff --git a/.gitignore b/.gitignore index ec57bbd..d5cdfa9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ node_modules/ test-results/ end2end/playwright-report/ playwright/.cache/ -pnpm-lock.yaml .idea/ settings.json style/ diff --git a/Makefile b/Makefile deleted file mode 100644 index 4499564..0000000 --- a/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -CARGO ?= cargo -.DEFAULT_GOAL := serve - -# ---------------------- -# Formatting tasks -# ---------------------- - -cargo-format: - $(CARGO) fmt --all - -leptos-format: - leptosfmt . - -format: cargo-format leptos-format - -fmt: format - -fmt-all: - leptosfmt . - $(CARGO) fmt --all - $(CARGO) clippy --fix -- -D warnings - -check: - leptosfmt --check . - $(CARGO) fmt --all --check - $(CARGO) clippy -- -D warnings - -# ---------------------- -# Utilidades -# ---------------------- - -get-sitemap: - rm -f assets/sitemap.xml - wget -S -P assets https://github.com/Phosphorus-M/sitemap-rustico/releases/download/latest/sitemap.xml - -# ---------------------- -# Configuración -# ---------------------- - -setup: - git submodule update --init --recursive - cd design-system-components && pnpm install --ignore-scripts && cd styles && pnpm run build - pnpm run postinstall - -# ---------------------- -# Build & Serve -# ---------------------- - -prebuild: - cp node_modules/@rustlanges/styles/dist/bundled.css bundled.css - -build: prebuild - $(CARGO) leptos serve -r --split - -serve: prebuild - $(CARGO) leptos watch --features development --hot-reload diff --git a/Makefile.toml b/Makefile.toml index 4035212..7db9281 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -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] @@ -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"] @@ -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"] diff --git a/README.md b/README.md index c9b39c7..7f60a33 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,21 @@ 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 @@ -32,7 +44,16 @@ Antes de empezar es necesario tener estos programas > `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 @@ -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 @@ -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 diff --git a/design-system-components b/design-system-components index 396fc60..1eae154 160000 --- a/design-system-components +++ b/design-system-components @@ -1 +1 @@ -Subproject commit 396fc603be6fc3466a8ece9157546da547ceba9d +Subproject commit 1eae154930b8b938995c766e05d0284a18b14373 diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index a1f21c0..0000000 --- a/package-lock.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "rustlanges-page", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "rustlanges-page", - "version": "1.0.0", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "@rustlanges/styles": "file:../design-system-components/styles" - }, - "devDependencies": { - "tailwindcss": "^4.1.14" - } - }, - "../design-system-components/styles": { - "name": "@rustlanges/styles", - "version": "0.0.10", - "devDependencies": { - "@tailwindcss/cli": "^4.1.8" - }, - "peerDependencies": { - "tailwindcss": "^4.1.8" - } - }, - "node_modules/@rustlanges/styles": { - "resolved": "../design-system-components/styles", - "link": true - }, - "node_modules/tailwindcss": { - "version": "4.1.14", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.14.tgz", - "integrity": "sha512-b7pCxjGO98LnxVkKjaZSDeNuljC4ueKUddjENJOADtubtdo8llTaJy7HwBMeLNSSo2N5QIAgklslK1+Ir8r6CA==", - "dev": true, - "license": "MIT" - } - } -} diff --git a/package.json b/package.json index 706e9c4..e204a11 100644 --- a/package.json +++ b/package.json @@ -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" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml new file mode 100644 index 0000000..896f55e --- /dev/null +++ b/pnpm-lock.yaml @@ -0,0 +1,35 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + + .: + dependencies: + '@rustlanges/styles': + specifier: file:design-system-components/styles + version: file:design-system-components/styles(tailwindcss@4.3.3) + devDependencies: + tailwindcss: + specifier: ^4.3.1 + version: 4.3.3 + +packages: + + '@rustlanges/styles@file:design-system-components/styles': + resolution: {directory: design-system-components/styles, type: directory} + peerDependencies: + tailwindcss: ^4.3.3 + + tailwindcss@4.3.3: + resolution: {integrity: sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ==} + +snapshots: + + '@rustlanges/styles@file:design-system-components/styles(tailwindcss@4.3.3)': + dependencies: + tailwindcss: 4.3.3 + + tailwindcss@4.3.3: {}