From 18c2f6cb0c6b480f0c570d57cfc08191814f2e42 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 16 Jul 2021 15:29:41 +0800 Subject: [PATCH] Rename sweetalert to sweetalert2 --- .../Sweetalert2ScriptContributor.cs} | 4 ++-- .../Bundling/SharedThemeGlobalScriptContributor.cs | 8 ++++---- .../abp-sweetalert.js => sweetalert2/abp-sweetalert2.js} | 0 npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | 2 +- .../{sweetalert => sweetalert2}/abp.resourcemapping.js | 0 npm/packs/{sweetalert => sweetalert2}/package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/{SweetAlert/SweetalertScriptContributor.cs => SweetAlert2/Sweetalert2ScriptContributor.cs} (76%) rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/{sweetalert/abp-sweetalert.js => sweetalert2/abp-sweetalert2.js} (100%) rename npm/packs/{sweetalert => sweetalert2}/abp.resourcemapping.js (100%) rename npm/packs/{sweetalert => sweetalert2}/package.json (88%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert/SweetalertScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert2/Sweetalert2ScriptContributor.cs similarity index 76% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert/SweetalertScriptContributor.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert2/Sweetalert2ScriptContributor.cs index a947417809..c05775d013 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert/SweetalertScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert2/Sweetalert2ScriptContributor.cs @@ -3,10 +3,10 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core; using Volo.Abp.Modularity; -namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert +namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert2 { [DependsOn(typeof(CoreScriptContributor))] - public class SweetalertScriptContributor : BundleContributor + public class Sweetalert2ScriptContributor : BundleContributor { public override void ConfigureBundle(BundleConfigurationContext context) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs index 4ff7430553..fb861aec40 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs @@ -9,7 +9,7 @@ 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; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert2; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Timeago; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Toastr; using Volo.Abp.Modularity; @@ -24,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling typeof(JQueryFormScriptContributor), typeof(Select2ScriptContributor), typeof(DatatablesNetBs4ScriptContributor), - typeof(SweetalertScriptContributor), + typeof(Sweetalert2ScriptContributor), typeof(ToastrScriptBundleContributor), typeof(MalihuCustomScrollbarPluginScriptBundleContributor), typeof(LuxonScriptContributor), @@ -44,9 +44,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling "/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js", "/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js", "/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js", - "/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js", + "/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js", "/libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js" }); } } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 566d21d5e9..746f8c5348 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -16,7 +16,7 @@ "@abp/luxon": "~4.4.0-rc.2", "@abp/malihu-custom-scrollbar-plugin": "~4.4.0-rc.2", "@abp/select2": "~4.4.0-rc.2", - "@abp/sweetalert": "~4.4.0-rc.2", + "@abp/sweetalert2": "~4.4.0-rc.2", "@abp/timeago": "~4.4.0-rc.2", "@abp/toastr": "~4.4.0-rc.2" }, diff --git a/npm/packs/sweetalert/abp.resourcemapping.js b/npm/packs/sweetalert2/abp.resourcemapping.js similarity index 100% rename from npm/packs/sweetalert/abp.resourcemapping.js rename to npm/packs/sweetalert2/abp.resourcemapping.js diff --git a/npm/packs/sweetalert/package.json b/npm/packs/sweetalert2/package.json similarity index 88% rename from npm/packs/sweetalert/package.json rename to npm/packs/sweetalert2/package.json index 91eb865722..f5b54a89b4 100644 --- a/npm/packs/sweetalert/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,6 +1,6 @@ { "version": "4.4.0-rc.2", - "name": "@abp/sweetalert", + "name": "@abp/sweetalert2", "publishConfig": { "access": "public" },