django-tailwind-cli 4.1.0__tar.gz → 4.2.0__tar.gz

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/.pre-commit-config.yaml

@@ -16,19 +16,19 @@ repos:
       - id: check-json
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.7.4"
+    rev: "v0.11.2"
     hooks:
       - id: ruff
       - id: ruff-format
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
     - id: pyupgrade
       args: [--py39-plus]
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: "1.22.1"
+    rev: "1.23.1"
     hooks:
     - id: django-upgrade
       args: [--target-version, "4.2"]
@@ -38,3 +38,8 @@ repos:
     hooks:
     -   id: djade
         args: [--target-version, "4.2"]
+
+  - repo: https://github.com/owenlamont/uv-secure
+    rev: 0.9.0
+    hooks:
+      - id: uv-secure

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 4.2.0 (Unreleased)
+
+> [!CAUTION]
+> Version 4.2.x and onward only support Tailwind CSS 4.x. If you are using Tailwind CSS 3.x,
+> please use version 2.21.1 of this library. Version 4.0.x or 4.1.x still support Tailwind CSS 3.x, but
+> these versions are not recommended to use for new projects.
+
+> [!CAUTION]
+> This version includes changes to the handling of `TAILWIND_CLI_PATH` and `TAILWIND_CLI_SRC_CSS`.
+
+- Default fallback version is now 4.1.3.
+- Removed support for Tailwind CSS 3.x. The main reason is that this makes the library easier to maintain and also add better support for custom CLI builds which support DaisyUI and other plugins.
+- django-tailwind-cli now uses proper platform directories to store the CLI binary.
+
+    * The proper directories are powered by [platformdirs](https://pypi.org/project/platformdirs/).
+    * `TAILWIND_CLI_PATH` is now optional by default.
+    * If `TAILWIND_CLI_PATH` is None, the binary is stored in `user_data_dir("django-tailwind-cli", "django-commons")`.
+    * The library doesn't rely anylonger on a properly set `settings.BASE_DIR`.
+
+- `TAILWIND_CLI_ASSET_NAME` is also used for the downloaded CLI to distinguish between `tailwindcss` and `tailwindcss-extra`.
+- The behaviour of `TAILWIND_CLI_SRC_CSS` has been changed. The reasoning behind this change was, less default code inside the project and whitenoise had issues with a CSS file inside an asset folder referencing non-existing imports.
+
+    * It defaults to `None`.
+    * If it is `None` the default input file is created in the user cache directory.
+    * If it is a relative path, this path is considered relative to `settings.BASE_DIR`.
+    * The last option is an absolute path.
+
+- Proper daisyUI support using [tailwind-cli-extra](https://github.com/dobicinaitis/tailwind-cli-extra).
+
 ## 4.1.0
 
 - TAILWIND_CLI_VERSION defaults to "latest" now. In case it is set to this value,

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-tailwind-cli
-Version: 4.1.0
+Version: 4.2.0
 Summary: Django and Tailwind integration based on the prebuilt Tailwind CSS CLI.
 Project-URL: Home, https://django-tailwind-cli.rtfd.io/
 Project-URL: Documentation, https://django-tailwind-cli.rtfd.io/
@@ -47,6 +47,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.9
 Requires-Dist: django-typer>=2.1.2
 Requires-Dist: django>=4.0
+Requires-Dist: platformdirs>=4.3.7
 Requires-Dist: requests>=2.32.3
 Requires-Dist: semver>=3.0.4
 Provides-Extra: django-extensions
@@ -66,6 +67,11 @@ Description-Content-Type: text/markdown
 [![Downloads](https://static.pepy.tech/badge/django-tailwind-cli)](https://pepy.tech/project/django-tailwind-cli)
 [![Downloads / Month](https://pepy.tech/badge/django-tailwind-cli/month)](<https://pepy.tech/project/django-tailwind-cli>)
 
+> [!WARNING]
+> Version 4.2.x and onward only support Tailwind CSS 4.x. If you are using Tailwind CSS 3.x,
+> please use version 2.21.1 of this library. Version 4.0.x or 4.1.x still support Tailwind CSS 3.x, but
+> these versions are not recommended to use for new projects.
+
 This library provides an integration of [Tailwind CSS](https://tailwindcss.com) for Django that is using on the precompiled versions of the [Tailwind CSS CLI](https://tailwindcss.com/blog/standalone-cli).
 
 The goal of this library is to provided the simplest possible Tailwind integration for your Django project. It took its inspiration from the [Tailwind integration for Phoenix](https://github.com/phoenixframework/tailwind) which completely skips the neccesity of a node installation.
@@ -120,7 +126,9 @@ if you want to activate browser reload or the `runserver_plus` management comman
 ## Features
 
 - Simplest possible integration.
-- Support Tailwind CSS 3.x and 4.x. Check the [update instructions](https://django-tailwind-cli.rtfd.io/latest/installation/#upgrade-from-tailwind-css-3x-to-4x).
+- Support Tailwind CSS 4.x.
+- Proper support for DaisyUI via [tailwindcss-cli-extra](https://github.com/dobicinaitis/tailwind-cli-extra). Settings are described in the [usage guide](https://django-tailwind-cli.readthedocs.io/latest/usage/#use-with-daisyui).
+- Or bring your own version of Tailwind CSS CLI.
 - Management commands:
 
     * To start the Tailwind CLI in watch mode during development.
@@ -130,7 +138,7 @@ if you want to activate browser reload or the `runserver_plus` management comman
 - Configuration options to adapt the library to your project, when the defaults don't fit you.
 - A template tag to include the Tailwind CSS file in your project.
 - A base template for your project.
-- Sane default configurations for Tailwind 3.x and Tailwinc 4.x.
+- Sane default configurations for Tailwinc 4.x.
 
 ## Requirements
 

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/README.md

@@ -10,6 +10,11 @@
 [![Downloads](https://static.pepy.tech/badge/django-tailwind-cli)](https://pepy.tech/project/django-tailwind-cli)
 [![Downloads / Month](https://pepy.tech/badge/django-tailwind-cli/month)](<https://pepy.tech/project/django-tailwind-cli>)
 
+> [!WARNING]
+> Version 4.2.x and onward only support Tailwind CSS 4.x. If you are using Tailwind CSS 3.x,
+> please use version 2.21.1 of this library. Version 4.0.x or 4.1.x still support Tailwind CSS 3.x, but
+> these versions are not recommended to use for new projects.
+
 This library provides an integration of [Tailwind CSS](https://tailwindcss.com) for Django that is using on the precompiled versions of the [Tailwind CSS CLI](https://tailwindcss.com/blog/standalone-cli).
 
 The goal of this library is to provided the simplest possible Tailwind integration for your Django project. It took its inspiration from the [Tailwind integration for Phoenix](https://github.com/phoenixframework/tailwind) which completely skips the neccesity of a node installation.
@@ -64,7 +69,9 @@ if you want to activate browser reload or the `runserver_plus` management comman
 ## Features
 
 - Simplest possible integration.
-- Support Tailwind CSS 3.x and 4.x. Check the [update instructions](https://django-tailwind-cli.rtfd.io/latest/installation/#upgrade-from-tailwind-css-3x-to-4x).
+- Support Tailwind CSS 4.x.
+- Proper support for DaisyUI via [tailwindcss-cli-extra](https://github.com/dobicinaitis/tailwind-cli-extra). Settings are described in the [usage guide](https://django-tailwind-cli.readthedocs.io/latest/usage/#use-with-daisyui).
+- Or bring your own version of Tailwind CSS CLI.
 - Management commands:
 
     * To start the Tailwind CLI in watch mode during development.
@@ -74,7 +81,7 @@ if you want to activate browser reload or the `runserver_plus` management comman
 - Configuration options to adapt the library to your project, when the defaults don't fit you.
 - A template tag to include the Tailwind CSS file in your project.
 - A base template for your project.
-- Sane default configurations for Tailwind 3.x and Tailwinc 4.x.
+- Sane default configurations for Tailwinc 4.x.
 
 ## Requirements
 

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/docs/installation.md

@@ -120,12 +120,3 @@ If you enjoy automatic reloading during development. Install the [django-browser
    The middleware should be listed after any that encodes the response, such as Django’s GZipMiddleware.
 
    The middleware automatically inserts the required script tag on HTML responses before </body> when DEBUG is True. It does so to every HTML response, meaning it will be included on Django’s debug pages, admin pages, etc. If you want more control, you can instead insert the script tag in your templates—see below.
-
-## Upgrade from Tailwind CSS 3.x to 4.x
-
-In order to upgrade this package from using Tailwind CSS 3.x to 4.x, you have to follow some simple
-steps.
-
-- Remove or change the setting `TAILWIND_CLI_VERSION` if it is set.
-- Remove the setting `TAILWIND_CLI_CONFIG_FILE` if it is set.
-- Remove the `tailwind.config.js` from your project.

django_tailwind_cli-4.2.0/docs/requirements.txt

@@ -0,0 +1,2 @@
+mkdocs-material
+markdown-callouts

django_tailwind_cli-4.2.0/docs/settings.md

@@ -0,0 +1,101 @@
+---
+hide:
+  - navigation
+---
+
+# Settings & Configuration
+
+## Settings
+
+The package can be configured by a few settings, which can be overwritten in the `settings.py` of
+your project.
+
+`TAILWIND_CLI_VERSION`
+: **Default**: `"latest"`
+
+    This defines the version of the CLI and of Tailwind CSS you want to use in your project.
+
+    If it is set to `latest`, the management commands try to determine the most recent version of Tailwind CSS by placing a request to GitHub and parse the location header of the redirect. If this is not possible a fallback version is used. This version is defined in the module `django_tailwind_cli.config`.
+
+    If you want to pinpoint your setup to certain version of Tailwind CSS, then you can set `TAILWIND_CLI_VERSION`to a fixed version number.
+
+    For example:
+    ```python
+    TAILWIND_CLI_VERSION = "4.1.0"
+    ```
+
+`TAILWIND_CLI_PATH`
+: **Default**: `None`
+
+    This allows you to override the default of the library where to store the CLI binary.
+
+    The default behaviour is to store the CLI binary in the directory returned by this call `platformdirs.user_data_dir("django-tailwind-cli", "django-commons")`. Checkout [platformdirs](https://pypi.org/project/platformdirs/) for details.
+
+    But if you want to store it elsewhere or plan to use a custom build binary stored locally, change this setting either to a path to a directory or the full path to the binary. If it points to a directory, this is the download destination otherwise it directly tries to use the referenced binary.
+
+    > [!Warning]
+    > If you use the new option from **2.7.0** but haven't installed a binary before running any of the management commands, these commands will treat the configured path as a directory and create it, if it is missing. Afterwards the official CLI will be downloaded to this path.
+    >
+    > In case you want to use the new behaviour, it is highly recommended to also set the new setting `TAILWIND_CLI_AUTOMATIC_DOWNLOAD` to `False`.
+
+`TAILWIND_CLI_AUTOMATIC_DOWNLOAD`
+: **Default**: `True`
+
+    Enable or disable the automatic downloading of the official CLI to your machine.
+
+`TAILWIND_CLI_SRC_REPO`
+: **Default**: `"tailwindlabs/tailwindcss"`
+
+    Specifies the repository from which the CLI is downloaded. This is useful if you are using a customized version of the CLI, such as [tailwind-cli-extra](https://github.com/dobicinaitis/tailwind-cli-extra).
+
+    > [!Warning]
+    > If you use this option, ensure that you update the `TAILWIND_CLI_VERSION` to match the version of the customized CLI you are using. Additionally, you may need to update the `TAILWIND_CLI_ASSET_NAME` if the asset name is different. See the example below.
+
+`TAILWIND_CLI_ASSET_NAME`:
+: **Default**: `"tailwindcss"`
+
+    Specifies the name of the asset to download from the repository.
+
+    This option is particularly useful if the customized repository you are using has a different name for the Tailwind CLI asset. For example, the asset name for [tailwind-cli-extra](https://github.com/dobicinaitis/tailwind-cli-extra/releases/latest/) is `tailwindcss-extra`.
+
+    > [!Note]
+    > Here is a full example of using a custom repository and asset name:
+    >    ```python
+    >    TAILWIND_CLI_SRC_REPO = "dobicinaitis/tailwind-cli-extra"
+    >    TAILWIND_CLI_ASSET_NAME = "tailwindcss-extra"
+    >    ```
+
+`TAILWIND_CLI_SRC_CSS`
+**Default**: `None`
+
+    This variable can be set to `None`, a relative path and an absolute path.
+
+    If it is set to `None`, the library creates file with the name `source.css` in the directory returned by this call `platformdirs.user_cache_dir("django-tailwind-cli", "django-commons")`. Checkout [platformdirs](https://pypi.org/project/platformdirs/) for details.
+
+    If it is a relative path it is assumed to be relative to `settings.BASE_DIR`. If `settings.BASE_DIR` is not defined or the file doesn't exist a `ValueError` is raised.
+
+    If it is an absolute path, this path is used as the input file for Tailwind CSS CLI. If the path doesn't exist, a `ValueError`is raised.
+
+`TAILWIND_CLI_DIST_CSS`
+: **Default**: `"css/tailwind.css"`
+
+    The name of the output file. This file is stored relative to the first element of the
+    `STATICFILES_DIRS` array.
+
+`TAILWIND_CLI_USE_DAISY_UI`:
+: **Default**: `False`
+
+    This switch determines what content is written to `TAILWIND_CLI_SRC_CSS` if it is automatically created by the library.
+
+    The default is:
+    ```css
+    @import "tailwindcss";
+    ```
+
+    If `TAILWIND_CLI_USE_DAISY_UI = True` is put into the `settings.py` of your project, this is the output:
+    ```css
+    @import "tailwindcss";
+    @plugin "daisyui";
+    ```
+
+    This switch can also be used as a shortcut to activate daisyUI and change `TAILWIND_CLI_SRC_REPO` and `TAILWIND_CLI_ASSET_NAME` as described above to fetch [tailwind-cli-extra](https://github.com/dobicinaitis/tailwind-cli-extra/releases/latest/).

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/docs/usage.md

@@ -9,10 +9,6 @@ hide:
 
     **No.** The management commands of this library handle the download and installation of the Tailwind CLI. You don't have to deal with this. But you can configure the installation location and the version of the CLI you want to use. Take a look at the [settings](settings.md) section.
 
-!!! question "Do I have to create my own `tailwind.config.js` for Tailwind 3.x?"
-
-    **No.** The management commands also take care of this step. If no `tailwind.config.js` is present in your project, a new one with sane defaults will be created. Afterwards this file will be used and be customized by you. The default location for the file is the `BASE_DIR` of your project, but you can change this. Take a look at the [settings](settings.md) section.
-
 !!! question "Do I have to create my own `css/source.css` for Tailwind 4.x?"
 
     **No.** The management commands also take care of this step. If no `css/source.css` is present in your project, a new one with sane defaults will be created. Afterwards this file will be used and be customized by you. The default location for the file is first folder from the `STATICFILES_DIRS` of your project, but you can change this. Take a look at the [settings](settings.md) section.
@@ -106,3 +102,35 @@ tailwind-sidecar:
   command: python manage.py tailwind watch
   tty: true
 ```
+
+## Use with daisyUI
+
+If you plan to use [daisyUI](https://daisyui.com), there is an easy way to solve this with this library.
+
+```python
+TAILWIND_CLI_USE_DAISY_UI = True
+```
+
+Setting this, the library switches from using the default TailwindCSS CLI to the one provided by [Andris Dobičinaitis](https://github.com/dobicinaitis) and his [tailwind-cli-extra](https://github.com/dobicinaitis/tailwind-cli-extra) project. It also causes the library to create a proper default config that activates the daisyUI plugin.
+
+But of course you can do it manually, too. Just configure a repository where the library should pull the CLI from and activate the daisyUI support.
+
+```python
+TAILWIND_CLI_SRC_REPO = "dobicinaitis/tailwind-cli-extra"
+TAILWIND_CLI_ASSET_NAME = "tailwindcss-extra"
+TAILWIND_CLI_USE_DAISY_UI = True
+```
+
+Or provide your custom configuration, too.
+
+```python
+TAILWIND_CLI_SRC_REPO = "dobicinaitis/tailwind-cli-extra"
+TAILWIND_CLI_ASSET_NAME = "tailwindcss-extra"
+TAILWIND_CLI_SRC_CSS = "etc/source.css"
+```
+
+## Use with WhiteNoise
+
+If you are using [WhiteNoise](https://whitenoise.readthedocs.io/en/latest/) to serve your static assets, you must not put your custom Tailwind configuration file inside any of the directories for static files. WhiteNoise stumbles across the `@import "tailwindcss";` statement, because it can't resolve it.
+
+If you want to use a custom configuration for Tailwind CSS, put it somewhere else in the project.

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/justfile

@@ -41,4 +41,4 @@ VENV_DIRNAME := ".venv"
 
 # serve docs during development
 @serve-docs: check_uv
-    uvx --with mkdocs-material mkdocs serve
+    uvx  --with markdown-callouts --with mkdocs-material mkdocs serve

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/mkdocs.yml

@@ -42,6 +42,7 @@ markdown_extensions:
   - footnotes
   - tables
   - sane_lists
+  - github-callouts
   - pymdownx.snippets:
       check_paths: true
 extra:

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/pyproject.toml

@@ -30,6 +30,7 @@ requires-python = ">=3.9"
 dependencies = [
     "django>=4.0",
     "django-typer>=2.1.2",
+    "platformdirs>=4.3.7",
     "requests>=2.32.3",
     "semver>=3.0.4",
 ]
@@ -77,7 +78,7 @@ strict_settings = false
 
 # Ruff
 [tool.ruff]
-target-version = "py38"
+target-version = "py39"
 line-length = 120
 
 [tool.ruff.format]
@@ -115,13 +116,13 @@ unfixable = [
 ]
 
 [tool.ruff.lint.isort]
-known-first-party = ["solomon"]
+known-first-party = ["django_tailwind_cli"]
 
 [tool.ruff.lint.flake8-tidy-imports]
 ban-relative-imports = "all"
 
 [tool.ruff.lint.per-file-ignores]
-"tests/**/*" = ["PLR2004", "S101", "TID252", "ARG001"]
+"tests/**/*" = ["PLR2004", "S101", "TID252", "ARG001", "FBT001"]
 "tests/snapshots/*" = ["ALL"]
 "**/migrations/*" = ["ALL"]
 

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/src/django_tailwind_cli/config.py

@@ -4,11 +4,12 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Optional
 
+import platformdirs
 import requests
 from django.conf import settings
 from semver import Version
 
-FALLBACK_VERSION = "4.0.6"
+FALLBACK_VERSION = "4.1.3"
 
 
 @dataclass
@@ -20,35 +21,33 @@ class Config:
     dist_css: Path
     dist_css_base: str
     src_css: Optional[Path]
-    config_file: Optional[Path]
     automatic_download: bool = True
+    use_daisy_ui: bool = False
 
     @property
     def watch_cmd(self) -> list[str]:
         result = [
             str(self.cli_path),
+            "--input",
+            str(self.src_css),
             "--output",
             str(self.dist_css),
             "--watch",
         ]
 
-        if self.src_css:
-            result.extend(["--input", str(self.src_css)])
-
         return result
 
     @property
     def build_cmd(self) -> list[str]:
         result = [
             str(self.cli_path),
+            "--input",
+            str(self.src_css),
             "--output",
             str(self.dist_css),
             "--minify",
         ]
 
-        if self.src_css:
-            result.extend(["--input", str(self.src_css)])
-
         return result
 
 
@@ -64,25 +63,41 @@ def get_version() -> tuple[str, Version]:
         ValueError: If the TAILWIND_CLI_SRC_REPO setting is None when the version is set to
         "latest".
     """
+    use_daisy_ui = getattr(settings, "TAILWIND_CLI_USE_DAISY_UI", False)
     version_str = getattr(settings, "TAILWIND_CLI_VERSION", "latest")
+    repo_url = getattr(
+        settings,
+        "TAILWIND_CLI_SRC_REPO",
+        "tailwindlabs/tailwindcss" if not use_daisy_ui else "dobicinaitis/tailwind-cli-extra",
+    )
+    if not repo_url:
+        raise ValueError("TAILWIND_CLI_SRC_REPO must not be None.")
 
     if version_str == "latest":
-        repo_url = getattr(settings, "TAILWIND_CLI_SRC_REPO", "tailwindlabs/tailwindcss")
-        if not repo_url:
-            raise ValueError("TAILWIND_CLI_SRC_REPO must not be None.")
         r = requests.get(f"https://github.com/{repo_url}/releases/latest/", timeout=2)
         if r.ok and "location" in r.headers:
             version_str = r.headers["location"].rstrip("/").split("/")[-1].replace("v", "")
+            return version_str, Version.parse(version_str)
         else:
-            version_str = FALLBACK_VERSION
-
-    return version_str, Version.parse(version_str)
+            return FALLBACK_VERSION, Version.parse(FALLBACK_VERSION)
+    elif repo_url == "tailwindlabs/tailwindcss":
+        version = Version.parse(version_str)
+        if version.major < 4:
+            raise ValueError(
+                "Tailwind CSS 3.x is not supported by this version. Use version 2.21.1 if you want to use Tailwind 3."
+            )
+        return version_str, version
+    else:
+        return version_str, Version.parse(version_str)
 
 
 def get_config() -> Config:
     if settings.STATICFILES_DIRS is None or len(settings.STATICFILES_DIRS) == 0:
         raise ValueError("STATICFILES_DIRS is empty. Please add a path to your static files.")
 
+    # daisyUI support
+    use_daisy_ui = getattr(settings, "TAILWIND_CLI_USE_DAISY_UI", False)
+
     # Determine the system and machine we are running on
     system = platform.system().lower()
     system = "macos" if system == "darwin" else system
@@ -99,18 +114,30 @@ def get_config() -> Config:
     # Read version from settings
     version_str, version = get_version()
 
+    # Determine the asset name
+    if not (
+        asset_name := getattr(
+            settings, "TAILWIND_CLI_ASSET_NAME", "tailwindcss" if not use_daisy_ui else "tailwindcss-extra"
+        )
+    ):
+        raise ValueError("TAILWIND_CLI_ASSET_NAME must not be None.")
+
     # Determine the full path to the CLI
-    cli_path = Path(getattr(settings, "TAILWIND_CLI_PATH", "~/.local/bin/") or settings.BASE_DIR)
+    cli_path = Path(
+        getattr(settings, "TAILWIND_CLI_PATH", None)
+        or platformdirs.user_data_dir("django-tailwind-cli", "django-commons")
+    )
     if cli_path.exists() and cli_path.is_file() and os.access(cli_path, os.X_OK):
         cli_path = cli_path.expanduser().resolve()
     else:
-        cli_path = cli_path.expanduser() / f"tailwindcss-{system}-{machine}-{version_str}{extension}"
+        cli_path = cli_path.expanduser() / f"{asset_name}-{system}-{machine}-{version_str}{extension}"
 
     # Determine the download url for the cli
-    if not (asset_name := getattr(settings, "TAILWIND_CLI_ASSET_NAME", "tailwindcss")):
-        raise ValueError("TAILWIND_CLI_ASSET_NAME must not be None.")
-    if not (repo_url := getattr(settings, "TAILWIND_CLI_SRC_REPO", "tailwindlabs/tailwindcss")):
-        raise ValueError("TAILWIND_CLI_SRC_REPO must not be None.")
+    repo_url = getattr(
+        settings,
+        "TAILWIND_CLI_SRC_REPO",
+        "tailwindlabs/tailwindcss" if not use_daisy_ui else "dobicinaitis/tailwind-cli-extra",
+    )
     download_url = (
         f"https://github.com/{repo_url}/releases/download/v{version_str}/{asset_name}-{system}-{machine}{extension}"
     )
@@ -121,27 +148,14 @@ def get_config() -> Config:
     dist_css = Path(settings.STATICFILES_DIRS[0]) / dist_css_base
 
     # Determine the full path to the source css file.
-    # It is optional for Tailwind CSS < 4.0.0, but required for >= 4.0.0.
-    if version >= Version.parse("4.0.0"):
-        if not (src_css := getattr(settings, "TAILWIND_CLI_SRC_CSS", "css/source.css")):
-            raise ValueError("TAILWIND_CLI_SRC_CSS must not be None.")
-        src_css = Path(settings.STATICFILES_DIRS[0]) / src_css
-    else:
-        if not (src_css := getattr(settings, "TAILWIND_CLI_SRC_CSS", None)):
-            src_css = None
-        else:
-            src_css = Path(settings.STATICFILES_DIRS[0]) / src_css
-
-    # Determine the full path to the config file.
-    # It is optional for Tailwind CSS >= 4.0.0, but required for < 4.0.0.
-    if version < Version.parse("4.0.0"):
-        if not (config_file := getattr(settings, "TAILWIND_CLI_CONFIG_FILE", "tailwind.config.js")):
-            raise ValueError("TAILWIND_CLI_CONFIG_FILE must not be None.")
-        config_file = Path(settings.BASE_DIR) / config_file
+    src_css = getattr(settings, "TAILWIND_CLI_SRC_CSS", None)
+    if not src_css:
+        user_cache_dir = platformdirs.user_cache_dir("django-tailwind-cli", "django-commons")
+        src_css = Path(user_cache_dir) / "source.css"
     else:
-        if config_file := getattr(settings, "TAILWIND_CLI_CONFIG_FILE", None):
-            raise ValueError("TAILWIND_CLI_CONFIG_FILE is not used by this library with Tailwind CSS >= 4.x.")
-        config_file = None
+        src_css = Path(src_css)
+        if not src_css.is_absolute():
+            src_css = Path(settings.BASE_DIR) / src_css
 
     # Determine if the CLI should be downloaded automatically
     automatic_download = getattr(settings, "TAILWIND_CLI_AUTOMATIC_DOWNLOAD", True)
@@ -155,6 +169,6 @@ def get_config() -> Config:
         dist_css=dist_css,
         dist_css_base=dist_css_base,
         src_css=src_css,
-        config_file=config_file,
         automatic_download=automatic_download,
+        use_daisy_ui=use_daisy_ui,
     )

{django_tailwind_cli-4.1.0 → django_tailwind_cli-4.2.0}/src/django_tailwind_cli/management/commands/tailwind.py

@@ -23,24 +23,19 @@ app = Typer(name="tailwind", help="Create and manage a Tailwind CSS theme.")  #
 @app.command()
 def build() -> None:
     """Build a minified production ready CSS file."""
-    c = get_config()
+    config = get_config()
     _download_cli()
     _create_standard_config()
 
     try:
-        subprocess.run(c.build_cmd, cwd=settings.BASE_DIR, check=True, capture_output=True)
+        subprocess.run(config.build_cmd, cwd=settings.BASE_DIR, check=True, capture_output=True, text=True)
+        typer.secho(f"Built production stylesheet '{config.dist_css}'.", fg=typer.colors.GREEN)
     except KeyboardInterrupt:
         typer.secho("Canceled building production stylesheet.", fg=typer.colors.RED)
     except subprocess.CalledProcessError as e:  # pragma: no cover
-        typer.secho(
-            f"Failed to build production stylesheet: {e.stderr.decode()}",
-            fg=typer.colors.RED,
-        )
-    else:
-        typer.secho(
-            f"Built production stylesheet '{c.dist_css}'.",
-            fg=typer.colors.GREEN,
-        )
+        error_message = e.stderr if e.stderr else "An unknown error occurred."
+        typer.secho(f"Failed to build production stylesheet: {error_message}", fg=typer.colors.RED)
+        sys.exit(1)
 
 
 @app.command()
@@ -55,10 +50,8 @@ def watch():
     except KeyboardInterrupt:
         typer.secho("Stopped watching for changes.", fg=typer.colors.RED)
     except subprocess.CalledProcessError as e:  # pragma: no cover
-        typer.secho(
-            f"Failed to start in watch mode: {e.stderr.decode()}",
-            fg=typer.colors.RED,
-        )
+        typer.secho(f"Failed to start in watch mode: {e.stderr.decode()}", fg=typer.colors.RED)
+        sys.exit(1)
 
 
 @app.command(name="list_templates")
@@ -285,52 +278,24 @@ def _download_cli(*, force_download: bool = False) -> None:
     typer.secho(f"Downloaded Tailwind CSS CLI to '{c.cli_path}'.", fg=typer.colors.GREEN)
 
 
-DEFAULT_TAILWIND_CONFIG = """/** @type {import('tailwindcss').Config} */
-const plugin = require("tailwindcss/plugin");
-
-module.exports = {
-  content: ["./templates/**/*.html", "**/templates/**/*.html",'**/*.py'],
-  theme: {
-    extend: {},
-  },
-  plugins: [
-    require("@tailwindcss/typography"),
-    require("@tailwindcss/forms"),
-    require("@tailwindcss/aspect-ratio"),
-    require("@tailwindcss/container-queries"),
-    plugin(function ({ addVariant }) {
-      addVariant("htmx-settling", ["&.htmx-settling", ".htmx-settling &"]);
-      addVariant("htmx-request", ["&.htmx-request", ".htmx-request &"]);
-      addVariant("htmx-swapping", ["&.htmx-swapping", ".htmx-swapping &"]);
-      addVariant("htmx-added", ["&.htmx-added", ".htmx-added &"]);
-    }),
-  ],
-};
-"""
-
 DEFAULT_SOURCE_CSS = '@import "tailwindcss";\n'
+DAISY_UI_SOURCE_CSS = '@import "tailwindcss";\n@plugin "daisyui";\n'
 
 
 def _create_standard_config() -> None:
     """Create a standard Tailwind CSS config file."""
     c = get_config()
 
-    if c.version.major >= 4:
-        if c.src_css and not c.src_css.exists():
-            c.src_css.parent.mkdir(parents=True, exist_ok=True)
+    if c.src_css and not c.src_css.exists():
+        c.src_css.parent.mkdir(parents=True, exist_ok=True)
+        if c.use_daisy_ui:
+            c.src_css.write_text(DAISY_UI_SOURCE_CSS)
+        else:
             c.src_css.write_text(DEFAULT_SOURCE_CSS)
-            typer.secho(
-                f"Created Tailwind Source CSS at '{c.src_css}'",
-                fg=typer.colors.GREEN,
-            )
-    else:
-        if c.config_file and not c.config_file.exists():
-            c.config_file.parent.mkdir(parents=True, exist_ok=True)
-            c.config_file.write_text(DEFAULT_TAILWIND_CONFIG)
-            typer.secho(
-                f"Created Tailwind CSS config at '{c.config_file}'",
-                fg=typer.colors.GREEN,
-            )
+        typer.secho(
+            f"Created Tailwind Source CSS at '{c.src_css}'",
+            fg=typer.colors.GREEN,
+        )
 
 
 def get_runserver_options(