diff --git a/Bare-Bones/.gitignore b/Bare-Bones/.gitignore index 80aab8e..facfd89 100644 --- a/Bare-Bones/.gitignore +++ b/Bare-Bones/.gitignore @@ -5,3 +5,8 @@ # These are backup files generated by rustfmt **/*.rs.bk + +{% if is_tailwind -%} +# dependencies +/node_modules +{%- endif %} \ No newline at end of file diff --git a/Bare-Bones/README.md b/Bare-Bones/README.md index f1dbec8..d7d0197 100644 --- a/Bare-Bones/README.md +++ b/Bare-Bones/README.md @@ -12,12 +12,13 @@ project/ {% if is_tailwind -%} ### Tailwind +Follow the instructions to install Tailwind CSS (make sure to install version 4): 1. Install npm: https://docs.npmjs.com/downloading-and-installing-node-js-and-npm -2. Install the Tailwind CSS CLI: https://tailwindcss.com/docs/installation +2. Install the Tailwind CSS CLI: https://tailwindcss.com/docs/installation/tailwind-cli 3. Run the following command in the root of the project to start the Tailwind CSS compiler: ```bash -npx tailwindcss -i ./input.css -o ./assets/tailwind.css --watch +npx @tailwindcss/cli -i ./input.css -o ./assets/tailwind.css --watch ``` {%- endif %} diff --git a/Bare-Bones/conditional-files.rhai b/Bare-Bones/conditional-files.rhai index 86c715c..7936216 100644 --- a/Bare-Bones/conditional-files.rhai +++ b/Bare-Bones/conditional-files.rhai @@ -4,7 +4,6 @@ const IS_TAILWIND_VAR = "is_tailwind"; let is_tailwind = variable::get(IS_TAILWIND_VAR); if !is_tailwind { - file::delete("tailwind.config.js"); file::delete("input.css"); file::delete("assets/tailwind.css"); } \ No newline at end of file diff --git a/Bare-Bones/input.css b/Bare-Bones/input.css index bd6213e..a461c50 100644 --- a/Bare-Bones/input.css +++ b/Bare-Bones/input.css @@ -1,3 +1 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; \ No newline at end of file +@import "tailwindcss"; \ No newline at end of file diff --git a/Bare-Bones/tailwind.config.js b/Bare-Bones/tailwind.config.js deleted file mode 100644 index 2a69d58..0000000 --- a/Bare-Bones/tailwind.config.js +++ /dev/null @@ -1,9 +0,0 @@ -/** @type {import('tailwindcss').Config} */ -module.exports = { - mode: "all", - content: ["./src/**/*.{rs,html,css}", "./dist/**/*.html"], - theme: { - extend: {}, - }, - plugins: [], -}; diff --git a/Jumpstart/.gitignore b/Jumpstart/.gitignore index 80aab8e..facfd89 100644 --- a/Jumpstart/.gitignore +++ b/Jumpstart/.gitignore @@ -5,3 +5,8 @@ # These are backup files generated by rustfmt **/*.rs.bk + +{% if is_tailwind -%} +# dependencies +/node_modules +{%- endif %} \ No newline at end of file diff --git a/Jumpstart/README.md b/Jumpstart/README.md index 64f2c6f..14b9a68 100644 --- a/Jumpstart/README.md +++ b/Jumpstart/README.md @@ -21,12 +21,13 @@ project/ {% if is_tailwind -%} ### Tailwind +Follow the instructions to install Tailwind CSS (make sure to install version 4): 1. Install npm: https://docs.npmjs.com/downloading-and-installing-node-js-and-npm -2. Install the Tailwind CSS CLI: https://tailwindcss.com/docs/installation +2. Install the Tailwind CSS CLI: https://tailwindcss.com/docs/installation/tailwind-cli 3. Run the following command in the root of the project to start the Tailwind CSS compiler: ```bash -npx tailwindcss -i ./input.css -o ./assets/tailwind.css --watch +npx @tailwindcss/cli -i ./input.css -o ./assets/tailwind.css --watch ``` {%- endif %} diff --git a/Jumpstart/conditional-files.rhai b/Jumpstart/conditional-files.rhai index f66f9a2..5075f3b 100644 --- a/Jumpstart/conditional-files.rhai +++ b/Jumpstart/conditional-files.rhai @@ -6,7 +6,6 @@ const IS_FULLSTACK_VAR = "is_fullstack"; let is_tailwind = variable::get(IS_TAILWIND_VAR); if !is_tailwind { - file::delete("tailwind.config.js"); file::delete("input.css"); file::delete("assets/tailwind.css"); } diff --git a/Jumpstart/input.css b/Jumpstart/input.css index bd6213e..a461c50 100644 --- a/Jumpstart/input.css +++ b/Jumpstart/input.css @@ -1,3 +1 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; \ No newline at end of file +@import "tailwindcss"; \ No newline at end of file diff --git a/Jumpstart/tailwind.config.js b/Jumpstart/tailwind.config.js deleted file mode 100644 index 2a69d58..0000000 --- a/Jumpstart/tailwind.config.js +++ /dev/null @@ -1,9 +0,0 @@ -/** @type {import('tailwindcss').Config} */ -module.exports = { - mode: "all", - content: ["./src/**/*.{rs,html,css}", "./dist/**/*.html"], - theme: { - extend: {}, - }, - plugins: [], -};