Migrate all the raw static

package.json

@@ -16,6 +16,7 @@
     "addons-linter": "7.8.0",
     "clean-css": "5.3.3",
     "clean-css-cli": "5.6.3",
+    "highcharts": "^12.1.2",
     "jqmodal": "1.4.2",
     "jquery": "3.7.1",
     "jquery-pjax": "2.0.1",
@@ -26,7 +27,7 @@
     "less": "4.2.2",
     "netmask": "2.0.2",
     "source-map": "0.7.4",
-    "timeago": "1.6.7",
+    "timeago.js": "^4.0.2",
     "underscore": "1.13.7"
   },
   "devDependencies": {

src/olympia/abuse/admin.py

@@ -92,12 +92,7 @@ def queryset(self, request, queryset):
 
 class AbuseReportAdmin(AMOModelAdmin):
     class Media(AMOModelAdmin.Media):
-        css = {
-            'all': (
-                'css/admin/amoadmin.css',
-                'css/admin/abuse_reports.css',
-            )
-        }
+        css = {'all': ('css/admin-abuse-report.css',)}
 
     date_hierarchy = 'modified'
     list_display = (

src/olympia/addons/admin.py

@@ -176,18 +176,8 @@ def get_queryset(self, request):
 
 class AddonAdmin(AMOModelAdmin):
     class Media(AMOModelAdmin.Media):
-        css = {
-            'all': (
-                'css/admin/amoadmin.css',
-                'css/admin/l10n.css',
-                'css/admin/pagination.css',
-                'css/admin/addons.css',
-            )
-        }
-        js = AMOModelAdmin.Media.js + (
-            'admin/js/jquery.init.js',
-            'js/admin/l10n.js',
-        )
+        css = {'all': ('css/admin-addon.css',)}
+        js = AMOModelAdmin.Media.js + ('js/admin-addon.js',)
 
     list_display = (
         '__str__',

src/olympia/amo/admin.py

@@ -180,12 +180,8 @@ def get_query_string(self, new_params=None, remove=None):
 
 class AMOModelAdmin(admin.ModelAdmin):
     class Media:
-        js = (
-            'js/admin/ip_address_search.js',
-            'js/exports.js',
-            'netmask/lib/netmask.js',
-        )
-        css = {'all': ('css/admin/amoadmin.css',)}
+        js = ('js/admin.js',)
+        css = {'all': ('css/admin.css',)}
 
     # Classes that want to implement search by ip can override these if needed.
     search_by_ip_actions = ()  # Deactivated by default.

src/olympia/blocklist/templates/admin/blocklist/blocklistsubmission_add_form.html

@@ -2,8 +2,8 @@
 {% load admin_urls static admin_modify %}
 
 {% block extrahead %}{{ block.super }}
-<script type="text/javascript" src="{% static 'js/i18n/en-US.js' %}"></script>
-<script type="text/javascript" src="{% static 'js/admin/blocklist_blocklistsubmission.js' %}"></script>
+<script type="text/javascript" src="{{ static('js/i18n/en-US.js') }}"></script>
+{{ vite_asset('js/blocklist_blocklistsubmission.js') }}
 {{ media }}
 {% endblock %}
 

src/olympia/blocklist/templates/admin/blocklist/blocklistsubmission_change_form.html

@@ -2,7 +2,7 @@
 {% load admin_urls static %}
 {% block admin_change_form_document_ready %}
 {{ block.super }}
-<script type="text/javascript" src="{% static 'js/admin/blocklist_blocklistsubmission.js' %}"></script>
+{{ vite_asset('js/blocklist_blocklistsubmission.js') }}
 {% endblock %}
 
 {% block submit_buttons_bottom %}

src/olympia/blocklist/templates/admin/blocklist/multi_guid_input.html

@@ -2,7 +2,7 @@
 {% load admin_urls static admin_modify %}
 
 {% block extrahead %}{{ block.super }}
-<script type="text/javascript" src="{% static 'js/i18n/en-US.js' %}"></script>
+<script type="text/javascript" src="{{ static('js/i18n/en-US.js') }}"></script>
 {{ media }}
 {% endblock %}
 

src/olympia/devhub/templates/devhub/base.html

@@ -21,15 +21,15 @@
 {% block title %}{{ dev_page_title() }}{% endblock %}
 
 {% block extrahead %}
-  {{ css('zamboni/devhub') }}
+  {{ vite_asset('css/devhub.less') }}
 {% endblock %}
 
 {% block site_header_title %}
   {% include "devhub/nav.html" %}
 {% endblock %}
 
 {% block js %}
-  {{ js('zamboni/devhub') }}
+  {{ vite_asset('js/devhub.js') }}
 {% endblock %}
 
 {% block footer_extras %}

src/olympia/devhub/templates/devhub/index.html

@@ -23,9 +23,9 @@
           href="{{ url('amo.opensearch') }}" />
 
     {% block site_css %}
-      {{ css('common/fonts') }}
-      {{ css('devhub/new-landing/css') }}
-      {{ css('common/footer') }}
+      {{ vite_asset('css/fonts.less') }}
+      {{ vite_asset('css/devhub-new-landing.less') }}
+      {{ vite_asset('css/footer.less') }}
     {% endblock %}
 
     {% block extrahead %}{% endblock %}
@@ -35,13 +35,9 @@
     {% endif %}
 
     {% if settings.DEV_MODE %}
-      {% if settings.LESS_LIVE_REFRESH %}
-        <meta id="live_refresh" name="live_refresh" value="1">
-      {% endif %}
-      {{ js('debug') }}
+      {{ vite_hmr_client() }}
     {% endif %}
 
-    {{ js('jquery_base') }}
     {{ vite_asset('js/preload.js') }}
   </head>
   {% set user_authenticated = request.user.is_authenticated %}
@@ -81,7 +77,7 @@
     </div>
     {% block site_js %}
       <script src="{{ static('js/i18n/%s.js'|format(LANG)) }}"></script>
-      {{ js('devhub/new-landing/js') }}
+      {{ vite_asset('js/devhub-new-landing.js') }}
     {% endblock %}
   </body>
 </html>

src/olympia/reviewers/templates/reviewers/base.html

@@ -17,12 +17,12 @@ <h1 class="site-title amo">
 {% block header_search %}{% endblock %}
 
 {% block extrahead %}
-  {{ css('zamboni/devhub') }}
-  {{ css('zamboni/reviewers') }}
+  {{ vite_asset('css/devhub.less') }}
+  {{ vite_asset('css/reviewers.less') }}
 {% endblock %}
 
 {% block js %}
-  {{ js('zamboni/reviewers') }}
+  {{ vite_asset('js/reviewers.js') }}
 {% endblock %}
 
 {% block outer_content %}

src/olympia/scanners/admin.py

@@ -249,12 +249,7 @@ class AbstractScannerResultAdminMixin:
     ordering = ('-pk',)
 
     class Media(AMOModelAdmin.Media):
-        css = {
-            'all': (
-                'css/admin/amoadmin.css',
-                'css/admin/scannerresult.css',
-            )
-        }
+        css = {'all': ('css/admin-scanner-results.css',)}
 
     def get_queryset(self, request):
         # We already set list_select_related() so we don't need to repeat that.
@@ -759,7 +754,7 @@ class ScannerQueryResultAdmin(AbstractScannerResultAdminMixin, AMOModelAdmin):
     ordering = ('version__addon_id', 'version__channel', 'version__created')
 
     class Media(AbstractScannerResultAdminMixin.Media):
-        js = ('js/admin/scannerqueryresult.js',)
+        js = ('js/admin-scanner-query-result.js',)
 
     def addon_name(self, obj):
         # Custom, simpler implementation to go with add-on grouping: the

src/olympia/scanners/templates/admin/scanners/scannerqueryrule/change_form.html

@@ -5,6 +5,5 @@
 
 {% block admin_change_form_document_ready %}
   {{ block.super }}
-
-  <script type="text/javascript" src="{% static 'js/scanners/scannerrule_change_form.js' %}"></script>
+  {{ vite_asset('js/scannerrule_change_form.js') }}
 {% endblock %}

src/olympia/scanners/templates/admin/scanners/scannerrule/change_form.html

@@ -3,6 +3,5 @@
 
 {% block admin_change_form_document_ready %}
   {{ block.super }}
-
-  <script type="text/javascript" src="{% static 'js/scanners/scannerrule_change_form.js' %}"></script>
+  {{ vite_asset('js/scannerrule_change_form.js') }}
 {% endblock %}

src/olympia/stats/templates/stats/stats.html

@@ -7,9 +7,8 @@
 {% block bodyclass %}statistics{% endblock %}
 
 {% block extrahead %}
-  {{ css('zamboni/stats') }}
-  <link rel="stylesheet"
-        href="{{ static('css/zamboni/jquery-ui/custom-1.7.2.css') }}">
+  {{ vite_asset('css/stats.less') }}
+  {{ vite_asset('css/jquery-ui.less') }}
 {% endblock %}
 
 {% block title %}
@@ -185,5 +184,6 @@ <h1>
 {% endblock %}
 
 {% block js %}
-{{ js('zamboni/stats') }}
+{{ vite_asset('js/stats.js') }}
 {% endblock %}
+x

src/olympia/templates/base.html

@@ -19,31 +19,29 @@
           href="{{ url('amo.opensearch') }}" />
 
     {% block site_css %}
-      {{ css('common/fonts') }}
-      {{ css('zamboni/css') }}
-      {{ css('common/footer') }}
+      {{ vite_asset('css/fonts.less') }}
+      {{ vite_asset('css/zamboni.less') }}
+      {{ vite_asset('css/footer.less') }}
     {% endblock %}
 
     {% block extrahead %}{% endblock %}
 
     {% block restyle %}
-      {{ css('restyle/css') }}
+      {{ vite_asset('css/restyle.less') }}
     {% endblock %}
 
-    <noscript><link rel="stylesheet" href="{{ static('css/legacy/nojs.css') }}"></noscript>
+    <noscript>
+      {{ vite_asset('css/nojs.less') }}
+    </noscript>
 
     {% if settings.DEV_MODE %}
-      {% if settings.LESS_LIVE_REFRESH %}
-        <meta id="live_refresh" name="live_refresh" value="1">
-      {% endif %}
-      {{ js('debug') }}
+      {{ vite_hmr_client() }}
     {% endif %}
 
     {% if user.is_authenticated %}
       <meta name="csrf" content="{{ csrf_token }}">
     {% endif %}
 
-    {{ js('jquery_base') }}
     {{ vite_asset('js/preload.js') }}
   </head>
   <body class="html-{{ DIR }} {{ amo.FIREFOX.short }} moz-header-slim {% block bodyclass %}{% endblock %} restyle"
@@ -116,8 +114,8 @@
       </div>
       {# js #}
       {% block site_js %}
-        <script src="{{ static('js/i18n/%s.js'|format(LANG)) }}"></script>
-        {{ js('common') }}
+        <script type="text/javascript" src="{{ static('js/i18n/%s.js'|format(LANG)) }}"></script>
+        {{ vite_asset('js/common.js') }}
       {% endblock %}
       {% block js %}{% endblock %}
       {% block footer %}

src/olympia/users/templates/admin/users/denied_name/add_form.html

@@ -2,7 +2,8 @@
 {% load admin_urls static admin_modify %}
 
 {% block extrahead %}{{ block.super }}
-<script type="text/javascript" src="{% static 'js/i18n/en-US.js' %}"></script>
+<script type="text/javascript" src="{{ static('js/i18n/en-US.js') }}"></script>
+{{ vite_asset('js/users_deniedname.js') }}
 {{ media }}
 {% endblock %}
 

static/css/admin-abuse-report.css

@@ -0,0 +1,2 @@
+@import url('./admin/amoadmin.css');
+@import url('./admin/abuse_reports.css');

static/css/admin-addon.css

@@ -0,0 +1,4 @@
+@import url('./admin/amoadmin.css');
+@import url('./admin/l10n.css');
+@import url('./admin/pagination.css');
+@import url('./admin/addons.css');

static/css/admin-scanner-results.css

@@ -0,0 +1,2 @@
+@import url('./admin/amoadmin.css');
+@import url('./admin/scannerresult.css');

static/css/admin.css

@@ -0,0 +1 @@
+@import url('./admin/amoadmin.css');

static/css/devhub-new-landing.less

@@ -0,0 +1 @@
+@import './devhub/new-landing/base.less';

static/css/devhub.less

@@ -0,0 +1,18 @@
+@import "./impala/tooltips.less";
+@import "./zamboni/developers.css";
+@import "./zamboni/docs.less";
+@import "./impala/developers.less";
+@import "./devhub/listing.less";
+@import "./devhub/popups.less";
+@import "./devhub/compat.less";
+@import "./impala/formset.less";
+@import "./devhub/forms.less";
+@import "./common/invisible-upload.less";
+@import "./devhub/submission.less";
+@import "./devhub/refunds.less";
+@import "./devhub/buttons.less";
+@import "./devhub/in-app-config.less";
+@import "./devhub/static-theme.less";
+@import "@claviska/jquery-minicolors/jquery.minicolors.css";
+@import "./impala/devhub-api.less";
+@import "./devhub/dashboard.less";