Widget: serve vite by default, origin-whitelist for vue2 (#6403)

src/pretix/control/forms/global_settings.py

@@ -105,12 +105,12 @@ class GlobalSettingsForm(SettingsForm):
                     domain=settings.SITE_URL
                 )
             )),
-            ('widget_vite_origins', forms.CharField(
+            ('widget_vue2_origins', forms.CharField(
                 widget=forms.Textarea(attrs={'rows': '3'}),
                 required=False,
                 # Not translated on purpose, this is a temporary feature and contains too many special case words
-                label="Vite widget origins",
-                help_text="One origin per line (e.g. https://example.com). Requests from these origins will be served the new vite-based widget.",
+                label="Vue2 widget origins",
+                help_text="One origin per line (e.g. https://example.com). Requests from these origins will be served the old vue2-based widget.",
             ))
         ])
         responses = register_global_settings.send(self)

src/pretix/presale/views/widget.py

@@ -122,19 +122,20 @@ def widget_css_etag(request, version, **kwargs):
         return f'{_get_source_cache_key(version)}-{request.organizer.cache.get_or_set("css_version", default=lambda: int(time.time()))}'
 
 
+# use vite by default, serve old vue2-based widget only for widget_vue2_origins
 def _use_vite(request):
-    if getattr(settings, 'PRETIX_WIDGET_VITE', False) or "beta" in request.GET:
-        return True
+    if getattr(settings, 'PRETIX_WIDGET_VUE', False) or "legacy" in request.GET:
+        return False
     origin = request.META.get('HTTP_ORIGIN', '')
     gs = GlobalSettingsObject()
-    vite_origins = gs.settings.get('widget_vite_origins', as_type=str, default='')
-    if vite_origins and not origin:
+    vue_origins = gs.settings.get('widget_vue2_origins', as_type=str, default='')
+    if vue_origins and not origin:
         referer = request.META.get('HTTP_REFERER', '')
         origin = '/'.join(referer.split('/', 3)[:3])
-    if origin and vite_origins:
-        origins_list = [o.strip() for o in vite_origins.strip().splitlines() if o.strip()]
-        return origin in origins_list
-    return False
+    if origin and vue_origins:
+        origins_list = [o.strip() for o in vue_origins.strip().splitlines() if o.strip()]
+        return origin not in origins_list
+    return True
 
 
 def widget_js_etag(request, version, lang, **kwargs):

src/pretix/settings.py

@@ -913,7 +913,7 @@ VITE_DEV_SERVER_PORT = 5173
 VITE_DEV_SERVER = f"http://localhost:{VITE_DEV_SERVER_PORT}"
 VITE_DEV_MODE = DEBUG
 VITE_IGNORE = False  # Used to ignore `collectstatic`/`rebuild`
-PRETIX_WIDGET_VITE = os.environ.get('PRETIX_WIDGET_VITE', '') not in ('', '0')
+PRETIX_WIDGET_VUE = os.environ.get('PRETIX_WIDGET_VUE', '') not in ('', '0')
 
 if DEBUG:
     # Reload if settings file changes

src/pretix/static/pretixpresale/widget/src/sharedStore.ts

@@ -514,10 +514,6 @@ export function createWidgetStore (config: {
 					// button with subevent but no items
 					redirectUrl += `${this.subevent}/`
 				}
-				if (this.subevent && !this.cartId) {
-					// button with subevent but no items
-					redirectUrl += `${this.subevent}/`
-				}
 				redirectUrl += `?iframe=1&locale=${LANG}`
 				if (this.cartId) {
 					// ajax to make sure the cart-id is used, even if the cart is currently empty

src/tests/e2e/conftest.py

@@ -89,11 +89,11 @@ def _widget_assets():
                 f'Start it with: npm run dev:widget'
             )
         yield
-    elif os.environ.get("PRETIX_WIDGET_VITE"):
+    elif os.environ.get("PRETIX_WIDGET_VUE"):
+        yield  # Old widget, no build needed
+    else:
         subprocess.check_call(['npm', 'run', 'build:widget'], cwd=PROJECT_ROOT)
         yield
-    else:
-        yield  # Old widget, no build needed
 
 
 # ============================================================================
@@ -155,10 +155,6 @@ def live_server_url(live_server, settings):
 
     settings.SITE_URL = live_server.url
 
-    # Enable Vite widget if requested via env var
-    if os.environ.get("PRETIX_WIDGET_VITE") or os.environ.get("PRETIX_WIDGET_VITE_DEV"):
-        settings.PRETIX_WIDGET_VITE = True
-
     return live_server.url