Merge branch 'dev' of https://github.com/abpframework/abp into dev

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Luxon/LuxonScriptContributor.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Luxon
+{
+    public class LuxonScriptContributor : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.AddIfNotContains("/libs/luxon/luxon.min.js");
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs

@@ -5,6 +5,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryForm;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidationUnobtrusive;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Lodash;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Luxon;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.MalihuCustomScrollbar;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert;
@@ -25,6 +26,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
         typeof(SweetalertScriptContributor),
         typeof(ToastrScriptBundleContributor),
         typeof(MalihuCustomScrollbarPluginScriptBundleContributor),
+        typeof(LuxonScriptContributor),
         typeof(TimeagoScriptContributor)
         )]
     public class SharedThemeGlobalScriptContributor : BundleContributor

npm/packs/aspnetcore.mvc.ui.theme.shared/package.json

@@ -16,6 +16,7 @@
     "@abp/select2": "^0.8.0",
     "@abp/sweetalert": "^0.8.0",
     "@abp/timeago": "^0.8.0",
+    "@abp/luxon": "^0.8.0",
     "@abp/toastr": "^0.8.0"
   },
   "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb"

npm/packs/luxon/abp.resourcemapping.js

@@ -0,0 +1,5 @@
+module.exports = {
+    mappings: {
+        "@node_modules/luxon/build/global/*.*": "@libs/luxon/"
+    }
+}

npm/packs/luxon/package.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.8.0",
+  "name": "@abp/luxon",
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "luxon": "^1.17.3"
+  },
+  "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb"
+}