Switch to minifier

kfet/static/kfet/js/kpsul.js

@@ -1,3 +0,0 @@
-import AccountManager from "./kpsul/managers/account_manager.js"
-
-self.account_manager = new AccountManager();

kfet/static/kfet/src/kpsul/Makefile

@@ -0,0 +1,25 @@
+# Compilation des fichiers .js de K-Psul en une version minifiée
+
+LIBS = libs/underscore.js libs/backbone.js
+MODELS = $(wildcard models/**.js)
+MANAGERS = $(wildcard managers/**.js)
+ENTRYPOINT = kpsul.js
+
+CONCAT_FILE = kpsul.src.js
+TARGET = ../../js/kpsul.min.js
+
+FLAGS = 
+
+
+build: concat minify
+# For dev use : we don't minify
+dev: concat cp
+
+concat:
+	@cat $(LIBS) $(MODELS) $(MANAGERS) $(ENTRYPOINT) > $(CONCAT_FILE)
+
+cp:
+	@cp $(CONCAT_FILE) $(TARGET)
+
+minify:
+	terser $(CONCAT_FILE) -o $(TARGET) $(FLAGS)

kfet/static/kfet/src/kpsul/kpsul.js

@@ -0,0 +1,3 @@
+$(function () {
+    self.account_manager = new AccountManager();
+})

kfet/static/kfet/src/kpsul/managers/account_manager.js

@@ -1,5 +1,3 @@
-import Account from "../models/account.js"
-
 class AccountManager {
     // Classe pour gérer la partie "compte" de K-Psul
     // Devrait être la seule interface entre le JS de K-Psul et la logique des comptes.
@@ -143,7 +141,7 @@ class AccountSearch {
         var choice_text = choice.text().trim();
         var trigramme_regex = /\((.{3})\)$/;
         // le match est de la forme [<global match>, <group match>]
-        trigramme = choice_text.match(trigramme_regex)[1]
+        var trigramme = choice_text.match(trigramme_regex)[1]
         this.manager.set(trigramme);
         this.close();
     }
@@ -154,5 +152,3 @@ class AccountSearch {
         }
     }
 }
-
-export default AccountManager;

kfet/static/kfet/src/kpsul/models/account.js

@@ -144,5 +144,3 @@ var EmptyAccountView = AccountView.extend({
         return buttons
     }
 })
-
-export default Account;

kfet/templates/kfet/kpsul.html

@@ -7,9 +7,7 @@
 <script type="text/javascript" src="{% static 'kfet/vendor/moment/moment-timezone-with-data-2012-2022.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
 <script type="text/javascript" src="{% url 'js_reverse' %}" ></script>
-<script type="text/javascript" src="{% static 'kfet/vendor/underscore-min.js' %}"></script>
-<script type="text/javascript" src="{% static 'kfet/vendor/backbone-min.js' %}"></script>
-<script type="module" src="{% static 'kfet/js/kpsul.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/kpsul.min.js' %}"></script>
 {% endblock %}
 
 {% block title %}K-Psul{% endblock %}