diff --git a/docs/en/Distributed-Event-Bus.md b/docs/en/Distributed-Event-Bus.md index 2fff974f50..fa825911f7 100644 --- a/docs/en/Distributed-Event-Bus.md +++ b/docs/en/Distributed-Event-Bus.md @@ -438,19 +438,23 @@ Enabling the event outbox and inbox systems require a few manual steps for your ### Enabling event outbox -Open your `DbContext` class (EF Core or MongoDB), implement the `IHasEventOutbox` interface. You should end up by adding a `DbSet` property into your `DbContext` class: +Enabling event outbox depends on your database provider. + +#### Enabling event outbox for Entity Framework Core + +Open your `DbContext` class, implement the `IHasEventOutbox` interface. You should end up by adding a `DbSet` property into your `DbContext` class: ```csharp public DbSet OutgoingEvents { get; set; } ``` -Add the following lines inside the `OnModelCreating` method of your `DbContext` class (only for EF Core): +Add the following lines inside the `OnModelCreating` method of your `DbContext` class: ```csharp builder.ConfigureEventOutbox(); ``` -For EF Core, use the standard `Add-Migration` and `Update-Database` commands to apply changes into your database (you can skip this step for MongoDB). If you want to use the command-line terminal, run the following commands in the root directory of the database integration project: +Use the standard `Add-Migration` and `Update-Database` commands to apply changes into your database. If you want to use the command-line terminal, run the following commands in the root directory of the database integration project: ```bash dotnet ef migrations add "Added_Event_Outbox" @@ -469,23 +473,55 @@ Configure(options => }); ```` -> **IMPORTANT**: Outbox sending service uses distributed locks to ensure only a single instance of your application consumes the outbox queue concurrently. Distributed locking key should be unique per database. The `config` object (in the preceding code example) has a `DatabaseName` property, which is used in the distributed lock key to ensure the uniqueness. `DatabaseName` is automatically set by the `UseDbContext` method, getting the database name from the `ConnectionStringName` attribute of the `YourDbContext` class. So, if you have multiple databases in your system, ensure that you use the same connection string name for the same database, but different connection string names for different databases. If you can't ensure that, you can manually set `config.DatabaseName` (after the `UseDbContext` line) to ensure that uniqueness. +#### Enabling event outbox for MongoDB + +Open your `DbContext` class, implement the `IHasEventOutbox` interface. You should end up by adding a `IMongoCollection` property into your `DbContext` class: + +```csharp +public IMongoCollection OutgoingEvents => Collection(); +``` + +Add the following lines inside the `CreateModel` method of your `DbContext` class: + +```csharp +modelBuilder.ConfigureEventOutbox(); +``` + +Finally, write the following configuration code inside the `ConfigureServices` method of your [module class](Module-Development-Basics.md) (replace `YourDbContext` with your own `DbContext` class): + +````csharp +Configure(options => +{ + options.Outboxes.Configure(config => + { + config.UseMongoDbContext(); + }); +}); +```` + +#### Distributed Locking for Outbox + +> **IMPORTANT**: Outbox sending service uses distributed locks to ensure only a single instance of your application consumes the outbox queue concurrently. Distributed locking key should be unique per database. The `config` object (in the `options.Outboxes.Configure(...)` method) has a `DatabaseName` property, which is used in the distributed lock key to ensure the uniqueness. `DatabaseName` is automatically set by the `UseDbContext` method, getting the database name from the `ConnectionStringName` attribute of the `YourDbContext` class. So, if you have multiple databases in your system, ensure that you use the same connection string name for the same database, but different connection string names for different databases. If you can't ensure that, you can manually set `config.DatabaseName` (after the `UseDbContext` line) to ensure that uniqueness. ### Enabling event inbox -Open your `DbContext` class (EF Core or MongoDB), implement the `IHasEventInbox` interface. You should end up by adding a `DbSet` property into your `DbContext` class: +Enabling event inbox depends on your database provider. + +#### Enabling event inbox for Entity Framework Core + +Open your `DbContext` class, implement the `IHasEventInbox` interface. You should end up by adding a `DbSet` property into your `DbContext` class: ```csharp public DbSet IncomingEvents { get; set; } ``` -Add the following lines inside the `OnModelCreating` method of your `DbContext` class (only for EF Core): +Add the following lines inside the `OnModelCreating` method of your `DbContext` class: ```csharp builder.ConfigureEventInbox(); ``` -For EF Core, use the standard `Add-Migration` and `Update-Database` commands to apply changes into your database (you can skip this step for MongoDB). If you want to use the command-line terminal, run the following commands in the root directory of the database integration project: +Use the standard `Add-Migration` and `Update-Database` commands to apply changes into your database. If you want to use the command-line terminal, run the following commands in the root directory of the database integration project: ```bash dotnet ef migrations add "Added_Event_Inbox" @@ -504,7 +540,35 @@ Configure(options => }); ```` -**IMPORTANT**: Inbox processing service uses distributed locks to ensure only a single instance of your application consumes the inbox queue concurrently. Distributed locking key should be unique per database. The `config` object (in the preceding code example) has a `DatabaseName` property, which is used in the distributed lock key to ensure the uniqueness. `DatabaseName` is automatically set by the `UseDbContext` method, getting the database name from the `ConnectionStringName` attribute of the `YourDbContext` class. So, if you have multiple databases in your system, ensure that you use the same connection string name for the same database, but different connection string names for different databases. If you can't ensure that, you can manually set `config.DatabaseName` (after the `UseDbContext` line) to ensure that uniqueness. +#### Enabling event inbox for MongoDB + +Open your `DbContext` class, implement the `IHasEventInbox` interface. You should end up by adding a `IMongoCollection` property into your `DbContext` class: + +```csharp +public IMongoCollection IncomingEvents => Collection(); +``` + +Add the following lines inside the `CreateModel` method of your `DbContext` class: + +```csharp +modelBuilder.ConfigureEventInbox(); +``` + +Finally, write the following configuration code inside the `ConfigureServices` method of your [module class](Module-Development-Basics.md) (replace `YourDbContext` with your own `DbContext` class): + +````csharp +Configure(options => +{ + options.Inboxes.Configure(config => + { + config.UseMongoDbContext(); + }); +}); +```` + +#### Distributed Locking for Inbox + +> **IMPORTANT**: Inbox processing service uses distributed locks to ensure only a single instance of your application consumes the inbox queue concurrently. Distributed locking key should be unique per database. The `config` object (in the `options.Inboxes.Configure(...)` method) has a `DatabaseName` property, which is used in the distributed lock key to ensure the uniqueness. `DatabaseName` is automatically set by the `UseDbContext` method, getting the database name from the `ConnectionStringName` attribute of the `YourDbContext` class. So, if you have multiple databases in your system, ensure that you use the same connection string name for the same database, but different connection string names for different databases. If you can't ensure that, you can manually set `config.DatabaseName` (after the `UseDbContext` line) to ensure that uniqueness. ### Additional Configuration @@ -529,7 +593,7 @@ Here, the following properties are available on the `config` object: * `IsSendingEnabled` (default: `true`): You can set to `false` to disable sending outbox events to the actual event bus. If you disable this, events can still be added to outbox, but not sent. This can be helpful if you have multiple applications (or application instances) writing to outbox, but use one of them to send the events. * `Selector`: A predicate to filter the event (ETO) types to be used for this configuration. Should return `true` to select the event. It selects all the events by default. This is especially useful if you want to ignore some ETO types from the outbox, or want to define named outbox configurations and group events within these configurations. See the *Named Configurations* section. * `ImplementationType`: Type of the class that implements the database operations for the outbox. This is normally set when you call `UseDbContext` as shown before. See *Implementing a Custom Outbox/Inbox Database Provider* section for advanced usages. -* `DatabaseName`: Unique database name for the database that is used for this outbox configuration. See the **IMPORTANT** paragraph at the end of the *Enabling event outbox* section. +* `DatabaseName`: Unique database name for the database that is used for this outbox configuration. See the **IMPORTANT** paragraph at the end of the *Enabling event outbox/inbox* sections. #### Inbox configuration diff --git a/docs/en/Modules/Cms-Kit/Index.md b/docs/en/Modules/Cms-Kit/Index.md index ddf43205a5..473872c44a 100644 --- a/docs/en/Modules/Cms-Kit/Index.md +++ b/docs/en/Modules/Cms-Kit/Index.md @@ -83,9 +83,9 @@ See the [connection strings](https://docs.abp.io/en/abp/latest/Connection-String ## Entity Extensions -[Module entity extension](https://docs.abp.io/en/abp/latest/Module-Entity-Extensions) system is a **high-level** extension system that allows you to **define new properties** for existing entities of the dependent modules. It automatically **adds properties to the entity**, **database**, **HTTP API and user interface** in a single point. +[Module entity extension](https://docs.abp.io/en/abp/latest/Module-Entity-Extensions) system is a **high-level** extension system that allows you to **define new properties** for existing entities of the dependent modules. It automatically **adds properties to the entity**, **database**, **HTTP API, and user interface** in a single point. -To extend entities of the CMS Kit Pro module, open your `YourProjectNameModuleExtensionConfigurator` class inside of your `DomainShared` project and change the `ConfigureExtraProperties` method like shown below. +To extend entities of the CMS Kit module, open your `YourProjectNameModuleExtensionConfigurator` class inside of your `DomainShared` project and change the `ConfigureExtraProperties` method like shown below. ```csharp public static void ConfigureExtraProperties() @@ -132,14 +132,13 @@ public static void ConfigureExtraProperties() * `ConfigureCmsKit(...)` method is used to configure the entities of the CMS Kit module. -* `cmsKit.ConfigureBlog(...)` is used to configure the **Blog** entity of the CMS Kit module. You can add or update your extra properties of the -**Blog** entity. +* `cmsKit.ConfigureBlog(...)` is used to configure the **Blog** entity of the CMS Kit module. You can add or update your extra properties on the **Blog** entity. * `cmsKit.ConfigureBlogPost(...)` is used to configure the **BlogPost** entity of the CMS Kit module. You can add or update your extra properties of the **BlogPost** entity. * You can also set some validation rules for the property that you defined. In the above sample, `RequiredAttribute` and `StringLengthAttribute` were added for the property named **"BlogPostDescription"**. -* When you define the new property, it will automatically add to **Entity**, **HTTP API** and **UI** for you. +* When you define the new property, it will automatically add to **Entity**, **HTTP API**, and **UI** for you. * Once you define a property, it appears in the create and update forms of the related entity. * New properties also appear in the datatable of the related page. diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DistributedEvents/EventInboxMongoModelBuilderExtensions.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DistributedEvents/EventInboxMongoModelBuilderExtensions.cs new file mode 100644 index 0000000000..1623bd9ccf --- /dev/null +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DistributedEvents/EventInboxMongoModelBuilderExtensions.cs @@ -0,0 +1,16 @@ +using Volo.Abp.Data; + +namespace Volo.Abp.MongoDB.DistributedEvents; + +public static class EventInboxMongoModelBuilderExtensions +{ + public static void ConfigureEventInbox(this IMongoModelBuilder builder) + { + Check.NotNull(builder, nameof(builder)); + + builder.Entity(b => + { + b.CollectionName = AbpCommonDbProperties.DbTablePrefix + "EventInbox"; + }); + } +} diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DistributedEvents/EventOutboxMongoModelBuilderExtensions.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DistributedEvents/EventOutboxMongoModelBuilderExtensions.cs new file mode 100644 index 0000000000..15001d6737 --- /dev/null +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DistributedEvents/EventOutboxMongoModelBuilderExtensions.cs @@ -0,0 +1,17 @@ +using JetBrains.Annotations; +using Volo.Abp.Data; + +namespace Volo.Abp.MongoDB.DistributedEvents; + +public static class EventOutboxMongoModelBuilderExtensions +{ + public static void ConfigureEventOutbox([NotNull] this IMongoModelBuilder builder) + { + Check.NotNull(builder, nameof(builder)); + + builder.Entity(b => + { + b.CollectionName = AbpCommonDbProperties.DbTablePrefix + "EventOutbox"; + }); + } +} diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index c92f85bb4f..6d2e55df22 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,7 +3,7 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.3", + "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.4", "@abp/prismjs": "^~7.3.2", "@abp/highlight.js": "^~7.3.2" }, diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index 0f5d1fdf6e..c407d48d1d 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3", - "@abp/prismjs": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", + "@abp/prismjs": "~7.4.0-rc.4" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index 8ea8ddaf06..ad399ee576 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.3.tgz#fd39fa05c7b13ddfb7353036321142b6d8e0760b" - integrity sha512-HmJJfZsWEzgDO+pzxHSGo7XWYjljmpAcN+jBvom4gn2KwzmhiuWhZSPKx85cdtIldp3yOKjldExPdvSFwR+iSw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.3.tgz#750355b35eaf213b5127e462789d0e849a77d9c7" - integrity sha512-LgRADz+OSRXtgcWzOzBanJ3lk9WxYrHill75Bv4SOUXkDLiAGIH49jqhcga1TNSzwHy7l6KZS6hOakAujoRPzg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.3" - "@abp/bootstrap" "~7.4.0-rc.3" - "@abp/bootstrap-datepicker" "~7.4.0-rc.3" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.3" - "@abp/datatables.net-bs5" "~7.4.0-rc.3" - "@abp/font-awesome" "~7.4.0-rc.3" - "@abp/jquery-form" "~7.4.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.3" - "@abp/lodash" "~7.4.0-rc.3" - "@abp/luxon" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/moment" "~7.4.0-rc.3" - "@abp/select2" "~7.4.0-rc.3" - "@abp/sweetalert2" "~7.4.0-rc.3" - "@abp/timeago" "~7.4.0-rc.3" - "@abp/toastr" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.3.tgz#678c0e7323a542fc558526a0fd024195ab9ea682" - integrity sha512-QuoQA4LJMGWs5OFGczGQMFEMBkNzEdNDqIuF8s0O9gwZ15qaqHD8PmhmHXFlPJaezRtfwzODxKKDB9wwouPGwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" + integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" + integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" + "@abp/bootstrap" "~7.4.0-rc.4" + "@abp/bootstrap-datepicker" "~7.4.0-rc.4" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" + "@abp/datatables.net-bs5" "~7.4.0-rc.4" + "@abp/font-awesome" "~7.4.0-rc.4" + "@abp/jquery-form" "~7.4.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" + "@abp/lodash" "~7.4.0-rc.4" + "@abp/luxon" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/moment" "~7.4.0-rc.4" + "@abp/select2" "~7.4.0-rc.4" + "@abp/sweetalert2" "~7.4.0-rc.4" + "@abp/timeago" "~7.4.0-rc.4" + "@abp/toastr" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" + integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,175 +43,175 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.3.tgz#76941922c44a655b19aa1afcb88524fc3a6c85c1" - integrity sha512-/2wMvPGoXT4BoBEUuL6B/vH9aDHxde6THWkPjuHFftA/RysC5fikcK4ekqHvANcuLptyz4CwwhBnSUIMpTSVhQ== +"@abp/bootstrap-datepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" + integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.3.tgz#a5cdc0d3bc9a890f0790e5271c6b8c75a9073fdd" - integrity sha512-kEpU0WWKFrpjVH/XNl8pLOSW61oa/eIdM4pqpDc1b7yzFD58FZa4FOo87MspDEAhkESjzREkqytyfJTQHdDr9w== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" + integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.3.tgz#d70ed14f6de898e2444293a698788e1ae4eba420" - integrity sha512-2tByO67RJCj+xEyLh8/KBUWpx0XLliG2tgfDsc358GUDJYD99voakvvvDTDBpxT4z3H1UMRvYYg2O3axJTw8Aw== +"@abp/bootstrap@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" + integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.3.tgz#fbe3320da399eaa9efc433efe929fc9f3fc43be2" - integrity sha512-q7wKSGKD4rj2zQvSZpb0bILA2eivsA89AxeDVyHEfTBMOh6dxbg1eLY2acJwGyrXza+KbTa8n/tWM/L9w9dDWg== +"@abp/clipboard@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" + integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" clipboard "^2.0.8" -"@abp/core@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.3.tgz#c78d1a2d7279bc6ee0c1c807788028517eb11c5e" - integrity sha512-sOOFqy2qqcrKbTRa1lFJUW6WKg6ozV+jE5P4fnJGUBlV+LsdYu+QGPefAc9PFlVNGwtcKpBV0863F85m4zV1+Q== +"@abp/core@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" + integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== dependencies: - "@abp/utils" "~7.4.0-rc.3" + "@abp/utils" "~7.4.0-rc.4" -"@abp/datatables.net-bs5@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.3.tgz#1c1585a3bca08fa1afee154d485ddf50b5593855" - integrity sha512-97+P3Olfztzf+e/hn/o66KUa++l9tchSabJfpaC0hPYPILcYDzOVlHdxFcT6ScLhxwmZAZ07gqP9Q2fjd++MlA== +"@abp/datatables.net-bs5@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" + integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== dependencies: - "@abp/datatables.net" "~7.4.0-rc.3" + "@abp/datatables.net" "~7.4.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.3.tgz#d32d2f18dbd63ac9fcb459e965137504c1dd6c21" - integrity sha512-bC29AdMi/9IQP6wy2BuNebt3cbeku4c0NdsSyw7S4YFZBozMpQHt5r5c75wH5YFn08h+fQxpbIWtMczYPsy40A== +"@abp/datatables.net@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" + integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.3.tgz#a8522559e3424dfd4bb228bf37e9f8faf744e91e" - integrity sha512-UYLR80Fw4K6DCHXYvYVr4u58AC5qFTecTBSwGKkD73PLF7sIslFjrPxkivP4LHGSTrE5ZhZFqh0BJrGfVfIlLw== +"@abp/font-awesome@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" + integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.3.tgz#fe883f26508edc99b411962a87b2129c74dd0e49" - integrity sha512-tK8KwFdX1WVBbopvgKCK6Pz5RJMBzV5bEs2/ZmGheHAGTBk+IxwPfcxEhpz28FC1AarAyHTCLcOu8mGyytgzwA== +"@abp/jquery-form@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" + integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.3.tgz#6bd2e4ab3835e9910092f31e866f027fa9abdd34" - integrity sha512-Rg6skGiEq/rJir9l7yFG1dULjFYAYejXa5xkNzvGydmlaNBWKcEHbWP/7N2+N3dD7W5Ov4q8e8TX1SRGNBcSmg== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" + integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.3" + "@abp/jquery-validation" "~7.4.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.3.tgz#638524781b77266540973d510dfaa441878f5d1b" - integrity sha512-RfQnjxtW4GMvzqwldhD8eW4yeZPgXCGvsoSWOu4YsCVnA3w+XLFhZi62CVfISSGizYnJCv0L0lDDTvf9W18E7w== +"@abp/jquery-validation@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" + integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.3.tgz#8381cbea10906ae1339de2c662518a8670e58680" - integrity sha512-7aMqj4zZqoQxLGEBIVI9wTuaRlat2Vf9d56908yFblNwKyexuOOxV6caWGa5rv2WDprRW1wvFS6poMuGknL9AA== +"@abp/jquery@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" + integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.3.tgz#1898f1c4b0eb22a780f4267287691e2c29e146a2" - integrity sha512-2mH68Jm+JnctFMxCpbyQeZcjIW9mvVMHXmTvf+AwrnD5XSs3KR1xyBpRFwc0yFc9PaWLtsZnhnaz5OC93liRoQ== +"@abp/lodash@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" + integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.3.tgz#6845a9f4071cc9ea7463687fbca879d20190f1b9" - integrity sha512-dIrwCUKeoAn29MEe2G+ni1nTPdlT2WaUEbPMRSe5IZL3boKI4zJUditMq778ZcrlPbqpiFl6+yOpw26iWPbMaQ== +"@abp/luxon@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" + integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.3.tgz#6a671fb0478cef92efbd3376813cf232e42f5f49" - integrity sha512-x/B+V46JQddpnr6uP8jWZ/8sCghVt5soDhpgbc4QR5QcWbT1wpErec3Gupgxb0A2GeI4+9xFa7LHG8asIBmh8A== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" + integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.3.tgz#3f0c1d3922ccdd75dac46e8441e3a036a96db6fd" - integrity sha512-AE6adhwBnpDdWt/RNGwEPKrv0vC6lSlzrot487KGoiNAA7NIGfhVYSWo4QSedPDP+Jq2tD4fDvB/X7TgSwTdzA== +"@abp/moment@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" + integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== dependencies: moment "^2.9.0" -"@abp/prismjs@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.3.tgz#4202830db4e469be3d329ed2fb9ef8eb2ef85f8d" - integrity sha512-ikG4SFm7DPU4GOnBUaBdoFu/3PQUoIHWmsk46TvI2J3dCt+2WEgFNU6SAoF48DoMHDnnxfYwU5LYwH/sux2PvQ== +"@abp/prismjs@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" + integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== dependencies: - "@abp/clipboard" "~7.4.0-rc.3" - "@abp/core" "~7.4.0-rc.3" + "@abp/clipboard" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.3.tgz#134e28502e7dfa149f9feea23645b8962405d6aa" - integrity sha512-oeS/HKh1z8S1gE5YyiTt8YO9YAEw4dzi2aXY5RBeCQCpS28vYWHR7yX07AUS7YpQZNnajqL/fK14STU4z67d5g== +"@abp/select2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" + integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.3.tgz#fe47ed2311c0dc611621ddeea5cd232edca7f7da" - integrity sha512-02BcsINV+NQIBVv0kIDowp5Zggqqklu5rNSyhTHmLLXgjULS12lbc9ZAN8elvaiRov1PBKLuNymhVtSGD+vgYA== +"@abp/sweetalert2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" + integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.3.tgz#c68fcea9c7fb667115d88d935fd4234397da0986" - integrity sha512-D5rNk5eYyTQNhicYXz9Jn/Hm080UescpMEK51foGRMBKWZAK4IzbYVbA1lWumfpM8uKRXjE0Ujhow8gtMu3qEA== +"@abp/timeago@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" + integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.3.tgz#308ccab6e1be2ce7d44bdb7548e427aa4b42f5fe" - integrity sha512-oiVA8a6iqxaOmVAmALqVsy2faJe54Ao9m9rS7C9N03gYfr8cP58p+gQvuBahd7lKvDKHhkR5dRxtJsFABaFpJQ== +"@abp/toastr@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" + integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.3.tgz#bc02be5e7294615d42c303bb777845e0a39813e1" - integrity sha512-RkNO/Qjdo/lkGr0TkR7YydBZqmete5bewDT59gqNbp5OsUQQ45pYLH0JYVsqpIUipJjjAezzVlBZk8+AuZYLGA== +"@abp/utils@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" + integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== dependencies: just-compare "^2.3.0" diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index 1eedca0c8a..364d7aebdb 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3", - "@abp/blogging": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", + "@abp/blogging": "~7.4.0-rc.4" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index 5c20f7068f..5766c65f11 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.3.tgz#fd39fa05c7b13ddfb7353036321142b6d8e0760b" - integrity sha512-HmJJfZsWEzgDO+pzxHSGo7XWYjljmpAcN+jBvom4gn2KwzmhiuWhZSPKx85cdtIldp3yOKjldExPdvSFwR+iSw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.3.tgz#750355b35eaf213b5127e462789d0e849a77d9c7" - integrity sha512-LgRADz+OSRXtgcWzOzBanJ3lk9WxYrHill75Bv4SOUXkDLiAGIH49jqhcga1TNSzwHy7l6KZS6hOakAujoRPzg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.3" - "@abp/bootstrap" "~7.4.0-rc.3" - "@abp/bootstrap-datepicker" "~7.4.0-rc.3" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.3" - "@abp/datatables.net-bs5" "~7.4.0-rc.3" - "@abp/font-awesome" "~7.4.0-rc.3" - "@abp/jquery-form" "~7.4.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.3" - "@abp/lodash" "~7.4.0-rc.3" - "@abp/luxon" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/moment" "~7.4.0-rc.3" - "@abp/select2" "~7.4.0-rc.3" - "@abp/sweetalert2" "~7.4.0-rc.3" - "@abp/timeago" "~7.4.0-rc.3" - "@abp/toastr" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.3.tgz#678c0e7323a542fc558526a0fd024195ab9ea682" - integrity sha512-QuoQA4LJMGWs5OFGczGQMFEMBkNzEdNDqIuF8s0O9gwZ15qaqHD8PmhmHXFlPJaezRtfwzODxKKDB9wwouPGwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" + integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" + integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" + "@abp/bootstrap" "~7.4.0-rc.4" + "@abp/bootstrap-datepicker" "~7.4.0-rc.4" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" + "@abp/datatables.net-bs5" "~7.4.0-rc.4" + "@abp/font-awesome" "~7.4.0-rc.4" + "@abp/jquery-form" "~7.4.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" + "@abp/lodash" "~7.4.0-rc.4" + "@abp/luxon" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/moment" "~7.4.0-rc.4" + "@abp/select2" "~7.4.0-rc.4" + "@abp/sweetalert2" "~7.4.0-rc.4" + "@abp/timeago" "~7.4.0-rc.4" + "@abp/toastr" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" + integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,201 +43,201 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/blogging@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-7.4.0-rc.3.tgz#8d5b7bd73920ace3e6a5a2eef109ec9d3e7fdd18" - integrity sha512-706mITgcPzqbhuX9PczkmAbtrbcWAzo8pBXMA9I1usT5fD8xvnJu2N5JU9nwzt/Isqh2ySLz5iqfWpxi9kjk1A== +"@abp/blogging@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-7.4.0-rc.4.tgz#8cb5b4ca9bc8f8b8b69114564bf81c347c301e4e" + integrity sha512-Mw72jLEIpvuOR10Z6HS+xjwueRykUghM+aaaDVNmK3NT91Q9RMpouv77Ymb21K3yVZBhJ/3a6pbGuBBvv9zhMQ== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - "@abp/owl.carousel" "~7.4.0-rc.3" - "@abp/prismjs" "~7.4.0-rc.3" - "@abp/tui-editor" "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + "@abp/owl.carousel" "~7.4.0-rc.4" + "@abp/prismjs" "~7.4.0-rc.4" + "@abp/tui-editor" "~7.4.0-rc.4" -"@abp/bootstrap-datepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.3.tgz#76941922c44a655b19aa1afcb88524fc3a6c85c1" - integrity sha512-/2wMvPGoXT4BoBEUuL6B/vH9aDHxde6THWkPjuHFftA/RysC5fikcK4ekqHvANcuLptyz4CwwhBnSUIMpTSVhQ== +"@abp/bootstrap-datepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" + integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.3.tgz#a5cdc0d3bc9a890f0790e5271c6b8c75a9073fdd" - integrity sha512-kEpU0WWKFrpjVH/XNl8pLOSW61oa/eIdM4pqpDc1b7yzFD58FZa4FOo87MspDEAhkESjzREkqytyfJTQHdDr9w== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" + integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.3.tgz#d70ed14f6de898e2444293a698788e1ae4eba420" - integrity sha512-2tByO67RJCj+xEyLh8/KBUWpx0XLliG2tgfDsc358GUDJYD99voakvvvDTDBpxT4z3H1UMRvYYg2O3axJTw8Aw== +"@abp/bootstrap@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" + integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.3.tgz#fbe3320da399eaa9efc433efe929fc9f3fc43be2" - integrity sha512-q7wKSGKD4rj2zQvSZpb0bILA2eivsA89AxeDVyHEfTBMOh6dxbg1eLY2acJwGyrXza+KbTa8n/tWM/L9w9dDWg== +"@abp/clipboard@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" + integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" clipboard "^2.0.8" -"@abp/core@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.3.tgz#c78d1a2d7279bc6ee0c1c807788028517eb11c5e" - integrity sha512-sOOFqy2qqcrKbTRa1lFJUW6WKg6ozV+jE5P4fnJGUBlV+LsdYu+QGPefAc9PFlVNGwtcKpBV0863F85m4zV1+Q== +"@abp/core@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" + integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== dependencies: - "@abp/utils" "~7.4.0-rc.3" + "@abp/utils" "~7.4.0-rc.4" -"@abp/datatables.net-bs5@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.3.tgz#1c1585a3bca08fa1afee154d485ddf50b5593855" - integrity sha512-97+P3Olfztzf+e/hn/o66KUa++l9tchSabJfpaC0hPYPILcYDzOVlHdxFcT6ScLhxwmZAZ07gqP9Q2fjd++MlA== +"@abp/datatables.net-bs5@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" + integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== dependencies: - "@abp/datatables.net" "~7.4.0-rc.3" + "@abp/datatables.net" "~7.4.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.3.tgz#d32d2f18dbd63ac9fcb459e965137504c1dd6c21" - integrity sha512-bC29AdMi/9IQP6wy2BuNebt3cbeku4c0NdsSyw7S4YFZBozMpQHt5r5c75wH5YFn08h+fQxpbIWtMczYPsy40A== +"@abp/datatables.net@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" + integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.3.tgz#a8522559e3424dfd4bb228bf37e9f8faf744e91e" - integrity sha512-UYLR80Fw4K6DCHXYvYVr4u58AC5qFTecTBSwGKkD73PLF7sIslFjrPxkivP4LHGSTrE5ZhZFqh0BJrGfVfIlLw== +"@abp/font-awesome@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" + integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.3.tgz#fe883f26508edc99b411962a87b2129c74dd0e49" - integrity sha512-tK8KwFdX1WVBbopvgKCK6Pz5RJMBzV5bEs2/ZmGheHAGTBk+IxwPfcxEhpz28FC1AarAyHTCLcOu8mGyytgzwA== +"@abp/jquery-form@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" + integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.3.tgz#6bd2e4ab3835e9910092f31e866f027fa9abdd34" - integrity sha512-Rg6skGiEq/rJir9l7yFG1dULjFYAYejXa5xkNzvGydmlaNBWKcEHbWP/7N2+N3dD7W5Ov4q8e8TX1SRGNBcSmg== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" + integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.3" + "@abp/jquery-validation" "~7.4.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.3.tgz#638524781b77266540973d510dfaa441878f5d1b" - integrity sha512-RfQnjxtW4GMvzqwldhD8eW4yeZPgXCGvsoSWOu4YsCVnA3w+XLFhZi62CVfISSGizYnJCv0L0lDDTvf9W18E7w== +"@abp/jquery-validation@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" + integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.3.tgz#8381cbea10906ae1339de2c662518a8670e58680" - integrity sha512-7aMqj4zZqoQxLGEBIVI9wTuaRlat2Vf9d56908yFblNwKyexuOOxV6caWGa5rv2WDprRW1wvFS6poMuGknL9AA== +"@abp/jquery@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" + integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.3.tgz#1898f1c4b0eb22a780f4267287691e2c29e146a2" - integrity sha512-2mH68Jm+JnctFMxCpbyQeZcjIW9mvVMHXmTvf+AwrnD5XSs3KR1xyBpRFwc0yFc9PaWLtsZnhnaz5OC93liRoQ== +"@abp/lodash@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" + integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.3.tgz#6845a9f4071cc9ea7463687fbca879d20190f1b9" - integrity sha512-dIrwCUKeoAn29MEe2G+ni1nTPdlT2WaUEbPMRSe5IZL3boKI4zJUditMq778ZcrlPbqpiFl6+yOpw26iWPbMaQ== +"@abp/luxon@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" + integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.3.tgz#6a671fb0478cef92efbd3376813cf232e42f5f49" - integrity sha512-x/B+V46JQddpnr6uP8jWZ/8sCghVt5soDhpgbc4QR5QcWbT1wpErec3Gupgxb0A2GeI4+9xFa7LHG8asIBmh8A== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" + integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.3.tgz#3f0c1d3922ccdd75dac46e8441e3a036a96db6fd" - integrity sha512-AE6adhwBnpDdWt/RNGwEPKrv0vC6lSlzrot487KGoiNAA7NIGfhVYSWo4QSedPDP+Jq2tD4fDvB/X7TgSwTdzA== +"@abp/moment@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" + integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== dependencies: moment "^2.9.0" -"@abp/owl.carousel@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-7.4.0-rc.3.tgz#878164f7177b65a1893fc8606a9d66126f09c6fe" - integrity sha512-ZKQca/GmQO/GfcfThzLa0TIJqQmaqSquzJkb3IIR54DfLDhOA8NdvOWurv1fhyJDm4Jmqx7VgRvam73O/3lBLg== +"@abp/owl.carousel@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-7.4.0-rc.4.tgz#866d0c07fa1aee33b81a3a46371b38e6cdb72e1c" + integrity sha512-K2jEqY9LucQYMQG5dUnMQ9cdzNEMmDA9cOyI9+wrunh05ov/WhtmdjaHfBeH4u0qCHjIn3TgrRgdZ/JP2TxWzA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" owl.carousel "^2.3.4" -"@abp/prismjs@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.3.tgz#4202830db4e469be3d329ed2fb9ef8eb2ef85f8d" - integrity sha512-ikG4SFm7DPU4GOnBUaBdoFu/3PQUoIHWmsk46TvI2J3dCt+2WEgFNU6SAoF48DoMHDnnxfYwU5LYwH/sux2PvQ== +"@abp/prismjs@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" + integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== dependencies: - "@abp/clipboard" "~7.4.0-rc.3" - "@abp/core" "~7.4.0-rc.3" + "@abp/clipboard" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.3.tgz#134e28502e7dfa149f9feea23645b8962405d6aa" - integrity sha512-oeS/HKh1z8S1gE5YyiTt8YO9YAEw4dzi2aXY5RBeCQCpS28vYWHR7yX07AUS7YpQZNnajqL/fK14STU4z67d5g== +"@abp/select2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" + integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.3.tgz#fe47ed2311c0dc611621ddeea5cd232edca7f7da" - integrity sha512-02BcsINV+NQIBVv0kIDowp5Zggqqklu5rNSyhTHmLLXgjULS12lbc9ZAN8elvaiRov1PBKLuNymhVtSGD+vgYA== +"@abp/sweetalert2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" + integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.3.tgz#c68fcea9c7fb667115d88d935fd4234397da0986" - integrity sha512-D5rNk5eYyTQNhicYXz9Jn/Hm080UescpMEK51foGRMBKWZAK4IzbYVbA1lWumfpM8uKRXjE0Ujhow8gtMu3qEA== +"@abp/timeago@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" + integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.3.tgz#308ccab6e1be2ce7d44bdb7548e427aa4b42f5fe" - integrity sha512-oiVA8a6iqxaOmVAmALqVsy2faJe54Ao9m9rS7C9N03gYfr8cP58p+gQvuBahd7lKvDKHhkR5dRxtJsFABaFpJQ== +"@abp/toastr@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" + integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" toastr "^2.1.4" -"@abp/tui-editor@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.0-rc.3.tgz#741b0639e77a394e2413d93cf05f1911f0ac9d66" - integrity sha512-yOU+fJJd0aPTi0m2kfYfg2Eug6BORWur49OhEGLV7QJi1WTYTL0ISZHw58j7A5xdHcoljwqPXLpr/fYnj6eVJg== +"@abp/tui-editor@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.0-rc.4.tgz#830e429aebd2f819a3f30a2dbe9384c8c7e058c5" + integrity sha512-opZEMuuCGxwmu0QuzfTZhJ8FlSH+e0z0q5lbo1ywu18w270c3xLY0qGfDEjyCRq+VahHi079k4BMKGwzBvzLow== dependencies: - "@abp/jquery" "~7.4.0-rc.3" - "@abp/prismjs" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" + "@abp/prismjs" "~7.4.0-rc.4" -"@abp/utils@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.3.tgz#bc02be5e7294615d42c303bb777845e0a39813e1" - integrity sha512-RkNO/Qjdo/lkGr0TkR7YydBZqmete5bewDT59gqNbp5OsUQQ45pYLH0JYVsqpIUipJjjAezzVlBZk8+AuZYLGA== +"@abp/utils@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" + integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== dependencies: just-compare "^2.3.0" diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index e1047a91a1..3f6d55475c 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index 6a7853ea08..739bb79d1c 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.3.tgz#fd39fa05c7b13ddfb7353036321142b6d8e0760b" - integrity sha512-HmJJfZsWEzgDO+pzxHSGo7XWYjljmpAcN+jBvom4gn2KwzmhiuWhZSPKx85cdtIldp3yOKjldExPdvSFwR+iSw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.3.tgz#750355b35eaf213b5127e462789d0e849a77d9c7" - integrity sha512-LgRADz+OSRXtgcWzOzBanJ3lk9WxYrHill75Bv4SOUXkDLiAGIH49jqhcga1TNSzwHy7l6KZS6hOakAujoRPzg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.3" - "@abp/bootstrap" "~7.4.0-rc.3" - "@abp/bootstrap-datepicker" "~7.4.0-rc.3" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.3" - "@abp/datatables.net-bs5" "~7.4.0-rc.3" - "@abp/font-awesome" "~7.4.0-rc.3" - "@abp/jquery-form" "~7.4.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.3" - "@abp/lodash" "~7.4.0-rc.3" - "@abp/luxon" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/moment" "~7.4.0-rc.3" - "@abp/select2" "~7.4.0-rc.3" - "@abp/sweetalert2" "~7.4.0-rc.3" - "@abp/timeago" "~7.4.0-rc.3" - "@abp/toastr" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.3.tgz#678c0e7323a542fc558526a0fd024195ab9ea682" - integrity sha512-QuoQA4LJMGWs5OFGczGQMFEMBkNzEdNDqIuF8s0O9gwZ15qaqHD8PmhmHXFlPJaezRtfwzODxKKDB9wwouPGwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" + integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" + integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" + "@abp/bootstrap" "~7.4.0-rc.4" + "@abp/bootstrap-datepicker" "~7.4.0-rc.4" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" + "@abp/datatables.net-bs5" "~7.4.0-rc.4" + "@abp/font-awesome" "~7.4.0-rc.4" + "@abp/jquery-form" "~7.4.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" + "@abp/lodash" "~7.4.0-rc.4" + "@abp/luxon" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/moment" "~7.4.0-rc.4" + "@abp/select2" "~7.4.0-rc.4" + "@abp/sweetalert2" "~7.4.0-rc.4" + "@abp/timeago" "~7.4.0-rc.4" + "@abp/toastr" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" + integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.3.tgz#76941922c44a655b19aa1afcb88524fc3a6c85c1" - integrity sha512-/2wMvPGoXT4BoBEUuL6B/vH9aDHxde6THWkPjuHFftA/RysC5fikcK4ekqHvANcuLptyz4CwwhBnSUIMpTSVhQ== +"@abp/bootstrap-datepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" + integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.3.tgz#a5cdc0d3bc9a890f0790e5271c6b8c75a9073fdd" - integrity sha512-kEpU0WWKFrpjVH/XNl8pLOSW61oa/eIdM4pqpDc1b7yzFD58FZa4FOo87MspDEAhkESjzREkqytyfJTQHdDr9w== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" + integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.3.tgz#d70ed14f6de898e2444293a698788e1ae4eba420" - integrity sha512-2tByO67RJCj+xEyLh8/KBUWpx0XLliG2tgfDsc358GUDJYD99voakvvvDTDBpxT4z3H1UMRvYYg2O3axJTw8Aw== +"@abp/bootstrap@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" + integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" bootstrap "^5.1.3" -"@abp/core@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.3.tgz#c78d1a2d7279bc6ee0c1c807788028517eb11c5e" - integrity sha512-sOOFqy2qqcrKbTRa1lFJUW6WKg6ozV+jE5P4fnJGUBlV+LsdYu+QGPefAc9PFlVNGwtcKpBV0863F85m4zV1+Q== +"@abp/core@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" + integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== dependencies: - "@abp/utils" "~7.4.0-rc.3" + "@abp/utils" "~7.4.0-rc.4" -"@abp/datatables.net-bs5@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.3.tgz#1c1585a3bca08fa1afee154d485ddf50b5593855" - integrity sha512-97+P3Olfztzf+e/hn/o66KUa++l9tchSabJfpaC0hPYPILcYDzOVlHdxFcT6ScLhxwmZAZ07gqP9Q2fjd++MlA== +"@abp/datatables.net-bs5@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" + integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== dependencies: - "@abp/datatables.net" "~7.4.0-rc.3" + "@abp/datatables.net" "~7.4.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.3.tgz#d32d2f18dbd63ac9fcb459e965137504c1dd6c21" - integrity sha512-bC29AdMi/9IQP6wy2BuNebt3cbeku4c0NdsSyw7S4YFZBozMpQHt5r5c75wH5YFn08h+fQxpbIWtMczYPsy40A== +"@abp/datatables.net@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" + integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.3.tgz#a8522559e3424dfd4bb228bf37e9f8faf744e91e" - integrity sha512-UYLR80Fw4K6DCHXYvYVr4u58AC5qFTecTBSwGKkD73PLF7sIslFjrPxkivP4LHGSTrE5ZhZFqh0BJrGfVfIlLw== +"@abp/font-awesome@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" + integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.3.tgz#fe883f26508edc99b411962a87b2129c74dd0e49" - integrity sha512-tK8KwFdX1WVBbopvgKCK6Pz5RJMBzV5bEs2/ZmGheHAGTBk+IxwPfcxEhpz28FC1AarAyHTCLcOu8mGyytgzwA== +"@abp/jquery-form@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" + integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.3.tgz#6bd2e4ab3835e9910092f31e866f027fa9abdd34" - integrity sha512-Rg6skGiEq/rJir9l7yFG1dULjFYAYejXa5xkNzvGydmlaNBWKcEHbWP/7N2+N3dD7W5Ov4q8e8TX1SRGNBcSmg== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" + integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.3" + "@abp/jquery-validation" "~7.4.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.3.tgz#638524781b77266540973d510dfaa441878f5d1b" - integrity sha512-RfQnjxtW4GMvzqwldhD8eW4yeZPgXCGvsoSWOu4YsCVnA3w+XLFhZi62CVfISSGizYnJCv0L0lDDTvf9W18E7w== +"@abp/jquery-validation@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" + integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.3.tgz#8381cbea10906ae1339de2c662518a8670e58680" - integrity sha512-7aMqj4zZqoQxLGEBIVI9wTuaRlat2Vf9d56908yFblNwKyexuOOxV6caWGa5rv2WDprRW1wvFS6poMuGknL9AA== +"@abp/jquery@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" + integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.3.tgz#1898f1c4b0eb22a780f4267287691e2c29e146a2" - integrity sha512-2mH68Jm+JnctFMxCpbyQeZcjIW9mvVMHXmTvf+AwrnD5XSs3KR1xyBpRFwc0yFc9PaWLtsZnhnaz5OC93liRoQ== +"@abp/lodash@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" + integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.3.tgz#6845a9f4071cc9ea7463687fbca879d20190f1b9" - integrity sha512-dIrwCUKeoAn29MEe2G+ni1nTPdlT2WaUEbPMRSe5IZL3boKI4zJUditMq778ZcrlPbqpiFl6+yOpw26iWPbMaQ== +"@abp/luxon@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" + integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.3.tgz#6a671fb0478cef92efbd3376813cf232e42f5f49" - integrity sha512-x/B+V46JQddpnr6uP8jWZ/8sCghVt5soDhpgbc4QR5QcWbT1wpErec3Gupgxb0A2GeI4+9xFa7LHG8asIBmh8A== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" + integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.3.tgz#3f0c1d3922ccdd75dac46e8441e3a036a96db6fd" - integrity sha512-AE6adhwBnpDdWt/RNGwEPKrv0vC6lSlzrot487KGoiNAA7NIGfhVYSWo4QSedPDP+Jq2tD4fDvB/X7TgSwTdzA== +"@abp/moment@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" + integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.3.tgz#134e28502e7dfa149f9feea23645b8962405d6aa" - integrity sha512-oeS/HKh1z8S1gE5YyiTt8YO9YAEw4dzi2aXY5RBeCQCpS28vYWHR7yX07AUS7YpQZNnajqL/fK14STU4z67d5g== +"@abp/select2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" + integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.3.tgz#fe47ed2311c0dc611621ddeea5cd232edca7f7da" - integrity sha512-02BcsINV+NQIBVv0kIDowp5Zggqqklu5rNSyhTHmLLXgjULS12lbc9ZAN8elvaiRov1PBKLuNymhVtSGD+vgYA== +"@abp/sweetalert2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" + integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.3.tgz#c68fcea9c7fb667115d88d935fd4234397da0986" - integrity sha512-D5rNk5eYyTQNhicYXz9Jn/Hm080UescpMEK51foGRMBKWZAK4IzbYVbA1lWumfpM8uKRXjE0Ujhow8gtMu3qEA== +"@abp/timeago@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" + integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.3.tgz#308ccab6e1be2ce7d44bdb7548e427aa4b42f5fe" - integrity sha512-oiVA8a6iqxaOmVAmALqVsy2faJe54Ao9m9rS7C9N03gYfr8cP58p+gQvuBahd7lKvDKHhkR5dRxtJsFABaFpJQ== +"@abp/toastr@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" + integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.3.tgz#bc02be5e7294615d42c303bb777845e0a39813e1" - integrity sha512-RkNO/Qjdo/lkGr0TkR7YydBZqmete5bewDT59gqNbp5OsUQQ45pYLH0JYVsqpIUipJjjAezzVlBZk8+AuZYLGA== +"@abp/utils@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" + integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index 3a5d58c3c5..20e1a3f475 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.3", - "@abp/ng.identity": "~7.4.0-rc.3", - "@abp/ng.setting-management": "~7.4.0-rc.3", - "@abp/ng.tenant-management": "~7.4.0-rc.3", - "@abp/ng.theme.basic": "~7.4.0-rc.3", + "@abp/ng.account": "~7.4.0-rc.4", + "@abp/ng.identity": "~7.4.0-rc.4", + "@abp/ng.setting-management": "~7.4.0-rc.4", + "@abp/ng.tenant-management": "~7.4.0-rc.4", + "@abp/ng.theme.basic": "~7.4.0-rc.4", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index 2097a9387d..b1a182d024 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=7.4.0-rc.3", - "@abp/ng.theme.shared": ">=7.4.0-rc.3" + "@abp/ng.core": ">=7.4.0-rc.4", + "@abp/ng.theme.shared": ">=7.4.0-rc.4" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index 14c84f93f8..3fad7aeb6d 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 6a7853ea08..739bb79d1c 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.3.tgz#fd39fa05c7b13ddfb7353036321142b6d8e0760b" - integrity sha512-HmJJfZsWEzgDO+pzxHSGo7XWYjljmpAcN+jBvom4gn2KwzmhiuWhZSPKx85cdtIldp3yOKjldExPdvSFwR+iSw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.3.tgz#750355b35eaf213b5127e462789d0e849a77d9c7" - integrity sha512-LgRADz+OSRXtgcWzOzBanJ3lk9WxYrHill75Bv4SOUXkDLiAGIH49jqhcga1TNSzwHy7l6KZS6hOakAujoRPzg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.3" - "@abp/bootstrap" "~7.4.0-rc.3" - "@abp/bootstrap-datepicker" "~7.4.0-rc.3" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.3" - "@abp/datatables.net-bs5" "~7.4.0-rc.3" - "@abp/font-awesome" "~7.4.0-rc.3" - "@abp/jquery-form" "~7.4.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.3" - "@abp/lodash" "~7.4.0-rc.3" - "@abp/luxon" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/moment" "~7.4.0-rc.3" - "@abp/select2" "~7.4.0-rc.3" - "@abp/sweetalert2" "~7.4.0-rc.3" - "@abp/timeago" "~7.4.0-rc.3" - "@abp/toastr" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.3.tgz#678c0e7323a542fc558526a0fd024195ab9ea682" - integrity sha512-QuoQA4LJMGWs5OFGczGQMFEMBkNzEdNDqIuF8s0O9gwZ15qaqHD8PmhmHXFlPJaezRtfwzODxKKDB9wwouPGwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" + integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" + integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" + "@abp/bootstrap" "~7.4.0-rc.4" + "@abp/bootstrap-datepicker" "~7.4.0-rc.4" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" + "@abp/datatables.net-bs5" "~7.4.0-rc.4" + "@abp/font-awesome" "~7.4.0-rc.4" + "@abp/jquery-form" "~7.4.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" + "@abp/lodash" "~7.4.0-rc.4" + "@abp/luxon" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/moment" "~7.4.0-rc.4" + "@abp/select2" "~7.4.0-rc.4" + "@abp/sweetalert2" "~7.4.0-rc.4" + "@abp/timeago" "~7.4.0-rc.4" + "@abp/toastr" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" + integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.3.tgz#76941922c44a655b19aa1afcb88524fc3a6c85c1" - integrity sha512-/2wMvPGoXT4BoBEUuL6B/vH9aDHxde6THWkPjuHFftA/RysC5fikcK4ekqHvANcuLptyz4CwwhBnSUIMpTSVhQ== +"@abp/bootstrap-datepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" + integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.3.tgz#a5cdc0d3bc9a890f0790e5271c6b8c75a9073fdd" - integrity sha512-kEpU0WWKFrpjVH/XNl8pLOSW61oa/eIdM4pqpDc1b7yzFD58FZa4FOo87MspDEAhkESjzREkqytyfJTQHdDr9w== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" + integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.3.tgz#d70ed14f6de898e2444293a698788e1ae4eba420" - integrity sha512-2tByO67RJCj+xEyLh8/KBUWpx0XLliG2tgfDsc358GUDJYD99voakvvvDTDBpxT4z3H1UMRvYYg2O3axJTw8Aw== +"@abp/bootstrap@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" + integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" bootstrap "^5.1.3" -"@abp/core@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.3.tgz#c78d1a2d7279bc6ee0c1c807788028517eb11c5e" - integrity sha512-sOOFqy2qqcrKbTRa1lFJUW6WKg6ozV+jE5P4fnJGUBlV+LsdYu+QGPefAc9PFlVNGwtcKpBV0863F85m4zV1+Q== +"@abp/core@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" + integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== dependencies: - "@abp/utils" "~7.4.0-rc.3" + "@abp/utils" "~7.4.0-rc.4" -"@abp/datatables.net-bs5@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.3.tgz#1c1585a3bca08fa1afee154d485ddf50b5593855" - integrity sha512-97+P3Olfztzf+e/hn/o66KUa++l9tchSabJfpaC0hPYPILcYDzOVlHdxFcT6ScLhxwmZAZ07gqP9Q2fjd++MlA== +"@abp/datatables.net-bs5@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" + integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== dependencies: - "@abp/datatables.net" "~7.4.0-rc.3" + "@abp/datatables.net" "~7.4.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.3.tgz#d32d2f18dbd63ac9fcb459e965137504c1dd6c21" - integrity sha512-bC29AdMi/9IQP6wy2BuNebt3cbeku4c0NdsSyw7S4YFZBozMpQHt5r5c75wH5YFn08h+fQxpbIWtMczYPsy40A== +"@abp/datatables.net@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" + integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.3.tgz#a8522559e3424dfd4bb228bf37e9f8faf744e91e" - integrity sha512-UYLR80Fw4K6DCHXYvYVr4u58AC5qFTecTBSwGKkD73PLF7sIslFjrPxkivP4LHGSTrE5ZhZFqh0BJrGfVfIlLw== +"@abp/font-awesome@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" + integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.3.tgz#fe883f26508edc99b411962a87b2129c74dd0e49" - integrity sha512-tK8KwFdX1WVBbopvgKCK6Pz5RJMBzV5bEs2/ZmGheHAGTBk+IxwPfcxEhpz28FC1AarAyHTCLcOu8mGyytgzwA== +"@abp/jquery-form@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" + integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.3.tgz#6bd2e4ab3835e9910092f31e866f027fa9abdd34" - integrity sha512-Rg6skGiEq/rJir9l7yFG1dULjFYAYejXa5xkNzvGydmlaNBWKcEHbWP/7N2+N3dD7W5Ov4q8e8TX1SRGNBcSmg== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" + integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.3" + "@abp/jquery-validation" "~7.4.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.3.tgz#638524781b77266540973d510dfaa441878f5d1b" - integrity sha512-RfQnjxtW4GMvzqwldhD8eW4yeZPgXCGvsoSWOu4YsCVnA3w+XLFhZi62CVfISSGizYnJCv0L0lDDTvf9W18E7w== +"@abp/jquery-validation@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" + integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.3.tgz#8381cbea10906ae1339de2c662518a8670e58680" - integrity sha512-7aMqj4zZqoQxLGEBIVI9wTuaRlat2Vf9d56908yFblNwKyexuOOxV6caWGa5rv2WDprRW1wvFS6poMuGknL9AA== +"@abp/jquery@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" + integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.3.tgz#1898f1c4b0eb22a780f4267287691e2c29e146a2" - integrity sha512-2mH68Jm+JnctFMxCpbyQeZcjIW9mvVMHXmTvf+AwrnD5XSs3KR1xyBpRFwc0yFc9PaWLtsZnhnaz5OC93liRoQ== +"@abp/lodash@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" + integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.3.tgz#6845a9f4071cc9ea7463687fbca879d20190f1b9" - integrity sha512-dIrwCUKeoAn29MEe2G+ni1nTPdlT2WaUEbPMRSe5IZL3boKI4zJUditMq778ZcrlPbqpiFl6+yOpw26iWPbMaQ== +"@abp/luxon@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" + integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.3.tgz#6a671fb0478cef92efbd3376813cf232e42f5f49" - integrity sha512-x/B+V46JQddpnr6uP8jWZ/8sCghVt5soDhpgbc4QR5QcWbT1wpErec3Gupgxb0A2GeI4+9xFa7LHG8asIBmh8A== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" + integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.3.tgz#3f0c1d3922ccdd75dac46e8441e3a036a96db6fd" - integrity sha512-AE6adhwBnpDdWt/RNGwEPKrv0vC6lSlzrot487KGoiNAA7NIGfhVYSWo4QSedPDP+Jq2tD4fDvB/X7TgSwTdzA== +"@abp/moment@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" + integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.3.tgz#134e28502e7dfa149f9feea23645b8962405d6aa" - integrity sha512-oeS/HKh1z8S1gE5YyiTt8YO9YAEw4dzi2aXY5RBeCQCpS28vYWHR7yX07AUS7YpQZNnajqL/fK14STU4z67d5g== +"@abp/select2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" + integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.3.tgz#fe47ed2311c0dc611621ddeea5cd232edca7f7da" - integrity sha512-02BcsINV+NQIBVv0kIDowp5Zggqqklu5rNSyhTHmLLXgjULS12lbc9ZAN8elvaiRov1PBKLuNymhVtSGD+vgYA== +"@abp/sweetalert2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" + integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.3.tgz#c68fcea9c7fb667115d88d935fd4234397da0986" - integrity sha512-D5rNk5eYyTQNhicYXz9Jn/Hm080UescpMEK51foGRMBKWZAK4IzbYVbA1lWumfpM8uKRXjE0Ujhow8gtMu3qEA== +"@abp/timeago@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" + integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.3.tgz#308ccab6e1be2ce7d44bdb7548e427aa4b42f5fe" - integrity sha512-oiVA8a6iqxaOmVAmALqVsy2faJe54Ao9m9rS7C9N03gYfr8cP58p+gQvuBahd7lKvDKHhkR5dRxtJsFABaFpJQ== +"@abp/toastr@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" + integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.3.tgz#bc02be5e7294615d42c303bb777845e0a39813e1" - integrity sha512-RkNO/Qjdo/lkGr0TkR7YydBZqmete5bewDT59gqNbp5OsUQQ45pYLH0JYVsqpIUipJjjAezzVlBZk8+AuZYLGA== +"@abp/utils@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" + integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json index 3a1316c670..704a94ab02 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock index 6a7853ea08..739bb79d1c 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.3.tgz#fd39fa05c7b13ddfb7353036321142b6d8e0760b" - integrity sha512-HmJJfZsWEzgDO+pzxHSGo7XWYjljmpAcN+jBvom4gn2KwzmhiuWhZSPKx85cdtIldp3yOKjldExPdvSFwR+iSw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.3.tgz#750355b35eaf213b5127e462789d0e849a77d9c7" - integrity sha512-LgRADz+OSRXtgcWzOzBanJ3lk9WxYrHill75Bv4SOUXkDLiAGIH49jqhcga1TNSzwHy7l6KZS6hOakAujoRPzg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.3" - "@abp/bootstrap" "~7.4.0-rc.3" - "@abp/bootstrap-datepicker" "~7.4.0-rc.3" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.3" - "@abp/datatables.net-bs5" "~7.4.0-rc.3" - "@abp/font-awesome" "~7.4.0-rc.3" - "@abp/jquery-form" "~7.4.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.3" - "@abp/lodash" "~7.4.0-rc.3" - "@abp/luxon" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/moment" "~7.4.0-rc.3" - "@abp/select2" "~7.4.0-rc.3" - "@abp/sweetalert2" "~7.4.0-rc.3" - "@abp/timeago" "~7.4.0-rc.3" - "@abp/toastr" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.3.tgz#678c0e7323a542fc558526a0fd024195ab9ea682" - integrity sha512-QuoQA4LJMGWs5OFGczGQMFEMBkNzEdNDqIuF8s0O9gwZ15qaqHD8PmhmHXFlPJaezRtfwzODxKKDB9wwouPGwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" + integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" + integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" + "@abp/bootstrap" "~7.4.0-rc.4" + "@abp/bootstrap-datepicker" "~7.4.0-rc.4" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" + "@abp/datatables.net-bs5" "~7.4.0-rc.4" + "@abp/font-awesome" "~7.4.0-rc.4" + "@abp/jquery-form" "~7.4.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" + "@abp/lodash" "~7.4.0-rc.4" + "@abp/luxon" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/moment" "~7.4.0-rc.4" + "@abp/select2" "~7.4.0-rc.4" + "@abp/sweetalert2" "~7.4.0-rc.4" + "@abp/timeago" "~7.4.0-rc.4" + "@abp/toastr" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" + integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.3.tgz#76941922c44a655b19aa1afcb88524fc3a6c85c1" - integrity sha512-/2wMvPGoXT4BoBEUuL6B/vH9aDHxde6THWkPjuHFftA/RysC5fikcK4ekqHvANcuLptyz4CwwhBnSUIMpTSVhQ== +"@abp/bootstrap-datepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" + integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.3.tgz#a5cdc0d3bc9a890f0790e5271c6b8c75a9073fdd" - integrity sha512-kEpU0WWKFrpjVH/XNl8pLOSW61oa/eIdM4pqpDc1b7yzFD58FZa4FOo87MspDEAhkESjzREkqytyfJTQHdDr9w== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" + integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.3.tgz#d70ed14f6de898e2444293a698788e1ae4eba420" - integrity sha512-2tByO67RJCj+xEyLh8/KBUWpx0XLliG2tgfDsc358GUDJYD99voakvvvDTDBpxT4z3H1UMRvYYg2O3axJTw8Aw== +"@abp/bootstrap@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" + integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" bootstrap "^5.1.3" -"@abp/core@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.3.tgz#c78d1a2d7279bc6ee0c1c807788028517eb11c5e" - integrity sha512-sOOFqy2qqcrKbTRa1lFJUW6WKg6ozV+jE5P4fnJGUBlV+LsdYu+QGPefAc9PFlVNGwtcKpBV0863F85m4zV1+Q== +"@abp/core@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" + integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== dependencies: - "@abp/utils" "~7.4.0-rc.3" + "@abp/utils" "~7.4.0-rc.4" -"@abp/datatables.net-bs5@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.3.tgz#1c1585a3bca08fa1afee154d485ddf50b5593855" - integrity sha512-97+P3Olfztzf+e/hn/o66KUa++l9tchSabJfpaC0hPYPILcYDzOVlHdxFcT6ScLhxwmZAZ07gqP9Q2fjd++MlA== +"@abp/datatables.net-bs5@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" + integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== dependencies: - "@abp/datatables.net" "~7.4.0-rc.3" + "@abp/datatables.net" "~7.4.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.3.tgz#d32d2f18dbd63ac9fcb459e965137504c1dd6c21" - integrity sha512-bC29AdMi/9IQP6wy2BuNebt3cbeku4c0NdsSyw7S4YFZBozMpQHt5r5c75wH5YFn08h+fQxpbIWtMczYPsy40A== +"@abp/datatables.net@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" + integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.3.tgz#a8522559e3424dfd4bb228bf37e9f8faf744e91e" - integrity sha512-UYLR80Fw4K6DCHXYvYVr4u58AC5qFTecTBSwGKkD73PLF7sIslFjrPxkivP4LHGSTrE5ZhZFqh0BJrGfVfIlLw== +"@abp/font-awesome@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" + integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.3.tgz#fe883f26508edc99b411962a87b2129c74dd0e49" - integrity sha512-tK8KwFdX1WVBbopvgKCK6Pz5RJMBzV5bEs2/ZmGheHAGTBk+IxwPfcxEhpz28FC1AarAyHTCLcOu8mGyytgzwA== +"@abp/jquery-form@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" + integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.3.tgz#6bd2e4ab3835e9910092f31e866f027fa9abdd34" - integrity sha512-Rg6skGiEq/rJir9l7yFG1dULjFYAYejXa5xkNzvGydmlaNBWKcEHbWP/7N2+N3dD7W5Ov4q8e8TX1SRGNBcSmg== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" + integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.3" + "@abp/jquery-validation" "~7.4.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.3.tgz#638524781b77266540973d510dfaa441878f5d1b" - integrity sha512-RfQnjxtW4GMvzqwldhD8eW4yeZPgXCGvsoSWOu4YsCVnA3w+XLFhZi62CVfISSGizYnJCv0L0lDDTvf9W18E7w== +"@abp/jquery-validation@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" + integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.3.tgz#8381cbea10906ae1339de2c662518a8670e58680" - integrity sha512-7aMqj4zZqoQxLGEBIVI9wTuaRlat2Vf9d56908yFblNwKyexuOOxV6caWGa5rv2WDprRW1wvFS6poMuGknL9AA== +"@abp/jquery@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" + integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.3.tgz#1898f1c4b0eb22a780f4267287691e2c29e146a2" - integrity sha512-2mH68Jm+JnctFMxCpbyQeZcjIW9mvVMHXmTvf+AwrnD5XSs3KR1xyBpRFwc0yFc9PaWLtsZnhnaz5OC93liRoQ== +"@abp/lodash@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" + integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.3.tgz#6845a9f4071cc9ea7463687fbca879d20190f1b9" - integrity sha512-dIrwCUKeoAn29MEe2G+ni1nTPdlT2WaUEbPMRSe5IZL3boKI4zJUditMq778ZcrlPbqpiFl6+yOpw26iWPbMaQ== +"@abp/luxon@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" + integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.3.tgz#6a671fb0478cef92efbd3376813cf232e42f5f49" - integrity sha512-x/B+V46JQddpnr6uP8jWZ/8sCghVt5soDhpgbc4QR5QcWbT1wpErec3Gupgxb0A2GeI4+9xFa7LHG8asIBmh8A== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" + integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.3.tgz#3f0c1d3922ccdd75dac46e8441e3a036a96db6fd" - integrity sha512-AE6adhwBnpDdWt/RNGwEPKrv0vC6lSlzrot487KGoiNAA7NIGfhVYSWo4QSedPDP+Jq2tD4fDvB/X7TgSwTdzA== +"@abp/moment@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" + integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.3.tgz#134e28502e7dfa149f9feea23645b8962405d6aa" - integrity sha512-oeS/HKh1z8S1gE5YyiTt8YO9YAEw4dzi2aXY5RBeCQCpS28vYWHR7yX07AUS7YpQZNnajqL/fK14STU4z67d5g== +"@abp/select2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" + integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.3.tgz#fe47ed2311c0dc611621ddeea5cd232edca7f7da" - integrity sha512-02BcsINV+NQIBVv0kIDowp5Zggqqklu5rNSyhTHmLLXgjULS12lbc9ZAN8elvaiRov1PBKLuNymhVtSGD+vgYA== +"@abp/sweetalert2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" + integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.3.tgz#c68fcea9c7fb667115d88d935fd4234397da0986" - integrity sha512-D5rNk5eYyTQNhicYXz9Jn/Hm080UescpMEK51foGRMBKWZAK4IzbYVbA1lWumfpM8uKRXjE0Ujhow8gtMu3qEA== +"@abp/timeago@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" + integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.3.tgz#308ccab6e1be2ce7d44bdb7548e427aa4b42f5fe" - integrity sha512-oiVA8a6iqxaOmVAmALqVsy2faJe54Ao9m9rS7C9N03gYfr8cP58p+gQvuBahd7lKvDKHhkR5dRxtJsFABaFpJQ== +"@abp/toastr@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" + integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.3.tgz#bc02be5e7294615d42c303bb777845e0a39813e1" - integrity sha512-RkNO/Qjdo/lkGr0TkR7YydBZqmete5bewDT59gqNbp5OsUQQ45pYLH0JYVsqpIUipJjjAezzVlBZk8+AuZYLGA== +"@abp/utils@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" + integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs index 0ab0ae4d6d..ec98cbcf78 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs @@ -36,6 +36,13 @@ using Volo.CmsKit.Reactions; using Volo.CmsKit.Tags; using Volo.CmsKit.Web; using Volo.CmsKit.Web.Contents; +using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.Mvc.Routing; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Volo.Abp.DependencyInjection; +using Volo.CmsKit.Public.Pages; + #if EntityFrameworkCore using Volo.Abp.SettingManagement.EntityFrameworkCore; @@ -54,7 +61,6 @@ using Volo.Abp.TenantManagement.MongoDB; using Volo.Abp.Identity.MongoDB; using Volo.Abp.PermissionManagement.MongoDB; using Volo.Abp.FeatureManagement.MongoDB; -using Volo.Abp.MongoDB; using Volo.Abp.BlobStoring.Database.MongoDB; using Volo.Abp.AuditLogging.MongoDB; using Volo.CmsKit.MongoDB; @@ -266,6 +272,7 @@ public class CmsKitWebUnifiedModule : AbpModule app.UseAuditing(); app.UseAbpSerilogEnrichers(); + app.UseConfiguredEndpoints(); using (var scope = context.ServiceProvider.CreateScope()) @@ -278,4 +285,4 @@ public class CmsKitWebUnifiedModule : AbpModule }); } } -} +} \ No newline at end of file diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index 9ba07e2fde..af94f94bb5 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3", - "@abp/cms-kit": "7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", + "@abp/cms-kit": "7.4.0-rc.4" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock index 6b8abd69c4..21183a1e78 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.3.tgz#fd39fa05c7b13ddfb7353036321142b6d8e0760b" - integrity sha512-HmJJfZsWEzgDO+pzxHSGo7XWYjljmpAcN+jBvom4gn2KwzmhiuWhZSPKx85cdtIldp3yOKjldExPdvSFwR+iSw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.3.tgz#750355b35eaf213b5127e462789d0e849a77d9c7" - integrity sha512-LgRADz+OSRXtgcWzOzBanJ3lk9WxYrHill75Bv4SOUXkDLiAGIH49jqhcga1TNSzwHy7l6KZS6hOakAujoRPzg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.3" - "@abp/bootstrap" "~7.4.0-rc.3" - "@abp/bootstrap-datepicker" "~7.4.0-rc.3" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.3" - "@abp/datatables.net-bs5" "~7.4.0-rc.3" - "@abp/font-awesome" "~7.4.0-rc.3" - "@abp/jquery-form" "~7.4.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.3" - "@abp/lodash" "~7.4.0-rc.3" - "@abp/luxon" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/moment" "~7.4.0-rc.3" - "@abp/select2" "~7.4.0-rc.3" - "@abp/sweetalert2" "~7.4.0-rc.3" - "@abp/timeago" "~7.4.0-rc.3" - "@abp/toastr" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.3.tgz#678c0e7323a542fc558526a0fd024195ab9ea682" - integrity sha512-QuoQA4LJMGWs5OFGczGQMFEMBkNzEdNDqIuF8s0O9gwZ15qaqHD8PmhmHXFlPJaezRtfwzODxKKDB9wwouPGwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" + integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" + integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" + "@abp/bootstrap" "~7.4.0-rc.4" + "@abp/bootstrap-datepicker" "~7.4.0-rc.4" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" + "@abp/datatables.net-bs5" "~7.4.0-rc.4" + "@abp/font-awesome" "~7.4.0-rc.4" + "@abp/jquery-form" "~7.4.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" + "@abp/lodash" "~7.4.0-rc.4" + "@abp/luxon" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/moment" "~7.4.0-rc.4" + "@abp/select2" "~7.4.0-rc.4" + "@abp/sweetalert2" "~7.4.0-rc.4" + "@abp/timeago" "~7.4.0-rc.4" + "@abp/toastr" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" + integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,257 +43,257 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.3.tgz#76941922c44a655b19aa1afcb88524fc3a6c85c1" - integrity sha512-/2wMvPGoXT4BoBEUuL6B/vH9aDHxde6THWkPjuHFftA/RysC5fikcK4ekqHvANcuLptyz4CwwhBnSUIMpTSVhQ== +"@abp/bootstrap-datepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" + integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.3.tgz#a5cdc0d3bc9a890f0790e5271c6b8c75a9073fdd" - integrity sha512-kEpU0WWKFrpjVH/XNl8pLOSW61oa/eIdM4pqpDc1b7yzFD58FZa4FOo87MspDEAhkESjzREkqytyfJTQHdDr9w== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" + integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.3.tgz#d70ed14f6de898e2444293a698788e1ae4eba420" - integrity sha512-2tByO67RJCj+xEyLh8/KBUWpx0XLliG2tgfDsc358GUDJYD99voakvvvDTDBpxT4z3H1UMRvYYg2O3axJTw8Aw== +"@abp/bootstrap@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" + integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.3.tgz#fbe3320da399eaa9efc433efe929fc9f3fc43be2" - integrity sha512-q7wKSGKD4rj2zQvSZpb0bILA2eivsA89AxeDVyHEfTBMOh6dxbg1eLY2acJwGyrXza+KbTa8n/tWM/L9w9dDWg== +"@abp/clipboard@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" + integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" clipboard "^2.0.8" -"@abp/cms-kit.admin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-7.4.0-rc.3.tgz#642282da32df3d4e717872bad436bbdf554a5198" - integrity sha512-n931iGYQZXHQ3SuVdOwTX0SgR9wLZIYPturwQCoJFKYBWkahwzkOiycqZ2SmSmmW7QbUrzMEEh2xBRi8H5eSow== +"@abp/cms-kit.admin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-7.4.0-rc.4.tgz#3f219f1a0f8d132037dc61f16beabd20d0f5a23d" + integrity sha512-UrMWk+SUrH9xvFpvW/zphbiGXWjKr9NRixNT4f93XI5objZChPrlfFjE6T4aiLo5HWLScaCcgRpRZeGB8vwrqA== dependencies: - "@abp/codemirror" "~7.4.0-rc.3" - "@abp/jstree" "~7.4.0-rc.3" - "@abp/slugify" "~7.4.0-rc.3" - "@abp/tui-editor" "~7.4.0-rc.3" - "@abp/uppy" "~7.4.0-rc.3" + "@abp/codemirror" "~7.4.0-rc.4" + "@abp/jstree" "~7.4.0-rc.4" + "@abp/slugify" "~7.4.0-rc.4" + "@abp/tui-editor" "~7.4.0-rc.4" + "@abp/uppy" "~7.4.0-rc.4" -"@abp/cms-kit.public@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-7.4.0-rc.3.tgz#f61acb138b74816e751988e7f553a6cce56bc14c" - integrity sha512-fpEdwAm9Mq+86XNUO2fmLkjVnT3qLL0V1cNsgQgW40N6WqX0pkIDXH1KI/ABNBaiV5C/MknUEm9YzUTkMci4BA== +"@abp/cms-kit.public@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-7.4.0-rc.4.tgz#6923e69becf7d3ee8924350488d084f3f2b323a0" + integrity sha512-Kj800zi8v4VgMjdZ9v3Old1VR9NsEcUcroAjK6RgPfX3WddB8qcTrGRrAjgz62OiFn/bXnb/iP0AjwjcqJejDg== dependencies: - "@abp/highlight.js" "~7.4.0-rc.3" - "@abp/star-rating-svg" "~7.4.0-rc.3" + "@abp/highlight.js" "~7.4.0-rc.4" + "@abp/star-rating-svg" "~7.4.0-rc.4" -"@abp/cms-kit@7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-7.4.0-rc.3.tgz#d5fd8cff486a3840173b6474912ea43d236ce252" - integrity sha512-Pf1ejgAnEt+znWCYzFHKSmFcLcq1U3/XcR12qwAS6WZYw7iosAl0qygdJS6Ys9RZw8E3m9JwY4XLXDE7SsEdvA== +"@abp/cms-kit@7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-7.4.0-rc.4.tgz#659f7ea0c0da4206ac3976f7968f221034c2f1f5" + integrity sha512-4RiB0VNFGfxnTsfz6xwwsgf71P2DgZ4IzREkaabFmSJ9sbaMpSBDTtVV+R3JJweMUJRpD+aX6XZ/3QDLpwVfyg== dependencies: - "@abp/cms-kit.admin" "~7.4.0-rc.3" - "@abp/cms-kit.public" "~7.4.0-rc.3" + "@abp/cms-kit.admin" "~7.4.0-rc.4" + "@abp/cms-kit.public" "~7.4.0-rc.4" -"@abp/codemirror@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-7.4.0-rc.3.tgz#3f98bbb02445764a1a167ec28fc6b3fbb306120e" - integrity sha512-jArCYfeHMaFmocFJAbwxM1Jprat5iAx97Gk2Pd5KSn17cufelCpFBneMaiociJ1REFBrN5nG2BPRC31Gbl/ATw== +"@abp/codemirror@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-7.4.0-rc.4.tgz#9fffb24e3722bd8191b9f401107d1928908e0775" + integrity sha512-PLFw2Fz2e+r7FgHhUJ6mAnKYmbbC7efaukbRg740xyTawFkayZCbaRaGMQsHisVVFPZYw8A2V7TNpny4WxgCIA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" codemirror "^5.65.1" -"@abp/core@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.3.tgz#c78d1a2d7279bc6ee0c1c807788028517eb11c5e" - integrity sha512-sOOFqy2qqcrKbTRa1lFJUW6WKg6ozV+jE5P4fnJGUBlV+LsdYu+QGPefAc9PFlVNGwtcKpBV0863F85m4zV1+Q== +"@abp/core@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" + integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== dependencies: - "@abp/utils" "~7.4.0-rc.3" + "@abp/utils" "~7.4.0-rc.4" -"@abp/datatables.net-bs5@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.3.tgz#1c1585a3bca08fa1afee154d485ddf50b5593855" - integrity sha512-97+P3Olfztzf+e/hn/o66KUa++l9tchSabJfpaC0hPYPILcYDzOVlHdxFcT6ScLhxwmZAZ07gqP9Q2fjd++MlA== +"@abp/datatables.net-bs5@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" + integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== dependencies: - "@abp/datatables.net" "~7.4.0-rc.3" + "@abp/datatables.net" "~7.4.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.3.tgz#d32d2f18dbd63ac9fcb459e965137504c1dd6c21" - integrity sha512-bC29AdMi/9IQP6wy2BuNebt3cbeku4c0NdsSyw7S4YFZBozMpQHt5r5c75wH5YFn08h+fQxpbIWtMczYPsy40A== +"@abp/datatables.net@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" + integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.3.tgz#a8522559e3424dfd4bb228bf37e9f8faf744e91e" - integrity sha512-UYLR80Fw4K6DCHXYvYVr4u58AC5qFTecTBSwGKkD73PLF7sIslFjrPxkivP4LHGSTrE5ZhZFqh0BJrGfVfIlLw== +"@abp/font-awesome@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" + integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/highlight.js@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-7.4.0-rc.3.tgz#aaf9292ed95e70bebe65ba0ebe67a5e92e9bda46" - integrity sha512-hmg+1clhYR8LKs+k4fGTkokedvtYgnYM2+Rl4i+k43Tac++224ttJOQVGBUPxEVw8fax4GRuhw81pOKJhwsi/A== +"@abp/highlight.js@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-7.4.0-rc.4.tgz#25c99742250f15402374c4bf5b2c815468435680" + integrity sha512-d4BJQXN2UiCPgCVqFUL8OJzqfVwjrpRxKj8ALFtbNMT2HYw0mKOIGUpuRIvOu5P161OSDuKzhMTPZrp4SsjMXA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.3.tgz#fe883f26508edc99b411962a87b2129c74dd0e49" - integrity sha512-tK8KwFdX1WVBbopvgKCK6Pz5RJMBzV5bEs2/ZmGheHAGTBk+IxwPfcxEhpz28FC1AarAyHTCLcOu8mGyytgzwA== +"@abp/jquery-form@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" + integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.3.tgz#6bd2e4ab3835e9910092f31e866f027fa9abdd34" - integrity sha512-Rg6skGiEq/rJir9l7yFG1dULjFYAYejXa5xkNzvGydmlaNBWKcEHbWP/7N2+N3dD7W5Ov4q8e8TX1SRGNBcSmg== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" + integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.3" + "@abp/jquery-validation" "~7.4.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.3.tgz#638524781b77266540973d510dfaa441878f5d1b" - integrity sha512-RfQnjxtW4GMvzqwldhD8eW4yeZPgXCGvsoSWOu4YsCVnA3w+XLFhZi62CVfISSGizYnJCv0L0lDDTvf9W18E7w== +"@abp/jquery-validation@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" + integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.3.tgz#8381cbea10906ae1339de2c662518a8670e58680" - integrity sha512-7aMqj4zZqoQxLGEBIVI9wTuaRlat2Vf9d56908yFblNwKyexuOOxV6caWGa5rv2WDprRW1wvFS6poMuGknL9AA== +"@abp/jquery@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" + integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" jquery "~3.6.0" -"@abp/jstree@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-7.4.0-rc.3.tgz#9baa5321ee4e669fedc9a43143a25def95127096" - integrity sha512-7nuCJpweGzzrxmzCzMSan6K6WXJkOpqxwg/bZKuJou5DGrum4LVR1gaDOzXHNnxatnirMwJFtCLkG5NIKhUcWw== +"@abp/jstree@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-7.4.0-rc.4.tgz#6c221e77ca43ecf3fa82ed74197096686e7acec5" + integrity sha512-M4Reb0XyjO07R3pcSKbGBam41Oz3x83Tz9qTVLqg0ulTpqaFB6Fny05yP/AoMohJ2EsogqYPOCo99QiTyeD+AQ== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jstree "^3.3.12" -"@abp/lodash@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.3.tgz#1898f1c4b0eb22a780f4267287691e2c29e146a2" - integrity sha512-2mH68Jm+JnctFMxCpbyQeZcjIW9mvVMHXmTvf+AwrnD5XSs3KR1xyBpRFwc0yFc9PaWLtsZnhnaz5OC93liRoQ== +"@abp/lodash@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" + integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.3.tgz#6845a9f4071cc9ea7463687fbca879d20190f1b9" - integrity sha512-dIrwCUKeoAn29MEe2G+ni1nTPdlT2WaUEbPMRSe5IZL3boKI4zJUditMq778ZcrlPbqpiFl6+yOpw26iWPbMaQ== +"@abp/luxon@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" + integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.3.tgz#6a671fb0478cef92efbd3376813cf232e42f5f49" - integrity sha512-x/B+V46JQddpnr6uP8jWZ/8sCghVt5soDhpgbc4QR5QcWbT1wpErec3Gupgxb0A2GeI4+9xFa7LHG8asIBmh8A== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" + integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.3.tgz#3f0c1d3922ccdd75dac46e8441e3a036a96db6fd" - integrity sha512-AE6adhwBnpDdWt/RNGwEPKrv0vC6lSlzrot487KGoiNAA7NIGfhVYSWo4QSedPDP+Jq2tD4fDvB/X7TgSwTdzA== +"@abp/moment@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" + integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== dependencies: moment "^2.9.0" -"@abp/prismjs@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.3.tgz#4202830db4e469be3d329ed2fb9ef8eb2ef85f8d" - integrity sha512-ikG4SFm7DPU4GOnBUaBdoFu/3PQUoIHWmsk46TvI2J3dCt+2WEgFNU6SAoF48DoMHDnnxfYwU5LYwH/sux2PvQ== +"@abp/prismjs@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" + integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== dependencies: - "@abp/clipboard" "~7.4.0-rc.3" - "@abp/core" "~7.4.0-rc.3" + "@abp/clipboard" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.3.tgz#134e28502e7dfa149f9feea23645b8962405d6aa" - integrity sha512-oeS/HKh1z8S1gE5YyiTt8YO9YAEw4dzi2aXY5RBeCQCpS28vYWHR7yX07AUS7YpQZNnajqL/fK14STU4z67d5g== +"@abp/select2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" + integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" select2 "^4.0.13" -"@abp/slugify@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-7.4.0-rc.3.tgz#57308f6be77da34943aab449ac9f0569737ea961" - integrity sha512-+MU7xKMvcJnSPgC/PKLNPqv6jMjSENLB775ULbxJquPisWXZCrmGfmXoEV9jW4TqTMiSVAY5Yt3dfFADfiMMHg== +"@abp/slugify@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-7.4.0-rc.4.tgz#afd70c6655d8216a00c32fdcea92587742e174c1" + integrity sha512-8M8prWvx+TfRWRPyzRhBagXs80IJST8rcEFK0MzPCT0zdYIRPQLV7EEVQtjCls63nAw2Nn7J6xifdXIPiauiiQ== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-7.4.0-rc.3.tgz#db50ef6798c7ebfb9545522cb36a9b73e086e4be" - integrity sha512-cY4anoHowV8Qg8SnCO6BSNn06es211wLyV+/M7ye1/Cr6SmBAp9ztSwMwJJ7dax47KM8JSk1g0iq4eCQXCkWnQ== +"@abp/star-rating-svg@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-7.4.0-rc.4.tgz#4bed8cb50e23d9c540620d215908fba377790755" + integrity sha512-XklV0msBxgUyw4evNnfTwLo7jEfJdLSYLrDEhGtWMWkwjM6qi3L6828YLmuSLKvaZh4ovoFQQm6/hURuK6qdWg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.3.tgz#fe47ed2311c0dc611621ddeea5cd232edca7f7da" - integrity sha512-02BcsINV+NQIBVv0kIDowp5Zggqqklu5rNSyhTHmLLXgjULS12lbc9ZAN8elvaiRov1PBKLuNymhVtSGD+vgYA== +"@abp/sweetalert2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" + integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.3.tgz#c68fcea9c7fb667115d88d935fd4234397da0986" - integrity sha512-D5rNk5eYyTQNhicYXz9Jn/Hm080UescpMEK51foGRMBKWZAK4IzbYVbA1lWumfpM8uKRXjE0Ujhow8gtMu3qEA== +"@abp/timeago@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" + integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.3.tgz#308ccab6e1be2ce7d44bdb7548e427aa4b42f5fe" - integrity sha512-oiVA8a6iqxaOmVAmALqVsy2faJe54Ao9m9rS7C9N03gYfr8cP58p+gQvuBahd7lKvDKHhkR5dRxtJsFABaFpJQ== +"@abp/toastr@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" + integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" toastr "^2.1.4" -"@abp/tui-editor@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.0-rc.3.tgz#741b0639e77a394e2413d93cf05f1911f0ac9d66" - integrity sha512-yOU+fJJd0aPTi0m2kfYfg2Eug6BORWur49OhEGLV7QJi1WTYTL0ISZHw58j7A5xdHcoljwqPXLpr/fYnj6eVJg== +"@abp/tui-editor@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.0-rc.4.tgz#830e429aebd2f819a3f30a2dbe9384c8c7e058c5" + integrity sha512-opZEMuuCGxwmu0QuzfTZhJ8FlSH+e0z0q5lbo1ywu18w270c3xLY0qGfDEjyCRq+VahHi079k4BMKGwzBvzLow== dependencies: - "@abp/jquery" "~7.4.0-rc.3" - "@abp/prismjs" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" + "@abp/prismjs" "~7.4.0-rc.4" -"@abp/uppy@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-7.4.0-rc.3.tgz#d74b8328405a61abbf321e7173d53d3bc05c7d12" - integrity sha512-mCzUgHMbiSWBAsyAmLMOyRBEhACMV3wWe2DtCdQpzJHWPlQQDIb8O32LlgGKt1YCLi4OVt8GaaFR8eF3sRib8A== +"@abp/uppy@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-7.4.0-rc.4.tgz#81a77314a526592b63d36211590ad095ca55ba23" + integrity sha512-TJ9hZrKVMIrNl0f0vNsNEOh3fu7it5EuJfwJCJ31ZDMTPPPw+6Eza/muhE1vl5lHw3pLxT7PgimHgA9R6Gv22g== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" uppy "^1.16.1" -"@abp/utils@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.3.tgz#bc02be5e7294615d42c303bb777845e0a39813e1" - integrity sha512-RkNO/Qjdo/lkGr0TkR7YydBZqmete5bewDT59gqNbp5OsUQQ45pYLH0JYVsqpIUipJjjAezzVlBZk8+AuZYLGA== +"@abp/utils@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" + integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs index e858bab189..4585077a49 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs @@ -66,6 +66,8 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi input.MapExtraPropertiesTo(page); await PageRepository.InsertAsync(page); + await PageCache.RemoveAsync(PageCacheItem.GetKey(page.Slug)); + return ObjectMapper.Map(page); } @@ -77,6 +79,8 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi { await InvalidateDefaultHomePageCacheAsync(considerUow: true); } + + await PageCache.RemoveAsync(PageCacheItem.GetKey(page.Slug)); await PageManager.SetSlugAsync(page, input.Slug); @@ -102,6 +106,7 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi } await PageRepository.DeleteAsync(page); + await PageCache.RemoveAsync(PageCacheItem.GetKey(page.Slug)); } [Authorize(CmsKitAdminPermissions.Pages.SetAsHomePage)] @@ -115,6 +120,6 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi protected virtual async Task InvalidateDefaultHomePageCacheAsync(bool considerUow = false) { - await PageCache.RemoveAsync(PageConsts.DefaultHomePageCacheKey, considerUow: considerUow); + await PageCache.RemoveAsync(PageCacheItem.GetKey(PageConsts.DefaultHomePageCacheKey), considerUow: considerUow); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Pages/PageConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Pages/PageConsts.cs index 69788463e2..f703fbac43 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Pages/PageConsts.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Pages/PageConsts.cs @@ -16,11 +16,5 @@ public static class PageConsts public static int MaxStyleLength { get; set; } = int.MaxValue; - public static string DefaultHomePageCacheKey { get; set; } = "DefaultHomePage"; - - private static string _urlPrefix = "/"; - public static string UrlPrefix { - get => _urlPrefix; - set => _urlPrefix = value.EnsureEndsWith('/').EnsureStartsWith('/'); - } + public static string DefaultHomePageCacheKey { get; set; } = "__DefaultHomePage"; } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuItemManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuItemManager.cs index 16fbbbdb8e..76d95f175f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuItemManager.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuItemManager.cs @@ -22,7 +22,7 @@ public class MenuItemManager : CmsKitDomainServiceBase public virtual void SetPageUrl(MenuItem menuItem, Page page) { menuItem.SetPageId(page.Id); - menuItem.SetUrl(PageConsts.UrlPrefix + page.Slug); + menuItem.SetUrl(page.Slug.EnsureStartsWith('/')); } [UnitOfWork] diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheItem.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheItem.cs index 71c6800e04..4dadd04e8e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheItem.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheItem.cs @@ -16,4 +16,9 @@ public class PageCacheItem : ExtensibleObject public string Script { get; set; } public string Style { get; set; } + + public static string GetKey(string slug) + { + return $"CmsPage_{slug}"; + } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageManager.cs index c11a64689a..587ae91144 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageManager.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageManager.cs @@ -37,7 +37,7 @@ public class PageManager : DomainService CurrentTenant.Id); } - public virtual async Task SetSlugAsync(Page page, string newSlug) + public virtual async Task SetSlugAsync(Page page, [NotNull] string newSlug) { if (page.Slug != newSlug) { diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/SlugNormalizer.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/SlugNormalizer.cs index d7529441b1..0e3b229620 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/SlugNormalizer.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/SlugNormalizer.cs @@ -5,9 +5,16 @@ namespace Volo.CmsKit; public static class SlugNormalizer { - static readonly SlugHelper SlugHelper = new(); + static readonly SlugHelper SlugHelper = new(new SlugHelperConfiguration + { + AllowedChars = + { + '/' + } + }); + public static string Normalize(string value) { - return SlugHelper.GenerateSlug(value?.Unidecode()); + return SlugHelper.GenerateSlug(value?.Unidecode()).Trim('/'); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs index bec4261f19..93ebb3df38 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs @@ -8,5 +8,6 @@ namespace Volo.CmsKit.Public.Pages; public interface IPagePublicAppService : IApplicationService { Task FindBySlugAsync([NotNull] string slug); + Task DoesSlugExistAsync([NotNull] string slug); Task FindDefaultHomePageAsync(); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs index 9940dceab1..cd0191e20d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using JetBrains.Annotations; using Microsoft.Extensions.Caching.Distributed; using Volo.Abp.Caching; using Volo.Abp.Features; @@ -16,31 +17,35 @@ namespace Volo.CmsKit.Public.Pages; public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppService { protected IPageRepository PageRepository { get; } - protected PageManager PageManager { get; } + protected PageManager PageManager { get; } protected IDistributedCache PageCache { get; } - public PagePublicAppService(IPageRepository pageRepository, PageManager pageManager, IDistributedCache pageCache) + public PagePublicAppService( + IPageRepository pageRepository, + PageManager pageManager, + IDistributedCache pageCache) { PageRepository = pageRepository; PageManager = pageManager; - PageCache = pageCache; + PageCache = pageCache; } public virtual async Task FindBySlugAsync(string slug) { - var page = await PageRepository.FindBySlugAsync(slug); - if (page == null) + var cachedPage = await FindAndCacheBySlugAsync(slug); + + if (cachedPage == null) { return null; } - return ObjectMapper.Map(page); + return ObjectMapper.Map(cachedPage); } public virtual async Task FindDefaultHomePageAsync() { - var pageCacheItem = await PageCache.GetAsync(PageConsts.DefaultHomePageCacheKey); + var pageCacheItem = await PageCache.GetAsync(PageCacheItem.GetKey(PageConsts.DefaultHomePageCacheKey)); if (pageCacheItem is null) { var page = await PageManager.GetHomePageAsync(); @@ -51,10 +56,34 @@ public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppSe pageCacheItem = ObjectMapper.Map(page); - await PageCache.SetAsync(PageConsts.DefaultHomePageCacheKey, pageCacheItem, + await PageCache.SetAsync(PageCacheItem.GetKey(PageConsts.DefaultHomePageCacheKey), pageCacheItem, new DistributedCacheEntryOptions { AbsoluteExpiration = DateTimeOffset.Now.AddHours(1) }); } return ObjectMapper.Map(pageCacheItem); } + + public virtual async Task DoesSlugExistAsync([NotNull] string slug) + { + var cached = await FindAndCacheBySlugAsync(slug); + + return cached != null; + } + + internal virtual async Task FindAndCacheBySlugAsync(string slug) + { + var pageCacheItem = await PageCache.GetOrAddAsync(PageCacheItem.GetKey(slug), async () => + { + var page = await PageRepository.FindBySlugAsync(slug); + // If page is not found, cache it as null to prevent further queries. + if (page is null) + { + return null; + } + + return ObjectMapper.Map(page); + }); + + return pageCacheItem; + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/Volo/CmsKit/Public/Pages/PagesPublicClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/Volo/CmsKit/Public/Pages/PagesPublicClientProxy.Generated.cs index 6a7df3e4e2..4fb1e8bc9f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/Volo/CmsKit/Public/Pages/PagesPublicClientProxy.Generated.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/Volo/CmsKit/Public/Pages/PagesPublicClientProxy.Generated.cs @@ -30,4 +30,12 @@ public partial class PagesPublicClientProxy : ClientProxyBase(nameof(FindDefaultHomePageAsync)); } + + public virtual async Task DoesSlugExistAsync(string slug) + { + return await RequestAsync(nameof(DoesSlugExistAsync), new ClientProxyRequestTypeValue + { + { typeof(string), slug } + }); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json index bfde04ba1d..477938b6de 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json @@ -829,6 +829,23 @@ "typeSimple": "Volo.CmsKit.Contents.PageDto" } }, + { + "name": "DoesSlugExistAsync", + "parametersOnMethod": [ + { + "name": "slug", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "returnValue": { + "type": "System.Boolean", + "typeSimple": "boolean" + } + }, { "name": "FindDefaultHomePageAsync", "parametersOnMethod": [], @@ -845,7 +862,7 @@ "uniqueName": "FindBySlugAsyncBySlug", "name": "FindBySlugAsync", "httpMethod": "GET", - "url": "api/cms-kit-public/pages/{slug}", + "url": "api/cms-kit-public/pages/by-slug", "supportedVersions": [], "parametersOnMethod": [ { @@ -866,8 +883,8 @@ "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", + "constraintTypes": null, + "bindingSourceId": "Query", "descriptorName": "" } ], @@ -882,7 +899,7 @@ "uniqueName": "FindDefaultHomePageAsync", "name": "FindDefaultHomePageAsync", "httpMethod": "GET", - "url": "api/cms-kit-public/pages", + "url": "api/cms-kit-public/pages/home", "supportedVersions": [], "parametersOnMethod": [], "parameters": [], @@ -892,6 +909,43 @@ }, "allowAnonymous": null, "implementFrom": "Volo.CmsKit.Public.Pages.IPagePublicAppService" + }, + "DoesSlugExistAsyncBySlug": { + "uniqueName": "DoesSlugExistAsyncBySlug", + "name": "DoesSlugExistAsync", + "httpMethod": "GET", + "url": "api/cms-kit-public/pages/exist", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "slug", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "slug", + "name": "slug", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Query", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.Boolean", + "typeSimple": "boolean" + }, + "allowAnonymous": null, + "implementFrom": "Volo.CmsKit.Public.Pages.IPagePublicAppService" } } }, diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs index d6550977ef..55534f8ac1 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using JetBrains.Annotations; using Microsoft.AspNetCore.Mvc; using Volo.Abp; using Volo.Abp.Features; @@ -24,15 +25,23 @@ public class PagesPublicController : CmsKitPublicControllerBase, IPagePublicAppS } [HttpGet] - [Route("{slug}")] - public virtual Task FindBySlugAsync(string slug) + [Route("by-slug")] + public virtual Task FindBySlugAsync([FromQuery]string slug) { return PageAppService.FindBySlugAsync(slug); } [HttpGet] - public Task FindDefaultHomePageAsync() + [Route("home")] + public virtual Task FindDefaultHomePageAsync() { return PageAppService.FindDefaultHomePageAsync(); } + + [HttpGet] + [Route("exist")] + public virtual Task DoesSlugExistAsync([NotNull][FromQuery] string slug) + { + return PageAppService.DoesSlugExistAsync(slug); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPagesConfigurationExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPagesConfigurationExtensions.cs new file mode 100644 index 0000000000..bf14634b2e --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPagesConfigurationExtensions.cs @@ -0,0 +1,39 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; +using Volo.Abp.GlobalFeatures; +using Volo.CmsKit.GlobalFeatures; +using Volo.CmsKit.Public.Web.Pages; + +namespace Volo.CmsKit.Public.Web; + +public static class CmsKitPagesConfigurationExtensions +{ + /// + /// Maps CMS Kit to the routing. + /// + /// + /// The matching order for the dynamic route. Lower is prior. + public static IEndpointRouteBuilder MapCmsPageRoute(this IEndpointRouteBuilder builder, int? order = null) + { + if (!GlobalFeatureManager.Instance.IsEnabled()) + { + return builder; + } + + builder + .MapDynamicPageRoute("/", state: null, order: int.MinValue); + + if (order is null) + { + builder + .MapDynamicPageRoute("{**slug}"); + } + else + { + builder + .MapDynamicPageRoute("{**slug}", state: default, order: order.Value); + } + + return builder; + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs index 36308b1839..74177352be 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs @@ -1,18 +1,17 @@ using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; using Volo.Abp.AspNetCore.Mvc.Localization; -using Volo.Abp.Ui.LayoutHooks; using Volo.Abp.AutoMapper; using Volo.Abp.Caching; using Volo.Abp.GlobalFeatures; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; using Volo.Abp.Modularity; +using Volo.Abp.Ui.LayoutHooks; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.Localization; -using Volo.CmsKit.Pages; using Volo.CmsKit.Public.Web.Menus; using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.GlobalResources.Script; using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.GlobalResources.Style; @@ -73,6 +72,14 @@ public class CmsKitPublicWebModule : AbpModule { options.KeyPrefix = "CmsKit:"; }); + + Configure(options => + { + options.EndpointConfigureActions.Add(context => + { + context.Endpoints.MapCmsPageRoute(); + }); + }); } public override void PostConfigureServices(ServiceConfigurationContext context) @@ -81,7 +88,6 @@ public class CmsKitPublicWebModule : AbpModule { Configure(options => { - options.Conventions.AddPageRoute("/Public/CmsKit/Pages/Index", PageConsts.UrlPrefix + "{slug:minlength(1)}"); options.Conventions.AddPageRoute("/Public/CmsKit/Blogs/Index", @"/blogs/{blogSlug:minlength(1)}"); options.Conventions.AddPageRoute("/Public/CmsKit/Blogs/BlogPost", @"/blogs/{blogSlug}/{blogPostSlug:minlength(1)}"); }); @@ -101,16 +107,5 @@ public class CmsKitPublicWebModule : AbpModule ); }); } - - } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - var app = context.GetApplicationBuilder(); - - if (GlobalFeatureManager.Instance.IsEnabled()) - { - app.UseHomePageDefaultMiddleware(); - } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs deleted file mode 100644 index 752e5f2f42..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Features; -using Volo.CmsKit.Features; -using Volo.CmsKit.Pages; -using Volo.CmsKit.Public.Pages; - -namespace Volo.CmsKit.Public.Web; - -public class DefaultHomePageMiddleware : IMiddleware, ITransientDependency -{ - public async Task InvokeAsync(HttpContext context, RequestDelegate next) - { - var featureChecker = context.RequestServices.GetRequiredService(); - - if (context.Request.Path.Value == "/") - { - if (await featureChecker.IsEnabledAsync(CmsKitFeatures.PageEnable)) - { - var pagePublicAppService = context.RequestServices.GetRequiredService(); - - var page = await pagePublicAppService.FindDefaultHomePageAsync(); - if (page != null) - { - context.Request.Path = $"{PageConsts.UrlPrefix}{page.Slug}"; - } - } - } - - await next(context); - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/HomePageDefaultMiddlewareExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/HomePageDefaultMiddlewareExtensions.cs deleted file mode 100644 index c5a2d8516f..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/HomePageDefaultMiddlewareExtensions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Microsoft.AspNetCore.Builder; - -namespace Volo.CmsKit.Public.Web; - -public static class HomePageDefaultMiddlewareExtensions -{ - public static IApplicationBuilder UseHomePageDefaultMiddleware(this IApplicationBuilder builder) - { - return builder.UseMiddleware(); - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKitHomePageRouteValueTransformer.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKitHomePageRouteValueTransformer.cs new file mode 100644 index 0000000000..3ac271938b --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKitHomePageRouteValueTransformer.cs @@ -0,0 +1,40 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Routing; +using Microsoft.AspNetCore.Routing; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Features; +using Volo.CmsKit.Features; +using Volo.CmsKit.Public.Pages; + +namespace Volo.CmsKit.Public.Web.Pages; + +public class CmsKitHomePageRouteValueTransformer : DynamicRouteValueTransformer, ITransientDependency +{ + protected IFeatureChecker FeatureChecker { get; } + + protected IPagePublicAppService PagePublicAppService { get; } + + public CmsKitHomePageRouteValueTransformer(IFeatureChecker featureChecker, IPagePublicAppService pagePublicAppService) + { + FeatureChecker = featureChecker; + PagePublicAppService = pagePublicAppService; + } + + public override async ValueTask TransformAsync(HttpContext httpContext, RouteValueDictionary values) + { + if (await FeatureChecker.IsEnabledAsync(CmsKitFeatures.PageEnable)) + { + var page = await PagePublicAppService.FindDefaultHomePageAsync(); + if (page is not null) + { + values = new RouteValueDictionary(); + + values["page"] = "/Public/CmsKit/Pages/Index"; + values["slug"] = page.Slug; + } + } + + return values; + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKitPageRouteValueTransformer.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKitPageRouteValueTransformer.cs new file mode 100644 index 0000000000..d9bba6cd0b --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKitPageRouteValueTransformer.cs @@ -0,0 +1,43 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Routing; +using Microsoft.AspNetCore.Routing; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Features; +using Volo.CmsKit.Features; +using Volo.CmsKit.Public.Pages; + +namespace Volo.CmsKit.Public.Web.Pages; + +public class CmsKitPageRouteValueTransformer : DynamicRouteValueTransformer, ITransientDependency +{ + protected IFeatureChecker FeatureChecker { get; } + protected IPagePublicAppService PagePublicAppService { get; } + + public CmsKitPageRouteValueTransformer(IFeatureChecker featureChecker, IPagePublicAppService pagePublicAppService) + { + FeatureChecker = featureChecker; + PagePublicAppService = pagePublicAppService; + } + + public override async ValueTask TransformAsync(HttpContext httpContext, RouteValueDictionary values) + { + if (values.TryGetValue("slug", out var slugParameter) && slugParameter is not null) + { + if (!await FeatureChecker.IsEnabledAsync(CmsKitFeatures.PageEnable)) + { + return values; + } + + var slug = slugParameter.ToString().TrimStart('/'); + var exist = await PagePublicAppService.DoesSlugExistAsync(slug); + + if (exist) + { + values["page"] = "/Public/CmsKit/Pages/Index"; + } + } + + return values; + } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml index 4237eb5c31..d55ffebad7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml @@ -1,4 +1,4 @@ -@page +@page "/pages/{**slug}" @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap @using Volo.CmsKit.Contents @using Volo.CmsKit.Web.Pages.CmsKit.Components.Contents diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Menus/MenuItemAdminAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Menus/MenuItemAdminAppService_Tests.cs index cd210a3ba5..509070fd7d 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Menus/MenuItemAdminAppService_Tests.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Menus/MenuItemAdminAppService_Tests.cs @@ -32,6 +32,7 @@ public class MenuItemAdminAppService_Tests : CmsKitApplicationTestBase menu.ShouldNotBeNull(); } + [Fact] public async Task GetListAsync_ShouldWorkProperly() { var result = await MenuAdminAppService.GetListAsync(); @@ -69,7 +70,6 @@ public class MenuItemAdminAppService_Tests : CmsKitApplicationTestBase }); }); - var menu = await MenuRepository.FindAsync(TestData.MenuItem_1_Id); menu.ShouldNotBeNull(); @@ -82,7 +82,6 @@ public class MenuItemAdminAppService_Tests : CmsKitApplicationTestBase { await MenuAdminAppService.DeleteAsync(TestData.MenuItem_1_Id); - var menu = await MenuRepository.FindAsync(TestData.MenuItem_1_Id); menu.ShouldBeNull(); diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs index 0eeb3210a9..8372de3cb5 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs @@ -33,4 +33,20 @@ public class PagePublicAppService_Tests : CmsKitApplicationTestBase page.ShouldBeNull(); } + + [Fact] + public async Task DoesSlugExistAsync_ShouldReturnTrue_WhenExists() + { + var result = await _pageAppService.DoesSlugExistAsync(_data.Page_1_Slug); + + result.ShouldBeTrue(); + } + + [Fact] + public async Task DoesSlugExistAsync_ShouldReturnFalse_WhenDoesNotExist() + { + var result = await _pageAppService.DoesSlugExistAsync("not-exist-url"); + + result.ShouldBeFalse(); + } } diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/SlugExtensions_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/SlugExtensions_Tests.cs index 941f82c7bf..ea07fb335c 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/SlugExtensions_Tests.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/SlugExtensions_Tests.cs @@ -129,4 +129,32 @@ public class SlugExtensions_Tests // Assert actual.ShouldBe(expected); } + + [Fact] + public void NormalizeSlug_ShouldWorkProperly_WithMultipleLevel() + { + // Arrange + var name = "path/to/my/page"; + var expected = "path/to/my/page"; + + // Act + var actual = SlugNormalizer.Normalize(name); + + // Assert + actual.ShouldBe(expected); + } + + [Fact] + public void NormalizeSlug_ShouldWorkProperly_WithMultipleLevelStartingSlash() + { + // Arrange + var name = "/path/to/my/page"; + var expected = "path/to/my/page"; + + // Act + var actual = SlugNormalizer.Normalize(name); + + // Assert + actual.ShouldBe(expected); + } } diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Menus/MenuManager_Test.cs b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Menus/MenuManager_Test.cs index 514aa47797..bcc1612d41 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Menus/MenuManager_Test.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Menus/MenuManager_Test.cs @@ -32,7 +32,7 @@ public class MenuManager_Test : CmsKitDomainTestBase menuManager.SetPageUrl(menuItem, page); menuItem.Url.ShouldNotBeNullOrEmpty(); - menuItem.Url.ShouldBe(PageConsts.UrlPrefix + page.Slug); + menuItem.Url.ShouldBe(page.Slug.EnsureStartsWith('/')); } [Fact] diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index 9435314f1a..777703fed7 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3", - "@abp/docs": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", + "@abp/docs": "~7.4.0-rc.4" } } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index c850ead39f..a1d41100a2 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,47 +2,47 @@ # yarn lockfile v1 -"@abp/anchor-js@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-7.4.0-rc.3.tgz#048d72123a75e98f09724db22a727e61d14dbaad" - integrity sha512-yy15N47jNt/+mhisRs6Or/Y7JdSwzXf9d2POh7cgnZWxAZ5dfwKEGmlMnYcDS2ZRgJWe2NQgABTb8mqx9MLCXw== +"@abp/anchor-js@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-7.4.0-rc.4.tgz#115c3915f9c06bd89ba17c2c16250d917f4a71d6" + integrity sha512-74VbQ9cz7EB3dqTRLzTDlvxuaehiCORWKMhCpDBkvLDy2ovrXv40wsygWaDXYGojGxsjkxJeZNBqTdts6cLM9w== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" anchor-js "^4.3.1" -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.3.tgz#fd39fa05c7b13ddfb7353036321142b6d8e0760b" - integrity sha512-HmJJfZsWEzgDO+pzxHSGo7XWYjljmpAcN+jBvom4gn2KwzmhiuWhZSPKx85cdtIldp3yOKjldExPdvSFwR+iSw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.3.tgz#750355b35eaf213b5127e462789d0e849a77d9c7" - integrity sha512-LgRADz+OSRXtgcWzOzBanJ3lk9WxYrHill75Bv4SOUXkDLiAGIH49jqhcga1TNSzwHy7l6KZS6hOakAujoRPzg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.3" - "@abp/bootstrap" "~7.4.0-rc.3" - "@abp/bootstrap-datepicker" "~7.4.0-rc.3" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.3" - "@abp/datatables.net-bs5" "~7.4.0-rc.3" - "@abp/font-awesome" "~7.4.0-rc.3" - "@abp/jquery-form" "~7.4.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.3" - "@abp/lodash" "~7.4.0-rc.3" - "@abp/luxon" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/moment" "~7.4.0-rc.3" - "@abp/select2" "~7.4.0-rc.3" - "@abp/sweetalert2" "~7.4.0-rc.3" - "@abp/timeago" "~7.4.0-rc.3" - "@abp/toastr" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.3.tgz#678c0e7323a542fc558526a0fd024195ab9ea682" - integrity sha512-QuoQA4LJMGWs5OFGczGQMFEMBkNzEdNDqIuF8s0O9gwZ15qaqHD8PmhmHXFlPJaezRtfwzODxKKDB9wwouPGwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" + integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" + integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" + "@abp/bootstrap" "~7.4.0-rc.4" + "@abp/bootstrap-datepicker" "~7.4.0-rc.4" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" + "@abp/datatables.net-bs5" "~7.4.0-rc.4" + "@abp/font-awesome" "~7.4.0-rc.4" + "@abp/jquery-form" "~7.4.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" + "@abp/lodash" "~7.4.0-rc.4" + "@abp/luxon" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/moment" "~7.4.0-rc.4" + "@abp/select2" "~7.4.0-rc.4" + "@abp/sweetalert2" "~7.4.0-rc.4" + "@abp/timeago" "~7.4.0-rc.4" + "@abp/toastr" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" + integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -51,194 +51,194 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.3.tgz#76941922c44a655b19aa1afcb88524fc3a6c85c1" - integrity sha512-/2wMvPGoXT4BoBEUuL6B/vH9aDHxde6THWkPjuHFftA/RysC5fikcK4ekqHvANcuLptyz4CwwhBnSUIMpTSVhQ== +"@abp/bootstrap-datepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" + integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.3.tgz#a5cdc0d3bc9a890f0790e5271c6b8c75a9073fdd" - integrity sha512-kEpU0WWKFrpjVH/XNl8pLOSW61oa/eIdM4pqpDc1b7yzFD58FZa4FOo87MspDEAhkESjzREkqytyfJTQHdDr9w== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" + integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.3.tgz#d70ed14f6de898e2444293a698788e1ae4eba420" - integrity sha512-2tByO67RJCj+xEyLh8/KBUWpx0XLliG2tgfDsc358GUDJYD99voakvvvDTDBpxT4z3H1UMRvYYg2O3axJTw8Aw== +"@abp/bootstrap@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" + integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.3.tgz#fbe3320da399eaa9efc433efe929fc9f3fc43be2" - integrity sha512-q7wKSGKD4rj2zQvSZpb0bILA2eivsA89AxeDVyHEfTBMOh6dxbg1eLY2acJwGyrXza+KbTa8n/tWM/L9w9dDWg== +"@abp/clipboard@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" + integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" clipboard "^2.0.8" -"@abp/core@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.3.tgz#c78d1a2d7279bc6ee0c1c807788028517eb11c5e" - integrity sha512-sOOFqy2qqcrKbTRa1lFJUW6WKg6ozV+jE5P4fnJGUBlV+LsdYu+QGPefAc9PFlVNGwtcKpBV0863F85m4zV1+Q== +"@abp/core@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" + integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== dependencies: - "@abp/utils" "~7.4.0-rc.3" + "@abp/utils" "~7.4.0-rc.4" -"@abp/datatables.net-bs5@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.3.tgz#1c1585a3bca08fa1afee154d485ddf50b5593855" - integrity sha512-97+P3Olfztzf+e/hn/o66KUa++l9tchSabJfpaC0hPYPILcYDzOVlHdxFcT6ScLhxwmZAZ07gqP9Q2fjd++MlA== +"@abp/datatables.net-bs5@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" + integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== dependencies: - "@abp/datatables.net" "~7.4.0-rc.3" + "@abp/datatables.net" "~7.4.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.3.tgz#d32d2f18dbd63ac9fcb459e965137504c1dd6c21" - integrity sha512-bC29AdMi/9IQP6wy2BuNebt3cbeku4c0NdsSyw7S4YFZBozMpQHt5r5c75wH5YFn08h+fQxpbIWtMczYPsy40A== +"@abp/datatables.net@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" + integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" datatables.net "^1.11.4" -"@abp/docs@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-7.4.0-rc.3.tgz#58f37acc1460941387e7359092fd007292078794" - integrity sha512-fxKkwqk5Sj9JDp+w8P+KKJU04oXAHzpIPd1UGTioJYwRFSnb/nOgTF3AlASP1Xqu2W6wwEsQxrqyAk1RRyuuVg== +"@abp/docs@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-7.4.0-rc.4.tgz#8dbd79930a48149972abdcc87f0a03982b16997c" + integrity sha512-YYQv7Eg7TJrOg5lU1ihVbDoT4cjHbYt/uyyZjITfdM4erFhqV4AG8sFWhdNxPcAV1gKkiQe4D+TYbajflBmcZA== dependencies: - "@abp/anchor-js" "~7.4.0-rc.3" - "@abp/clipboard" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/popper.js" "~7.4.0-rc.3" - "@abp/prismjs" "~7.4.0-rc.3" + "@abp/anchor-js" "~7.4.0-rc.4" + "@abp/clipboard" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/popper.js" "~7.4.0-rc.4" + "@abp/prismjs" "~7.4.0-rc.4" -"@abp/font-awesome@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.3.tgz#a8522559e3424dfd4bb228bf37e9f8faf744e91e" - integrity sha512-UYLR80Fw4K6DCHXYvYVr4u58AC5qFTecTBSwGKkD73PLF7sIslFjrPxkivP4LHGSTrE5ZhZFqh0BJrGfVfIlLw== +"@abp/font-awesome@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" + integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.3.tgz#fe883f26508edc99b411962a87b2129c74dd0e49" - integrity sha512-tK8KwFdX1WVBbopvgKCK6Pz5RJMBzV5bEs2/ZmGheHAGTBk+IxwPfcxEhpz28FC1AarAyHTCLcOu8mGyytgzwA== +"@abp/jquery-form@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" + integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.3.tgz#6bd2e4ab3835e9910092f31e866f027fa9abdd34" - integrity sha512-Rg6skGiEq/rJir9l7yFG1dULjFYAYejXa5xkNzvGydmlaNBWKcEHbWP/7N2+N3dD7W5Ov4q8e8TX1SRGNBcSmg== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" + integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.3" + "@abp/jquery-validation" "~7.4.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.3.tgz#638524781b77266540973d510dfaa441878f5d1b" - integrity sha512-RfQnjxtW4GMvzqwldhD8eW4yeZPgXCGvsoSWOu4YsCVnA3w+XLFhZi62CVfISSGizYnJCv0L0lDDTvf9W18E7w== +"@abp/jquery-validation@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" + integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.3.tgz#8381cbea10906ae1339de2c662518a8670e58680" - integrity sha512-7aMqj4zZqoQxLGEBIVI9wTuaRlat2Vf9d56908yFblNwKyexuOOxV6caWGa5rv2WDprRW1wvFS6poMuGknL9AA== +"@abp/jquery@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" + integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.3.tgz#1898f1c4b0eb22a780f4267287691e2c29e146a2" - integrity sha512-2mH68Jm+JnctFMxCpbyQeZcjIW9mvVMHXmTvf+AwrnD5XSs3KR1xyBpRFwc0yFc9PaWLtsZnhnaz5OC93liRoQ== +"@abp/lodash@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" + integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.3.tgz#6845a9f4071cc9ea7463687fbca879d20190f1b9" - integrity sha512-dIrwCUKeoAn29MEe2G+ni1nTPdlT2WaUEbPMRSe5IZL3boKI4zJUditMq778ZcrlPbqpiFl6+yOpw26iWPbMaQ== +"@abp/luxon@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" + integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.3.tgz#6a671fb0478cef92efbd3376813cf232e42f5f49" - integrity sha512-x/B+V46JQddpnr6uP8jWZ/8sCghVt5soDhpgbc4QR5QcWbT1wpErec3Gupgxb0A2GeI4+9xFa7LHG8asIBmh8A== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" + integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.3.tgz#3f0c1d3922ccdd75dac46e8441e3a036a96db6fd" - integrity sha512-AE6adhwBnpDdWt/RNGwEPKrv0vC6lSlzrot487KGoiNAA7NIGfhVYSWo4QSedPDP+Jq2tD4fDvB/X7TgSwTdzA== +"@abp/moment@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" + integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== dependencies: moment "^2.9.0" -"@abp/popper.js@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-7.4.0-rc.3.tgz#1e42aba51fcab2632f6365083707425ec12b79a3" - integrity sha512-07JM/IHantcxDqwyPwiRBJLRbX1aartqW51OuT3ghKBUWBAZTp+ADXp0AtnobjzGyIBsxQ9uk33KEjNydqeCSw== +"@abp/popper.js@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-7.4.0-rc.4.tgz#13c32f419f60f8a9d16819d28136678089de21eb" + integrity sha512-pqpiKApPMbVFJIrZPYFFqfytY0rRoe467r/sSWGMvO1llQ62NuLgLXkzqqiL0crbNOm0bz0Uw3rYotc7z5q3og== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@popperjs/core" "^2.11.2" -"@abp/prismjs@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.3.tgz#4202830db4e469be3d329ed2fb9ef8eb2ef85f8d" - integrity sha512-ikG4SFm7DPU4GOnBUaBdoFu/3PQUoIHWmsk46TvI2J3dCt+2WEgFNU6SAoF48DoMHDnnxfYwU5LYwH/sux2PvQ== +"@abp/prismjs@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" + integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== dependencies: - "@abp/clipboard" "~7.4.0-rc.3" - "@abp/core" "~7.4.0-rc.3" + "@abp/clipboard" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.3.tgz#134e28502e7dfa149f9feea23645b8962405d6aa" - integrity sha512-oeS/HKh1z8S1gE5YyiTt8YO9YAEw4dzi2aXY5RBeCQCpS28vYWHR7yX07AUS7YpQZNnajqL/fK14STU4z67d5g== +"@abp/select2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" + integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.3.tgz#fe47ed2311c0dc611621ddeea5cd232edca7f7da" - integrity sha512-02BcsINV+NQIBVv0kIDowp5Zggqqklu5rNSyhTHmLLXgjULS12lbc9ZAN8elvaiRov1PBKLuNymhVtSGD+vgYA== +"@abp/sweetalert2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" + integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.3.tgz#c68fcea9c7fb667115d88d935fd4234397da0986" - integrity sha512-D5rNk5eYyTQNhicYXz9Jn/Hm080UescpMEK51foGRMBKWZAK4IzbYVbA1lWumfpM8uKRXjE0Ujhow8gtMu3qEA== +"@abp/timeago@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" + integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.3.tgz#308ccab6e1be2ce7d44bdb7548e427aa4b42f5fe" - integrity sha512-oiVA8a6iqxaOmVAmALqVsy2faJe54Ao9m9rS7C9N03gYfr8cP58p+gQvuBahd7lKvDKHhkR5dRxtJsFABaFpJQ== +"@abp/toastr@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" + integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.3.tgz#bc02be5e7294615d42c303bb777845e0a39813e1" - integrity sha512-RkNO/Qjdo/lkGr0TkR7YydBZqmete5bewDT59gqNbp5OsUQQ45pYLH0JYVsqpIUipJjjAezzVlBZk8+AuZYLGA== +"@abp/utils@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" + integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== dependencies: just-compare "^2.3.0" diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs index 81488b1f30..c52902bfed 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs @@ -174,13 +174,14 @@ public class EfCoreIdentityUserRepository : EfCoreRepository - u.UserName.Contains(filter) || - u.Email.Contains(filter) || + u.NormalizedUserName.Contains(upperFilter) || + u.NormalizedEmail.Contains(upperFilter) || (u.Name != null && u.Name.Contains(filter)) || (u.Surname != null && u.Surname.Contains(filter)) || (u.PhoneNumber != null && u.PhoneNumber.Contains(filter)) @@ -255,12 +256,13 @@ public class EfCoreIdentityUserRepository : EfCoreRepository - u.UserName.Contains(filter) || - u.Email.Contains(filter) || + u.NormalizedUserName.Contains(upperFilter) || + u.NormalizedEmail.Contains(upperFilter) || (u.Name != null && u.Name.Contains(filter)) || (u.Surname != null && u.Surname.Contains(filter)) || (u.PhoneNumber != null && u.PhoneNumber.Contains(filter)) diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs index f5589d5dfa..51960edbba 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs @@ -155,12 +155,13 @@ public class MongoIdentityUserRepository : MongoDbRepository>( !filter.IsNullOrWhiteSpace(), u => - u.UserName.Contains(filter) || - u.Email.Contains(filter) || + u.NormalizedUserName.Contains(upperFilter) || + u.NormalizedEmail.Contains(upperFilter) || (u.Name != null && u.Name.Contains(filter)) || (u.Surname != null && u.Surname.Contains(filter)) || (u.PhoneNumber != null && u.PhoneNumber.Contains(filter)) @@ -240,12 +241,13 @@ public class MongoIdentityUserRepository : MongoDbRepository>( !filter.IsNullOrWhiteSpace(), u => - u.UserName.Contains(filter) || - u.Email.Contains(filter) || + u.NormalizedUserName.Contains(upperFilter) || + u.NormalizedEmail.Contains(upperFilter) || (u.Name != null && u.Name.Contains(filter)) || (u.Surname != null && u.Surname.Contains(filter)) || (u.PhoneNumber != null && u.PhoneNumber.Contains(filter)) diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index 3a1316c670..704a94ab02 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index b69313c308..9891205adb 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.3", - "@abp/ng.components": "~7.4.0-rc.3", - "@abp/ng.core": "~7.4.0-rc.3", - "@abp/ng.oauth": "~7.4.0-rc.3", - "@abp/ng.identity": "~7.4.0-rc.3", - "@abp/ng.setting-management": "~7.4.0-rc.3", - "@abp/ng.tenant-management": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.account": "~7.4.0-rc.4", + "@abp/ng.components": "~7.4.0-rc.4", + "@abp/ng.core": "~7.4.0-rc.4", + "@abp/ng.oauth": "~7.4.0-rc.4", + "@abp/ng.identity": "~7.4.0-rc.4", + "@abp/ng.setting-management": "~7.4.0-rc.4", + "@abp/ng.tenant-management": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "@abp/ng.theme.lepton-x": "~2.4.0-rc.2", "@angular/animations": "^15.0.1", "@angular/common": "^15.0.1", @@ -36,7 +36,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~7.4.0-rc.3", + "@abp/ng.schematics": "~7.4.0-rc.4", "@angular-devkit/build-angular": "^15.0.1", "@angular-eslint/builder": "~15.1.0", "@angular-eslint/eslint-plugin": "~15.1.0", diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index ea33a50c9a..727acf59ed 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock index 6a7853ea08..739bb79d1c 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.3.tgz#fd39fa05c7b13ddfb7353036321142b6d8e0760b" - integrity sha512-HmJJfZsWEzgDO+pzxHSGo7XWYjljmpAcN+jBvom4gn2KwzmhiuWhZSPKx85cdtIldp3yOKjldExPdvSFwR+iSw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.3.tgz#750355b35eaf213b5127e462789d0e849a77d9c7" - integrity sha512-LgRADz+OSRXtgcWzOzBanJ3lk9WxYrHill75Bv4SOUXkDLiAGIH49jqhcga1TNSzwHy7l6KZS6hOakAujoRPzg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.3" - "@abp/bootstrap" "~7.4.0-rc.3" - "@abp/bootstrap-datepicker" "~7.4.0-rc.3" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.3" - "@abp/datatables.net-bs5" "~7.4.0-rc.3" - "@abp/font-awesome" "~7.4.0-rc.3" - "@abp/jquery-form" "~7.4.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.3" - "@abp/lodash" "~7.4.0-rc.3" - "@abp/luxon" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/moment" "~7.4.0-rc.3" - "@abp/select2" "~7.4.0-rc.3" - "@abp/sweetalert2" "~7.4.0-rc.3" - "@abp/timeago" "~7.4.0-rc.3" - "@abp/toastr" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.3.tgz#678c0e7323a542fc558526a0fd024195ab9ea682" - integrity sha512-QuoQA4LJMGWs5OFGczGQMFEMBkNzEdNDqIuF8s0O9gwZ15qaqHD8PmhmHXFlPJaezRtfwzODxKKDB9wwouPGwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" + integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" + integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" + "@abp/bootstrap" "~7.4.0-rc.4" + "@abp/bootstrap-datepicker" "~7.4.0-rc.4" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" + "@abp/datatables.net-bs5" "~7.4.0-rc.4" + "@abp/font-awesome" "~7.4.0-rc.4" + "@abp/jquery-form" "~7.4.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" + "@abp/lodash" "~7.4.0-rc.4" + "@abp/luxon" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/moment" "~7.4.0-rc.4" + "@abp/select2" "~7.4.0-rc.4" + "@abp/sweetalert2" "~7.4.0-rc.4" + "@abp/timeago" "~7.4.0-rc.4" + "@abp/toastr" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" + integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.3.tgz#76941922c44a655b19aa1afcb88524fc3a6c85c1" - integrity sha512-/2wMvPGoXT4BoBEUuL6B/vH9aDHxde6THWkPjuHFftA/RysC5fikcK4ekqHvANcuLptyz4CwwhBnSUIMpTSVhQ== +"@abp/bootstrap-datepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" + integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.3.tgz#a5cdc0d3bc9a890f0790e5271c6b8c75a9073fdd" - integrity sha512-kEpU0WWKFrpjVH/XNl8pLOSW61oa/eIdM4pqpDc1b7yzFD58FZa4FOo87MspDEAhkESjzREkqytyfJTQHdDr9w== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" + integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.3.tgz#d70ed14f6de898e2444293a698788e1ae4eba420" - integrity sha512-2tByO67RJCj+xEyLh8/KBUWpx0XLliG2tgfDsc358GUDJYD99voakvvvDTDBpxT4z3H1UMRvYYg2O3axJTw8Aw== +"@abp/bootstrap@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" + integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" bootstrap "^5.1.3" -"@abp/core@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.3.tgz#c78d1a2d7279bc6ee0c1c807788028517eb11c5e" - integrity sha512-sOOFqy2qqcrKbTRa1lFJUW6WKg6ozV+jE5P4fnJGUBlV+LsdYu+QGPefAc9PFlVNGwtcKpBV0863F85m4zV1+Q== +"@abp/core@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" + integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== dependencies: - "@abp/utils" "~7.4.0-rc.3" + "@abp/utils" "~7.4.0-rc.4" -"@abp/datatables.net-bs5@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.3.tgz#1c1585a3bca08fa1afee154d485ddf50b5593855" - integrity sha512-97+P3Olfztzf+e/hn/o66KUa++l9tchSabJfpaC0hPYPILcYDzOVlHdxFcT6ScLhxwmZAZ07gqP9Q2fjd++MlA== +"@abp/datatables.net-bs5@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" + integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== dependencies: - "@abp/datatables.net" "~7.4.0-rc.3" + "@abp/datatables.net" "~7.4.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.3.tgz#d32d2f18dbd63ac9fcb459e965137504c1dd6c21" - integrity sha512-bC29AdMi/9IQP6wy2BuNebt3cbeku4c0NdsSyw7S4YFZBozMpQHt5r5c75wH5YFn08h+fQxpbIWtMczYPsy40A== +"@abp/datatables.net@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" + integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.3.tgz#a8522559e3424dfd4bb228bf37e9f8faf744e91e" - integrity sha512-UYLR80Fw4K6DCHXYvYVr4u58AC5qFTecTBSwGKkD73PLF7sIslFjrPxkivP4LHGSTrE5ZhZFqh0BJrGfVfIlLw== +"@abp/font-awesome@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" + integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.3.tgz#fe883f26508edc99b411962a87b2129c74dd0e49" - integrity sha512-tK8KwFdX1WVBbopvgKCK6Pz5RJMBzV5bEs2/ZmGheHAGTBk+IxwPfcxEhpz28FC1AarAyHTCLcOu8mGyytgzwA== +"@abp/jquery-form@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" + integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.3.tgz#6bd2e4ab3835e9910092f31e866f027fa9abdd34" - integrity sha512-Rg6skGiEq/rJir9l7yFG1dULjFYAYejXa5xkNzvGydmlaNBWKcEHbWP/7N2+N3dD7W5Ov4q8e8TX1SRGNBcSmg== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" + integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.3" + "@abp/jquery-validation" "~7.4.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.3.tgz#638524781b77266540973d510dfaa441878f5d1b" - integrity sha512-RfQnjxtW4GMvzqwldhD8eW4yeZPgXCGvsoSWOu4YsCVnA3w+XLFhZi62CVfISSGizYnJCv0L0lDDTvf9W18E7w== +"@abp/jquery-validation@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" + integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.3.tgz#8381cbea10906ae1339de2c662518a8670e58680" - integrity sha512-7aMqj4zZqoQxLGEBIVI9wTuaRlat2Vf9d56908yFblNwKyexuOOxV6caWGa5rv2WDprRW1wvFS6poMuGknL9AA== +"@abp/jquery@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" + integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.3.tgz#1898f1c4b0eb22a780f4267287691e2c29e146a2" - integrity sha512-2mH68Jm+JnctFMxCpbyQeZcjIW9mvVMHXmTvf+AwrnD5XSs3KR1xyBpRFwc0yFc9PaWLtsZnhnaz5OC93liRoQ== +"@abp/lodash@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" + integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.3.tgz#6845a9f4071cc9ea7463687fbca879d20190f1b9" - integrity sha512-dIrwCUKeoAn29MEe2G+ni1nTPdlT2WaUEbPMRSe5IZL3boKI4zJUditMq778ZcrlPbqpiFl6+yOpw26iWPbMaQ== +"@abp/luxon@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" + integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.3.tgz#6a671fb0478cef92efbd3376813cf232e42f5f49" - integrity sha512-x/B+V46JQddpnr6uP8jWZ/8sCghVt5soDhpgbc4QR5QcWbT1wpErec3Gupgxb0A2GeI4+9xFa7LHG8asIBmh8A== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" + integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.3.tgz#3f0c1d3922ccdd75dac46e8441e3a036a96db6fd" - integrity sha512-AE6adhwBnpDdWt/RNGwEPKrv0vC6lSlzrot487KGoiNAA7NIGfhVYSWo4QSedPDP+Jq2tD4fDvB/X7TgSwTdzA== +"@abp/moment@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" + integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.3.tgz#134e28502e7dfa149f9feea23645b8962405d6aa" - integrity sha512-oeS/HKh1z8S1gE5YyiTt8YO9YAEw4dzi2aXY5RBeCQCpS28vYWHR7yX07AUS7YpQZNnajqL/fK14STU4z67d5g== +"@abp/select2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" + integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.3.tgz#fe47ed2311c0dc611621ddeea5cd232edca7f7da" - integrity sha512-02BcsINV+NQIBVv0kIDowp5Zggqqklu5rNSyhTHmLLXgjULS12lbc9ZAN8elvaiRov1PBKLuNymhVtSGD+vgYA== +"@abp/sweetalert2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" + integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.3.tgz#c68fcea9c7fb667115d88d935fd4234397da0986" - integrity sha512-D5rNk5eYyTQNhicYXz9Jn/Hm080UescpMEK51foGRMBKWZAK4IzbYVbA1lWumfpM8uKRXjE0Ujhow8gtMu3qEA== +"@abp/timeago@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" + integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.3.tgz#308ccab6e1be2ce7d44bdb7548e427aa4b42f5fe" - integrity sha512-oiVA8a6iqxaOmVAmALqVsy2faJe54Ao9m9rS7C9N03gYfr8cP58p+gQvuBahd7lKvDKHhkR5dRxtJsFABaFpJQ== +"@abp/toastr@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" + integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.3.tgz#bc02be5e7294615d42c303bb777845e0a39813e1" - integrity sha512-RkNO/Qjdo/lkGr0TkR7YydBZqmete5bewDT59gqNbp5OsUQQ45pYLH0JYVsqpIUipJjjAezzVlBZk8+AuZYLGA== +"@abp/utils@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" + integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== dependencies: just-compare "^2.3.0" diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json index 1d36b9f8bd..95676c765e 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3", - "@abp/virtual-file-explorer": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", + "@abp/virtual-file-explorer": "~7.4.0-rc.4" } } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock index b0094f03cc..62673456fe 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.3.tgz#fd39fa05c7b13ddfb7353036321142b6d8e0760b" - integrity sha512-HmJJfZsWEzgDO+pzxHSGo7XWYjljmpAcN+jBvom4gn2KwzmhiuWhZSPKx85cdtIldp3yOKjldExPdvSFwR+iSw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.3.tgz#750355b35eaf213b5127e462789d0e849a77d9c7" - integrity sha512-LgRADz+OSRXtgcWzOzBanJ3lk9WxYrHill75Bv4SOUXkDLiAGIH49jqhcga1TNSzwHy7l6KZS6hOakAujoRPzg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.3" - "@abp/bootstrap" "~7.4.0-rc.3" - "@abp/bootstrap-datepicker" "~7.4.0-rc.3" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.3" - "@abp/datatables.net-bs5" "~7.4.0-rc.3" - "@abp/font-awesome" "~7.4.0-rc.3" - "@abp/jquery-form" "~7.4.0-rc.3" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.3" - "@abp/lodash" "~7.4.0-rc.3" - "@abp/luxon" "~7.4.0-rc.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.3" - "@abp/moment" "~7.4.0-rc.3" - "@abp/select2" "~7.4.0-rc.3" - "@abp/sweetalert2" "~7.4.0-rc.3" - "@abp/timeago" "~7.4.0-rc.3" - "@abp/toastr" "~7.4.0-rc.3" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.3.tgz#678c0e7323a542fc558526a0fd024195ab9ea682" - integrity sha512-QuoQA4LJMGWs5OFGczGQMFEMBkNzEdNDqIuF8s0O9gwZ15qaqHD8PmhmHXFlPJaezRtfwzODxKKDB9wwouPGwg== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" + integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" + integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" + "@abp/bootstrap" "~7.4.0-rc.4" + "@abp/bootstrap-datepicker" "~7.4.0-rc.4" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" + "@abp/datatables.net-bs5" "~7.4.0-rc.4" + "@abp/font-awesome" "~7.4.0-rc.4" + "@abp/jquery-form" "~7.4.0-rc.4" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" + "@abp/lodash" "~7.4.0-rc.4" + "@abp/luxon" "~7.4.0-rc.4" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" + "@abp/moment" "~7.4.0-rc.4" + "@abp/select2" "~7.4.0-rc.4" + "@abp/sweetalert2" "~7.4.0-rc.4" + "@abp/timeago" "~7.4.0-rc.4" + "@abp/toastr" "~7.4.0-rc.4" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" + integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,185 +43,185 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.3.tgz#76941922c44a655b19aa1afcb88524fc3a6c85c1" - integrity sha512-/2wMvPGoXT4BoBEUuL6B/vH9aDHxde6THWkPjuHFftA/RysC5fikcK4ekqHvANcuLptyz4CwwhBnSUIMpTSVhQ== +"@abp/bootstrap-datepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" + integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.3.tgz#a5cdc0d3bc9a890f0790e5271c6b8c75a9073fdd" - integrity sha512-kEpU0WWKFrpjVH/XNl8pLOSW61oa/eIdM4pqpDc1b7yzFD58FZa4FOo87MspDEAhkESjzREkqytyfJTQHdDr9w== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" + integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.3.tgz#d70ed14f6de898e2444293a698788e1ae4eba420" - integrity sha512-2tByO67RJCj+xEyLh8/KBUWpx0XLliG2tgfDsc358GUDJYD99voakvvvDTDBpxT4z3H1UMRvYYg2O3axJTw8Aw== +"@abp/bootstrap@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" + integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.3.tgz#fbe3320da399eaa9efc433efe929fc9f3fc43be2" - integrity sha512-q7wKSGKD4rj2zQvSZpb0bILA2eivsA89AxeDVyHEfTBMOh6dxbg1eLY2acJwGyrXza+KbTa8n/tWM/L9w9dDWg== +"@abp/clipboard@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" + integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" clipboard "^2.0.8" -"@abp/core@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.3.tgz#c78d1a2d7279bc6ee0c1c807788028517eb11c5e" - integrity sha512-sOOFqy2qqcrKbTRa1lFJUW6WKg6ozV+jE5P4fnJGUBlV+LsdYu+QGPefAc9PFlVNGwtcKpBV0863F85m4zV1+Q== +"@abp/core@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" + integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== dependencies: - "@abp/utils" "~7.4.0-rc.3" + "@abp/utils" "~7.4.0-rc.4" -"@abp/datatables.net-bs5@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.3.tgz#1c1585a3bca08fa1afee154d485ddf50b5593855" - integrity sha512-97+P3Olfztzf+e/hn/o66KUa++l9tchSabJfpaC0hPYPILcYDzOVlHdxFcT6ScLhxwmZAZ07gqP9Q2fjd++MlA== +"@abp/datatables.net-bs5@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" + integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== dependencies: - "@abp/datatables.net" "~7.4.0-rc.3" + "@abp/datatables.net" "~7.4.0-rc.4" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.3.tgz#d32d2f18dbd63ac9fcb459e965137504c1dd6c21" - integrity sha512-bC29AdMi/9IQP6wy2BuNebt3cbeku4c0NdsSyw7S4YFZBozMpQHt5r5c75wH5YFn08h+fQxpbIWtMczYPsy40A== +"@abp/datatables.net@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" + integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.3.tgz#a8522559e3424dfd4bb228bf37e9f8faf744e91e" - integrity sha512-UYLR80Fw4K6DCHXYvYVr4u58AC5qFTecTBSwGKkD73PLF7sIslFjrPxkivP4LHGSTrE5ZhZFqh0BJrGfVfIlLw== +"@abp/font-awesome@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" + integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.3.tgz#fe883f26508edc99b411962a87b2129c74dd0e49" - integrity sha512-tK8KwFdX1WVBbopvgKCK6Pz5RJMBzV5bEs2/ZmGheHAGTBk+IxwPfcxEhpz28FC1AarAyHTCLcOu8mGyytgzwA== +"@abp/jquery-form@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" + integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.3.tgz#6bd2e4ab3835e9910092f31e866f027fa9abdd34" - integrity sha512-Rg6skGiEq/rJir9l7yFG1dULjFYAYejXa5xkNzvGydmlaNBWKcEHbWP/7N2+N3dD7W5Ov4q8e8TX1SRGNBcSmg== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" + integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.3" + "@abp/jquery-validation" "~7.4.0-rc.4" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.3.tgz#638524781b77266540973d510dfaa441878f5d1b" - integrity sha512-RfQnjxtW4GMvzqwldhD8eW4yeZPgXCGvsoSWOu4YsCVnA3w+XLFhZi62CVfISSGizYnJCv0L0lDDTvf9W18E7w== +"@abp/jquery-validation@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" + integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.3.tgz#8381cbea10906ae1339de2c662518a8670e58680" - integrity sha512-7aMqj4zZqoQxLGEBIVI9wTuaRlat2Vf9d56908yFblNwKyexuOOxV6caWGa5rv2WDprRW1wvFS6poMuGknL9AA== +"@abp/jquery@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" + integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.3.tgz#1898f1c4b0eb22a780f4267287691e2c29e146a2" - integrity sha512-2mH68Jm+JnctFMxCpbyQeZcjIW9mvVMHXmTvf+AwrnD5XSs3KR1xyBpRFwc0yFc9PaWLtsZnhnaz5OC93liRoQ== +"@abp/lodash@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" + integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.3.tgz#6845a9f4071cc9ea7463687fbca879d20190f1b9" - integrity sha512-dIrwCUKeoAn29MEe2G+ni1nTPdlT2WaUEbPMRSe5IZL3boKI4zJUditMq778ZcrlPbqpiFl6+yOpw26iWPbMaQ== +"@abp/luxon@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" + integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.3.tgz#6a671fb0478cef92efbd3376813cf232e42f5f49" - integrity sha512-x/B+V46JQddpnr6uP8jWZ/8sCghVt5soDhpgbc4QR5QcWbT1wpErec3Gupgxb0A2GeI4+9xFa7LHG8asIBmh8A== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" + integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.3.tgz#3f0c1d3922ccdd75dac46e8441e3a036a96db6fd" - integrity sha512-AE6adhwBnpDdWt/RNGwEPKrv0vC6lSlzrot487KGoiNAA7NIGfhVYSWo4QSedPDP+Jq2tD4fDvB/X7TgSwTdzA== +"@abp/moment@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" + integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== dependencies: moment "^2.9.0" -"@abp/prismjs@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.3.tgz#4202830db4e469be3d329ed2fb9ef8eb2ef85f8d" - integrity sha512-ikG4SFm7DPU4GOnBUaBdoFu/3PQUoIHWmsk46TvI2J3dCt+2WEgFNU6SAoF48DoMHDnnxfYwU5LYwH/sux2PvQ== +"@abp/prismjs@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" + integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== dependencies: - "@abp/clipboard" "~7.4.0-rc.3" - "@abp/core" "~7.4.0-rc.3" + "@abp/clipboard" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.4" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.3.tgz#134e28502e7dfa149f9feea23645b8962405d6aa" - integrity sha512-oeS/HKh1z8S1gE5YyiTt8YO9YAEw4dzi2aXY5RBeCQCpS28vYWHR7yX07AUS7YpQZNnajqL/fK14STU4z67d5g== +"@abp/select2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" + integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.3.tgz#fe47ed2311c0dc611621ddeea5cd232edca7f7da" - integrity sha512-02BcsINV+NQIBVv0kIDowp5Zggqqklu5rNSyhTHmLLXgjULS12lbc9ZAN8elvaiRov1PBKLuNymhVtSGD+vgYA== +"@abp/sweetalert2@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" + integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== dependencies: - "@abp/core" "~7.4.0-rc.3" + "@abp/core" "~7.4.0-rc.4" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.3.tgz#c68fcea9c7fb667115d88d935fd4234397da0986" - integrity sha512-D5rNk5eYyTQNhicYXz9Jn/Hm080UescpMEK51foGRMBKWZAK4IzbYVbA1lWumfpM8uKRXjE0Ujhow8gtMu3qEA== +"@abp/timeago@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" + integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.3.tgz#308ccab6e1be2ce7d44bdb7548e427aa4b42f5fe" - integrity sha512-oiVA8a6iqxaOmVAmALqVsy2faJe54Ao9m9rS7C9N03gYfr8cP58p+gQvuBahd7lKvDKHhkR5dRxtJsFABaFpJQ== +"@abp/toastr@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" + integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== dependencies: - "@abp/jquery" "~7.4.0-rc.3" + "@abp/jquery" "~7.4.0-rc.4" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.3.tgz#bc02be5e7294615d42c303bb777845e0a39813e1" - integrity sha512-RkNO/Qjdo/lkGr0TkR7YydBZqmete5bewDT59gqNbp5OsUQQ45pYLH0JYVsqpIUipJjjAezzVlBZk8+AuZYLGA== +"@abp/utils@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" + integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== dependencies: just-compare "^2.3.0" -"@abp/virtual-file-explorer@~7.4.0-rc.3": - version "7.4.0-rc.3" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-7.4.0-rc.3.tgz#1c3290e8196122b0707a4828d7a3ac35be7bd711" - integrity sha512-MmdgMoGigzbp99MKqnTrn66cRQMuneiejkqEj+1d8/D0iU847uRiMJucCp4TAVE0OOsTMCFNKj0xiXS0BZR1jw== +"@abp/virtual-file-explorer@~7.4.0-rc.4": + version "7.4.0-rc.4" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-7.4.0-rc.4.tgz#4a47fc551baa243de9cea13a65591ea73dcd18b6" + integrity sha512-e1xM/AQls7WhUVmJjV04BEeoMRtwfJTP1FHZi+/LHud1cRwmuz7+HfvPuwwOMPZDPd8xWQrk/h9VPZ5tQCEdHg== dependencies: - "@abp/clipboard" "~7.4.0-rc.3" - "@abp/prismjs" "~7.4.0-rc.3" + "@abp/clipboard" "~7.4.0-rc.4" + "@abp/prismjs" "~7.4.0-rc.4" "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" diff --git a/npm/lerna.json b/npm/lerna.json index a67cdae5d8..55103cca1a 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 63bd64639b..8f29c351cc 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -44,20 +44,20 @@ }, "private": true, "devDependencies": { - "@abp/ng.account": "~7.4.0-rc.3", - "@abp/ng.account.core": "~7.4.0-rc.3", - "@abp/ng.core": "~7.4.0-rc.3", - "@abp/ng.feature-management": "~7.4.0-rc.3", - "@abp/ng.identity": "~7.4.0-rc.3", - "@abp/ng.oauth": "~7.4.0-rc.3", - "@abp/ng.permission-management": "~7.4.0-rc.3", - "@abp/ng.schematics": "~7.4.0-rc.3", - "@abp/ng.setting-management": "~7.4.0-rc.3", - "@abp/ng.tenant-management": "~7.4.0-rc.3", - "@abp/ng.theme.basic": "~7.4.0-rc.3", + "@abp/ng.account": "~7.4.0-rc.4", + "@abp/ng.account.core": "~7.4.0-rc.4", + "@abp/ng.core": "~7.4.0-rc.4", + "@abp/ng.feature-management": "~7.4.0-rc.4", + "@abp/ng.identity": "~7.4.0-rc.4", + "@abp/ng.oauth": "~7.4.0-rc.4", + "@abp/ng.permission-management": "~7.4.0-rc.4", + "@abp/ng.schematics": "~7.4.0-rc.4", + "@abp/ng.setting-management": "~7.4.0-rc.4", + "@abp/ng.tenant-management": "~7.4.0-rc.4", + "@abp/ng.theme.basic": "~7.4.0-rc.4", "@abp/ng.theme.lepton-x": "^2.4.0-rc.2", - "@abp/ng.theme.shared": "~7.4.0-rc.3", - "@abp/utils": "~7.4.0-rc.3", + "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/utils": "~7.4.0-rc.4", "@angular-devkit/build-angular": "~16.0.0", "@angular-devkit/core": "~16.0.0", "@angular-devkit/schematics": "~16.0.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index dc22bb6ae3..1126eb58de 100644 --- a/npm/ng-packs/packages/account-core/package.json +++ b/npm/ng-packs/packages/account-core/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account.core", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.core": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "@angular/common": ">=12.0.0", "@angular/core": ">=12.0.0" }, diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 31e8bd0886..bf0ccd17a0 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.account.core": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index a331e9d6f8..8bb70bee32 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.components", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=7.4.0-rc.3", - "@abp/ng.theme.shared": ">=7.4.0-rc.3" + "@abp/ng.core": ">=7.4.0-rc.4", + "@abp/ng.theme.shared": ">=7.4.0-rc.4" }, "dependencies": { "chart.js": "^3.5.1", diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index b57c6e97c1..d3001c8ecb 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.core", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~7.4.0-rc.3", + "@abp/utils": "~7.4.0-rc.4", "angular-oauth2-oidc": "^15.0.1", "just-clone": "^6.1.1", "just-compare": "^2.3.0", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index eaf0eb11f0..b4b752287e 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.feature-management", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/generators/package.json b/npm/ng-packs/packages/generators/package.json index cc54ac927e..da0c28264c 100644 --- a/npm/ng-packs/packages/generators/package.json +++ b/npm/ng-packs/packages/generators/package.json @@ -1,6 +1,6 @@ { "name": "@abp/nx.generators", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "generators": "./generators.json", "type": "commonjs", diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index 1b01e9cf82..1137db7800 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,15 +1,15 @@ { "name": "@abp/ng.identity", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~7.4.0-rc.3", - "@abp/ng.permission-management": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.components": "~7.4.0-rc.4", + "@abp/ng.permission-management": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/oauth/package.json b/npm/ng-packs/packages/oauth/package.json index f77fa37b36..58f66c4870 100644 --- a/npm/ng-packs/packages/oauth/package.json +++ b/npm/ng-packs/packages/oauth/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.oauth", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~7.4.0-rc.3", - "@abp/utils": "~7.4.0-rc.3", + "@abp/ng.core": "~7.4.0-rc.4", + "@abp/utils": "~7.4.0-rc.4", "angular-oauth2-oidc": "^15.0.1", "just-clone": "^6.1.1", "just-compare": "^2.3.0", diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 4342631056..daa320eb5a 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.permission-management", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index ec3535c100..15b95b639b 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.schematics", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "author": "", "schematics": "./collection.json", "dependencies": { diff --git a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts index 30a29ed7dc..d3a28876ba 100644 --- a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts @@ -4,7 +4,14 @@ import { ProjectDefinition } from '@angular-devkit/core/src/workspace'; import * as ts from 'typescript'; import { allStyles, importMap, styleMap } from './style-map'; import { ChangeThemeOptions } from './model'; -import { Change, InsertChange, isLibrary, updateWorkspace, WorkspaceDefinition } from '../../utils'; +import { + Change, + createDefaultPath, + InsertChange, + isLibrary, + updateWorkspace, + WorkspaceDefinition, +} from '../../utils'; import { ThemeOptionsEnum } from './theme-options.enum'; import { addImportToModule, @@ -59,20 +66,8 @@ function updateProjectStyle( } function updateAppModule(selectedProject: string, targetThemeName: ThemeOptionsEnum): Rule { - return (host: Tree) => { - const angularJSON = host.read('angular.json'); - if (!angularJSON) { - throw new SchematicsException('The angular.json does not found'); - } - - const workspace = JSON.parse(angularJSON.toString()); - const project = workspace.projects[selectedProject]; - - if (!project || !project.sourceRoot) { - throw new SchematicsException('The target project does not found'); - } - - const appModulePath = project.sourceRoot + '/app/app.module.ts'; + return async (host: Tree) => { + const appModulePath = (await createDefaultPath(host, selectedProject)) + '/app.module.ts'; return chain([ removeImportPath(appModulePath, targetThemeName), @@ -82,24 +77,16 @@ function updateAppModule(selectedProject: string, targetThemeName: ThemeOptionsE }; } -function removeImportPath(appModulePath: string, selectedTheme: ThemeOptionsEnum): Rule { +export function removeImportPath(appModulePath: string, selectedTheme: ThemeOptionsEnum): Rule { return (host: Tree) => { const recorder = host.beginUpdate(appModulePath); - const sourceText = host.read(appModulePath)?.toString('utf-8'); - const source = ts.createSourceFile( - appModulePath, - sourceText!, - ts.ScriptTarget.Latest, - true, - ts.ScriptKind.TS, - ); - const impMap = Array.from(importMap.values()) - .filter(f => f !== importMap.get(selectedTheme)) - .reduce((acc, val) => [...acc, ...val], []); + const source = createSourceFile(host, appModulePath); + const impMap = getImportPaths(selectedTheme); const nodes = findNodes(source, ts.isImportDeclaration); + const filteredNodes = nodes.filter(n => impMap.some(f => n.getFullText().match(f.path))); - if (!filteredNodes || filteredNodes.length < 1) { + if (filteredNodes?.length < 1) { return; } @@ -112,23 +99,14 @@ function removeImportPath(appModulePath: string, selectedTheme: ThemeOptionsEnum }; } -function removeImportFromNgModuleMetadata( +export function removeImportFromNgModuleMetadata( appModulePath: string, selectedTheme: ThemeOptionsEnum, ): Rule { return (host: Tree) => { const recorder = host.beginUpdate(appModulePath); - const sourceText = host.read(appModulePath)?.toString('utf-8'); - const source = ts.createSourceFile( - appModulePath, - sourceText!, - ts.ScriptTarget.Latest, - true, - ts.ScriptKind.TS, - ); - const impMap = Array.from(importMap.values()) - .filter(f => f !== importMap.get(selectedTheme)) - .reduce((acc, val) => [...acc, ...val], []); + const source = createSourceFile(host, appModulePath); + const impMap = getImportPaths(selectedTheme); const node = getDecoratorMetadata(source, 'NgModule', '@angular/core')[0] || {}; if (!node) { @@ -136,18 +114,18 @@ function removeImportFromNgModuleMetadata( } const matchingProperties = getMetadataField(node as ts.ObjectLiteralExpression, 'imports'); - const assignment = matchingProperties[0] as ts.PropertyAssignment; const assignmentInit = assignment.initializer as ts.ArrayLiteralExpression; const elements = assignmentInit.elements; if (!elements || elements.length < 1) { - return; + throw new SchematicsException(`Elements could not found: ${elements}`); } const filteredElements = elements.filter(f => impMap.some(s => f.getText().match(s.importName)), ); + if (!filteredElements || filteredElements.length < 1) { return; } @@ -160,17 +138,10 @@ function removeImportFromNgModuleMetadata( }; } -function insertImports(appModulePath: string, selectedTheme: ThemeOptionsEnum): Rule { +export function insertImports(appModulePath: string, selectedTheme: ThemeOptionsEnum): Rule { return (host: Tree) => { const recorder = host.beginUpdate(appModulePath); - const sourceText = host.read(appModulePath)?.toString('utf-8'); - const source = ts.createSourceFile( - appModulePath, - sourceText!, - ts.ScriptTarget.Latest, - true, - ts.ScriptKind.TS, - ); + const source = createSourceFile(host, appModulePath); const selected = importMap.get(selectedTheme); const changes: Change[] = []; @@ -190,6 +161,30 @@ function insertImports(appModulePath: string, selectedTheme: ThemeOptionsEnum): }; } +export function createSourceFile(host: Tree, appModulePath: string): ts.SourceFile { + const buffer = host.read(appModulePath); + if (!buffer || buffer.length === 0) { + throw new SchematicsException(`${appModulePath} file could not be read.`); + } + + const sourceText = buffer.toString('utf-8'); + const source = ts.createSourceFile( + appModulePath, + sourceText, + ts.ScriptTarget.Latest, + true, + ts.ScriptKind.TS, + ); + + return source; +} + +export function getImportPaths(selectedTheme: ThemeOptionsEnum) { + return Array.from(importMap.values()) + .filter(f => f !== importMap.get(selectedTheme)) + .reduce((acc, val) => [...acc, ...val], []); +} + export function getProjectTargetOptions( project: ProjectDefinition, buildTarget: string, diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index 874f0151d0..e0832d0836 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.setting-management", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.components": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index 7126582979..5eac1080cf 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.tenant-management", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.feature-management": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index 55cf8de614..375994c24c 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.theme.basic", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.account.core": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index aa35e0ca56..798bce2ae4 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.theme.shared", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~7.4.0-rc.3", + "@abp/ng.core": "~7.4.0-rc.4", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "^15.0.0", "@ngx-validate/core": "^0.2.0", diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index aa4f200f04..216b7f4c25 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "anchor-js": "^4.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index 2300563be2..17f5bde782 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~7.4.0-rc.3" + "@abp/aspnetcore.components.server.theming": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index 9f1f230753..49fa44a88d 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~7.4.0-rc.3", - "@abp/font-awesome": "~7.4.0-rc.3" + "@abp/bootstrap": "~7.4.0-rc.4", + "@abp/font-awesome": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 394cc2b626..68d150d601 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 5d4cfc1cac..2c5fba53f9 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,22 +10,22 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~7.4.0-rc.3", - "@abp/bootstrap": "~7.4.0-rc.3", - "@abp/bootstrap-datepicker": "~7.4.0-rc.3", - "@abp/bootstrap-daterangepicker": "~7.4.0-rc.3", - "@abp/datatables.net-bs5": "~7.4.0-rc.3", - "@abp/font-awesome": "~7.4.0-rc.3", - "@abp/jquery-form": "~7.4.0-rc.3", - "@abp/jquery-validation-unobtrusive": "~7.4.0-rc.3", - "@abp/lodash": "~7.4.0-rc.3", - "@abp/luxon": "~7.4.0-rc.3", - "@abp/malihu-custom-scrollbar-plugin": "~7.4.0-rc.3", - "@abp/moment": "~7.4.0-rc.3", - "@abp/select2": "~7.4.0-rc.3", - "@abp/sweetalert2": "~7.4.0-rc.3", - "@abp/timeago": "~7.4.0-rc.3", - "@abp/toastr": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui": "~7.4.0-rc.4", + "@abp/bootstrap": "~7.4.0-rc.4", + "@abp/bootstrap-datepicker": "~7.4.0-rc.4", + "@abp/bootstrap-daterangepicker": "~7.4.0-rc.4", + "@abp/datatables.net-bs5": "~7.4.0-rc.4", + "@abp/font-awesome": "~7.4.0-rc.4", + "@abp/jquery-form": "~7.4.0-rc.4", + "@abp/jquery-validation-unobtrusive": "~7.4.0-rc.4", + "@abp/lodash": "~7.4.0-rc.4", + "@abp/luxon": "~7.4.0-rc.4", + "@abp/malihu-custom-scrollbar-plugin": "~7.4.0-rc.4", + "@abp/moment": "~7.4.0-rc.4", + "@abp/select2": "~7.4.0-rc.4", + "@abp/sweetalert2": "~7.4.0-rc.4", + "@abp/timeago": "~7.4.0-rc.4", + "@abp/toastr": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index 1fb18b2818..5c1d285ff9 100644 --- a/npm/packs/aspnetcore.mvc.ui/package-lock.json +++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@abp/aspnetcore.mvc.ui", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index 4490f44cc8..12f963b7ad 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index cb63931139..649df2a435 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.3", - "@abp/owl.carousel": "~7.4.0-rc.3", - "@abp/prismjs": "~7.4.0-rc.3", - "@abp/tui-editor": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.4", + "@abp/owl.carousel": "~7.4.0-rc.4", + "@abp/prismjs": "~7.4.0-rc.4", + "@abp/tui-editor": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index ea373c01c3..a903c31137 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap-daterangepicker/package.json b/npm/packs/bootstrap-daterangepicker/package.json index e754d6001c..6e615111eb 100644 --- a/npm/packs/bootstrap-daterangepicker/package.json +++ b/npm/packs/bootstrap-daterangepicker/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/bootstrap-daterangepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 24cde9e202..1dcd78fc5a 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "bootstrap": "^5.1.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index 50ab94810e..e743325176 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index 209c4c7c3b..479f4a8c4c 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "clipboard": "^2.0.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index 67d2dfb664..6508676f7a 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,15 +1,15 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~7.4.0-rc.3", - "@abp/jstree": "~7.4.0-rc.3", - "@abp/slugify": "~7.4.0-rc.3", - "@abp/tui-editor": "~7.4.0-rc.3", - "@abp/uppy": "~7.4.0-rc.3" + "@abp/codemirror": "~7.4.0-rc.4", + "@abp/jstree": "~7.4.0-rc.4", + "@abp/slugify": "~7.4.0-rc.4", + "@abp/tui-editor": "~7.4.0-rc.4", + "@abp/uppy": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index a13571be5b..ab5aebc85b 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~7.4.0-rc.3", - "@abp/star-rating-svg": "~7.4.0-rc.3" + "@abp/highlight.js": "~7.4.0-rc.4", + "@abp/star-rating-svg": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index 5475523175..3e51781930 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~7.4.0-rc.3", - "@abp/cms-kit.public": "~7.4.0-rc.3" + "@abp/cms-kit.admin": "~7.4.0-rc.4", + "@abp/cms-kit.public": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 6f0fd4c681..0ba35eaf43 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index afc22a8ab4..19308b19c0 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~7.4.0-rc.3" + "@abp/utils": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index 556c3bb333..3506f7d902 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "cropperjs": "^1.5.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index b373229428..f3219c18b5 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~7.4.0-rc.3", + "@abp/datatables.net": "~7.4.0-rc.4", "datatables.net-bs4": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index f67ce15062..741a9d6dcf 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~7.4.0-rc.3", + "@abp/datatables.net": "~7.4.0-rc.4", "datatables.net-bs5": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 707c479295..33e467d209 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.3", + "@abp/jquery": "~7.4.0-rc.4", "datatables.net": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index c1d96cc1c2..b3ac82d941 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~7.4.0-rc.3", - "@abp/clipboard": "~7.4.0-rc.3", - "@abp/malihu-custom-scrollbar-plugin": "~7.4.0-rc.3", - "@abp/popper.js": "~7.4.0-rc.3", - "@abp/prismjs": "~7.4.0-rc.3" + "@abp/anchor-js": "~7.4.0-rc.4", + "@abp/clipboard": "~7.4.0-rc.4", + "@abp/malihu-custom-scrollbar-plugin": "~7.4.0-rc.4", + "@abp/popper.js": "~7.4.0-rc.4", + "@abp/prismjs": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 6a50dec64b..d45a7b2701 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/flag-icons/package.json b/npm/packs/flag-icons/package.json index 7ea2a208e3..9d4dae4972 100644 --- a/npm/packs/flag-icons/package.json +++ b/npm/packs/flag-icons/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/flag-icons", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 1ffce475cd..d88436576e 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "@fortawesome/fontawesome-free": "^5.15.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index 020727f768..226eeda6a4 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "@highlightjs/cdn-assets": "~11.4.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 1974906bc7..931bb87622 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.3", + "@abp/jquery": "~7.4.0-rc.4", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index 1b197fa93e..d2e9c59440 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~7.4.0-rc.3", + "@abp/jquery-validation": "~7.4.0-rc.4", "jquery-validation-unobtrusive": "^3.2.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index 9d32622a5f..b3dc4e10f8 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.3", + "@abp/jquery": "~7.4.0-rc.4", "jquery-validation": "^1.19.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 3535fbab07..0ba6e8aea4 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "jquery": "~3.6.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index a7f42ae608..517359e606 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.3", + "@abp/jquery": "~7.4.0-rc.4", "jstree": "^3.3.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 38d66621e4..a72ebfe997 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index b6d495772b..a0926beee6 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "luxon": "^2.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 0f1ee24aa4..ad84ba86a2 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index 4054fe9f31..b129510e35 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "markdown-it": "^12.3.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/moment/package.json b/npm/packs/moment/package.json index 9fba6a3f0c..bf4108bf07 100644 --- a/npm/packs/moment/package.json +++ b/npm/packs/moment/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/moment", "repository": { "type": "git", diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 489eac56e5..4d059ee17b 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 8d45d374f8..da1c17f9a1 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "@popperjs/core": "^2.11.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index cea827d224..b21716b619 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~7.4.0-rc.3", - "@abp/core": "~7.4.0-rc.3", + "@abp/clipboard": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.4", "prismjs": "^1.26.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/qrcode/package.json b/npm/packs/qrcode/package.json index c60cba2fe0..b6ae5110c4 100644 --- a/npm/packs/qrcode/package.json +++ b/npm/packs/qrcode/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/qrcode", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3" + "@abp/core": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index 5cc104fde6..ec8768cc46 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index 27f1b1edf2..633449c1a3 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "@microsoft/signalr": "~6.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index 68e820f74a..4662c21a6b 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/slugify", "publishConfig": { "access": "public" diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index 75f37e76d8..5bde9c74c8 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.3", + "@abp/jquery": "~7.4.0-rc.4", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index 3165433d70..620644ec70 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "sweetalert2": "^11.3.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index a29e2eb7bf..d2678b5764 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.3", + "@abp/jquery": "~7.4.0-rc.4", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index db39f4f719..fc533243b9 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.3", + "@abp/jquery": "~7.4.0-rc.4", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 6a6d807441..9eb7cfec87 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.3", - "@abp/prismjs": "~7.4.0-rc.3" + "@abp/jquery": "~7.4.0-rc.4", + "@abp/prismjs": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index 1ad37cb596..24e4781990 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.3", + "@abp/core": "~7.4.0-rc.4", "uppy": "^1.16.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index fb29e1e5b7..fd6cad056d 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "scripts": { "prepublishOnly": "yarn install --ignore-scripts && node prepublish.js", "ng": "ng", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index 1a95ffc562..ceef3bd64f 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~7.4.0-rc.3", + "@abp/vue": "~7.4.0-rc.4", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index de118303b1..1572c75b6b 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~7.4.0-rc.3", - "@abp/prismjs": "~7.4.0-rc.3" + "@abp/clipboard": "~7.4.0-rc.4", + "@abp/prismjs": "~7.4.0-rc.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index 461f7b3439..31eeb56739 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.3", + "version": "7.4.0-rc.4", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip index 6bdac01337..0b8eba2d12 100644 Binary files a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip and b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip differ diff --git a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip index a58a66c067..b01d03e440 100644 Binary files a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip and b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip index bcca3c9b69..e52fb98321 100644 Binary files a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip and b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip index 485f8e3e47..4607d1d954 100644 Binary files a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip and b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip index be81acd866..6f759f7c11 100644 Binary files a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip and b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip differ diff --git a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip index c7a9625228..5d08347411 100644 Binary files a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip and b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip index 8ac06c2079..ed194cf960 100644 Binary files a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip and b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip differ diff --git a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip index 671b75abd0..69057d286b 100644 Binary files a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip and b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip differ diff --git a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip index f79d994b22..0b881fda3b 100644 Binary files a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip and b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip differ diff --git a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip index e0c16f3a33..8019ec7c54 100644 Binary files a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip and b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip index ba6c07c7a1..1e358546c7 100644 Binary files a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip and b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip index c814b884fd..54b43afda0 100644 Binary files a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip and b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip index 6967d7cc0c..cd9b8cbd82 100644 Binary files a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip and b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip differ diff --git a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip index ce3fe0f315..4488aef862 100644 Binary files a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip and b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip differ diff --git a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip index 29489103ce..ebf57d6f3d 100644 Binary files a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip and b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip differ diff --git a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip index d6041e21e3..be51c03fa2 100644 Binary files a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip and b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip differ diff --git a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip index 545168d0ba..593b5c7ab6 100644 Binary files a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip and b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip differ diff --git a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip index 79545ec92b..36df03e452 100644 Binary files a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip and b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip differ diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index b3c7e2be5a..a519d05807 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.3", - "@abp/ng.components": "~7.4.0-rc.3", - "@abp/ng.core": "~7.4.0-rc.3", - "@abp/ng.oauth": "~7.4.0-rc.3", - "@abp/ng.identity": "~7.4.0-rc.3", - "@abp/ng.setting-management": "~7.4.0-rc.3", - "@abp/ng.tenant-management": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.account": "~7.4.0-rc.4", + "@abp/ng.components": "~7.4.0-rc.4", + "@abp/ng.core": "~7.4.0-rc.4", + "@abp/ng.oauth": "~7.4.0-rc.4", + "@abp/ng.identity": "~7.4.0-rc.4", + "@abp/ng.setting-management": "~7.4.0-rc.4", + "@abp/ng.tenant-management": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "@abp/ng.theme.lepton-x": "~2.4.0-rc.3", "@angular/animations": "~16.0.0", "@angular/common": "~16.0.0", @@ -36,7 +36,7 @@ "zone.js": "~0.13.0" }, "devDependencies": { - "@abp/ng.schematics": "~7.4.0-rc.3", + "@abp/ng.schematics": "~7.4.0-rc.4", "@angular-devkit/build-angular": "~16.0.0", "@angular-eslint/builder": "~16.0.0", "@angular-eslint/eslint-plugin": "~16.0.0", diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 70a6c8e56b..e44f77fafd 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.3", - "@abp/ng.components": "~7.4.0-rc.3", - "@abp/ng.core": "~7.4.0-rc.3", - "@abp/ng.oauth": "~7.4.0-rc.3", - "@abp/ng.identity": "~7.4.0-rc.3", - "@abp/ng.setting-management": "~7.4.0-rc.3", - "@abp/ng.tenant-management": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.account": "~7.4.0-rc.4", + "@abp/ng.components": "~7.4.0-rc.4", + "@abp/ng.core": "~7.4.0-rc.4", + "@abp/ng.oauth": "~7.4.0-rc.4", + "@abp/ng.identity": "~7.4.0-rc.4", + "@abp/ng.setting-management": "~7.4.0-rc.4", + "@abp/ng.tenant-management": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "@abp/ng.theme.lepton-x": "~2.4.0-rc.3", "@angular/animations": "~16.0.0", "@angular/common": "~16.0.0", @@ -42,7 +42,7 @@ "@angular-eslint/eslint-plugin-template": "~16.0.0", "@angular-eslint/schematics": "~16.0.0", "@angular-eslint/template-parser": "~16.0.0", - "@abp/ng.schematics": "~7.4.0-rc.3", + "@abp/ng.schematics": "~7.4.0-rc.4", "@angular/cli": "~16.0.0", "@angular/compiler-cli": "~16.0.0", "@angular/language-service": "~16.0.0", diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 39c9aec240..3d5427f45b 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,15 +15,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.3", - "@abp/ng.components": "~7.4.0-rc.3", - "@abp/ng.core": "~7.4.0-rc.3", - "@abp/ng.oauth": "~7.4.0-rc.3", - "@abp/ng.identity": "~7.4.0-rc.3", - "@abp/ng.setting-management": "~7.4.0-rc.3", - "@abp/ng.tenant-management": "~7.4.0-rc.3", - "@abp/ng.theme.basic": "~7.4.0-rc.3", - "@abp/ng.theme.shared": "~7.4.0-rc.3", + "@abp/ng.account": "~7.4.0-rc.4", + "@abp/ng.components": "~7.4.0-rc.4", + "@abp/ng.core": "~7.4.0-rc.4", + "@abp/ng.oauth": "~7.4.0-rc.4", + "@abp/ng.identity": "~7.4.0-rc.4", + "@abp/ng.setting-management": "~7.4.0-rc.4", + "@abp/ng.tenant-management": "~7.4.0-rc.4", + "@abp/ng.theme.basic": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.4", "@angular/animations": "~16.0.0", "@angular/common": "~16.0.0", "@angular/compiler": "~16.0.0", @@ -38,7 +38,7 @@ "zone.js": "~0.13.0" }, "devDependencies": { - "@abp/ng.schematics": "~7.4.0-rc.3", + "@abp/ng.schematics": "~7.4.0-rc.4", "@angular-devkit/build-angular": "~16.0.0", "@angular-eslint/builder": "~16.0.0", "@angular-eslint/eslint-plugin": "~16.0.0", diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index a54d072bda..f559a1053c 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": ">=14", "@angular/core": ">=14", - "@abp/ng.core": ">=7.4.0-rc.3", - "@abp/ng.theme.shared": ">=7.4.0-rc.3" + "@abp/ng.core": ">=7.4.0-rc.4", + "@abp/ng.theme.shared": ">=7.4.0-rc.4" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json index da08e01d1c..3149a7612c 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index 94ddf37b97..2933fd7ef0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3", - "@abp/aspnetcore.components.server.basictheme": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", + "@abp/aspnetcore.components.server.basictheme": "~7.4.0-rc.4" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index 3a1316c670..704a94ab02 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index 3a1316c670..704a94ab02 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" } }