Switch to ESM and Baseline2024

Author: codingjoe

.github/workflows/ci.yml

@@ -19,25 +19,28 @@ jobs:
       - run: python -m build --sdist --wheel
       - run: python -m twine check dist/*
 
-  standardjs:
+  js-lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-node@v4
-        with:
-          node-version: '14.x'
       - uses: actions/checkout@v4
-      - id: cache-npm
-        uses: actions/cache@v4
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
       - name: Install Node dependencies
         run: npm ci
       - run: npm run lint:js
 
-  lint:
+
+  js-test:
+    runs-on: ubuntu-latest
+    needs:
+      - js-lint
+    steps:
+      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v4
+      - name: Install Node dependencies
+        run: npm ci
+      - run: npm test
+
+  py-lint:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -59,20 +62,19 @@ jobs:
 
   pytest:
     needs:
-      - lint
-      - standardjs
+      - py-lint
       - dist
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version:
-          - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
         django-version:
-          - "3.2"
           - "4.2"
           - "5.0"
+          - "5.1"
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

package.json

@@ -6,7 +6,7 @@
     "test": "tests"
   },
   "scripts": {
-    "test": "standard",
+    "test": "node --test",
     "postinstall": "uglifyjs --compress -o s3file/static/s3file/js/s3file.min.js s3file/static/s3file/js/s3file.js",
     "minify": "uglifyjs --compress -o s3file/static/s3file/js/s3file.min.js s3file/static/s3file/js/s3file.js",
     "lint:js": "standard"
@@ -23,11 +23,14 @@
   ],
   "author": "Johannes Hoppe <[email protected]>",
   "license": "MIT",
+  "type": "module",
   "bugs": {
     "url": "https://github.com/codingjoe/django-s3file/issues"
   },
   "homepage": "https://github.com/codingjoe/django-s3file#readme",
   "devDependencies": {
+    "global-jsdom": "^25.0.0",
+    "jsdom": "^25.0.1",
     "standard": "*",
     "uglify-js": "*"
   }

pyproject.toml

@@ -21,17 +21,17 @@ classifiers = [
   "Topic :: Software Development",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Framework :: Django",
-  "Framework :: Django :: 3.2",
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.0",
+  "Framework :: Django :: 5.1",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 dependencies = [
-  "django>=2.0",
+  "django>=4.2",
   "django-storages>=1.6",
   "boto3",
 ]

s3file/forms.py

@@ -4,7 +4,9 @@
 import uuid
 
 from django.conf import settings
+from django.templatetags.static import static
 from django.utils.functional import cached_property
+from django.utils.html import format_html, html_safe
 from storages.utils import safe_join
 
 from s3file.middleware import S3FileMiddleware
@@ -13,6 +15,44 @@
 logger = logging.getLogger("s3file")
 
 
+
+
+@html_safe
+class Asset:
+    """A generic asset that can be included in a template."""
+
+    def __init__(self, path):
+        self.path = path
+
+    def __eq__(self, other):
+        return (self.__class__ is other.__class__ and self.path == other.path) or (
+            other.__class__ is str and self.path == other
+        )
+
+    def __hash__(self):
+        return hash(self.path)
+
+    def __str__(self):
+        return self.absolute_path(self.path)
+
+    def absolute_path(self, path):
+        if path.startswith(("http://", "https://", "/")):
+            return path
+        return static(path)
+
+    def __repr__(self):
+        return f"{type(self).__qualname__}: {self.path!r}"
+
+
+class ESM(Asset):
+    """A JavaScript asset for ECMA Script Modules (ESM)."""
+
+    def __str__(self):
+        path = super().__str__()
+        template = '<script src="{}" type="module"></script>'
+        return format_html(template, self.absolute_path(path))
+
+
 class S3FileInputMixin:
     """FileInput that uses JavaScript to directly upload to Amazon S3."""
 
@@ -91,4 +131,4 @@ def upload_folder(self):
         )  # S3 uses POSIX paths
 
     class Media:
-        js = ("s3file/js/s3file.js" if settings.DEBUG else "s3file/js/s3file.min.js",)
+        js = [ESM("s3file/js/s3file.js")]