diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 64f3c79f0af..011db43a47d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -23,3 +23,31 @@ updates: labels: - ".NET" - "Type: Maintenance" + groups: + MailKit: + patterns: + - "MailKit" + - "MimeKit" + - "BouncyCastle.Cryptography" + Google-Apis: + patterns: + - "Google.Apis*" + AspNet: + patterns: + - "Microsoft.AspNet.*" + SourceLink: + patterns: + - "Microsoft.SourceLink.*" + TestStack-Dossier: + patterns: + - "TestStack.Dossier" + - "AutoFixture" + - "Fare" + - "NSubstitute" + - "Castle.Core" + Cake-Issues: + patterns: + - "Cake.Issues*" + DependencyInjection: + patterns: + - "Microsoft.Extensions.DependencyInjection*" diff --git a/.yarnrc.yml b/.yarnrc.yml index 0acb2636e32..70ec1882d0c 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1 +1,3 @@ +compressionLevel: mixed + nodeLinker: node-modules diff --git a/Build/Build.csproj b/Build/Build.csproj index 7d3fbc4c721..40c6b91c322 100644 --- a/Build/Build.csproj +++ b/Build/Build.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + net8.0 true $(MSBuildProjectDirectory) @@ -16,7 +16,7 @@ - + diff --git a/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn index 80e2077dc7f..82673aadecd 100644 --- a/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn +++ b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn @@ -1,6 +1,6 @@ - + Google Analytics 4 Connector Configure your site's Google Analytics 4 settings. ~/DesktopModules/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png diff --git a/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalStyles.cs b/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalStyles.cs new file mode 100644 index 00000000000..2493dd87c65 --- /dev/null +++ b/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalStyles.cs @@ -0,0 +1,227 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information + +namespace DotNetNuke.Abstractions.Portals +{ + /// + /// Provides css custom properties to customize the Dnn UI in the platform, themes and modules for an overall consistent look. + /// + public interface IPortalStyles + { + /// + /// Gets or sets the main shade of the primary color. + /// + StyleColor ColorPrimary { get; set; } + + /// + /// Gets or sets the light shade of the primary color. + /// + StyleColor ColorPrimaryLight { get; set; } + + /// + /// Gets or sets the dark shade of the primary color. + /// + StyleColor ColorPrimaryDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the primary color shades. + /// + StyleColor ColorPrimaryContrast { get; set; } + + /// + /// Gets or sets the main shade of the secondary color. + /// + StyleColor ColorSecondary { get; set; } + + /// + /// Gets or sets the light shade of the secondary color. + /// + StyleColor ColorSecondaryLight { get; set; } + + /// + /// Gets or sets the dark shade of the secondary color. + /// + StyleColor ColorSecondaryDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the secondary color shades. + /// + StyleColor ColorSecondaryContrast { get; set; } + + /// + /// Gets or sets the main shade of the Tertiary color. + /// + StyleColor ColorTertiary { get; set; } + + /// + /// Gets or sets the light shade of the Tertiary color. + /// + StyleColor ColorTertiaryLight { get; set; } + + /// + /// Gets or sets the dark shade of the Tertiary color. + /// + StyleColor ColorTertiaryDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the Tertiary color shades. + /// + StyleColor ColorTertiaryContrast { get; set; } + + /// + /// Gets or sets the main shade of the Neutral color. + /// + StyleColor ColorNeutral { get; set; } + + /// + /// Gets or sets the light shade of the Neutral color. + /// + StyleColor ColorNeutralLight { get; set; } + + /// + /// Gets or sets the dark shade of the Neutral color. + /// + StyleColor ColorNeutralDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the Neutral color shades. + /// + StyleColor ColorNeutralContrast { get; set; } + + /// + /// Gets or sets the main shade of the Background color. + /// + StyleColor ColorBackground { get; set; } + + /// + /// Gets or sets the light shade of the Background color. + /// + StyleColor ColorBackgroundLight { get; set; } + + /// + /// Gets or sets the dark shade of the Background color. + /// + StyleColor ColorBackgroundDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the Background color shades. + /// + StyleColor ColorBackgroundContrast { get; set; } + + /// + /// Gets or sets the main shade of the Foreground color. + /// + StyleColor ColorForeground { get; set; } + + /// + /// Gets or sets the light shade of the Foreground color. + /// + StyleColor ColorForegroundLight { get; set; } + + /// + /// Gets or sets the dark shade of the Foreground color. + /// + StyleColor ColorForegroundDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the Foreground color shades. + /// + StyleColor ColorForegroundContrast { get; set; } + + /// + /// Gets or sets the main shade of the Info color. + /// + StyleColor ColorInfo { get; set; } + + /// + /// Gets or sets the light shade of the Info color. + /// + StyleColor ColorInfoLight { get; set; } + + /// + /// Gets or sets the dark shade of the Info color. + /// + StyleColor ColorInfoDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the Info color shades. + /// + StyleColor ColorInfoContrast { get; set; } + + /// + /// Gets or sets the main shade of the Success color. + /// + StyleColor ColorSuccess { get; set; } + + /// + /// Gets or sets the light shade of the Success color. + /// + StyleColor ColorSuccessLight { get; set; } + + /// + /// Gets or sets the dark shade of the Success color. + /// + StyleColor ColorSuccessDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the Success color shades. + /// + StyleColor ColorSuccessContrast { get; set; } + + /// + /// Gets or sets the main shade of the Warning color. + /// + StyleColor ColorWarning { get; set; } + + /// + /// Gets or sets the light shade of the Warning color. + /// + StyleColor ColorWarningLight { get; set; } + + /// + /// Gets or sets the dark shade of the Warning color. + /// + StyleColor ColorWarningDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the Warning color shades. + /// + StyleColor ColorWarningContrast { get; set; } + + /// + /// Gets or sets the main shade of the Danger color. + /// + StyleColor ColorDanger { get; set; } + + /// + /// Gets or sets the light shade of the Danger color. + /// + StyleColor ColorDangerLight { get; set; } + + /// + /// Gets or sets the dark shade of the Danger color. + /// + StyleColor ColorDangerDark { get; set; } + + /// + /// Gets or sets a color that contrasts well over the Danger color shades. + /// + StyleColor ColorDangerContrast { get; set; } + + /// + /// Gets or sets the controls border radius in pixels. + /// + double ControlsRadius { get; set; } + + /// + /// Gets or sets the controls padding in pixels. + /// + double ControlsPadding { get; set; } + + /// + /// Gets or sets the base font size in pixels. + /// + double BaseFontSize { get; set; } + } +} diff --git a/DNN Platform/DotNetNuke.Abstractions/Portals/StyleColor.cs b/DNN Platform/DotNetNuke.Abstractions/Portals/StyleColor.cs new file mode 100644 index 00000000000..81509a04bba --- /dev/null +++ b/DNN Platform/DotNetNuke.Abstractions/Portals/StyleColor.cs @@ -0,0 +1,161 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information + +namespace DotNetNuke.Abstractions.Portals +{ + using System; + using System.Text.RegularExpressions; + + /// + /// Represents a CSS color and its components. + /// + public struct StyleColor + { + private static readonly Regex HexColorRegex = new Regex(@"([\da-f]{3}){1,2}", RegexOptions.IgnoreCase | RegexOptions.Compiled); + + private readonly byte red; + private readonly byte green; + private readonly byte blue; + private string hex; + + /// + /// Initializes a new instance of the struct. + /// + public StyleColor() + : this("FFFFFF") + { + } + + /// + /// Initializes a new instance of the struct. + /// + /// The hex value to use. + public StyleColor(string hexValue) + { + AssertIsValidCssColor(hexValue); + + this.HexValue = ExpandColor(hexValue); + this.red = byte.Parse(this.HexValue.Substring(0, 2), System.Globalization.NumberStyles.HexNumber); + this.green = byte.Parse(this.HexValue.Substring(2, 2), System.Globalization.NumberStyles.HexNumber); + this.blue = byte.Parse(this.HexValue.Substring(4, 2), System.Globalization.NumberStyles.HexNumber); + } + + private enum Component + { + Red, + Green, + Blue, + } + + /// + /// Gets or sets the value for the red component. + /// + public byte Red + { + get => this.red; + set { this.SetComponent(Component.Red, value); } + } + + /// + /// Gets or sets the value for the green component. + /// + public byte Green + { + get => this.green; + set { this.SetComponent(Component.Green, value); } + } + + /// + /// Gets or sets the value for the blue component. + /// + public byte Blue + { + get => this.blue; + set { this.SetComponent(Component.Blue, value); } + } + + /// + /// Gets or sets the color hexadecimal value. + /// + public string HexValue + { + get + { + return this.hex; + } + + set + { + AssertIsValidCssColor(value); + this.hex = ExpandColor(value); + } + } + + /// + /// Gets a minified hexadecimal value for the color. + /// + /// If the color is 0088FF, it should return 08F. + public string MinifiedHex + { + get + { + if ( + this.hex[0] == this.hex[1] && + this.hex[2] == this.hex[3] && + this.hex[4] == this.hex[5]) + { + return $"{this.hex[0]}{this.hex[2]}{this.hex[4]}"; + } + + return this.hex; + } + } + + private static string ExpandColor(string hexValue) + { + if (hexValue.Length == 6) + { + return hexValue.ToUpperInvariant(); + } + + string value; + var r = hexValue[0]; + var g = hexValue[1]; + var b = hexValue[2]; + value = string.Concat(r, r, g, g, b, b); + return value.ToUpperInvariant(); + } + + private static void AssertIsValidCssColor(string hexValue) + { + if (string.IsNullOrWhiteSpace(hexValue)) + { + throw new ArgumentNullException("You need to provide a CSS color value in the constructor"); + } + + if (!HexColorRegex.IsMatch(hexValue)) + { + throw new ArgumentOutOfRangeException($"The value {hexValue} that was provided is not valid, it needs to be 3 or 6 character long hexadecimal string without the # sing"); + } + } + + private void SetComponent(Component comp, byte value) + { + switch (comp) + { + case Component.Red: + this.hex = this.hex.Remove(0, 2).Insert(0, $"{value:x2}"); + break; + case Component.Green: + this.hex = this.hex.Remove(2, 2).Insert(2, $"{value:x2}"); + break; + case Component.Blue: + this.hex = this.hex.Remove(4, 2).Insert(4, $"{value:x2}"); + break; + default: + break; + } + } + } +} diff --git a/DNN Platform/JavaScript Libraries/DnnPlugins/DnnPlugins.dnn b/DNN Platform/JavaScript Libraries/DnnPlugins/DnnPlugins.dnn index dad8ed570b5..22a91887246 100644 --- a/DNN Platform/JavaScript Libraries/DnnPlugins/DnnPlugins.dnn +++ b/DNN Platform/JavaScript Libraries/DnnPlugins/DnnPlugins.dnn @@ -1,6 +1,6 @@ - + DNN jQuery Plugins A collection of jQuery plugins for DNN UI components (tabs, panels, tooltips, checkboxes, etc.) Icons\Sigma\Extensions_32x32_Standard.png diff --git a/DNN Platform/Library/Common/Utilities/DataCache.cs b/DNN Platform/Library/Common/Utilities/DataCache.cs index 51b7b324b9e..6f2fa36be87 100644 --- a/DNN Platform/Library/Common/Utilities/DataCache.cs +++ b/DNN Platform/Library/Common/Utilities/DataCache.cs @@ -73,6 +73,15 @@ public class DataCache public const CacheItemPriority PortalPermissionCachePriority = CacheItemPriority.High; public const int PortalPermissionCacheTimeOut = 20; + /// The portal styles cache key. + public const string PortalStylesCacheKey = "Dnn_Css_Custom_Properties_{0}"; + + /// The portal styles cache priority. + public const CacheItemPriority PortalStylesCachePriority = CacheItemPriority.High; + + /// The portal styles cache time out. + public const int PortalStylesCacheTimeOut = 20; + // Tab cache keys public const string TabCacheKey = "Tab_Tabs{0}"; public const string TabSettingsCacheKey = "TabSettings{0}"; diff --git a/DNN Platform/Library/DotNetNuke.Library.csproj b/DNN Platform/Library/DotNetNuke.Library.csproj index d773d2ef3b1..baeeb8fbbaa 100644 --- a/DNN Platform/Library/DotNetNuke.Library.csproj +++ b/DNN Platform/Library/DotNetNuke.Library.csproj @@ -251,7 +251,10 @@ + + + diff --git a/DNN Platform/Library/Entities/Portals/Extensions/IPortalSettingsExtensions.cs b/DNN Platform/Library/Entities/Portals/Extensions/IPortalSettingsExtensions.cs new file mode 100644 index 00000000000..9518c2fd467 --- /dev/null +++ b/DNN Platform/Library/Entities/Portals/Extensions/IPortalSettingsExtensions.cs @@ -0,0 +1,25 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information + +namespace DotNetNuke.Entities.Portals.Extensions +{ + using DotNetNuke.Abstractions.Portals; + + /// + /// Extends the interface. + /// + public static class IPortalSettingsExtensions + { + /// + /// Gets the styles for the portal. + /// + /// The portal settings to the the styles from. + /// . + public static IPortalStyles GetStyles(this IPortalSettings portalSettings) + { + var repo = new PortalStylesRepository(); + return repo.GetSettings(portalSettings.PortalId); + } + } +} diff --git a/DNN Platform/Library/Entities/Portals/PortalSettingsController.cs b/DNN Platform/Library/Entities/Portals/PortalSettingsController.cs index abf60ba0018..4b6e0559bee 100644 --- a/DNN Platform/Library/Entities/Portals/PortalSettingsController.cs +++ b/DNN Platform/Library/Entities/Portals/PortalSettingsController.cs @@ -15,6 +15,7 @@ namespace DotNetNuke.Entities.Portals using DotNetNuke.ComponentModel; using DotNetNuke.Entities.Controllers; using DotNetNuke.Entities.Modules; + using DotNetNuke.Entities.Modules.Settings; using DotNetNuke.Entities.Tabs; using DotNetNuke.Security; using DotNetNuke.Services.Localization; diff --git a/DNN Platform/Library/Entities/Portals/PortalStyles.cs b/DNN Platform/Library/Entities/Portals/PortalStyles.cs new file mode 100644 index 00000000000..d7c0bdd5938 --- /dev/null +++ b/DNN Platform/Library/Entities/Portals/PortalStyles.cs @@ -0,0 +1,187 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information + +namespace DotNetNuke.Entities.Portals +{ + using DotNetNuke.Abstractions.Portals; + using DotNetNuke.Entities.Modules.Settings; + + /// + /// Provides css custom properties to customize the Dnn UI in the platform, themes and modules for an overall consistent look. + /// + public class PortalStyles : IPortalStyles + { + /// + [PortalSetting] + public StyleColor ColorPrimary { get; set; } = new StyleColor("3792ED"); + + /// + [PortalSetting] + public StyleColor ColorPrimaryLight { get; set; } = new StyleColor("6CB6F3"); + + /// + [PortalSetting] + public StyleColor ColorPrimaryDark { get; set; } = new StyleColor("0D569E"); + + /// + [PortalSetting] + public StyleColor ColorPrimaryContrast { get; set; } = new StyleColor("FFFFFF"); + + /// + [PortalSetting] + public StyleColor ColorSecondary { get; set; } = new StyleColor("CCCCCC"); + + /// + [PortalSetting] + public StyleColor ColorSecondaryLight { get; set; } = new StyleColor("EEEEEE"); + + /// + [PortalSetting] + public StyleColor ColorSecondaryDark { get; set; } = new StyleColor("AAAAAA"); + + /// + [PortalSetting] + public StyleColor ColorSecondaryContrast { get; set; } = new StyleColor("222222"); + + /// + [PortalSetting] + public StyleColor ColorTertiary { get; set; } = new StyleColor("EAEAEA"); + + /// + [PortalSetting] + public StyleColor ColorTertiaryLight { get; set; } = new StyleColor("F2F2F2"); + + /// + [PortalSetting] + public StyleColor ColorTertiaryDark { get; set; } = new StyleColor("D8D8D8"); + + /// + [PortalSetting] + public StyleColor ColorTertiaryContrast { get; set; } = new StyleColor("333333"); + + /// + [PortalSetting] + public StyleColor ColorNeutral { get; set; } = new StyleColor("B2B2B2"); + + /// + [PortalSetting] + public StyleColor ColorNeutralLight { get; set; } = new StyleColor("E5E5E5"); + + /// + [PortalSetting] + public StyleColor ColorNeutralDark { get; set; } = new StyleColor("999999"); + + /// + [PortalSetting] + public StyleColor ColorNeutralContrast { get; set; } = new StyleColor("000000"); + + /// + [PortalSetting] + public StyleColor ColorBackground { get; set; } = new StyleColor("FFFFFF"); + + /// + [PortalSetting] + public StyleColor ColorBackgroundLight { get; set; } = new StyleColor("FFFFFF"); + + /// + [PortalSetting] + public StyleColor ColorBackgroundDark { get; set; } = new StyleColor("999999"); + + /// + [PortalSetting] + public StyleColor ColorBackgroundContrast { get; set; } = new StyleColor("000000"); + + /// + [PortalSetting] + public StyleColor ColorForeground { get; set; } = new StyleColor("000000"); + + /// + [PortalSetting] + public StyleColor ColorForegroundLight { get; set; } = new StyleColor("333333"); + + /// + [PortalSetting] + public StyleColor ColorForegroundDark { get; set; } = new StyleColor("000000"); + + /// + [PortalSetting] + public StyleColor ColorForegroundContrast { get; set; } = new StyleColor("FFFFFF"); + + /// + [PortalSetting] + public StyleColor ColorInfo { get; set; } = new StyleColor("17A2B8"); + + /// + [PortalSetting] + public StyleColor ColorInfoLight { get; set; } = new StyleColor("23B8CF"); + + /// + [PortalSetting] + public StyleColor ColorInfoDark { get; set; } = new StyleColor("00889E"); + + /// + [PortalSetting] + public StyleColor ColorInfoContrast { get; set; } = new StyleColor("FFFFFF"); + + /// + [PortalSetting] + public StyleColor ColorSuccess { get; set; } = new StyleColor("28A745"); + + /// + [PortalSetting] + public StyleColor ColorSuccessLight { get; set; } = new StyleColor("49C25D"); + + /// + [PortalSetting] + public StyleColor ColorSuccessDark { get; set; } = new StyleColor("00902F"); + + /// + [PortalSetting] + public StyleColor ColorSuccessContrast { get; set; } = new StyleColor("FFFFFF"); + + /// + [PortalSetting] + public StyleColor ColorWarning { get; set; } = new StyleColor("FFC107"); + + /// + [PortalSetting] + public StyleColor ColorWarningLight { get; set; } = new StyleColor("FFD42E"); + + /// + [PortalSetting] + public StyleColor ColorWarningDark { get; set; } = new StyleColor("E9AD00"); + + /// + [PortalSetting] + public StyleColor ColorWarningContrast { get; set; } = new StyleColor("FFFFFF"); + + /// + [PortalSetting] + public StyleColor ColorDanger { get; set; } = new StyleColor("DC3545"); + + /// + [PortalSetting] + public StyleColor ColorDangerLight { get; set; } = new StyleColor("F14954"); + + /// + [PortalSetting] + public StyleColor ColorDangerDark { get; set; } = new StyleColor("C51535"); + + /// + [PortalSetting] + public StyleColor ColorDangerContrast { get; set; } = new StyleColor("FFFFFF"); + + /// + [PortalSetting] + public double ControlsRadius { get; set; } = 5; + + /// + [PortalSetting] + public double ControlsPadding { get; set; } = 5; + + /// + [PortalSetting] + public double BaseFontSize { get; set; } = 16; + } +} diff --git a/DNN Platform/Library/Entities/Portals/PortalStylesRepository.cs b/DNN Platform/Library/Entities/Portals/PortalStylesRepository.cs new file mode 100644 index 00000000000..a0068a1f0e9 --- /dev/null +++ b/DNN Platform/Library/Entities/Portals/PortalStylesRepository.cs @@ -0,0 +1,15 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information + +namespace DotNetNuke.Entities.Portals +{ + using DotNetNuke.Entities.Modules.Settings; + + /// + /// Provides data-access to portal styles. + /// + public class PortalStylesRepository : SettingsRepository + { + } +} diff --git a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn index 849b6e88f78..ada1193d489 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn +++ b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn @@ -1,6 +1,6 @@  - + Exchange Online SMTP OAuth Provider The provider allows you to config the SMTP client to send emails with Microsoft exchange online service. ~/Icons/Sigma/Extensions_32x32_Standard.png diff --git a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn index aada38c07c9..2a6d22994a9 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn +++ b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn @@ -1,6 +1,6 @@  - + Google Mail SMTP OAuth Provider The provider allows you to config the SMTP client to send emails with gmail service. ~/Icons/Sigma/Extensions_32x32_Standard.png diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Portals/PortalSettingsControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Portals/PortalSettingsControllerTests.cs index eb6a61b1ef2..269ac62997a 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Portals/PortalSettingsControllerTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Portals/PortalSettingsControllerTests.cs @@ -7,11 +7,14 @@ namespace DotNetNuke.Tests.Core.Entities.Portals using System.Collections.Generic; using DotNetNuke.Abstractions.Application; + using DotNetNuke.Collections; using DotNetNuke.Common; using DotNetNuke.Common.Utilities; + using DotNetNuke.ComponentModel; using DotNetNuke.Entities.Controllers; using DotNetNuke.Entities.Portals; using DotNetNuke.Entities.Tabs; + using DotNetNuke.Services.Cache; using DotNetNuke.Services.Localization; using DotNetNuke.Tests.Utilities.Fakes; using DotNetNuke.Tests.Utilities.Mocks; @@ -84,6 +87,9 @@ public void LoadPortalSettings_Loads_Default_Value(Dictionary te var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString }; var hostSettings = PortalSettingsControllerTestFactory.GetHostSettings(); + var fakeCachingProvider = new FakeCachingProvider(new Dictionary()); + ComponentFactory.RegisterComponentInstance(fakeCachingProvider); + var mockPortalController = new Mock(); mockPortalController .Setup(c => c.GetPortalSettings(It.IsAny())) @@ -91,15 +97,15 @@ public void LoadPortalSettings_Loads_Default_Value(Dictionary te PortalController.SetTestableInstance(mockPortalController.Object); this.mockHostController.Setup(c => c.GetString(It.IsAny())) - .Returns((string s) => hostSettings[s]); + .Returns((string s) => hostSettings.GetValueOrDefault(s)); this.mockHostController.Setup(c => c.GetString(It.IsAny(), It.IsAny())) - .Returns((string s1, string s2) => hostSettings[s1]); + .Returns((string s1, string s2) => hostSettings.GetValueOrDefault(s1)); this.mockHostController.Setup(c => c.GetBoolean(It.IsAny(), It.IsAny())) - .Returns((string s, bool b) => bool.Parse(hostSettings[s])); + .Returns((string s, bool b) => hostSettings.GetValueOrDefault(s)); this.mockHostController.Setup(c => c.GetInteger(It.IsAny(), It.IsAny())) - .Returns((string s, int i) => int.Parse(hostSettings[s])); + .Returns((string s, int i) => hostSettings.GetValueOrDefault(s)); this.mockHostController.Setup(c => c.GetInteger(It.IsAny())) - .Returns((string s) => int.Parse(hostSettings[s])); + .Returns((string s) => hostSettings.GetValueOrDefault(s)); if (isHostDefault) { @@ -136,6 +142,9 @@ public void LoadPortalSettings_Loads_Setting_Value(Dictionary te var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString }; var hostSettings = PortalSettingsControllerTestFactory.GetHostSettings(); + var fakeCachingProvider = new FakeCachingProvider(new Dictionary()); + ComponentFactory.RegisterComponentInstance(fakeCachingProvider); + var mockPortalController = new Mock(); mockPortalController .Setup(c => c.GetPortalSettings(It.IsAny())) @@ -143,13 +152,13 @@ public void LoadPortalSettings_Loads_Setting_Value(Dictionary te PortalController.SetTestableInstance(mockPortalController.Object); this.mockHostController.Setup(c => c.GetString(It.IsAny())) - .Returns((string s) => hostSettings[s]); + .Returns((string s) => hostSettings.GetValueOrDefault(s)); this.mockHostController.Setup(c => c.GetString(It.IsAny(), It.IsAny())) - .Returns((string s1, string s2) => hostSettings[s1]); + .Returns((string s1, string s2) => hostSettings.GetValueOrDefault(s1)); this.mockHostController.Setup(c => c.GetBoolean(It.IsAny(), It.IsAny())) - .Returns((string s, bool b) => bool.Parse(hostSettings[s])); + .Returns((string s, bool b) => hostSettings.GetValueOrDefault(s)); this.mockHostController.Setup(c => c.GetInteger(It.IsAny(), It.IsAny())) - .Returns((string s, int i) => int.Parse(hostSettings[s])); + .Returns((string s, int i) => hostSettings.GetValueOrDefault(s)); // Act controller.LoadPortalSettings(settings); @@ -176,6 +185,9 @@ public void LoadPortalSettings_Sets_TimeZone_Property_To_Local_TimeZone() var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString }; var hostSettings = PortalSettingsControllerTestFactory.GetHostSettings(); + var fakeCachingProvider = new FakeCachingProvider(new Dictionary()); + ComponentFactory.RegisterComponentInstance(fakeCachingProvider); + var mockPortalController = new Mock(); mockPortalController .Setup(c => c.GetPortalSettings(It.IsAny())) @@ -183,13 +195,13 @@ public void LoadPortalSettings_Sets_TimeZone_Property_To_Local_TimeZone() PortalController.SetTestableInstance(mockPortalController.Object); this.mockHostController.Setup(c => c.GetString(It.IsAny())) - .Returns((string s) => hostSettings[s]); + .Returns((string s) => hostSettings.GetValueOrDefault(s)); this.mockHostController.Setup(c => c.GetString(It.IsAny(), It.IsAny())) - .Returns((string s1, string s2) => hostSettings[s1]); + .Returns((string s1, string s2) => hostSettings.GetValueOrDefault(s1)); this.mockHostController.Setup(c => c.GetBoolean(It.IsAny(), It.IsAny())) - .Returns((string s, bool b) => bool.Parse(hostSettings[s])); + .Returns((string s, bool b) => hostSettings.GetValueOrDefault(s)); this.mockHostController.Setup(c => c.GetInteger(It.IsAny(), It.IsAny())) - .Returns((string s, int i) => int.Parse(hostSettings[s])); + .Returns((string s, int i) => hostSettings.GetValueOrDefault(s)); // Act controller.LoadPortalSettings(settings); diff --git a/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj b/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj index 670b7b0c3f2..bc004e3ecad 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/DNN Platform/Website/Default.aspx b/DNN Platform/Website/Default.aspx index 56df5741b0d..b8d61386067 100644 --- a/DNN Platform/Website/Default.aspx +++ b/DNN Platform/Website/Default.aspx @@ -1,39 +1,40 @@ -<%@ Page Language="C#" AutoEventWireup="True" Inherits="DotNetNuke.Framework.DefaultPage" CodeBehind="Default.aspx.cs" Async="true" %> -<%@ Register TagPrefix="dnncrm" Namespace="DotNetNuke.Web.Client.ClientResourceManagement" Assembly="DotNetNuke.Web.Client" %> -<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Common.Controls" Assembly="DotNetNuke" %> - -> - - - - <meta id="MetaRefresh" runat="Server" http-equiv="Refresh" name="Refresh" Visible="False" /> - <meta id="MetaDescription" runat="Server" name="description" Visible="False"/> - <meta id="MetaKeywords" runat="Server" name="keywords" Visible="False"/> - <meta id="MetaCopyright" runat="Server" name="copyright" Visible="False"/> - <meta id="MetaGenerator" runat="Server" name="generator" Visible="False"/> - <meta id="MetaAuthor" runat="Server" name="author" Visible="False"/> - <meta id="MetaRobots" runat="server" name="robots" Visible="False" /> - <asp:PlaceHolder runat="server" ID="ClientDependencyHeadCss"></asp:PlaceHolder> - <asp:PlaceHolder runat="server" ID="ClientDependencyHeadJs"></asp:PlaceHolder> - <asp:placeholder id="CSS" runat="server" /> - <asp:placeholder id="SCRIPTS" runat="server" /> -</head> -<body id="Body" runat="server"> - - <dnn:Form ID="Form" runat="server" ENCTYPE="multipart/form-data"> - <asp:PlaceHolder ID="BodySCRIPTS" runat="server" /> - <asp:Label ID="SkinError" runat="server" CssClass="NormalRed" Visible="False"></asp:Label> - <asp:PlaceHolder ID="SkinPlaceHolder" runat="server" /> - <input id="ScrollTop" runat="server" name="ScrollTop" type="hidden" /> - <input id="__dnnVariable" runat="server" name="__dnnVariable" type="hidden" autocomplete="off" /> - <asp:placeholder runat="server" ID="ClientResourcesFormBottom" /> - </dnn:Form> - <asp:placeholder runat="server" id="ClientResourceIncludes" /> - <dnncrm:ClientResourceLoader runat="server" id="ClientResourceLoader"> - <Paths> - <dnncrm:ClientResourcePath Name="SkinPath" Path="<%# CurrentSkinPath %>" /> - <dnncrm:ClientResourcePath Name="SharedScripts" Path="~/Resources/Shared/Scripts/" /> - </Paths> - </dnncrm:ClientResourceLoader> -</body> -</html> +<%@ Page Language="C#" AutoEventWireup="True" Inherits="DotNetNuke.Framework.DefaultPage" CodeBehind="Default.aspx.cs" Async="true" %> +<%@ Register TagPrefix="dnncrm" Namespace="DotNetNuke.Web.Client.ClientResourceManagement" Assembly="DotNetNuke.Web.Client" %> +<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Common.Controls" Assembly="DotNetNuke" %> +<asp:literal id="skinDocType" runat="server" ViewStateMode="Disabled"/> +<html <asp:literal id="attributeList" runat="server" ViewStateMode="Disabled"></asp:literal>> +<head id="Head" runat="server" ViewStateMode="Disabled"> + <asp:PlaceHolder runat="server" ID="metaPanel"></asp:PlaceHolder> + <title /> + <meta id="MetaRefresh" runat="Server" http-equiv="Refresh" name="Refresh" Visible="False" /> + <meta id="MetaDescription" runat="Server" name="description" Visible="False"/> + <meta id="MetaKeywords" runat="Server" name="keywords" Visible="False"/> + <meta id="MetaCopyright" runat="Server" name="copyright" Visible="False"/> + <meta id="MetaGenerator" runat="Server" name="generator" Visible="False"/> + <meta id="MetaAuthor" runat="Server" name="author" Visible="False"/> + <meta id="MetaRobots" runat="server" name="robots" Visible="False" /> + <asp:Literal runat="server" id="CssCustomProperties"></asp:Literal> + <asp:PlaceHolder runat="server" ID="ClientDependencyHeadCss"></asp:PlaceHolder> + <asp:PlaceHolder runat="server" ID="ClientDependencyHeadJs"></asp:PlaceHolder> + <asp:placeholder id="CSS" runat="server" /> + <asp:placeholder id="SCRIPTS" runat="server" /> +</head> +<body id="Body" runat="server"> + + <dnn:Form ID="Form" runat="server" ENCTYPE="multipart/form-data"> + <asp:PlaceHolder ID="BodySCRIPTS" runat="server" /> + <asp:Label ID="SkinError" runat="server" CssClass="NormalRed" Visible="False"></asp:Label> + <asp:PlaceHolder ID="SkinPlaceHolder" runat="server" /> + <input id="ScrollTop" runat="server" name="ScrollTop" type="hidden" /> + <input id="__dnnVariable" runat="server" name="__dnnVariable" type="hidden" autocomplete="off" /> + <asp:placeholder runat="server" ID="ClientResourcesFormBottom" /> + </dnn:Form> + <asp:placeholder runat="server" id="ClientResourceIncludes" /> + <dnncrm:ClientResourceLoader runat="server" id="ClientResourceLoader"> + <Paths> + <dnncrm:ClientResourcePath Name="SkinPath" Path="<%# CurrentSkinPath %>" /> + <dnncrm:ClientResourcePath Name="SharedScripts" Path="~/Resources/Shared/Scripts/" /> + </Paths> + </dnncrm:ClientResourceLoader> +</body> +</html> diff --git a/DNN Platform/Website/Default.aspx.cs b/DNN Platform/Website/Default.aspx.cs index aeca2b97ccc..27207bee24d 100644 --- a/DNN Platform/Website/Default.aspx.cs +++ b/DNN Platform/Website/Default.aspx.cs @@ -15,12 +15,13 @@ namespace DotNetNuke.Framework using System.Web.UI.WebControls; using DotNetNuke.Abstractions; + using DotNetNuke.Abstractions.Portals; using DotNetNuke.Application; using DotNetNuke.Common.Utilities; using DotNetNuke.Entities.Host; using DotNetNuke.Entities.Portals; + using DotNetNuke.Entities.Portals.Extensions; using DotNetNuke.Entities.Tabs; - using DotNetNuke.Entities.Users; using DotNetNuke.Framework.JavaScriptLibraries; using DotNetNuke.Instrumentation; using DotNetNuke.Security.Permissions; @@ -38,16 +39,22 @@ namespace DotNetNuke.Framework using DotNetNuke.Web.Client.ClientResourceManagement; using Microsoft.Extensions.DependencyInjection; + using DataCache = DotNetNuke.Common.Utilities.DataCache; using Globals = DotNetNuke.Common.Globals; + /// <summary> + /// The DNN default page. + /// </summary> public partial class DefaultPage : CDefault, IClientAPICallbackEventHandler { private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(DefaultPage)); - private static readonly Regex HeaderTextRegex = new Regex( "<meta([^>])+name=('|\")robots('|\")", RegexOptions.IgnoreCase | RegexOptions.Multiline | RegexOptions.Compiled); + /// <summary> + /// Initializes a new instance of the <see cref="DefaultPage"/> class. + /// </summary> public DefaultPage() { this.NavigationManager = Globals.GetCurrentServiceProvider().GetRequiredService<INavigationManager>(); @@ -85,8 +92,12 @@ public int PageScrollTop } } + /// <summary>Gets a service that provides navigation features.</summary> protected INavigationManager NavigationManager { get; } + /// <summary> + /// Gets a string representation of the list HTML attributes. + /// </summary> protected string HtmlAttributeList { get @@ -149,13 +160,17 @@ public string RaiseClientAPICallbackEvent(string eventArgument) return string.Empty; } + /// <summary> + /// Checks if the current version is not a production version. + /// </summary> + /// <returns>A value indicating whether the current version is not a production version.</returns> protected bool NonProductionVersion() { return DotNetNukeContext.Current.Application.Status != ReleaseMode.Stable; } /// <summary>Contains the functionality to populate the Root aspx page with controls.</summary> - /// <param name="e"></param> + /// <param name="e">The event arguments.</param> /// <remarks> /// - obtain PortalSettings from Current Context /// - set global page settings. @@ -291,7 +306,7 @@ protected override void OnInit(EventArgs e) } /// <summary>Initialize the Scrolltop html control which controls the open / closed nature of each module.</summary> - /// <param name="e"></param> + /// <param name="e">The event arguments.</param> protected override void OnLoad(EventArgs e) { base.OnLoad(e); @@ -317,12 +332,6 @@ protected override void OnPreRender(EventArgs evt) this.MetaGenerator.Content = this.Generator; this.MetaGenerator.Visible = !string.IsNullOrEmpty(this.Generator); this.MetaAuthor.Content = this.PortalSettings.PortalName; - /* - * Never show to be html5 compatible and stay backward compatible - * - * MetaCopyright.Content = Copyright; - * MetaCopyright.Visible = (!String.IsNullOrEmpty(Copyright)); - */ this.MetaKeywords.Content = this.KeyWords; this.MetaKeywords.Visible = !string.IsNullOrEmpty(this.KeyWords); this.MetaDescription.Content = this.Description; @@ -369,7 +378,7 @@ protected override void Render(HtmlTextWriter writer) } /// <summary> - /// + /// Initializes the page. /// </summary> /// <remarks> /// - Obtain PortalSettings from Current Context @@ -606,6 +615,8 @@ private void InitializePage() } } + this.CssCustomProperties.Text = this.GenerateCssCustomProperties(); + // NonProduction Label Injection if (this.NonProductionVersion() && Host.DisplayBetaNotice && !UrlUtils.InPopUp()) { @@ -645,6 +656,111 @@ private void InitializePage() } } + private string GenerateCssCustomProperties() + { + var cacheKey = string.Format(DataCache.PortalStylesCacheKey, this.PortalSettings.PortalId); + var cacheArgs = new CacheItemArgs( + cacheKey, + DataCache.PortalStylesCacheTimeOut, + DataCache.PortalStylesCachePriority, + this.PortalSettings.GetStyles()); + return DataCache.GetCachedData<string>( + cacheArgs, + static args => + { + var styles = (IPortalStyles)args.Params[0]; + return $$""" + <style type="text/css"> + :root { + --dnn-color-primary: #{{styles.ColorPrimary.MinifiedHex}}; + --dnn-color-primary-light: #{{styles.ColorPrimaryLight.MinifiedHex}}; + --dnn-color-primary-dark: #{{styles.ColorPrimaryDark.MinifiedHex}}; + --dnn-color-primary-contrast: #{{styles.ColorPrimaryContrast.MinifiedHex}}; + --dnn-color-primary-r: {{styles.ColorPrimary.Red}}; + --dnn-color-primary-g: {{styles.ColorPrimary.Green}}; + --dnn-color-primary-b: {{styles.ColorPrimary.Blue}}; + + --dnn-color-secondary: #{{styles.ColorSecondary.MinifiedHex}}; + --dnn-color-secondary-light: #{{styles.ColorSecondaryLight.MinifiedHex}}; + --dnn-color-secondary-dark: #{{styles.ColorSecondaryDark.MinifiedHex}}; + --dnn-color-secondary-contrast: #{{styles.ColorSecondaryContrast.MinifiedHex}}; + --dnn-color-secondary-r: {{styles.ColorSecondary.Red}}; + --dnn-color-secondary-g: {{styles.ColorSecondary.Green}}; + --dnn-color-secondary-b: {{styles.ColorSecondary.Blue}}; + + --dnn-color-tertiary: #{{styles.ColorTertiary.MinifiedHex}}; + --dnn-color-tertiary-light: #{{styles.ColorTertiaryLight.MinifiedHex}}; + --dnn-color-tertiary-dark: #{{styles.ColorTertiaryDark.MinifiedHex}}; + --dnn-color-tertiary-contrast: #{{styles.ColorTertiaryContrast.MinifiedHex}}; + --dnn-color-tertiary-r: {{styles.ColorTertiary.Red}}; + --dnn-color-tertiary-g: {{styles.ColorTertiary.Green}}; + --dnn-color-tertiary-b: {{styles.ColorTertiary.Blue}}; + + --dnn-color-neutral: #{{styles.ColorNeutral.MinifiedHex}}; + --dnn-color-neutral-light: #{{styles.ColorNeutralLight.MinifiedHex}}; + --dnn-color-neutral-dark: #{{styles.ColorNeutralDark.MinifiedHex}}; + --dnn-color-neutral-contrast: #{{styles.ColorNeutralContrast.MinifiedHex}}; + --dnn-color-neutral-r: {{styles.ColorNeutral.Red}}; + --dnn-color-neutral-g: {{styles.ColorNeutral.Green}}; + --dnn-color-neutral-b: {{styles.ColorNeutral.Blue}}; + + --dnn-color-background: #{{styles.ColorBackground.MinifiedHex}}; + --dnn-color-background-light: #{{styles.ColorBackgroundLight.MinifiedHex}}; + --dnn-color-background-dark: #{{styles.ColorBackgroundDark.MinifiedHex}}; + --dnn-color-background-contrast: #{{styles.ColorBackgroundContrast.MinifiedHex}}; + --dnn-color-background-r: {{styles.ColorBackground.Red}}; + --dnn-color-background-g: {{styles.ColorBackground.Green}}; + --dnn-color-background-b: {{styles.ColorBackground.Blue}}; + + --dnn-color-foreground: #{{styles.ColorForeground.MinifiedHex}}; + --dnn-color-foreground-light: #{{styles.ColorForegroundLight.MinifiedHex}}; + --dnn-color-foreground-dark: #{{styles.ColorForegroundDark.MinifiedHex}}; + --dnn-color-foreground-contrast: #{{styles.ColorForegroundContrast.MinifiedHex}}; + --dnn-color-foreground-r: {{styles.ColorForeground.Red}}; + --dnn-color-foreground-g: {{styles.ColorForeground.Green}}; + --dnn-color-foreground-b: {{styles.ColorForeground.Blue}}; + + --dnn-color-info: #{{styles.ColorInfo.MinifiedHex}}; + --dnn-color-info-light: #{{styles.ColorInfoLight.MinifiedHex}}; + --dnn-color-info-dark: #{{styles.ColorInfoDark.MinifiedHex}}; + --dnn-color-info-contrast: #{{styles.ColorInfoContrast.MinifiedHex}}; + --dnn-color-info-r: {{styles.ColorInfo.Red}}; + --dnn-color-info-g: {{styles.ColorInfo.Green}}; + --dnn-color-info-b: {{styles.ColorInfo.Blue}}; + + --dnn-color-success: #{{styles.ColorSuccess.MinifiedHex}}; + --dnn-color-success-light: #{{styles.ColorSuccessLight.MinifiedHex}}; + --dnn-color-success-dark: #{{styles.ColorSuccessDark.MinifiedHex}}; + --dnn-color-success-contrast: #{{styles.ColorSuccessContrast.MinifiedHex}}; + --dnn-color-success-r: {{styles.ColorSuccess.Red}}; + --dnn-color-success-g: {{styles.ColorSuccess.Green}}; + --dnn-color-success-b: {{styles.ColorSuccess.Blue}}; + + --dnn-color-warning: #{{styles.ColorWarning.MinifiedHex}}; + --dnn-color-warning-light: #{{styles.ColorWarningLight.MinifiedHex}}; + --dnn-color-warning-dark: #{{styles.ColorWarningDark.MinifiedHex}}; + --dnn-color-warning-contrast: #{{styles.ColorWarningContrast.MinifiedHex}}; + --dnn-color-warning-r: {{styles.ColorWarning.Red}}; + --dnn-color-warning-g: {{styles.ColorWarning.Green}}; + --dnn-color-warning-b: {{styles.ColorWarning.Blue}}; + + --dnn-color-danger: #{{styles.ColorDanger.MinifiedHex}}; + --dnn-color-danger-light: #{{styles.ColorDangerLight.MinifiedHex}}; + --dnn-color-danger-dark: #{{styles.ColorDangerDark.MinifiedHex}}; + --dnn-color-danger-contrast: #{{styles.ColorDangerContrast.MinifiedHex}}; + --dnn-color-danger-r: {{styles.ColorDanger.Red}}; + --dnn-color-danger-g: {{styles.ColorDanger.Green}}; + --dnn-color-danger-b: {{styles.ColorDanger.Blue}}; + + --dnn-controls-radius: {{styles.ControlsRadius}}px; + --dnn-controls-padding: {{styles.ControlsPadding}}px; + --dnn-base-font-size: {{styles.BaseFontSize}}px; + } + </style> + """; + }); + } + /// <summary> /// Look for skin level doctype configuration file, and inject the value into the top of default.aspx /// when no configuration if found, the doctype for versions prior to 4.4 is used to maintain backwards compatibility with existing skins. diff --git a/DNN Platform/Website/Default.aspx.designer.cs b/DNN Platform/Website/Default.aspx.designer.cs index f003230f459..b48ef15a5aa 100644 --- a/DNN Platform/Website/Default.aspx.designer.cs +++ b/DNN Platform/Website/Default.aspx.designer.cs @@ -1,169 +1,251 @@ -// -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See LICENSE file in the project root for full license information. -// -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </auto-generated> -//------------------------------------------------------------------------------ - -namespace DotNetNuke.Framework { - - - public partial class DefaultPage { - /// <summary>skinDocType control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.Literal skinDocType; - /// <summary>attributeList control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.Literal attributeList; - /// <summary>Head control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlHead Head; - /// <summary>metaPanel control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.PlaceHolder metaPanel; - /// <summary>MetaRefresh control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlMeta MetaRefresh; - /// <summary>MetaDescription control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected new global::System.Web.UI.HtmlControls.HtmlMeta MetaDescription; - /// <summary>MetaKeywords control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected new global::System.Web.UI.HtmlControls.HtmlMeta MetaKeywords; - /// <summary>MetaCopyright control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlMeta MetaCopyright; - /// <summary>MetaGenerator control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlMeta MetaGenerator; - /// <summary>MetaAuthor control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlMeta MetaAuthor; - /// <summary>MetaRobots control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlMeta MetaRobots; - /// <summary>ClientDependencyHeadCss control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.PlaceHolder ClientDependencyHeadCss; - /// <summary>ClientDependencyHeadJs control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.PlaceHolder ClientDependencyHeadJs; - /// <summary>CSS control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.PlaceHolder CSS; - /// <summary>SCRIPTS control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.PlaceHolder SCRIPTS; - /// <summary>Body control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlGenericControl Body; - /// <summary>Form control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected new global::DotNetNuke.Common.Controls.Form Form; - /// <summary>BodySCRIPTS control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.PlaceHolder BodySCRIPTS; - /// <summary>SkinError control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.Label SkinError; - /// <summary>SkinPlaceHolder control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.PlaceHolder SkinPlaceHolder; - /// <summary>ScrollTop control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlInputHidden ScrollTop; - /// <summary>__dnnVariable control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlInputHidden @__dnnVariable; - /// <summary>ClientResourcesFormBottom control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.PlaceHolder ClientResourcesFormBottom; - /// <summary>ClientResourceIncludes control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.WebControls.PlaceHolder ClientResourceIncludes; - /// <summary>ClientResourceLoader control.</summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::DotNetNuke.Web.Client.ClientResourceManagement.ClientResourceLoader ClientResourceLoader; - } -} +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace DotNetNuke.Framework +{ + + + public partial class DefaultPage + { + + /// <summary> + /// skinDocType control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.Literal skinDocType; + + /// <summary> + /// attributeList control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.Literal attributeList; + + /// <summary> + /// Head control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlHead Head; + + /// <summary> + /// metaPanel control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.PlaceHolder metaPanel; + + /// <summary> + /// MetaRefresh control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlMeta MetaRefresh; + + /// <summary> + /// MetaDescription control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected new global::System.Web.UI.HtmlControls.HtmlMeta MetaDescription; + + /// <summary> + /// MetaKeywords control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected new global::System.Web.UI.HtmlControls.HtmlMeta MetaKeywords; + + /// <summary> + /// MetaCopyright control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlMeta MetaCopyright; + + /// <summary> + /// MetaGenerator control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlMeta MetaGenerator; + + /// <summary> + /// MetaAuthor control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlMeta MetaAuthor; + + /// <summary> + /// MetaRobots control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlMeta MetaRobots; + + /// <summary> + /// CssCustomProperties control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.Literal CssCustomProperties; + + /// <summary> + /// ClientDependencyHeadCss control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.PlaceHolder ClientDependencyHeadCss; + + /// <summary> + /// ClientDependencyHeadJs control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.PlaceHolder ClientDependencyHeadJs; + + /// <summary> + /// CSS control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.PlaceHolder CSS; + + /// <summary> + /// SCRIPTS control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.PlaceHolder SCRIPTS; + + /// <summary> + /// Body control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlGenericControl Body; + + /// <summary> + /// Form control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected new global::DotNetNuke.Common.Controls.Form Form; + + /// <summary> + /// BodySCRIPTS control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.PlaceHolder BodySCRIPTS; + + /// <summary> + /// SkinError control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.Label SkinError; + + /// <summary> + /// SkinPlaceHolder control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.PlaceHolder SkinPlaceHolder; + + /// <summary> + /// ScrollTop control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlInputHidden ScrollTop; + + /// <summary> + /// __dnnVariable control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlInputHidden @__dnnVariable; + + /// <summary> + /// ClientResourcesFormBottom control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.PlaceHolder ClientResourcesFormBottom; + + /// <summary> + /// ClientResourceIncludes control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::System.Web.UI.WebControls.PlaceHolder ClientResourceIncludes; + + /// <summary> + /// ClientResourceLoader control. + /// </summary> + /// <remarks> + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// </remarks> + protected global::DotNetNuke.Web.Client.ClientResourceManagement.ClientResourceLoader ClientResourceLoader; + } +} diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/10.00.00.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/10.00.00.SqlDataProvider index 68f0e925598..96f479495d4 100644 --- a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/10.00.00.SqlDataProvider +++ b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/10.00.00.SqlDataProvider @@ -1,12 +1,12 @@ -/************************************************************/ -/***** SqlDataProvider *****/ -/***** *****/ -/***** *****/ -/***** Note: To manually execute this script you must *****/ -/***** perform a search and replace operation *****/ -/***** for {databaseOwner} and {objectQualifier} *****/ -/***** *****/ -/************************************************************/ +/************************************************************/ +/***** SqlDataProvider *****/ +/***** *****/ +/***** *****/ +/***** Note: To manually execute this script you must *****/ +/***** perform a search and replace operation *****/ +/***** for {databaseOwner} and {objectQualifier} *****/ +/***** *****/ +/************************************************************/ /***********************/ diff --git a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json index 3d140141a36..70cacde57c3 100644 --- a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json @@ -1,56 +1,56 @@ -{ - "name": "admin-logs", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/plugin-transform-object-assign": "^7.22.5", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "array.prototype.find": "2.2.1", - "array.prototype.findindex": "2.2.1", - "babel-loader": "8.3.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "es6-object-assign": "1.1.0", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "i18n-webpack-plugin": "1.0.0", - "jwt-decode": "2.2.0", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-click-outside": "^3.0.1", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "react-redux": "^8.1.1", - "redux": "^4.2.1", - "redux-devtools": "3.7.0", - "redux-devtools-dock-monitor": "1.2.0", - "redux-devtools-log-monitor": "2.1.0", - "redux-immutable-state-invariant": "2.1.0", - "redux-thunk": "2.4.2", - "style-loader": "^0.23.1", - "throttle-debounce": "^5.0.0", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "admin-logs", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/plugin-transform-object-assign": "^7.22.5", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "array.prototype.find": "2.2.1", + "array.prototype.findindex": "2.2.1", + "babel-loader": "8.3.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "es6-object-assign": "1.1.0", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "i18n-webpack-plugin": "1.0.0", + "jwt-decode": "2.2.0", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-click-outside": "^3.0.1", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "react-redux": "^8.1.1", + "redux": "^4.2.1", + "redux-devtools": "3.7.0", + "redux-devtools-dock-monitor": "1.2.0", + "redux-devtools-log-monitor": "2.1.0", + "redux-immutable-state-invariant": "2.1.0", + "redux-thunk": "2.4.2", + "style-loader": "^0.23.1", + "throttle-debounce": "^5.0.0", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json index 32f54c465d8..e4bb7e55d39 100644 --- a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json @@ -1,42 +1,42 @@ -{ - "name": "extensions", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "babel-loader": "8.3.0", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "extensions", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "babel-loader": "8.3.0", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json index 03f4d9ec2b9..77e59d63239 100644 --- a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json @@ -1,44 +1,44 @@ -{ - "name": "licensing", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "array.prototype.find": "2.2.1", - "array.prototype.findindex": "2.2.1", - "babel-loader": "8.3.0", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "css-loader": "2.1.1", - "es6-object-assign": "1.1.0", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "jwt-decode": "2.2.0", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react-hot-loader": "4.13.1", - "react-modal": "3.16.1", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "licensing", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "array.prototype.find": "2.2.1", + "array.prototype.findindex": "2.2.1", + "babel-loader": "8.3.0", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "css-loader": "2.1.1", + "es6-object-assign": "1.1.0", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "jwt-decode": "2.2.0", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react-hot-loader": "4.13.1", + "react-modal": "3.16.1", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json index 82d1e06019e..504991e4412 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json @@ -1,76 +1,76 @@ -{ - "name": "pages", - "version": "10.0.0", - "private": true, - "scripts": { - "start": "npm run webpack", - "test": "jest", - "test:watch": "jest --watch", - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "jest": { - "setupTestFrameworkScriptFile": "./src/jest.config.js" - }, - "peerDependencies": { - "es6-promise": "4.0.5" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "@types/knockout": "^3.4.72", - "@types/redux": "3.6.31", - "babel-eslint": "^10.1.0", - "babel-jest": "^24.9.0", - "babel-loader": "8.3.0", - "babel-plugin-transform-object-assign": "^6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "babel-preset-es2015": "6.24.1", - "babel-preset-react": "6.24.1", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "enzyme": "^3.11.0", - "enzyme-adapter-react-16": "^1.15.7", - "eslint": "^7.32.0", - "eslint-import-resolver-webpack": "^0.13.2", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "jest": "^28.1.3", - "less": "4.1.3", - "less-loader": "5.0.0", - "lodash": "4.17.21", - "raw-loader": "2.0.0", - "react-custom-scrollbars": "4.2.1", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "react-test-renderer": "^17.0.2", - "react-widgets": "4.6.1", - "string.prototype.startswith": "1.0.0", - "style-loader": "^0.23.1", - "throttle-debounce": "^5.0.0", - "uglifyjs-webpack-plugin": "^2.2.0", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - }, - "dependencies": { - "dayjs": "^1.11.9", - "promise": "^8.3.0", - "prop-types": "^15.8.1", - "react": "^16.14.0", - "react-day-picker": "^7.4.10", - "url-parse": "^1.5.10" - } -} +{ + "name": "pages", + "version": "10.0.0", + "private": true, + "scripts": { + "start": "npm run webpack", + "test": "jest", + "test:watch": "jest --watch", + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "jest": { + "setupTestFrameworkScriptFile": "./src/jest.config.js" + }, + "peerDependencies": { + "es6-promise": "4.0.5" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "@types/knockout": "^3.4.72", + "@types/redux": "3.6.31", + "babel-eslint": "^10.1.0", + "babel-jest": "^24.9.0", + "babel-loader": "8.3.0", + "babel-plugin-transform-object-assign": "^6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "babel-preset-es2015": "6.24.1", + "babel-preset-react": "6.24.1", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "enzyme": "^3.11.0", + "enzyme-adapter-react-16": "^1.15.7", + "eslint": "^7.32.0", + "eslint-import-resolver-webpack": "^0.13.2", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "jest": "^28.1.3", + "less": "4.1.3", + "less-loader": "5.0.0", + "lodash": "4.17.21", + "raw-loader": "2.0.0", + "react-custom-scrollbars": "4.2.1", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "react-test-renderer": "^17.0.2", + "react-widgets": "4.6.1", + "string.prototype.startswith": "1.0.0", + "style-loader": "^0.23.1", + "throttle-debounce": "^5.0.0", + "uglifyjs-webpack-plugin": "^2.2.0", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + }, + "dependencies": { + "dayjs": "^1.11.9", + "promise": "^8.3.0", + "prop-types": "^15.8.1", + "react": "^16.14.0", + "react-day-picker": "^7.4.10", + "url-parse": "^1.5.10" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json index 0bcac7bd7da..8b662827d23 100644 --- a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json @@ -1,76 +1,76 @@ -{ - "name": "prompt", - "version": "10.0.0", - "description": "DNN Prompt", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=analyze&&webpack-dev-server -d --port 8100 --hot --inline --content-base dist/ --history-api-fallback", - "test": "jest", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "array.prototype.find": "2.2.1", - "array.prototype.findindex": "2.2.1", - "babel-eslint": "^10.1.0", - "babel-jest": "^24.9.0", - "babel-loader": "^8.3.0", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "enzyme": "^3.11.0", - "enzyme-adapter-react-16": "^1.15.7", - "es6-object-assign": "1.1.0", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-babel": "^5.3.1", - "eslint-plugin-jest": "^22.21.0", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "extract-text-webpack-plugin": "^3.0.2", - "fbjs": "*", - "fetch-mock": "^7.7.3", - "file-loader": "3.0.1", - "i18n-webpack-plugin": "1.0.0", - "jest": "^28.1.3", - "jwt-decode": "2.2.0", - "less": "4.1.3", - "less-loader": "5.0.0", - "localization": "^1.0.2", - "object-assign": "*", - "optimize-css-assets-webpack-plugin": "^5.0.8", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-click-outside": "^3.0.1", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "react-redux": "8.1.1", - "react-test-renderer": "^17.0.2", - "redux": "4.2.1", - "redux-devtools": "^3.7.0", - "redux-devtools-dock-monitor": "1.2.0", - "redux-devtools-log-monitor": "2.1.0", - "redux-immutable-state-invariant": "2.1.0", - "redux-mock-store": "^1.5.4", - "redux-thunk": "2.4.2", - "style-loader": "^0.23.1", - "throttle-debounce": "^5.0.0", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - }, - "dependencies": { - "html-react-parser": "^0.7.1" - } -} +{ + "name": "prompt", + "version": "10.0.0", + "description": "DNN Prompt", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=analyze&&webpack-dev-server -d --port 8100 --hot --inline --content-base dist/ --history-api-fallback", + "test": "jest", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "array.prototype.find": "2.2.1", + "array.prototype.findindex": "2.2.1", + "babel-eslint": "^10.1.0", + "babel-jest": "^24.9.0", + "babel-loader": "^8.3.0", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "enzyme": "^3.11.0", + "enzyme-adapter-react-16": "^1.15.7", + "es6-object-assign": "1.1.0", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-babel": "^5.3.1", + "eslint-plugin-jest": "^22.21.0", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "extract-text-webpack-plugin": "^3.0.2", + "fbjs": "*", + "fetch-mock": "^7.7.3", + "file-loader": "3.0.1", + "i18n-webpack-plugin": "1.0.0", + "jest": "^28.1.3", + "jwt-decode": "2.2.0", + "less": "4.1.3", + "less-loader": "5.0.0", + "localization": "^1.0.2", + "object-assign": "*", + "optimize-css-assets-webpack-plugin": "^5.0.8", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-click-outside": "^3.0.1", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "react-redux": "8.1.1", + "react-test-renderer": "^17.0.2", + "redux": "4.2.1", + "redux-devtools": "^3.7.0", + "redux-devtools-dock-monitor": "1.2.0", + "redux-devtools-log-monitor": "2.1.0", + "redux-immutable-state-invariant": "2.1.0", + "redux-mock-store": "^1.5.4", + "redux-thunk": "2.4.2", + "style-loader": "^0.23.1", + "throttle-debounce": "^5.0.0", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + }, + "dependencies": { + "html-react-parser": "^0.7.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json index 7b4699d86a0..6079aa7eddc 100644 --- a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json @@ -1,52 +1,52 @@ -{ - "name": "roles", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "array.prototype.find": "^2.2.1", - "array.prototype.findindex": "^2.2.1", - "babel-loader": "^8.3.0", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "es6-object-assign": "^1.1.0", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "jwt-decode": "2.2.0", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-click-outside": "^3.0.1", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "style-loader": "0.23.1", - "throttle-debounce": "5.0.0", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - }, - "dependencies": { - "react-widgets": "^4.6.1" - } -} +{ + "name": "roles", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "array.prototype.find": "^2.2.1", + "array.prototype.findindex": "^2.2.1", + "babel-loader": "^8.3.0", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "es6-object-assign": "^1.1.0", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "jwt-decode": "2.2.0", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-click-outside": "^3.0.1", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "style-loader": "0.23.1", + "throttle-debounce": "5.0.0", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + }, + "dependencies": { + "react-widgets": "^4.6.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json index 31852d683a0..73f12e15d0a 100644 --- a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json @@ -1,49 +1,49 @@ -{ - "name": "seo", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "array.prototype.find": "2.2.1", - "array.prototype.findindex": "2.2.1", - "babel-loader": "8.3.0", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "es6-object-assign": "1.1.0", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "jwt-decode": "2.2.0", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "react-modal": "3.16.1", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "seo", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "array.prototype.find": "2.2.1", + "array.prototype.findindex": "2.2.1", + "babel-loader": "8.3.0", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "es6-object-assign": "1.1.0", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "jwt-decode": "2.2.0", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "react-modal": "3.16.1", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json index 58e4f5a5564..0cd63067322 100644 --- a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json @@ -1,50 +1,50 @@ -{ - "name": "servers", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "@types/redux": "^3.6.31", - "babel-loader": "8.3.0", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "dayjs": "^1.11.9", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "less": "4.1.3", - "less-loader": "5.0.0", - "null-loader": "^4.0.1", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - }, - "dependencies": { - "react-custom-scrollbars": "^4.2.1" - } -} +{ + "name": "servers", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "@types/redux": "^3.6.31", + "babel-loader": "8.3.0", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "dayjs": "^1.11.9", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "less": "4.1.3", + "less-loader": "5.0.0", + "null-loader": "^4.0.1", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + }, + "dependencies": { + "react-custom-scrollbars": "^4.2.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json index 5ebdd4cfa45..dedfbd05cd5 100644 --- a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json @@ -1,43 +1,43 @@ -{ - "name": "dnn-sitegroups", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "7.22.9", - "@babel/plugin-proposal-object-rest-spread": "7.20.7", - "@babel/plugin-transform-object-assign": "7.22.5", - "@babel/preset-env": "7.22.9", - "@babel/preset-react": "7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "babel-loader": "8.3.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "dnn-sitegroups", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "7.22.9", + "@babel/plugin-proposal-object-rest-spread": "7.20.7", + "@babel/plugin-transform-object-assign": "7.22.5", + "@babel/preset-env": "7.22.9", + "@babel/preset-react": "7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "babel-loader": "8.3.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json index 7175cc069ac..c33c3214085 100644 --- a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json @@ -1,64 +1,64 @@ -{ - "name": "site-import-export", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/plugin-transform-react-jsx": "^7.22.5", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "babel-eslint": "^10.1.0", - "babel-loader": "8.3.0", - "babel-plugin-transform-class-properties": "^6.24.1", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "i18n-webpack-plugin": "1.0.0", - "jwt-decode": "2.2.0", - "less": "4.1.3", - "less-loader": "5.0.0", - "localization": "^1.0.2", - "prop-types": "^15.8.1", - "raw-loader": "^2.0.0", - "rc-progress": "^2.6.1", - "react": "^16.14.0", - "react-click-outside": "^3.0.1", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "react-redux": "^8.1.1", - "redux": "^4.2.1", - "redux-devtools": "3.7.0", - "redux-devtools-dock-monitor": "1.2.0", - "redux-devtools-log-monitor": "2.1.0", - "redux-immutable-state-invariant": "2.1.0", - "redux-thunk": "2.4.2", - "style-loader": "^0.23.1", - "svg-url-loader": "^7.1.1", - "throttle-debounce": "^5.0.0", - "url-loader": "1.1.2", - "utils": "^0.3.1", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - }, - "dependencies": { - "shortid": "^2.2.16" - } -} +{ + "name": "site-import-export", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/plugin-transform-react-jsx": "^7.22.5", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "babel-eslint": "^10.1.0", + "babel-loader": "8.3.0", + "babel-plugin-transform-class-properties": "^6.24.1", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "^0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "i18n-webpack-plugin": "1.0.0", + "jwt-decode": "2.2.0", + "less": "4.1.3", + "less-loader": "5.0.0", + "localization": "^1.0.2", + "prop-types": "^15.8.1", + "raw-loader": "^2.0.0", + "rc-progress": "^2.6.1", + "react": "^16.14.0", + "react-click-outside": "^3.0.1", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "react-redux": "^8.1.1", + "redux": "^4.2.1", + "redux-devtools": "3.7.0", + "redux-devtools-dock-monitor": "1.2.0", + "redux-devtools-log-monitor": "2.1.0", + "redux-immutable-state-invariant": "2.1.0", + "redux-thunk": "2.4.2", + "style-loader": "^0.23.1", + "svg-url-loader": "^7.1.1", + "throttle-debounce": "^5.0.0", + "url-loader": "1.1.2", + "utils": "^0.3.1", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + }, + "dependencies": { + "shortid": "^2.2.16" + } +} diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json index 9cd8c7d3e74..ead34126dd9 100644 --- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json @@ -1,56 +1,56 @@ -{ - "name": "site-settings", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "test": "jest", - "test:watch": "jest --watch", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/plugin-transform-react-jsx": "^7.22.5", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "array.prototype.find": "2.2.1", - "array.prototype.findindex": "2.2.1", - "babel-loader": "^8.3.0", - "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-jest": "^22.21.0", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "jest": "^28.1.3", - "jwt-decode": "2.2.0", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-custom-scrollbars": "4.2.1", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "react-modal": "3.16.1", - "react-redux": "^8.1.1", - "redux": "^4.2.1", - "redux-immutable-state-invariant": "^2.1.0", - "redux-thunk": "^2.4.2", - "source-map-loader": "^0.2.4", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "site-settings", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "test": "jest", + "test:watch": "jest --watch", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/plugin-transform-react-jsx": "^7.22.5", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "array.prototype.find": "2.2.1", + "array.prototype.findindex": "2.2.1", + "babel-loader": "^8.3.0", + "babel-plugin-transform-react-remove-prop-types": "^0.4.24", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-jest": "^22.21.0", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "jest": "^28.1.3", + "jwt-decode": "2.2.0", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-custom-scrollbars": "4.2.1", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "react-modal": "3.16.1", + "react-redux": "^8.1.1", + "redux": "^4.2.1", + "redux-immutable-state-invariant": "^2.1.0", + "redux-thunk": "^2.4.2", + "source-map-loader": "^0.2.4", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json index b434d58339d..51769081b22 100644 --- a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json @@ -1,43 +1,43 @@ -{ - "name": "sites", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "7.22.9", - "@babel/plugin-proposal-object-rest-spread": "7.20.7", - "@babel/plugin-transform-object-assign": "7.22.5", - "@babel/preset-env": "7.22.9", - "@babel/preset-react": "7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "babel-loader": "8.3.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "sites", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "7.22.9", + "@babel/plugin-proposal-object-rest-spread": "7.20.7", + "@babel/plugin-transform-object-assign": "7.22.5", + "@babel/preset-env": "7.22.9", + "@babel/preset-react": "7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "babel-loader": "8.3.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json index dec1b1d0f9d..da2872e8ee9 100644 --- a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json +++ b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json @@ -1,43 +1,43 @@ -{ - "name": "dnn-sites-list-view", - "version": "10.0.0", - "description": "DNN Sites List View", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "build": "set NODE_ENV=production&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch" - }, - "license": "UNLICENSED", - "devDependencies": { - "@babel/core": "7.22.9", - "@babel/plugin-proposal-object-rest-spread": "7.20.7", - "@babel/plugin-transform-object-assign": "7.22.5", - "@babel/preset-env": "7.22.9", - "@babel/preset-react": "7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "babel-loader": "8.3.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "1.0.1", - "dayjs": "^1.11.9", - "eslint": "7.32.0", - "eslint-import-resolver-webpack": "^0.13.2", - "eslint-loader": "4.0.2", - "eslint-plugin-filenames": "^1.3.2", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-react": "7.33.0", - "eslint-plugin-spellcheck": "0.0.11", - "less": "4.1.3", - "less-loader": "4.1.0", - "null-loader": "^4.0.1", - "prop-types": "^15.8.1", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "style-loader": "^0.23.1", - "webpack": "5.88.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "dnn-sites-list-view", + "version": "10.0.0", + "description": "DNN Sites List View", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "build": "set NODE_ENV=production&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch" + }, + "license": "UNLICENSED", + "devDependencies": { + "@babel/core": "7.22.9", + "@babel/plugin-proposal-object-rest-spread": "7.20.7", + "@babel/plugin-transform-object-assign": "7.22.5", + "@babel/preset-env": "7.22.9", + "@babel/preset-react": "7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "babel-loader": "8.3.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "1.0.1", + "dayjs": "^1.11.9", + "eslint": "7.32.0", + "eslint-import-resolver-webpack": "^0.13.2", + "eslint-loader": "4.0.2", + "eslint-plugin-filenames": "^1.3.2", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-react": "7.33.0", + "eslint-plugin-spellcheck": "0.0.11", + "less": "4.1.3", + "less-loader": "4.1.0", + "null-loader": "^4.0.1", + "prop-types": "^15.8.1", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "style-loader": "^0.23.1", + "webpack": "5.88.2", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json index d5960a8ca69..bfff84f4238 100644 --- a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json @@ -1,49 +1,49 @@ -{ - "name": "task-scheduler", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "array.prototype.find": "2.2.1", - "array.prototype.findindex": "2.2.1", - "babel-loader": "8.3.0", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "es6-object-assign": "1.1.0", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "jwt-decode": "2.2.0", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "react-modal": "3.16.1", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "task-scheduler", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "array.prototype.find": "2.2.1", + "array.prototype.findindex": "2.2.1", + "babel-loader": "8.3.0", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "es6-object-assign": "1.1.0", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "jwt-decode": "2.2.0", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "react-modal": "3.16.1", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json index ac4aa25be6f..5ef39cafc14 100644 --- a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json @@ -1,44 +1,44 @@ -{ - "name": "themes", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "babel-loader": "8.3.0", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "less": "4.1.3", - "less-loader": "5.0.0", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "themes", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "babel-loader": "8.3.0", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "less": "4.1.3", + "less-loader": "5.0.0", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json index 66a8c9108ea..638b608feb1 100644 --- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json +++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json @@ -1,49 +1,49 @@ -{ - "name": "dnn-users-exportables", - "version": "10.0.0", - "description": "DNN Users Exportables", - "scripts": { - "start": "npm run webpack", - "test": "echo \"Error: no test specified\" && exit 1", - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch" - }, - "license": "UNLICENSED", - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/plugin-transform-react-jsx": "^7.22.5", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "babel-loader": "8.3.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "dayjs": "^1.11.9", - "eslint": "7.32.0", - "eslint-import-resolver-webpack": "^0.13.2", - "eslint-loader": "4.0.2", - "eslint-plugin-filenames": "^1.3.2", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-react": "7.33.0", - "eslint-plugin-spellcheck": "0.0.11", - "less": "4.1.3", - "less-loader": "5.0.0", - "localization": "^1.0.2", - "null-loader": "^4.0.1", - "prop-types": "15.8.1", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "^4.13.1", - "react-redux": "^8.1.1", - "react-widgets": "^4.6.1", - "redux": "4.2.1", - "style-loader": "^0.23.1", - "throttle-debounce": "^5.0.0", - "utils": "^0.3.1", - "webpack": "5.88.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "dnn-users-exportables", + "version": "10.0.0", + "description": "DNN Users Exportables", + "scripts": { + "start": "npm run webpack", + "test": "echo \"Error: no test specified\" && exit 1", + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch" + }, + "license": "UNLICENSED", + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/plugin-transform-react-jsx": "^7.22.5", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "babel-loader": "8.3.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "dayjs": "^1.11.9", + "eslint": "7.32.0", + "eslint-import-resolver-webpack": "^0.13.2", + "eslint-loader": "4.0.2", + "eslint-plugin-filenames": "^1.3.2", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-react": "7.33.0", + "eslint-plugin-spellcheck": "0.0.11", + "less": "4.1.3", + "less-loader": "5.0.0", + "localization": "^1.0.2", + "null-loader": "^4.0.1", + "prop-types": "15.8.1", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "^4.13.1", + "react-redux": "^8.1.1", + "react-widgets": "^4.6.1", + "redux": "4.2.1", + "style-loader": "^0.23.1", + "throttle-debounce": "^5.0.0", + "utils": "^0.3.1", + "webpack": "5.88.2", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json index fadb6089720..3931da15425 100644 --- a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json @@ -1,49 +1,49 @@ -{ - "name": "taxonomy", - "version": "10.0.0", - "private": true, - "scripts": { - "build": "set NODE_ENV=production&&webpack --mode production", - "debug": "set NODE_ENV=debug&&webpack --mode production", - "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", - "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", - "lint": "eslint --fix" - }, - "devDependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-proposal-object-rest-spread": "^7.20.7", - "@babel/preset-env": "^7.22.9", - "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "10.0.0", - "array.prototype.find": "2.2.1", - "array.prototype.findindex": "2.2.1", - "babel-loader": "^8.3.0", - "babel-plugin-transform-object-assign": "6.22.0", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "babel-polyfill": "6.26.0", - "create-react-class": "^15.7.0", - "css-loader": "2.1.1", - "es6-object-assign": "1.1.0", - "eslint": "7.32.0", - "eslint-loader": "4.0.2", - "eslint-plugin-react": "7.13.0", - "eslint-plugin-spellcheck": "0.0.11", - "file-loader": "3.0.1", - "jwt-decode": "2.2.0", - "less": "4.1.3", - "less-loader": "5.0.0", - "object-path": "0.11.8", - "prop-types": "^15.8.1", - "raw-loader": "2.0.0", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hot-loader": "4.13.1", - "style-loader": "^0.23.1", - "url-loader": "1.1.2", - "webpack": "5.88.2", - "webpack-bundle-size-analyzer": "3.1.0", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1" - } -} +{ + "name": "taxonomy", + "version": "10.0.0", + "private": true, + "scripts": { + "build": "set NODE_ENV=production&&webpack --mode production", + "debug": "set NODE_ENV=debug&&webpack --mode production", + "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch", + "analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer", + "lint": "eslint --fix" + }, + "devDependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/preset-env": "^7.22.9", + "@babel/preset-react": "^7.22.5", + "@dnnsoftware/dnn-react-common": "10.0.0", + "array.prototype.find": "2.2.1", + "array.prototype.findindex": "2.2.1", + "babel-loader": "^8.3.0", + "babel-plugin-transform-object-assign": "6.22.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "babel-polyfill": "6.26.0", + "create-react-class": "^15.7.0", + "css-loader": "2.1.1", + "es6-object-assign": "1.1.0", + "eslint": "7.32.0", + "eslint-loader": "4.0.2", + "eslint-plugin-react": "7.13.0", + "eslint-plugin-spellcheck": "0.0.11", + "file-loader": "3.0.1", + "jwt-decode": "2.2.0", + "less": "4.1.3", + "less-loader": "5.0.0", + "object-path": "0.11.8", + "prop-types": "^15.8.1", + "raw-loader": "2.0.0", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-hot-loader": "4.13.1", + "style-loader": "^0.23.1", + "url-loader": "1.1.2", + "webpack": "5.88.2", + "webpack-bundle-size-analyzer": "3.1.0", + "webpack-cli": "5.1.4", + "webpack-dev-server": "4.15.1" + } +} diff --git a/SolutionInfo.cs b/SolutionInfo.cs index b6b9958ef34..b3832f55496 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -13,6 +13,6 @@ [assembly: AssemblyProduct("https://dnncommunity.org")] [assembly: AssemblyCopyright("DNN Platform is copyright 2002-2020 by .NET Foundation. All Rights Reserved.")] [assembly: AssemblyTrademark("DNN")] -[assembly: AssemblyVersion("10.0.0.0")] +[assembly: AssemblyVersion("10.0.0")] [assembly: AssemblyFileVersion("10.0.0.0")] -[assembly: AssemblyInformationalVersion("10.0.0.0 Custom build")] +[assembly: AssemblyInformationalVersion("10.0.0 Custom build")] diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ed5e80386f0..40a217b8185 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -54,9 +54,9 @@ steps: path: $(YARN_CACHE_FOLDER) - task: UseDotNet@2 - displayName: 'Use .NET 6.x SDK' + displayName: 'Use .NET 8.x SDK' inputs: - version: 6.x + version: 8.x - task: PowerShell@2 displayName: 'Run DNN Update Versions' diff --git a/gitversion.yml b/gitversion.yml index ca63c3e02da..031a3d5ad0c 100644 --- a/gitversion.yml +++ b/gitversion.yml @@ -3,7 +3,7 @@ commit-date-format: 'yyyyMMdd' assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{CommitsSinceVersionSource}' mode: ContinuousDeployment ignore: - commits-before: 2020-01-01T00:00:00 + commits-before: 2023-01-01T00:00:00 branches: future: regex: future?[/-] @@ -21,6 +21,7 @@ branches: increment: Patch is-mainline: true source-branches: [] + tracks-release-branches: false release: regex: release?[/-] mode: ContinuousDelivery diff --git a/global.json b/global.json index ab11801d6e9..219be5d60f4 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.404", + "version": "8.0.100", "allowPrerelease": false, "rollForward": "latestMinor" } diff --git a/package.json b/package.json index 5f01bbe7b13..39f15b9a1b9 100644 --- a/package.json +++ b/package.json @@ -42,5 +42,5 @@ "resolutions": { "@types/ws": "8.5.4" }, - "packageManager": "yarn@3.4.1" + "packageManager": "yarn@4.0.2" }