From 274351ed3c7afc49d955159ed0dbabdd409ca361 Mon Sep 17 00:00:00 2001
From: nobody42 <5514211-nobody42@users.noreply.gitlab.com>
Date: Tue, 24 Mar 2020 08:11:03 +0100
Subject: [PATCH] Fixed Moment.js (File extension and detection of resource
 name)

---
 core/files.js                                              | 2 +-
 core/mappings.js                                           | 7 +++++++
 modules/internal/helpers.js                                | 2 ++
 pages/updates/updates.html                                 | 1 +
 .../moment.js/2.24.0/{moment.min.js => moment.min.jsm}     | 0
 5 files changed, 11 insertions(+), 1 deletion(-)
 rename resources/moment.js/2.24.0/{moment.min.js => moment.min.jsm} (100%)

diff --git a/core/files.js b/core/files.js
index 8533c530..470068c3 100644
--- a/core/files.js
+++ b/core/files.js
@@ -85,7 +85,7 @@ var files = {
         'resources/modernizr/2.8.3/modernizr.min.jsm': true,
 
         // Moment.js
-        'resources/moment.js/2.24.0/moment.min.js': true,
+        'resources/moment.js/2.24.0/moment.min.jsm': true,
 
         // MooTools
         'resources/mootools/1.6.0/mootools-core.min.jsm': true,
diff --git a/core/mappings.js b/core/mappings.js
index 59d6d47f..8269d329 100644
--- a/core/mappings.js
+++ b/core/mappings.js
@@ -76,6 +76,7 @@ var mappings = {
             'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI,
             'modernizr/{version}/modernizr.': resources.modernizr,
             'moment.js/{version}/moment.': resources.moment,
+            'moment.js/{version}/moment.min.': resources.moment,
             'mootools/{version}/mootools-core': resources.mootools,
             'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
             'swfobject/{version}/swfobject.': resources.swfobject,
@@ -156,6 +157,7 @@ var mappings = {
             'jquery.ui/{version}/jquery-ui.js': resources.jQueryUI,
             'jquery.ui/{version}/jquery-ui.min.js': resources.jQueryUI,
             'momentjs/{version}/moment.': resources.moment,
+            'momentjs/{version}/moment.min.': resources.moment,
             'mootools/{version}/mootools-': resources.mootools,
             'swfobject/{version}/swfobject.': resources.swfobject,
             'underscorejs/{version}/underscore.': resources.underscore,
@@ -176,6 +178,7 @@ var mappings = {
             'jquery-ui/{version}/jquery-ui.min.js': resources.jQueryUI,
             'modernizr/{version}/modernizr.': resources.modernizr,
             'momentjs/{version}/moment.': resources.moment,
+            'momentjs/{version}/moment.min.': resources.moment,
             'prototype/{version}/prototype.': resources.prototypeJS,
             'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
             'swfobject/{version}/swfobject.': resources.swfobject,
@@ -196,6 +199,7 @@ var mappings = {
             'jquery-ui/{version}/jquery-ui.min.js': resources.jQueryUI,
             'modernizr/{version}/modernizr.': resources.modernizr,
             'momentjs/{version}/moment.': resources.moment,
+            'momentjs/{version}/moment.min.': resources.moment,
             'prototype/{version}/prototype.': resources.prototypeJS,
             'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
             'swfobject/{version}/swfobject.': resources.swfobject,
@@ -216,6 +220,7 @@ var mappings = {
             'jqueryui/{version}/jquery-ui.js': resources.jQueryUI,
             'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI,
             'moment/{version}/moment.': resources.moment,
+            'moment/{version}/moment.min.': resources.moment,
             'mootools/{version}/mootools-yui-compressed.': resources.mootools,
             'prototype/{version}/prototype.': resources.prototypeJS,
             'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
@@ -240,6 +245,7 @@ var mappings = {
             'jqueryui/{version}/jquery-ui.js': resources.jQueryUI,
             'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI,
             'moment/{version}/moment.': resources.moment,
+            'moment/{version}/moment.min.': resources.moment,
             'mootools/{version}/mootools-yui-compressed.': resources.mootools,
             'prototype/{version}/prototype.': resources.prototypeJS,
             'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
@@ -412,6 +418,7 @@ var mappings = {
             'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI,
             'modernizr/{version}/modernizr.': resources.modernizr,
             'moment.js/{version}/moment.': resources.moment,
+            'moment.js/{version}/moment.min.': resources.moment,
             'mootools/{version}/mootools-yui-compressed.': resources.mootools,
             'prototype/{version}/prototype.': resources.prototypeJS,
             'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js
index e98cc3e3..fc76a067 100644
--- a/modules/internal/helpers.js
+++ b/modules/internal/helpers.js
@@ -222,6 +222,8 @@ helpers.determineResourceName = function (filename) {
         return 'lozad.js';
     case 'modernizr.min.jsm':
         return 'Modernizr';
+    case 'moment.min.jsm':
+        return 'Modernizr';
     case 'mootools-yui-compressed.jsm':
         return 'MooTools';
     case 'prototype.jsm':
diff --git a/pages/updates/updates.html b/pages/updates/updates.html
index c74f438f..e8261959 100644
--- a/pages/updates/updates.html
+++ b/pages/updates/updates.html
@@ -26,6 +26,7 @@
                             <li>Added lozad v1.14.0</li>
                             <li>Added Findify v6.9.15</li>
                             <li>Added detection of framework-bundles (e.g. Findify)</li>
+                            <li>Fixed Moment.js (File extension and detection of resource name)</li>
                         </ul>
                     <div class="topic-label">
                         Please update your uBlock/uMatrix rules
diff --git a/resources/moment.js/2.24.0/moment.min.js b/resources/moment.js/2.24.0/moment.min.jsm
similarity index 100%
rename from resources/moment.js/2.24.0/moment.min.js
rename to resources/moment.js/2.24.0/moment.min.jsm