feat(file-uploader): Updated @uploadcare/blocks to @uploadcare/file-u…

…ploader

Makefile

@@ -39,8 +39,10 @@ run_django:
 
 update_bundled_static:
 	blocks_version=$$(DJANGO_SETTINGS_MODULE=tests.test_project.settings poetry run python -c "from pyuploadcare.dj.conf import DEFAULT_CONFIG; print(DEFAULT_CONFIG['widget']['version'])"); \
-	curl "https://cdn.jsdelivr.net/npm/@uploadcare/blocks@$${blocks_version}/web/blocks.min.js" -o pyuploadcare/dj/static/uploadcare/blocks.min.js; \
-	curl "https://cdn.jsdelivr.net/npm/@uploadcare/blocks@$${blocks_version}/web/lr-file-uploader-inline.min.css" -o pyuploadcare/dj/static/uploadcare/lr-file-uploader-inline.min.css; \
-	curl "https://cdn.jsdelivr.net/npm/@uploadcare/blocks@$${blocks_version}/web/lr-file-uploader-minimal.min.css" -o pyuploadcare/dj/static/uploadcare/lr-file-uploader-minimal.min.css; \
-	curl "https://cdn.jsdelivr.net/npm/@uploadcare/blocks@$${blocks_version}/web/lr-file-uploader-regular.min.css" -o pyuploadcare/dj/static/uploadcare/lr-file-uploader-regular.min.css
+	curl "https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@$${blocks_version}/web/file-uploader.min.js" -o pyuploadcare/dj/static/uploadcare/file-uploader.min.js; \
+	curl "https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@$${blocks_version}/web/uc-file-uploader-inline.min.css" -o pyuploadcare/dj/static/uploadcare/uc-file-uploader-inline.min.css; \
+	curl "https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@$${blocks_version}/web/uc-file-uploader-minimal.min.css" -o pyuploadcare/dj/static/uploadcare/uc-file-uploader-minimal.min.css; \
+	curl "https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@$${blocks_version}/web/uc-file-uploader-regular.min.css" -o pyuploadcare/dj/static/uploadcare/uc-file-uploader-regular.min.css
+
+
 

docs/django-widget.rst

@@ -58,17 +58,22 @@ PyUploadcare takes assets from CDN by default, e.g.:
 
 .. code-block:: html
 
+    <link
+        rel="stylesheet"
+        href="https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@1/web/uc-file-uploader-regular.min.css"
+    >
+
+
     <script type="module">
-        import * as LR from "https://cdn.jsdelivr.net/npm/@uploadcare/[email protected]/web/blocks.min.js";
-        LR.registerBlocks(LR);
+        import * as UC from "https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@1/web/file-uploader.min.js";
+        UC.defineComponents(UC);
     </script>
 
     <!-- ... -->
 
-    <lr-file-uploader-inline
-        css-src="https://cdn.jsdelivr.net/npm/@uploadcare/[email protected]/web/lr-file-uploader-regular.min.css"
+    <uc-file-uploader-inline
         ctx-name="my-uploader"
-    ></lr-file-uploader-inline>
+    ></uc-file-uploader-inline>
 
 If you don't want to use hosted assets you have to turn off this feature:
 
@@ -91,9 +96,9 @@ widget url:
         "widget": {
             "override_js_url": "http://path.to/your/blocks.js",
             "override_css_url": {
-                "regular": "http://path.to/your/lr-file-uploader-regular.css", 
-                "inline": "http://path.to/your/lr-file-uploader-inline.css", 
-                "minimal": "http://path.to/your/lr-file-uploader-minimal.css", 
+                "regular": "http://path.to/your/uc-file-uploader-regular.css",
+                "inline": "http://path.to/your/uc-file-uploader-inline.css",
+                "minimal": "http://path.to/your/uc-file-uploader-minimal.css",
             },
         },
     }

docs/install.rst

@@ -128,5 +128,5 @@ In version 5.0, we introduce a new `file uploader`_, which is now the default fo
 Additionally, please take note that some settings have been renamed in this update. For example, ``UPLOADCARE["widget_version"]`` has been changed to ``UPLOADCARE["legacy_widget"]["version"]``. You can find the full list of these changes in the `changelog for version 5.0.0`_.
 
 .. _file uploader: https://uploadcare.com/docs/file-uploader/
-.. _@uploadcare/blocks: https://www.npmjs.com/package/@uploadcare/blocks
+.. _@uploadcare/file-uploader: https://www.npmjs.com/package/@uploadcare/file-uploader
 .. _changelog for version 5.0.0: https://github.com/uploadcare/pyuploadcare/blob/main/HISTORY.md#500---2023-12-28

pyuploadcare/dj/conf.py

@@ -67,7 +67,7 @@ class SettingsType(typing_extensions.TypedDict):
     "use_legacy_widget": False,
     "use_hosted_assets": True,
     "widget": {
-        "version": "0.36.0",
+        "version": "1",
         "variant": "regular",
         "build": "min",
         "options": {},
@@ -131,10 +131,10 @@ def get_legacy_widget_js_url() -> str:
 
 def get_widget_js_url() -> str:
     widget_config = config["widget"]
-    filename = "blocks.{0}.js".format(widget_config["build"]).replace(
+    filename = "file-uploader.{0}.min.js".format(widget_config["build"]).replace(
         "..", "."
     )
-    hosted_url = "https://cdn.jsdelivr.net/npm/@uploadcare/blocks@{version}/web/{filename}".format(
+    hosted_url = "https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@{version}/web/{filename}".format(
         version=widget_config["version"], filename=filename
     )
     local_url = "uploadcare/{filename}".format(filename=filename)
@@ -149,10 +149,10 @@ def get_widget_js_url() -> str:
 
 def get_widget_css_url(variant: WidgetVariantType) -> str:
     widget_config = config["widget"]
-    filename = "lr-file-uploader-{0}.{1}.css".format(
+    filename = "uc-file-uploader-{0}.{1}.min.css".format(
         variant, widget_config["build"]
     ).replace("..", ".")
-    hosted_url = "https://cdn.jsdelivr.net/npm/@uploadcare/blocks@{version}/web/{filename}".format(
+    hosted_url = "https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@{version}/web/{filename}".format(
         version=widget_config["version"], filename=filename
     )
     local_url = "uploadcare/{filename}".format(filename=filename)

pyuploadcare/dj/templates/uploadcare/forms/widgets/file.html

@@ -16,32 +16,32 @@
 {% endif %}
 
 <div style="position: relative; display: flex;">
+    <link rel="stylesheet" href="{{ uploadcare_css }}" >
 
     <script type="module">
-        import * as LR from "{{ uploadcare_js }}";
-        LR.registerBlocks(LR);
+        import * as UC from "{{ uploadcare_js }}";
+        UC.defineComponents(UC);
     </script>
 
-    <lr-config
+    <uc-config
         ctx-name="{{ name }}"
         pubkey="{{ pub_key }}"
         {% for k, v in options.items %}
         {{ k|escape }}="{{ v|escape }}"{% endfor %}
-    ></lr-config>
+    ></uc-config>
 
-    <lr-upload-ctx-provider
+    <uc-upload-ctx-provider
         id="uploaderctx_{{ name }}"
         ctx-name="{{ name }}"
-    ></lr-upload-ctx-provider>
+    ></uc-upload-ctx-provider>
 
-    <lr-file-uploader-{{ variant }}
-        css-src="{{ uploadcare_css }}"
+    <uc-file-uploader-{{ variant }}
         ctx-name="{{ name }}"
     >
-        <lr-form-input
+        <uc-form-input
             ctx-name="{{ name }}"
-        ></lr-form-input>
-    </lr-file-uploader-{{ variant }}>
+        ></uc-form-input>
+    </uc-file-uploader-{{ variant }}>
 
 
 </div>

tests/dj/test_conf.py

@@ -51,7 +51,7 @@ def setUp(self):
         self._original_widget = config["widget"]
         config["use_hosted_assets"] = True
         config["widget"] = {
-            "version": "latest",
+            "version": "1",
             "variant": "inline",
             "build": "",
             "options": {},
@@ -71,12 +71,12 @@ def test_hosted_js_url(self):
         config["use_hosted_assets"] = True
         self.assertEqual(
             get_widget_js_url(),
-            "https://cdn.jsdelivr.net/npm/@uploadcare/blocks@latest/web/blocks.js",
+            "https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@1/web/file-uploader.min.js",
         )
 
     def test_local_js_url(self):
         config["use_hosted_assets"] = False
-        self.assertEqual(get_widget_js_url(), "uploadcare/blocks.js")
+        self.assertEqual(get_widget_js_url(), "uploadcare/file-uploader.min.js")
 
     def test_override_js_url(self):
         config["widget"]["override_js_url"] = "https://example.com/blocks.js"
@@ -86,15 +86,14 @@ def test_hosted_css_url(self):
         config["use_hosted_assets"] = True
         self.assertEqual(
             get_widget_css_url("minimal"),
-            "https://cdn.jsdelivr.net/npm/@uploadcare/blocks@latest"
-            + "/web/lr-file-uploader-minimal.css",
+            "https://cdn.jsdelivr.net/npm/@uploadcare/file-uploader@1/web/uc-file-uploader-minimal.min.css"
         )
 
     def test_local_css_url(self):
         config["use_hosted_assets"] = False
         self.assertEqual(
             get_widget_css_url("minimal"),
-            "uploadcare/lr-file-uploader-minimal.css",
+            "uploadcare/uc-file-uploader-minimal.min.css",
         )
 
     def test_override_css_url(self):

tests/dj/test_forms.py

@@ -44,8 +44,8 @@ class SomeForm(forms.Form):
         f = SomeForm(label_suffix="")
         self.assertFalse(f["ff"].field.legacy_widget)
         ff_str = str(f["ff"])
-        self.assertIn("LR.registerBlocks(LR);", ff_str)
-        self.assertIn("<lr-config\n", ff_str)
+        self.assertIn("UC.defineComponents(UC);", ff_str)
+        self.assertIn("<uc-config\n", ff_str)
         self.assertIn('pubkey="asdf"', ff_str)
         self.assertIn('ctx-name="ff"', ff_str)
 
@@ -75,7 +75,7 @@ class SomeForm(forms.Form):
         f = SomeForm(label_suffix="")
         self.assertFalse(f["ff"].field.legacy_widget)
         ff_str = str(f["ff"])
-        self.assertIn("LR.registerBlocks(LR);", ff_str)
+        self.assertIn("UC.defineComponents(UC);", ff_str)
         self.assertIn('source-list="local"', ff_str)