From 5d567e02a62234ff82872be7a418d4c7a7a64a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sat, 7 Mar 2020 08:30:17 +0300 Subject: [PATCH 01/29] Increment version to 2.2.1. --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 6f12895d7c..96415d3e4c 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 2.2.0 + 2.2.1 $(NoWarn);CS1591 https://abp.io/assets/abp_nupkg.png https://abp.io From e87ae5a2d574a51844cc7b2ca7c83b8dee5ba4c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 9 Mar 2020 10:20:55 +0300 Subject: [PATCH 02/29] Add Volo.Abp.Quartz to nuget package list --- nupkg/common.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index af62eb56ed..ea84e52b28 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -92,6 +92,7 @@ $projects = ( "framework/src/Volo.Abp.MultiTenancy", "framework/src/Volo.Abp.Minify", "framework/src/Volo.Abp.ObjectMapping", + "framework/src/Volo.Abp.Quartz", "framework/src/Volo.Abp.RabbitMQ", "framework/src/Volo.Abp.Security", "framework/src/Volo.Abp.Serialization", From 6ebc2616727c4f64a8e0aeb68533a6ee7907926e Mon Sep 17 00:00:00 2001 From: erolarkat Date: Thu, 19 Mar 2020 11:24:43 +0300 Subject: [PATCH 03/29] 1 --- npm/New Text Document.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 npm/New Text Document.txt diff --git a/npm/New Text Document.txt b/npm/New Text Document.txt new file mode 100644 index 0000000000..e69de29bb2 From 034da97dda710373556d39a6ea6d5c473cf975e5 Mon Sep 17 00:00:00 2001 From: erolarkat Date: Thu, 19 Mar 2020 11:24:49 +0300 Subject: [PATCH 04/29] Revert "1" This reverts commit 6ebc2616727c4f64a8e0aeb68533a6ee7907926e. --- npm/New Text Document.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 npm/New Text Document.txt diff --git a/npm/New Text Document.txt b/npm/New Text Document.txt deleted file mode 100644 index e69de29bb2..0000000000 From 8bbbbf9a145bf7a939c5265c319e4466bb1e4dc4 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 19 Mar 2020 12:01:06 +0300 Subject: [PATCH 05/29] Cli: createSolutionFolder option --- docs/en/CLI.md | 1 + .../Volo/Abp/Cli/Commands/NewCommand.cs | 25 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/docs/en/CLI.md b/docs/en/CLI.md index dcab1b672e..68a5923a9f 100644 --- a/docs/en/CLI.md +++ b/docs/en/CLI.md @@ -59,6 +59,7 @@ abp new Acme.BookStore * `--output-folder` or `-o`: Specifies the output folder. Default value is the current directory. * `--version` or `-v`: Specifies the ABP & template version. It can be a [release tag](https://github.com/abpframework/abp/releases) or a [branch name](https://github.com/abpframework/abp/branches). Uses the latest release if not specified. Most of the times, you will want to use the latest version. * `--template-source` or `-ts`: Specifies a custom template source to use to build the project. Local and network sources can be used(Like `D\localTemplate` or `https://.zip`). +* `--create-solution-folder` or `-csf`: Specifies if the project will be in a new folder in the output folder or directly the output folder. ### add-package diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index 04b9168a44..51950de215 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -85,10 +85,25 @@ namespace Volo.Abp.Cli.Commands Logger.LogInformation("Template Source: " + templateSource); } + var createSolutionFolder = (commandLineArgs.Options.GetOrNull(Options.CreateSolutionFolder.Short, Options.CreateSolutionFolder.Long) ?? "true").ToLowerInvariant() != "false"; + if (!createSolutionFolder) + { + Logger.LogInformation("Create Solution Folder: false"); + } + var outputFolder = commandLineArgs.Options.GetOrNull(Options.OutputFolder.Short, Options.OutputFolder.Long); - outputFolder = Path.Combine(outputFolder != null ? Path.GetFullPath(outputFolder) : Directory.GetCurrentDirectory(), - SolutionName.Parse(projectName).FullName); + var outputFolderRoot = + outputFolder != null ? Path.GetFullPath(outputFolder) : Directory.GetCurrentDirectory(); + + if (createSolutionFolder) + { + outputFolder = Path.Combine(outputFolderRoot, SolutionName.Parse(projectName).FullName); + } + else + { + outputFolder = outputFolderRoot; + } if (!Directory.Exists(outputFolder)) { @@ -289,6 +304,12 @@ namespace Volo.Abp.Cli.Commands public const string Short = "ts"; public const string Long = "template-source"; } + + public static class CreateSolutionFolder + { + public const string Short = "csf"; + public const string Long = "create-solution-folder"; + } } } } From e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7 Mon Sep 17 00:00:00 2001 From: erolarkat Date: Thu, 19 Mar 2020 12:03:53 +0300 Subject: [PATCH 06/29] Upgrade ng package versions --- npm/ng-packs/lerna.version.json | 2 +- npm/ng-packs/packages/account-config/package.json | 2 +- npm/ng-packs/packages/account/package.json | 6 +++--- npm/ng-packs/packages/core/package.json | 2 +- npm/ng-packs/packages/feature-management/package.json | 4 ++-- npm/ng-packs/packages/identity-config/package.json | 2 +- npm/ng-packs/packages/identity/package.json | 8 ++++---- npm/ng-packs/packages/permission-management/package.json | 4 ++-- .../packages/setting-management-config/package.json | 2 +- npm/ng-packs/packages/setting-management/package.json | 6 +++--- .../packages/tenant-management-config/package.json | 2 +- npm/ng-packs/packages/tenant-management/package.json | 8 ++++---- npm/ng-packs/packages/theme-basic/package.json | 4 ++-- npm/ng-packs/packages/theme-shared/package.json | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json index ccbc798b72..9f5e9c4874 100644 --- a/npm/ng-packs/lerna.version.json +++ b/npm/ng-packs/lerna.version.json @@ -1,5 +1,5 @@ { - "version": "2.2.0", + "version": "2.3.0", "packages": [ "packages/*" ], diff --git a/npm/ng-packs/packages/account-config/package.json b/npm/ng-packs/packages/account-config/package.json index acbfbc6e8b..fb21569a6d 100644 --- a/npm/ng-packs/packages/account-config/package.json +++ b/npm/ng-packs/packages/account-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.account.config", - "version": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 84d4b6bf56..84b88dc78d 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": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.config": "~2.2.0", - "@abp/ng.theme.shared": "~2.2.0" + "@abp/ng.account.config": "^2.3.0", + "@abp/ng.theme.shared": "^2.3.0" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index 3fdb5bf6bb..49aee45ca3 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.core", - "version": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index f4518675c6..5c8fa4b3cb 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": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~2.2.0" + "@abp/ng.theme.shared": "^2.3.0" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/identity-config/package.json b/npm/ng-packs/packages/identity-config/package.json index 13ce65c2be..0e4218bc6e 100644 --- a/npm/ng-packs/packages/identity-config/package.json +++ b/npm/ng-packs/packages/identity-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.identity.config", - "version": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index d003761f4c..0e60ce9189 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": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.identity.config": "~2.2.0", - "@abp/ng.permission-management": "~2.2.0", - "@abp/ng.theme.shared": "~2.2.0" + "@abp/ng.identity.config": "^2.3.0", + "@abp/ng.permission-management": "^2.3.0", + "@abp/ng.theme.shared": "^2.3.0" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index cb114343cb..5b0e0f2701 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": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~2.2.0" + "@abp/ng.theme.shared": "^2.3.0" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/setting-management-config/package.json b/npm/ng-packs/packages/setting-management-config/package.json index 5467d1591d..437a46d005 100644 --- a/npm/ng-packs/packages/setting-management-config/package.json +++ b/npm/ng-packs/packages/setting-management-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.setting-management.config", - "version": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index 78b733b3b1..64a563d045 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": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.setting-management.config": "~2.2.0", - "@abp/ng.theme.shared": "~2.2.0" + "@abp/ng.setting-management.config": "^2.3.0", + "@abp/ng.theme.shared": "^2.3.0" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/tenant-management-config/package.json b/npm/ng-packs/packages/tenant-management-config/package.json index c2f8f63ec2..b4d9d555ae 100644 --- a/npm/ng-packs/packages/tenant-management-config/package.json +++ b/npm/ng-packs/packages/tenant-management-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.tenant-management.config", - "version": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index 4e17d00c9c..dae3c9a6dc 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,15 +1,15 @@ { "name": "@abp/ng.tenant-management", - "version": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~2.2.0", - "@abp/ng.tenant-management.config": "~2.2.0", - "@abp/ng.theme.shared": "~2.2.0" + "@abp/ng.feature-management": "^2.3.0", + "@abp/ng.tenant-management.config": "^2.3.0", + "@abp/ng.theme.shared": "^2.3.0" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index 7ac94efb0a..cf7111b6f3 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.theme.basic", - "version": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~2.2.0" + "@abp/ng.theme.shared": "^2.3.0" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index efd21cd245..b3a17b8d88 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": "2.2.0", + "version": "2.3.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~2.2.0", + "@abp/ng.core": "^2.3.0", "@fortawesome/fontawesome-free": "^5.12.1", "@ng-bootstrap/ng-bootstrap": "^5.3.0", "@ngx-validate/core": "^0.0.7", From 4279a2e6a25ee542720c94748f89a8c916a2d6f0 Mon Sep 17 00:00:00 2001 From: erolarkat Date: Thu, 19 Mar 2020 12:08:02 +0300 Subject: [PATCH 07/29] npm packages --- npm/ng-packs/yarn.lock | 181 +++++++++++++++++++---------------------- npm/package-lock.json | 2 +- 2 files changed, 83 insertions(+), 100 deletions(-) diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index f405dcbd9d..db911bfb55 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -2,125 +2,122 @@ # yarn lockfile v1 -"@abp/ng.account.config@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.account.config/-/ng.account.config-2.1.0.tgz#3ee7cdf6a3d72db90c55f2dc775c402d5be63b29" - integrity sha512-6kCMRy+HLZqM5wKhSDfwc71Ei6MdQ502jOSWCpIPt2wgo8hGnRbht0hdUbT0XgY3qebRA14wXSh59DzLLhPW+A== +"@abp/ng.account.config@^2.2.0", "@abp/ng.account.config@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.account.config/-/ng.account.config-2.2.0.tgz#420396fc55eadd9a5c179e87075a51437ebc964c" + integrity sha512-5BpxFnXCeCDR+m3qGMKn8rSMGwBb4mkwtejVAJXCVYoMXL8x2J9uRgDf9fkdudqpls+BIgB8BX1tRyJiY+Bg8Q== dependencies: tslib "^1.9.0" -"@abp/ng.account@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-2.1.0.tgz#20a702e0901f1402eb9a4fe1fbb7d326ad4664ae" - integrity sha512-Ql6U9D+r34xCSvZpDTy7R/jYf9zt9Rx+0Dgsro4JRII+rKHtS8r3+aLPD3PMSNwjKBsCwj6dl+GUYbICbxhHiQ== +"@abp/ng.account@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-2.2.0.tgz#3a200a46f83c36ae89a6724a6a2226a5f846641b" + integrity sha512-OwTOxXDI3BJ1MrlR6WtvDmNIkqi1OCWlq7MvUhuFPVmIIUI3OjxHNASk1NfWMSlu6amXDxuFEey4ItrMKnAJog== dependencies: - "@abp/ng.account.config" "^2.1.0" - "@abp/ng.theme.shared" "^2.1.0" + "@abp/ng.account.config" "^2.2.0" + "@abp/ng.theme.shared" "^2.2.0" tslib "^1.9.0" -"@abp/ng.core@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-2.1.0.tgz#70d47b81e7bbf1fa6d38e557c2aef26c9611458a" - integrity sha512-BJquoWQbH/lJmXeBKcOQfUTLkeGvTTgeq+ZRIngm7qGnbM5oeS3LPo6rTopP1ELHWzfkRMthx3HHJF4xqMpmaQ== +"@abp/ng.core@^2.2.0", "@abp/ng.core@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-2.2.0.tgz#a553e845f7bc43838704eb15d8684869dfcb053b" + integrity sha512-HtyHJYPY6kKqySt/afgFT5j6yaN7Bx4MMvIGWHqFqZsQChWceagLk5SBFTOjCE1FgsewX2a7OT452bKjgsWsrg== dependencies: - "@ngxs/router-plugin" "^3.5.1" - "@ngxs/storage-plugin" "^3.5.1" - "@ngxs/store" "^3.5.1" + "@angular/localize" "~9.0.2" + "@ngxs/router-plugin" "^3.6.2" + "@ngxs/storage-plugin" "^3.6.2" + "@ngxs/store" "^3.6.2" angular-oauth2-oidc "^8.0.4" just-clone "3.1.0" just-compare "^1.3.0" snq "^1.0.3" tslib "^1.9.0" -"@abp/ng.feature-management@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-2.1.0.tgz#914bafbbb16e7080a519b081e830c7e6dec1e948" - integrity sha512-9geOnDrmZyVD9VRVkLD+Az5zVjw2K/t1znq2IE6aZN9XUmCkvu7Rsao0OwPeMZDcFHqe2MlrLSa/RkxOpwX5Og== +"@abp/ng.feature-management@^2.2.0", "@abp/ng.feature-management@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-2.2.0.tgz#04f959ddb62a0abd99a84fb4e6ec935a796418d4" + integrity sha512-Cw0GRi+6LX5oKDwEvJJyUoh7M4hvaUE5TsuP1E3Hicg/1mMSyUDXVrLBOvAeWWolyfFTpFKLppAvoEEMpUt2eg== dependencies: - "@abp/ng.theme.shared" "^2.1.0" + "@abp/ng.theme.shared" "^2.2.0" tslib "^1.9.0" -"@abp/ng.identity.config@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.identity.config/-/ng.identity.config-2.1.0.tgz#2ea5ba58fc2d882166a076d32eb1b1835b9d9f78" - integrity sha512-irg2ey/LEIHeOkq/ZnNSAncq69AxYYt4Cm4xTT+sNgjyN2hrqpj+NBx6hjOnLci0ZB69o08/o1NgVdHRwgk9WQ== +"@abp/ng.identity.config@^2.2.0", "@abp/ng.identity.config@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.identity.config/-/ng.identity.config-2.2.0.tgz#ac050ed632624c490d8957a18606622637d1d6f3" + integrity sha512-sHRG0iRFrGtF2pNnKcjBaeupg39V8easzUFPU42/SVPi0XyAumrOZRbKkN2CBl0WYedqARTZxE5/nejRMXX4Fg== dependencies: tslib "^1.9.0" -"@abp/ng.identity@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-2.1.0.tgz#ee5646b7538619735548cd6e8db3bcdeedf1e21e" - integrity sha512-4aRtveWZ0J0zSfVuNR9t8EIsujLrI0Zudg9/iagbA37Q018rJIiRX58zuOfcfoBojk8y9Ul0ceviaWbH4DLoYg== +"@abp/ng.identity@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-2.2.0.tgz#1cc7ffa4e2aae462d8ce2399f94cf5ad047fefae" + integrity sha512-G/hrMg/PaN0tA871D52AuKlUhsLWfWSblK0XqQiRmMp/ozsEYSvAV91n/pEScm7qx0RF01K0J5K5V8Cjb4LTyA== dependencies: - "@abp/ng.identity.config" "^2.1.0" - "@abp/ng.permission-management" "^2.1.0" - "@abp/ng.theme.shared" "^2.1.0" + "@abp/ng.identity.config" "^2.2.0" + "@abp/ng.permission-management" "^2.2.0" + "@abp/ng.theme.shared" "^2.2.0" tslib "^1.9.0" -"@abp/ng.permission-management@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-2.1.0.tgz#e5e561d4a9d6e7f46a681860836a3094eedf9b08" - integrity sha512-qXVFaenKikcu6WRJFt6BIIiCtdxuVirgwvo6hoILzfuDeNn0Kl6qqpjMAe2Rpeltm5hBj5Xurm2WFsAQMJeu2w== +"@abp/ng.permission-management@^2.2.0", "@abp/ng.permission-management@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-2.2.0.tgz#56bece037aa094400f8d5585db0bfd5718437ae0" + integrity sha512-OeUZzZV+2TTWOhmpwFTvar9/4IpKz5EhI/6uabu3pOtIsU2Ms2OBbjwVUSKbhLT7e0+z5MM1nPCDoXIlYv22wA== dependencies: - "@abp/ng.theme.shared" "^2.1.0" + "@abp/ng.theme.shared" "^2.2.0" tslib "^1.9.0" -"@abp/ng.setting-management.config@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.setting-management.config/-/ng.setting-management.config-2.1.0.tgz#aba507be43f6cef3e03fc65d2f361fd6fc375801" - integrity sha512-L7iJ9E+qIsylz0cLuiabZJrTl4pMs8H7cx7ZL7aNGcwMqULSSpI1DYZ7HbodNxZetpL2R1AO6mTEHU+Y3YtaLw== +"@abp/ng.setting-management.config@^2.2.0", "@abp/ng.setting-management.config@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.setting-management.config/-/ng.setting-management.config-2.2.0.tgz#31cf94a785fc2d5c3f1bcfe2c79afc0f1ab419ee" + integrity sha512-vZhBvKFZ6puWwujkzEEhqyQiMKdTmAeJjSxlUPRyIuwowrZhPnUk1r0ghyOLTC5fC1TDaUXF1mZ2UsBFMDvuiw== dependencies: tslib "^1.9.0" -"@abp/ng.setting-management@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-2.1.0.tgz#5a44da7615c93ecce51ff0df137df00bc1611964" - integrity sha512-Ri3YBn484PU0U1ffp8Hwyq/Do4hajMIk7K70R985vOhzyq9jPzBS4hOoBP+C9Xl/Cn6H0mfMiyr25NNUk7at+w== +"@abp/ng.setting-management@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-2.2.0.tgz#e1c976bf69bbfaa452489b8968b8669c3fba7710" + integrity sha512-LL6CUi0qpS0+9kPz/T0n1U+Kpu9gwI49+d/+xVDG+lIziGqukgwgoUwlEv+Lk0ak+RC5noLurvvJaaKd3l3mPw== dependencies: - "@abp/ng.setting-management.config" "^2.1.0" - "@abp/ng.theme.shared" "^2.1.0" + "@abp/ng.setting-management.config" "^2.2.0" + "@abp/ng.theme.shared" "^2.2.0" tslib "^1.9.0" -"@abp/ng.tenant-management.config@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management.config/-/ng.tenant-management.config-2.1.0.tgz#8dd5c32fdca0c679b2534cb4b4025fb5de1532ee" - integrity sha512-A9ucsNiLsAA/bANJGX4mi2DThR7jiNFb9u4aGdwcphZw5l2DyDqJdcXkOHMQU3S4KwVBCzQbOY1FHdNTqnTPSQ== +"@abp/ng.tenant-management.config@^2.2.0", "@abp/ng.tenant-management.config@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management.config/-/ng.tenant-management.config-2.2.0.tgz#16d87f31ec069e1f3a8351ef3be9a05a3002ed26" + integrity sha512-lfW9lGERn9PBIRseJajQ0GSxo1+wfRxO7Ic/lSSPxhUbsmwg6afquYTcGiU0d+4QQOBY47ga3n0IVrNqWq1pmw== dependencies: tslib "^1.9.0" -"@abp/ng.tenant-management@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-2.1.0.tgz#908b421a4a1c91348bb9576a2f2f9db610de3977" - integrity sha512-5vMqpmcRiRpnUOVhknJc9T2mUzwB+j4vfJGBxxeLpSd9oMpausvL44waMvpyGJGtXNJaiDkeE0ef7EycSwpD0Q== +"@abp/ng.tenant-management@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-2.2.0.tgz#0ce498eaf9f65ef0255fc23949a47f8ae36cf5c8" + integrity sha512-v9Y5F9fm2EXYteCWKI8QODN4ETmSdh6K7gC5Y3+/N+QaUAod8JxFNX0EIXzFGnSLbiZ0O1xA/TRJruQTv1m3SA== dependencies: - "@abp/ng.feature-management" "^2.1.0" - "@abp/ng.tenant-management.config" "^2.1.0" - "@abp/ng.theme.shared" "^2.1.0" + "@abp/ng.feature-management" "^2.2.0" + "@abp/ng.tenant-management.config" "^2.2.0" + "@abp/ng.theme.shared" "^2.2.0" tslib "^1.9.0" -"@abp/ng.theme.basic@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-2.1.0.tgz#9b1d9cbf47f01bbe93db57312bc685dfabfd2a92" - integrity sha512-yjUbFlGPe85hndiCJ9ZefN3JZyItXeKFhGOFbNclTuN8owW21fVrQsk9V6cGN0Jtt1AQr1TDZ0Qr2tVnKEthlQ== +"@abp/ng.theme.basic@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-2.2.0.tgz#7a086a27daa3bec16962dd62dfb2f39a1538e82f" + integrity sha512-fpdDjjhEQZtaZvFkVi5uhqZoYyrxCWJeQgGFvLS36TqYqvJVyoMeJBlVw0CgbY3F+u5V/GmZSVxvZAAJDpUYhg== dependencies: - "@abp/ng.theme.shared" "^2.1.0" + "@abp/ng.theme.shared" "^2.2.0" tslib "^1.9.0" -"@abp/ng.theme.shared@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-2.1.0.tgz#60655b94f755ccd6af3d51061d15547bb216c2ab" - integrity sha512-6PFEVIg2hST8ZVOaR8xHNiEwd9S5AEQ+S2eQRBs7eptN75WYL7CGQTjVGIsphB2g1TYA3256k0shxyOR6iw63g== +"@abp/ng.theme.shared@^2.2.0", "@abp/ng.theme.shared@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-2.2.0.tgz#438f77498df3e2f25a1ecf9adb77a9ee5a71d2c5" + integrity sha512-w7TnDbdHpOFcT12wt/9nZDH9PkyZdTP6W+tJIGeH6zOgWC8V4MDX8Ulc9e/ZvQ8u0qRLOEmk3aE5odFQUHSlJw== dependencies: - "@abp/ng.core" "^2.1.0" - "@angular/cdk" "^8.2.3" - "@fortawesome/fontawesome-free" "^5.11.2" - "@ng-bootstrap/ng-bootstrap" "^5.1.4" + "@abp/ng.core" "^2.2.0" + "@fortawesome/fontawesome-free" "^5.12.1" + "@ng-bootstrap/ng-bootstrap" "^5.3.0" "@ngx-validate/core" "^0.0.7" - bootstrap "^4.3.1" - chart.js "^2.9.2" - font-awesome "^4.7.0" - primeicons "^2.0.0" - primeng "^8.1.1" + bootstrap "^4.4.1" + chart.js "^2.9.3" tslib "^1.9.0" "@angular-builders/jest@^8.2.0": @@ -274,15 +271,6 @@ dependencies: tslib "^1.9.0" -"@angular/cdk@^8.2.3": - version "8.2.3" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.2.3.tgz#16b96ffa935cbf5a646757ecaf2b19c434678f72" - integrity sha512-ZwO5Sn720RA2YvBqud0JAHkZXjmjxM0yNzCO8RVtRE9i8Gl26Wk0j0nQeJkVm4zwv2QO8MwbKUKGTMt8evsokA== - dependencies: - tslib "^1.7.1" - optionalDependencies: - parse5 "^5.0.0" - "@angular/cli@~8.3.21": version "8.3.25" resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.3.25.tgz#2802291f83a88f334336a1482c8ee63a69cabad7" @@ -1232,7 +1220,7 @@ unique-filename "^1.1.1" which "^1.3.1" -"@fortawesome/fontawesome-free@^5.11.2", "@fortawesome/fontawesome-free@^5.12.1": +"@fortawesome/fontawesome-free@^5.12.1": version "5.12.1" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.1.tgz#2a98fea9fbb8a606ddc79a4680034e9d5591c550" integrity sha512-ZtjIIFplxncqxvogq148C3hBLQE+W3iJ8E4UvJ09zIJUgzwLcROsWwFDErVSXY2Plzao5J9KUYNHKHMEUYDMKw== @@ -2083,7 +2071,7 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@ng-bootstrap/ng-bootstrap@^5.1.4", "@ng-bootstrap/ng-bootstrap@^5.3.0": +"@ng-bootstrap/ng-bootstrap@^5.3.0": version "5.3.0" resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-5.3.0.tgz#4d624dd70a93f99c38bc35b1d3e00afc490155fc" integrity sha512-oNg1sgT+XXxwSBX9oF4AeCHrq+Nm1CvukfVT/NPuYiuNAoTeVOdXc5bJHTLd+cCwoZ1OPZN/yZT+1BcW1KCksQ== @@ -2133,21 +2121,21 @@ dependencies: tslib "^1.9.0" -"@ngxs/router-plugin@^3.5.1", "@ngxs/router-plugin@^3.6.2": +"@ngxs/router-plugin@^3.6.2": version "3.6.2" resolved "https://registry.yarnpkg.com/@ngxs/router-plugin/-/router-plugin-3.6.2.tgz#058b09565011203bbf52294f16f29f9337aeaa27" integrity sha512-5J3G9+Qsy/s7iqFivzAN1S6EmaZYTb9hqz7Xjn3c0u3Y44VMP5VWiz77jZ/eowXX0slJywcMxk6oCEFPwz4lXQ== dependencies: tslib "^1.9.0" -"@ngxs/storage-plugin@^3.5.1", "@ngxs/storage-plugin@^3.6.2": +"@ngxs/storage-plugin@^3.6.2": version "3.6.2" resolved "https://registry.yarnpkg.com/@ngxs/storage-plugin/-/storage-plugin-3.6.2.tgz#6fe2168891382c635406df02308f67b585efc60a" integrity sha512-x9CATYmXDH9bWmKW4uQxt5xxb51naSAmMkhvv1QHIrE9hG4uYNqiV3ERAM1wZvZbu2MJB9iXEN0cBziTgrwe2Q== dependencies: tslib "^1.9.0" -"@ngxs/store@^3.5.1", "@ngxs/store@^3.6.2": +"@ngxs/store@^3.6.2": version "3.6.2" resolved "https://registry.yarnpkg.com/@ngxs/store/-/store-3.6.2.tgz#cfba63dc1e5bd422e89e54b3332cd69818510624" integrity sha512-al7GU618SAuz2Ul4rFYVDgS1DM0gHReGOGvbnE7LBt4Etz3gsJERNYXPp2bSA7lZGaRPRaFfIHJN+Lm/GikFJw== @@ -3274,7 +3262,7 @@ bonjour@^3.5.0: multicast-dns "^6.0.1" multicast-dns-service-types "^1.1.0" -bootstrap@^4.3.1, bootstrap@^4.4.1: +bootstrap@^4.4.1: version "4.4.1" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01" integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA== @@ -3696,7 +3684,7 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -chart.js@^2.9.2, chart.js@^2.9.3: +chart.js@^2.9.3: version "2.9.3" resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.3.tgz#ae3884114dafd381bc600f5b35a189138aac1ef7" integrity sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw== @@ -9595,11 +9583,6 @@ primeicons@^2.0.0: resolved "https://registry.yarnpkg.com/primeicons/-/primeicons-2.0.0.tgz#ec3e5a8d4d04a09309225a5a57deb911e08dc0d3" integrity sha512-GJTCeMSQU8UU1GqbsaDrg/IH+b/vSinJQl52NVpdJ7sShYLZA8Eq6jLF48Ye3N/dQloGrE07i7XsZvxQ9pNbqg== -primeng@^8.1.1: - version "8.1.4" - resolved "https://registry.yarnpkg.com/primeng/-/primeng-8.1.4.tgz#aa98de9b3a4f8bd669da6011c0abde6892110fe5" - integrity sha512-UHZ10i551zS3+g5GAADI99JhWriYs25QvYYh8wm3twi9HuCVpmRdpULqbsY6gIhvcl0qnPyVTLQM/XII//tVUg== - private@^0.1.6: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -11712,7 +11695,7 @@ tslib@1.10.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: version "1.11.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz#f1f3528301621a53220d58373ae510ff747a66bc" integrity sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg== diff --git a/npm/package-lock.json b/npm/package-lock.json index 5aadbe1235..b50344e0c5 100644 --- a/npm/package-lock.json +++ b/npm/package-lock.json @@ -1,5 +1,5 @@ { - "version": "2.2.0", + "version": "2.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { From 2592c46b242696cb7be8ceb386963b110dd41225 Mon Sep 17 00:00:00 2001 From: erolarkat Date: Thu, 19 Mar 2020 12:08:50 +0300 Subject: [PATCH 08/29] npm packages --- npm/lerna.json | 2 +- npm/packs/anchor-js/package.json | 6 +- .../package.json | 6 +- .../package.json | 32 +-- npm/packs/aspnetcore.mvc.ui/package.json | 4 +- npm/packs/blogging/package.json | 10 +- npm/packs/bootstrap-datepicker/package.json | 4 +- npm/packs/bootstrap/package.json | 6 +- npm/packs/chart.js/package.json | 4 +- npm/packs/clipboard/package.json | 6 +- npm/packs/codemirror/package.json | 6 +- npm/packs/core/package.json | 4 +- npm/packs/datatables.net-bs4/package.json | 6 +- npm/packs/datatables.net/package.json | 6 +- npm/packs/docs/package.json | 14 +- npm/packs/flag-icon-css/package.json | 4 +- npm/packs/font-awesome/package.json | 6 +- npm/packs/highlight.js/package.json | 6 +- npm/packs/jquery-form/package.json | 6 +- .../package.json | 6 +- npm/packs/jquery-validation/package.json | 6 +- npm/packs/jquery/package.json | 6 +- npm/packs/lodash/package.json | 6 +- npm/packs/luxon/package.json | 4 +- .../package.json | 6 +- npm/packs/markdown-it/package.json | 6 +- npm/packs/owl.carousel/package.json | 6 +- npm/packs/popper.js/package.json | 6 +- npm/packs/prismjs/package.json | 6 +- npm/packs/select2/package.json | 6 +- npm/packs/sweetalert/package.json | 6 +- npm/packs/timeago/package.json | 6 +- npm/packs/toastr/package.json | 6 +- npm/packs/tui-editor/package.json | 12 +- templates/app/angular/package.json | 10 +- .../package.json | 2 +- .../yarn.lock | 222 +++++++++--------- .../package.json | 2 +- .../yarn.lock | 222 +++++++++--------- .../package.json | 2 +- .../yarn.lock | 222 +++++++++--------- .../package.json | 2 +- .../MyCompanyName.MyProjectName.Web/yarn.lock | 222 +++++++++--------- templates/module/angular/package.json | 10 +- .../my-project-name-config/package.json | 2 +- .../projects/my-project-name/package.json | 2 +- .../package.json | 2 +- .../yarn.lock | 222 +++++++++--------- .../package.json | 2 +- .../yarn.lock | 222 +++++++++--------- .../package.json | 2 +- .../yarn.lock | 222 +++++++++--------- 52 files changed, 912 insertions(+), 912 deletions(-) diff --git a/npm/lerna.json b/npm/lerna.json index e23f5a1a9a..145064dc14 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.0", + "version": "2.3.0", "packages": [ "packs/*" ], diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 0548674d45..a352b6722f 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "anchor-js": "^4.2.2" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index e3b0981f37..da66f27d5d 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,11 +1,11 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.shared": "^2.3.0" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 05d398abcd..4a3b24579b 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,24 +1,24 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "^2.2.0", - "@abp/bootstrap": "^2.2.0", - "@abp/bootstrap-datepicker": "^2.2.0", - "@abp/datatables.net-bs4": "^2.2.0", - "@abp/font-awesome": "^2.2.0", - "@abp/jquery-form": "^2.2.0", - "@abp/jquery-validation-unobtrusive": "^2.2.0", - "@abp/lodash": "^2.2.0", - "@abp/luxon": "^2.2.0", - "@abp/malihu-custom-scrollbar-plugin": "^2.2.0", - "@abp/select2": "^2.2.0", - "@abp/sweetalert": "^2.2.0", - "@abp/timeago": "^2.2.0", - "@abp/toastr": "^2.2.0" + "@abp/aspnetcore.mvc.ui": "^2.3.0", + "@abp/bootstrap": "^2.3.0", + "@abp/bootstrap-datepicker": "^2.3.0", + "@abp/datatables.net-bs4": "^2.3.0", + "@abp/font-awesome": "^2.3.0", + "@abp/jquery-form": "^2.3.0", + "@abp/jquery-validation-unobtrusive": "^2.3.0", + "@abp/lodash": "^2.3.0", + "@abp/luxon": "^2.3.0", + "@abp/malihu-custom-scrollbar-plugin": "^2.3.0", + "@abp/select2": "^2.3.0", + "@abp/sweetalert": "^2.3.0", + "@abp/timeago": "^2.3.0", + "@abp/toastr": "^2.3.0" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index 3f32ccb015..6095327299 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/aspnetcore.mvc.ui", "publishConfig": { "access": "public" @@ -12,5 +12,5 @@ "path": "^0.12.7", "rimraf": "^3.0.0" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 932b4c856d..15df7b9ed8 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,13 +1,13 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "^2.2.0", - "@abp/owl.carousel": "^2.2.0", - "@abp/tui-editor": "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.shared": "^2.3.0", + "@abp/owl.carousel": "^2.3.0", + "@abp/tui-editor": "^2.3.0" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index 386d7eba6c..0e8509d622 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/bootstrap-datepicker", "publishConfig": { "access": "public" @@ -7,5 +7,5 @@ "dependencies": { "bootstrap-datepicker": "^1.9.0" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 498e54e892..96de72dc43 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/bootstrap", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "bootstrap": "^4.3.1" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index 80ccd61e17..e6b3bf0f5a 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/chart.js", "publishConfig": { "access": "public" @@ -7,5 +7,5 @@ "dependencies": { "chart.js": "^2.9.3" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index b6a483d76f..b4f3659faf 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "clipboard": "^2.0.4" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 7a2b528f44..894f5370df 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "codemirror": "^5.49.2" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index dec0ece13b..383aeba66f 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,8 +1,8 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/core", "publishConfig": { "access": "public" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index d5e3c10801..dd553c0fda 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/datatables.net-bs4", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "^2.2.0", + "@abp/datatables.net": "^2.3.0", "datatables.net-bs4": "^1.10.20" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 47d51dd15b..90f83375ae 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/datatables.net", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "datatables.net": "^1.10.20" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index e21b186f57..4656a2562f 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "^2.2.0", - "@abp/clipboard": "^2.2.0", - "@abp/malihu-custom-scrollbar-plugin": "^2.2.0", - "@abp/popper.js": "^2.2.0", - "@abp/prismjs": "^2.2.0" + "@abp/anchor-js": "^2.3.0", + "@abp/clipboard": "^2.3.0", + "@abp/malihu-custom-scrollbar-plugin": "^2.3.0", + "@abp/popper.js": "^2.3.0", + "@abp/prismjs": "^2.3.0" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 96ec8df8c4..c7929d83a5 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" @@ -7,5 +7,5 @@ "dependencies": { "flag-icon-css": "^3.4.5" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index fe302462be..277eb28eed 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/font-awesome", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "@fortawesome/fontawesome-free": "^5.11.2" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index e46c972e59..f1d91f0b35 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0" + "@abp/core": "^2.3.0" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 391c4a06df..6d396750fb 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/jquery-form", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "^2.2.0", + "@abp/jquery": "^2.3.0", "jquery-form": "^4.2.2" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index b40a776119..8e83ae4c17 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/jquery-validation-unobtrusive", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery-validation": "^2.2.0", + "@abp/jquery-validation": "^2.3.0", "jquery-validation-unobtrusive": "^3.2.11" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index d1c32c5fea..a0793621e1 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/jquery-validation", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "^2.2.0", + "@abp/jquery": "^2.3.0", "jquery-validation": "^1.19.1" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 5ec2fd0ec3..ce18819d94 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/jquery", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "jquery": "^3.4.1" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 6e9ffd0c0c..becc25f57a 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/lodash", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "lodash": "^4.17.15" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index 1e53e6fd99..d7f2c9eba6 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/luxon", "publishConfig": { "access": "public" @@ -7,5 +7,5 @@ "dependencies": { "luxon": "^1.21.3" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 1d65d8f9d8..ef24529795 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/malihu-custom-scrollbar-plugin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "malihu-custom-scrollbar-plugin": "^3.1.5" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index da0afef6db..a996ce3163 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "markdown-it": "^10.0.0" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 947313ad4a..3ecd626f1e 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "owl.carousel": "^2.3.4" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 21fa7de6ee..83ea7eea5f 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "popper.js": "^1.16.0" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 745e4da5b1..e6899bbb1f 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "prismjs": "^1.17.1" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index f3f6715210..58c48daa56 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/select2", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "select2": "^4.0.12" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/sweetalert/package.json b/npm/packs/sweetalert/package.json index 01693f17d1..0c947bb1de 100644 --- a/npm/packs/sweetalert/package.json +++ b/npm/packs/sweetalert/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/sweetalert", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^2.2.0", + "@abp/core": "^2.3.0", "sweetalert": "^2.1.2" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index 57f55b073b..b2549944e1 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/timeago", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "^2.2.0", + "@abp/jquery": "^2.3.0", "timeago": "^1.6.7" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index 063be979ae..16fa91de0e 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,12 +1,12 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/toastr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "^2.2.0", + "@abp/jquery": "^2.3.0", "toastr": "^2.1.4" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index e13b5d37b8..cb61bce4e0 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,15 +1,15 @@ { - "version": "2.2.0", + "version": "2.3.0", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "^2.2.0", - "@abp/highlight.js": "^2.2.0", - "@abp/jquery": "^2.2.0", - "@abp/markdown-it": "^2.2.0", + "@abp/codemirror": "^2.3.0", + "@abp/highlight.js": "^2.3.0", + "@abp/jquery": "^2.3.0", + "@abp/markdown-it": "^2.3.0", "tui-editor": "^1.4.8" }, - "gitHead": "d5707967977fb14328661ae403c41eaa679ee263" + "gitHead": "e5aead708928c668494ed0dbd7e8ae5c5ef9b9e7" } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 20b3d0ea23..c982ed20ca 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -11,11 +11,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~2.2.0", - "@abp/ng.identity": "~2.2.0", - "@abp/ng.setting-management": "~2.2.0", - "@abp/ng.tenant-management": "~2.2.0", - "@abp/ng.theme.basic": "~2.2.0", + "@abp/ng.account": "~2.3.0", + "@abp/ng.identity": "~2.3.0", + "@abp/ng.setting-management": "~2.3.0", + "@abp/ng.tenant-management": "~2.3.0", + "@abp/ng.theme.basic": "~2.3.0", "@angular/animations": "~9.0.2", "@angular/common": "~9.0.2", "@angular/compiler": "~9.0.2", diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json index 6e36dde3bf..504aafc075 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^2.3.0" } } \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock index 157d0f2e34..a900560181 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.2.0.tgz#e7f4e57d2b17cc76388e9c56bc34d50c9658873b" - integrity sha512-S9GQ9YVg4DWrgjujwiXBER6KqdqW5nZ1Bmt+YEePn5gEoPvoVrh6ojthpHYRjBJtGFqBSzRAQ9eVZLebT22Ozg== +"@abp/aspnetcore.mvc.ui.theme.basic@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.3.0.tgz#482c236565268d305c0c86399e837bdddecf97ad" + integrity sha512-PJqGAHllBoZv/97DalfMFQr4oPA6PatObaj/+oxkjUjQcPD4z2sJO5Z+d8t6plo3ZvjzMvwm+VwzhZgdJhtwKw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.shared" "^2.3.0" -"@abp/aspnetcore.mvc.ui.theme.shared@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.2.0.tgz#e0df953853be2a184d323931573f9f98aebbaa62" - integrity sha512-urxziaCdvfEqN5cjiiM5f5dx2Yr+AoGqCJVCo0Okjl2dosdaj5DH4SBzMvKAaLXzo3Ep1h4b3Wvws4BThL/6rA== - dependencies: - "@abp/aspnetcore.mvc.ui" "^2.2.0" - "@abp/bootstrap" "^2.2.0" - "@abp/bootstrap-datepicker" "^2.2.0" - "@abp/datatables.net-bs4" "^2.2.0" - "@abp/font-awesome" "^2.2.0" - "@abp/jquery-form" "^2.2.0" - "@abp/jquery-validation-unobtrusive" "^2.2.0" - "@abp/lodash" "^2.2.0" - "@abp/luxon" "^2.2.0" - "@abp/malihu-custom-scrollbar-plugin" "^2.2.0" - "@abp/select2" "^2.2.0" - "@abp/sweetalert" "^2.2.0" - "@abp/timeago" "^2.2.0" - "@abp/toastr" "^2.2.0" - -"@abp/aspnetcore.mvc.ui@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.2.0.tgz#b2cdd421eed09ec1d30ae85e14434b7efc094ade" - integrity sha512-IO/AjhJu+LUa9zOaT8JlEnV+Pcp9oQ3q9kTq8kmMakC35vTIyvBpB3nnykXIOytZSyjsBgFYB/uMxPgBOjWagg== +"@abp/aspnetcore.mvc.ui.theme.shared@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.3.0.tgz#553ba6983308a8da3336226b8c20f9191da8a5cc" + integrity sha512-LLf89lXILM0MiSv/Mk4GXXl+eu+J5obTMfA9obLNiXD5fpwlYxnTtMwxh+sfZe9KcsZTuYEcXJgVk/A8HKydeg== + dependencies: + "@abp/aspnetcore.mvc.ui" "^2.3.0" + "@abp/bootstrap" "^2.3.0" + "@abp/bootstrap-datepicker" "^2.3.0" + "@abp/datatables.net-bs4" "^2.3.0" + "@abp/font-awesome" "^2.3.0" + "@abp/jquery-form" "^2.3.0" + "@abp/jquery-validation-unobtrusive" "^2.3.0" + "@abp/lodash" "^2.3.0" + "@abp/luxon" "^2.3.0" + "@abp/malihu-custom-scrollbar-plugin" "^2.3.0" + "@abp/select2" "^2.3.0" + "@abp/sweetalert" "^2.3.0" + "@abp/timeago" "^2.3.0" + "@abp/toastr" "^2.3.0" + +"@abp/aspnetcore.mvc.ui@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.3.0.tgz#166a1235b70b460be0c84171c229c1c5543dcbb7" + integrity sha512-5vitUltSBEVf97tJwonMkL6YQ0acKF2JEtbkfer3GN63MuU4+8ayYT8bwlieV6iC20dm69dCLI3dIfezvFnAfA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^3.0.0" -"@abp/bootstrap-datepicker@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.2.0.tgz#a2f50b422824f18ed4b7e80be6852e2979119f8e" - integrity sha512-X9jT5mU42QFfVhOZdun7aEJUf3bMko6NsG3NFQVjqTqKH+iYGKfHPFpXD0gP/6Nb4KgZUdId8hSyQTZyOK2JEA== +"@abp/bootstrap-datepicker@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.3.0.tgz#fc235d1fb47e44cd6950cd6179b045fbd19b2a12" + integrity sha512-X7iWvwo7QqOp35IBz8WELDVfuVK110vZCcfuXwo0MbnH0aXS3+2CEUxqZnYHNcDrf+eXaact/IPKVl5Z/mA70A== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.2.0.tgz#16e41d3432117bbcd9012c6f735c49c543255879" - integrity sha512-aRmluu6SkIl+JgCzSSJZrDPkYr6WWaQdY0iJAOz6NHtffa7Aumh1IUOrLVKL0T1pQn6QKs0Z7JDGyYMdh1HPkQ== +"@abp/bootstrap@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.3.0.tgz#e53ead2fae02cef04e8d44c1fd38d3368d0db8df" + integrity sha512-PsmCRUEF82Co903JxdvvPaBaiP+BFpQvMhM0PMqZzJ4AKGq0qG4kdCTAhFYhusy1e/UqBaNwCp7URDN/I+Xr7A== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" bootstrap "^4.3.1" -"@abp/core@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.2.0.tgz#4eea0a06458c90acb8566a11eb841fe65d15d256" - integrity sha512-tBGHa5CUr0ewT31g689RAfQ6Su2p4uyn2PzmrW/8lahBrvqkoCb41fkCDLQJkTY5rKPrEKZd/s9OoyOnS20DLg== +"@abp/core@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.3.0.tgz#3bb600c6b3e77060561d90db06e0052e04fa59b6" + integrity sha512-LGtOSYZqINZuX6Hy9vDDxxLJpEfZYyzdTxFdQt9UBtE/AuypILG8lOQjd96OJpRTeqyOUHBYo8AXtYzEyR6ZiA== -"@abp/datatables.net-bs4@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.2.0.tgz#c7cc49e889b295ae10fb24ed62b154ef79ffc85a" - integrity sha512-zjJRPqOCWPfkHt1QztfFHKrsTE9o6Je2EpfA7hRMej2FlGbsMWUxOqx/btK1vjD6YIU8DtVDpIdj1WvPOITQ4Q== +"@abp/datatables.net-bs4@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.3.0.tgz#f7268173bd5070471999e3e694509b49e4fc2e87" + integrity sha512-nA913hyrZRl8gQlGAmg+n7Z4iav4U+XrPgC0CfTUkZda7ReHj50jFZPQREfnmGdM77FVA+3y4q4LZELGB65GMQ== dependencies: - "@abp/datatables.net" "^2.2.0" + "@abp/datatables.net" "^2.3.0" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.2.0.tgz#22f9c7ca90c2d4af264483b4f8286b0feb7c3d52" - integrity sha512-L4MnpdloSWr/px3mvV75sxsxL68MyALB2LKdzCFMQWILCZVkxMmQb9LARINYIrn461Wrc+zbYWNEBD0MAq7flg== +"@abp/datatables.net@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.3.0.tgz#420ab84c54ca6b81a555c8525a96de62c54aca75" + integrity sha512-CAIF/+eQzCPltfQsvojOE5ojbbOv0u9MqtAIjgCiQ0ccCLe0j+68ZJhizDK1e3JA1o9jZXcBZnEWIGPdhpcRcA== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" datatables.net "^1.10.20" -"@abp/font-awesome@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.2.0.tgz#2de39e3c6c3e8c30394d82861761a66c5b4032f0" - integrity sha512-RT06MYUGgaWBEpW5c7wUcfMXgxcOHWdX/C01LDO/j6iVoKBuBHOkkvcUoTWII068ECrLYOkj+RyT59dCKm8FFw== +"@abp/font-awesome@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.3.0.tgz#30988351f7ca7ccf84b414e95848016df701bafe" + integrity sha512-lco8ArQi1xeKqypmvCubXrwO0/a+uP33vqQy+d3JRcmAXJgc5+AeQrzEq9KRcD/BGeWQUi8aJobW0rGFTAZxxQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.2.0.tgz#951653fac4013a7bbec065b5101b86d575e0eca7" - integrity sha512-ji44E3Ud0S3LNXn1WJ/Aw44qAIG7EITEW1KOe46oz+/awPpbiiA4dDDNleTvO2jI2/s8mNyR0bNanP6BUsc7tw== +"@abp/jquery-form@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.3.0.tgz#91e088fd1861c2a6224ce127c0fe0071baec9eef" + integrity sha512-cVPFdKpgAPSsG4mxrREfmslkgVJEZI9LpHask/6vy5gE/eFKZ9t6BZg+gop7bj6co3NcjekjDxhM7c0Iq+auyA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.2.0.tgz#6d39ba9f7bf026d1380796bf5dff76c8d16b42ce" - integrity sha512-SuS/dRRVz7ZR4HK/h9x0jRRVLPqXN0CPRGPdJZ1LJraXVEJ9/eDEGf1rMlHmEGt1FXXFTD01/zjisbweDE786w== +"@abp/jquery-validation-unobtrusive@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.3.0.tgz#18dcd10ac0d6678716b42170fca1810b23cebaab" + integrity sha512-CAR3zZ4Oxbu5MK7VO2QhZjwYW81NCEqOViKPpPzk/K2qkgphHbDpRei3XMbi+476KMhrAgQE6KzlrafWBtsdRA== dependencies: - "@abp/jquery-validation" "^2.2.0" + "@abp/jquery-validation" "^2.3.0" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.2.0.tgz#02bb8ba883e72c1204867ee4d1c1094bd91c4c4c" - integrity sha512-ypITQloO4iEDgqlA6qb3taj+7HMX0Cf/ACA2OvtrvOgJejx6J4wfrPjwuFZu1WWJ0xtc9yTdbovdcSVcQbIGaA== +"@abp/jquery-validation@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.3.0.tgz#af723abf5950729ef2763cecb7f5a9c5cbed0031" + integrity sha512-YvFCbvx9hWzi7BytYRBb/0tFdiibWT9CFz7vcHTrZiXjjSfZ1koh3DeXPErj091VR9X4q4nzRfCETA+0lINQbA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-validation "^1.19.1" -"@abp/jquery@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.2.0.tgz#0e641b1109e78eff4c34331ca2b123b67cc30cbe" - integrity sha512-vEfRoFEAmDmRgSq98Y9EZExfQFSWtmjaHrodUu+MadTcRlnn+wHq8wwkKKxpj/eYtNc8aFORpyHMMH7uliAKxg== +"@abp/jquery@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.3.0.tgz#c17fcc3559a0285af3d6e534a5a076e99fc0ba37" + integrity sha512-376LnHco1kW6U094Tx3cbkM5y3ZAA02Lp3yrN/b0Qc1th84Xr2twix2YZG+GqcqlwdljH4ihdgpAM/ZO7REEaw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" jquery "^3.4.1" -"@abp/lodash@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.2.0.tgz#af0a2ebcb28fd0a8c02da5026479d9370ed19719" - integrity sha512-wOMLqIpuq4a7ww7pB138G6YxBiTGBgxNW/IWGUiWbfgrr88cGPKIYYv/8O8mvr8PLNGjizNynuwQRj522yA3Dw== +"@abp/lodash@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.3.0.tgz#20219d872db7eba372cbaea168494fa54eb1cf12" + integrity sha512-I2KKEJaGwfpCKUox32lkllLRKgP25mszJuGpj571KTsvuT0Zo6BlNov4xoy8wbHC7vZF7dvkJpiCGg2yKnxc8Q== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" lodash "^4.17.15" -"@abp/luxon@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.2.0.tgz#0d0e78edc249853fa31eceecc00df2846a879aa9" - integrity sha512-WbOW0PcMks+WXRPWt/+H4pOa5waM331WkY0F+EJx8fpxemNGQNUEXLkuMXzN3MrN6LrplM9AZ9i+NRA9PWHbNw== +"@abp/luxon@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.3.0.tgz#5e08cdff00682f317707d9f34da6a1fb21402914" + integrity sha512-UAbh+HyVwr+ytJpJEddHp0aRpIKQIWknvrDmcyIOaTY6ZSJPZSxJlDmIC56d094JopeRf/+E/cTMMS5bM8nmrA== dependencies: luxon "^1.21.3" -"@abp/malihu-custom-scrollbar-plugin@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.2.0.tgz#e11fd46dccbb28d44fb199e880b91d27c94f1919" - integrity sha512-YDu/NLpIzMA96NDHxd27/+liTm3sow9M+oWH29+9JW8o/AEpXUH3T3AmoXXcTgsBlzLaewgHEFM8yxsAAFoj8Q== +"@abp/malihu-custom-scrollbar-plugin@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.3.0.tgz#1b2535ca6f30dd49ea5ec3de283f3ac4d1d5f6a0" + integrity sha512-dCeJMRn+zHhGi1Uwg0h0ET21+sZ/Zf2trwfVJrd8bXan5bMKPRd3UtXrJlxZg3NHqVJmUiwWe2dzEHt1fexCDQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.2.0.tgz#4639d4e5b72b1736fa4476bd9b6a78e036400421" - integrity sha512-tc87JyM0kvVF388kyGUjDby49Zrrb089jVRRipoIaxXeu4M1YxEFSKBEcUK1MohZWjVtWrNs8MoxPlfukaMpyw== +"@abp/select2@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.3.0.tgz#edc5ae4655ccdf6b9ec7546dd156cda33bf907d3" + integrity sha512-s7TMBe2zUndVkfDTD0cBX/F4Fm9alA1BUx7l0b2+CmbJkdIp3YkjA4Oqsi4RinpP6/vVSYpTiTGWX4cYogbcFw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" select2 "^4.0.12" -"@abp/sweetalert@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.2.0.tgz#dfc60ba085522d8390e41b90bf5a3d474f4ae624" - integrity sha512-HS6TKOwP91UjzjZHaheurZ1AYUSMkQyCSmoX6g5LAK4eH8IIgpojVSp1AFCSPATrFsFWY/dzkDGcfu90FWsVBg== +"@abp/sweetalert@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.3.0.tgz#2120b1f98e2530afc65f6c11fb7ea8d087a98777" + integrity sha512-Kq7UAOwi2sH/lxIrwoEhUCt5n8OAv17SubLWE/Ud3gWgcSw5XSmAZb13S6e78yydlV89Ny3LeYeGjqfU6nnSug== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" sweetalert "^2.1.2" -"@abp/timeago@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.2.0.tgz#9a8297f36a46cdc4cc62f44d0fdc91b70def389c" - integrity sha512-8qjmKscsTvPznHKWEsddYxdSBiU+l+OgLG6vzMcSWqngYbDQGXqNA93BwJI2qiwd+FkNcfGgYg7CN7bcwzmaiw== +"@abp/timeago@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.3.0.tgz#79bb1019f135d3342916bb61f52f3be35914f11b" + integrity sha512-TogWr4bdFl/DsB3QLa1iOkRGmeWNPyR60buI3D+WSJGlEtbjU9L5I3cGDEWJGYOxPKU9WuqV4DiraBbq/xNGLw== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" timeago "^1.6.7" -"@abp/toastr@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.2.0.tgz#1cad83a89da244685b3c82adff64260b7ccf4742" - integrity sha512-HHfSaw4M/9zS+KgzxGvbHYiQ5qcJgpf21cRZEo16aUwnTeKr4SRaewAWryNn4dKcIO2YNrhzDLH+OYbEaJJlDQ== +"@abp/toastr@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.3.0.tgz#0c0201e00a8070b831a33fe9763e0fb3a1981523" + integrity sha512-MlS9KXPuo1vYW78QvJUR1CXGMq7qo2wGKRxZJEloxWTI8bg7zEZwa27LGJJmHLQacOqdhUP9c5t9D136eUhu6A== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json index 5d035c76c9..b467e1767f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^2.3.0" } } \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock index b3b0eb268b..3c0e460076 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.2.0.tgz#e7f4e57d2b17cc76388e9c56bc34d50c9658873b" - integrity sha512-S9GQ9YVg4DWrgjujwiXBER6KqdqW5nZ1Bmt+YEePn5gEoPvoVrh6ojthpHYRjBJtGFqBSzRAQ9eVZLebT22Ozg== +"@abp/aspnetcore.mvc.ui.theme.basic@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.3.0.tgz#482c236565268d305c0c86399e837bdddecf97ad" + integrity sha512-PJqGAHllBoZv/97DalfMFQr4oPA6PatObaj/+oxkjUjQcPD4z2sJO5Z+d8t6plo3ZvjzMvwm+VwzhZgdJhtwKw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.shared" "^2.3.0" -"@abp/aspnetcore.mvc.ui.theme.shared@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.2.0.tgz#e0df953853be2a184d323931573f9f98aebbaa62" - integrity sha512-urxziaCdvfEqN5cjiiM5f5dx2Yr+AoGqCJVCo0Okjl2dosdaj5DH4SBzMvKAaLXzo3Ep1h4b3Wvws4BThL/6rA== - dependencies: - "@abp/aspnetcore.mvc.ui" "^2.2.0" - "@abp/bootstrap" "^2.2.0" - "@abp/bootstrap-datepicker" "^2.2.0" - "@abp/datatables.net-bs4" "^2.2.0" - "@abp/font-awesome" "^2.2.0" - "@abp/jquery-form" "^2.2.0" - "@abp/jquery-validation-unobtrusive" "^2.2.0" - "@abp/lodash" "^2.2.0" - "@abp/luxon" "^2.2.0" - "@abp/malihu-custom-scrollbar-plugin" "^2.2.0" - "@abp/select2" "^2.2.0" - "@abp/sweetalert" "^2.2.0" - "@abp/timeago" "^2.2.0" - "@abp/toastr" "^2.2.0" - -"@abp/aspnetcore.mvc.ui@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.2.0.tgz#b2cdd421eed09ec1d30ae85e14434b7efc094ade" - integrity sha512-IO/AjhJu+LUa9zOaT8JlEnV+Pcp9oQ3q9kTq8kmMakC35vTIyvBpB3nnykXIOytZSyjsBgFYB/uMxPgBOjWagg== +"@abp/aspnetcore.mvc.ui.theme.shared@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.3.0.tgz#553ba6983308a8da3336226b8c20f9191da8a5cc" + integrity sha512-LLf89lXILM0MiSv/Mk4GXXl+eu+J5obTMfA9obLNiXD5fpwlYxnTtMwxh+sfZe9KcsZTuYEcXJgVk/A8HKydeg== + dependencies: + "@abp/aspnetcore.mvc.ui" "^2.3.0" + "@abp/bootstrap" "^2.3.0" + "@abp/bootstrap-datepicker" "^2.3.0" + "@abp/datatables.net-bs4" "^2.3.0" + "@abp/font-awesome" "^2.3.0" + "@abp/jquery-form" "^2.3.0" + "@abp/jquery-validation-unobtrusive" "^2.3.0" + "@abp/lodash" "^2.3.0" + "@abp/luxon" "^2.3.0" + "@abp/malihu-custom-scrollbar-plugin" "^2.3.0" + "@abp/select2" "^2.3.0" + "@abp/sweetalert" "^2.3.0" + "@abp/timeago" "^2.3.0" + "@abp/toastr" "^2.3.0" + +"@abp/aspnetcore.mvc.ui@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.3.0.tgz#166a1235b70b460be0c84171c229c1c5543dcbb7" + integrity sha512-5vitUltSBEVf97tJwonMkL6YQ0acKF2JEtbkfer3GN63MuU4+8ayYT8bwlieV6iC20dm69dCLI3dIfezvFnAfA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^3.0.0" -"@abp/bootstrap-datepicker@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.2.0.tgz#a2f50b422824f18ed4b7e80be6852e2979119f8e" - integrity sha512-X9jT5mU42QFfVhOZdun7aEJUf3bMko6NsG3NFQVjqTqKH+iYGKfHPFpXD0gP/6Nb4KgZUdId8hSyQTZyOK2JEA== +"@abp/bootstrap-datepicker@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.3.0.tgz#fc235d1fb47e44cd6950cd6179b045fbd19b2a12" + integrity sha512-X7iWvwo7QqOp35IBz8WELDVfuVK110vZCcfuXwo0MbnH0aXS3+2CEUxqZnYHNcDrf+eXaact/IPKVl5Z/mA70A== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.2.0.tgz#16e41d3432117bbcd9012c6f735c49c543255879" - integrity sha512-aRmluu6SkIl+JgCzSSJZrDPkYr6WWaQdY0iJAOz6NHtffa7Aumh1IUOrLVKL0T1pQn6QKs0Z7JDGyYMdh1HPkQ== +"@abp/bootstrap@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.3.0.tgz#e53ead2fae02cef04e8d44c1fd38d3368d0db8df" + integrity sha512-PsmCRUEF82Co903JxdvvPaBaiP+BFpQvMhM0PMqZzJ4AKGq0qG4kdCTAhFYhusy1e/UqBaNwCp7URDN/I+Xr7A== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" bootstrap "^4.3.1" -"@abp/core@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.2.0.tgz#4eea0a06458c90acb8566a11eb841fe65d15d256" - integrity sha512-tBGHa5CUr0ewT31g689RAfQ6Su2p4uyn2PzmrW/8lahBrvqkoCb41fkCDLQJkTY5rKPrEKZd/s9OoyOnS20DLg== +"@abp/core@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.3.0.tgz#3bb600c6b3e77060561d90db06e0052e04fa59b6" + integrity sha512-LGtOSYZqINZuX6Hy9vDDxxLJpEfZYyzdTxFdQt9UBtE/AuypILG8lOQjd96OJpRTeqyOUHBYo8AXtYzEyR6ZiA== -"@abp/datatables.net-bs4@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.2.0.tgz#c7cc49e889b295ae10fb24ed62b154ef79ffc85a" - integrity sha512-zjJRPqOCWPfkHt1QztfFHKrsTE9o6Je2EpfA7hRMej2FlGbsMWUxOqx/btK1vjD6YIU8DtVDpIdj1WvPOITQ4Q== +"@abp/datatables.net-bs4@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.3.0.tgz#f7268173bd5070471999e3e694509b49e4fc2e87" + integrity sha512-nA913hyrZRl8gQlGAmg+n7Z4iav4U+XrPgC0CfTUkZda7ReHj50jFZPQREfnmGdM77FVA+3y4q4LZELGB65GMQ== dependencies: - "@abp/datatables.net" "^2.2.0" + "@abp/datatables.net" "^2.3.0" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.2.0.tgz#22f9c7ca90c2d4af264483b4f8286b0feb7c3d52" - integrity sha512-L4MnpdloSWr/px3mvV75sxsxL68MyALB2LKdzCFMQWILCZVkxMmQb9LARINYIrn461Wrc+zbYWNEBD0MAq7flg== +"@abp/datatables.net@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.3.0.tgz#420ab84c54ca6b81a555c8525a96de62c54aca75" + integrity sha512-CAIF/+eQzCPltfQsvojOE5ojbbOv0u9MqtAIjgCiQ0ccCLe0j+68ZJhizDK1e3JA1o9jZXcBZnEWIGPdhpcRcA== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" datatables.net "^1.10.20" -"@abp/font-awesome@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.2.0.tgz#2de39e3c6c3e8c30394d82861761a66c5b4032f0" - integrity sha512-RT06MYUGgaWBEpW5c7wUcfMXgxcOHWdX/C01LDO/j6iVoKBuBHOkkvcUoTWII068ECrLYOkj+RyT59dCKm8FFw== +"@abp/font-awesome@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.3.0.tgz#30988351f7ca7ccf84b414e95848016df701bafe" + integrity sha512-lco8ArQi1xeKqypmvCubXrwO0/a+uP33vqQy+d3JRcmAXJgc5+AeQrzEq9KRcD/BGeWQUi8aJobW0rGFTAZxxQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.2.0.tgz#951653fac4013a7bbec065b5101b86d575e0eca7" - integrity sha512-ji44E3Ud0S3LNXn1WJ/Aw44qAIG7EITEW1KOe46oz+/awPpbiiA4dDDNleTvO2jI2/s8mNyR0bNanP6BUsc7tw== +"@abp/jquery-form@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.3.0.tgz#91e088fd1861c2a6224ce127c0fe0071baec9eef" + integrity sha512-cVPFdKpgAPSsG4mxrREfmslkgVJEZI9LpHask/6vy5gE/eFKZ9t6BZg+gop7bj6co3NcjekjDxhM7c0Iq+auyA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.2.0.tgz#6d39ba9f7bf026d1380796bf5dff76c8d16b42ce" - integrity sha512-SuS/dRRVz7ZR4HK/h9x0jRRVLPqXN0CPRGPdJZ1LJraXVEJ9/eDEGf1rMlHmEGt1FXXFTD01/zjisbweDE786w== +"@abp/jquery-validation-unobtrusive@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.3.0.tgz#18dcd10ac0d6678716b42170fca1810b23cebaab" + integrity sha512-CAR3zZ4Oxbu5MK7VO2QhZjwYW81NCEqOViKPpPzk/K2qkgphHbDpRei3XMbi+476KMhrAgQE6KzlrafWBtsdRA== dependencies: - "@abp/jquery-validation" "^2.2.0" + "@abp/jquery-validation" "^2.3.0" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.2.0.tgz#02bb8ba883e72c1204867ee4d1c1094bd91c4c4c" - integrity sha512-ypITQloO4iEDgqlA6qb3taj+7HMX0Cf/ACA2OvtrvOgJejx6J4wfrPjwuFZu1WWJ0xtc9yTdbovdcSVcQbIGaA== +"@abp/jquery-validation@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.3.0.tgz#af723abf5950729ef2763cecb7f5a9c5cbed0031" + integrity sha512-YvFCbvx9hWzi7BytYRBb/0tFdiibWT9CFz7vcHTrZiXjjSfZ1koh3DeXPErj091VR9X4q4nzRfCETA+0lINQbA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-validation "^1.19.1" -"@abp/jquery@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.2.0.tgz#0e641b1109e78eff4c34331ca2b123b67cc30cbe" - integrity sha512-vEfRoFEAmDmRgSq98Y9EZExfQFSWtmjaHrodUu+MadTcRlnn+wHq8wwkKKxpj/eYtNc8aFORpyHMMH7uliAKxg== +"@abp/jquery@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.3.0.tgz#c17fcc3559a0285af3d6e534a5a076e99fc0ba37" + integrity sha512-376LnHco1kW6U094Tx3cbkM5y3ZAA02Lp3yrN/b0Qc1th84Xr2twix2YZG+GqcqlwdljH4ihdgpAM/ZO7REEaw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" jquery "^3.4.1" -"@abp/lodash@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.2.0.tgz#af0a2ebcb28fd0a8c02da5026479d9370ed19719" - integrity sha512-wOMLqIpuq4a7ww7pB138G6YxBiTGBgxNW/IWGUiWbfgrr88cGPKIYYv/8O8mvr8PLNGjizNynuwQRj522yA3Dw== +"@abp/lodash@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.3.0.tgz#20219d872db7eba372cbaea168494fa54eb1cf12" + integrity sha512-I2KKEJaGwfpCKUox32lkllLRKgP25mszJuGpj571KTsvuT0Zo6BlNov4xoy8wbHC7vZF7dvkJpiCGg2yKnxc8Q== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" lodash "^4.17.15" -"@abp/luxon@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.2.0.tgz#0d0e78edc249853fa31eceecc00df2846a879aa9" - integrity sha512-WbOW0PcMks+WXRPWt/+H4pOa5waM331WkY0F+EJx8fpxemNGQNUEXLkuMXzN3MrN6LrplM9AZ9i+NRA9PWHbNw== +"@abp/luxon@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.3.0.tgz#5e08cdff00682f317707d9f34da6a1fb21402914" + integrity sha512-UAbh+HyVwr+ytJpJEddHp0aRpIKQIWknvrDmcyIOaTY6ZSJPZSxJlDmIC56d094JopeRf/+E/cTMMS5bM8nmrA== dependencies: luxon "^1.21.3" -"@abp/malihu-custom-scrollbar-plugin@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.2.0.tgz#e11fd46dccbb28d44fb199e880b91d27c94f1919" - integrity sha512-YDu/NLpIzMA96NDHxd27/+liTm3sow9M+oWH29+9JW8o/AEpXUH3T3AmoXXcTgsBlzLaewgHEFM8yxsAAFoj8Q== +"@abp/malihu-custom-scrollbar-plugin@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.3.0.tgz#1b2535ca6f30dd49ea5ec3de283f3ac4d1d5f6a0" + integrity sha512-dCeJMRn+zHhGi1Uwg0h0ET21+sZ/Zf2trwfVJrd8bXan5bMKPRd3UtXrJlxZg3NHqVJmUiwWe2dzEHt1fexCDQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.2.0.tgz#4639d4e5b72b1736fa4476bd9b6a78e036400421" - integrity sha512-tc87JyM0kvVF388kyGUjDby49Zrrb089jVRRipoIaxXeu4M1YxEFSKBEcUK1MohZWjVtWrNs8MoxPlfukaMpyw== +"@abp/select2@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.3.0.tgz#edc5ae4655ccdf6b9ec7546dd156cda33bf907d3" + integrity sha512-s7TMBe2zUndVkfDTD0cBX/F4Fm9alA1BUx7l0b2+CmbJkdIp3YkjA4Oqsi4RinpP6/vVSYpTiTGWX4cYogbcFw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" select2 "^4.0.12" -"@abp/sweetalert@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.2.0.tgz#dfc60ba085522d8390e41b90bf5a3d474f4ae624" - integrity sha512-HS6TKOwP91UjzjZHaheurZ1AYUSMkQyCSmoX6g5LAK4eH8IIgpojVSp1AFCSPATrFsFWY/dzkDGcfu90FWsVBg== +"@abp/sweetalert@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.3.0.tgz#2120b1f98e2530afc65f6c11fb7ea8d087a98777" + integrity sha512-Kq7UAOwi2sH/lxIrwoEhUCt5n8OAv17SubLWE/Ud3gWgcSw5XSmAZb13S6e78yydlV89Ny3LeYeGjqfU6nnSug== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" sweetalert "^2.1.2" -"@abp/timeago@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.2.0.tgz#9a8297f36a46cdc4cc62f44d0fdc91b70def389c" - integrity sha512-8qjmKscsTvPznHKWEsddYxdSBiU+l+OgLG6vzMcSWqngYbDQGXqNA93BwJI2qiwd+FkNcfGgYg7CN7bcwzmaiw== +"@abp/timeago@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.3.0.tgz#79bb1019f135d3342916bb61f52f3be35914f11b" + integrity sha512-TogWr4bdFl/DsB3QLa1iOkRGmeWNPyR60buI3D+WSJGlEtbjU9L5I3cGDEWJGYOxPKU9WuqV4DiraBbq/xNGLw== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" timeago "^1.6.7" -"@abp/toastr@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.2.0.tgz#1cad83a89da244685b3c82adff64260b7ccf4742" - integrity sha512-HHfSaw4M/9zS+KgzxGvbHYiQ5qcJgpf21cRZEo16aUwnTeKr4SRaewAWryNn4dKcIO2YNrhzDLH+OYbEaJJlDQ== +"@abp/toastr@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.3.0.tgz#0c0201e00a8070b831a33fe9763e0fb3a1981523" + integrity sha512-MlS9KXPuo1vYW78QvJUR1CXGMq7qo2wGKRxZJEloxWTI8bg7zEZwa27LGJJmHLQacOqdhUP9c5t9D136eUhu6A== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json index 6e36dde3bf..504aafc075 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^2.3.0" } } \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock index b3b0eb268b..3c0e460076 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.2.0.tgz#e7f4e57d2b17cc76388e9c56bc34d50c9658873b" - integrity sha512-S9GQ9YVg4DWrgjujwiXBER6KqdqW5nZ1Bmt+YEePn5gEoPvoVrh6ojthpHYRjBJtGFqBSzRAQ9eVZLebT22Ozg== +"@abp/aspnetcore.mvc.ui.theme.basic@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.3.0.tgz#482c236565268d305c0c86399e837bdddecf97ad" + integrity sha512-PJqGAHllBoZv/97DalfMFQr4oPA6PatObaj/+oxkjUjQcPD4z2sJO5Z+d8t6plo3ZvjzMvwm+VwzhZgdJhtwKw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.shared" "^2.3.0" -"@abp/aspnetcore.mvc.ui.theme.shared@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.2.0.tgz#e0df953853be2a184d323931573f9f98aebbaa62" - integrity sha512-urxziaCdvfEqN5cjiiM5f5dx2Yr+AoGqCJVCo0Okjl2dosdaj5DH4SBzMvKAaLXzo3Ep1h4b3Wvws4BThL/6rA== - dependencies: - "@abp/aspnetcore.mvc.ui" "^2.2.0" - "@abp/bootstrap" "^2.2.0" - "@abp/bootstrap-datepicker" "^2.2.0" - "@abp/datatables.net-bs4" "^2.2.0" - "@abp/font-awesome" "^2.2.0" - "@abp/jquery-form" "^2.2.0" - "@abp/jquery-validation-unobtrusive" "^2.2.0" - "@abp/lodash" "^2.2.0" - "@abp/luxon" "^2.2.0" - "@abp/malihu-custom-scrollbar-plugin" "^2.2.0" - "@abp/select2" "^2.2.0" - "@abp/sweetalert" "^2.2.0" - "@abp/timeago" "^2.2.0" - "@abp/toastr" "^2.2.0" - -"@abp/aspnetcore.mvc.ui@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.2.0.tgz#b2cdd421eed09ec1d30ae85e14434b7efc094ade" - integrity sha512-IO/AjhJu+LUa9zOaT8JlEnV+Pcp9oQ3q9kTq8kmMakC35vTIyvBpB3nnykXIOytZSyjsBgFYB/uMxPgBOjWagg== +"@abp/aspnetcore.mvc.ui.theme.shared@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.3.0.tgz#553ba6983308a8da3336226b8c20f9191da8a5cc" + integrity sha512-LLf89lXILM0MiSv/Mk4GXXl+eu+J5obTMfA9obLNiXD5fpwlYxnTtMwxh+sfZe9KcsZTuYEcXJgVk/A8HKydeg== + dependencies: + "@abp/aspnetcore.mvc.ui" "^2.3.0" + "@abp/bootstrap" "^2.3.0" + "@abp/bootstrap-datepicker" "^2.3.0" + "@abp/datatables.net-bs4" "^2.3.0" + "@abp/font-awesome" "^2.3.0" + "@abp/jquery-form" "^2.3.0" + "@abp/jquery-validation-unobtrusive" "^2.3.0" + "@abp/lodash" "^2.3.0" + "@abp/luxon" "^2.3.0" + "@abp/malihu-custom-scrollbar-plugin" "^2.3.0" + "@abp/select2" "^2.3.0" + "@abp/sweetalert" "^2.3.0" + "@abp/timeago" "^2.3.0" + "@abp/toastr" "^2.3.0" + +"@abp/aspnetcore.mvc.ui@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.3.0.tgz#166a1235b70b460be0c84171c229c1c5543dcbb7" + integrity sha512-5vitUltSBEVf97tJwonMkL6YQ0acKF2JEtbkfer3GN63MuU4+8ayYT8bwlieV6iC20dm69dCLI3dIfezvFnAfA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^3.0.0" -"@abp/bootstrap-datepicker@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.2.0.tgz#a2f50b422824f18ed4b7e80be6852e2979119f8e" - integrity sha512-X9jT5mU42QFfVhOZdun7aEJUf3bMko6NsG3NFQVjqTqKH+iYGKfHPFpXD0gP/6Nb4KgZUdId8hSyQTZyOK2JEA== +"@abp/bootstrap-datepicker@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.3.0.tgz#fc235d1fb47e44cd6950cd6179b045fbd19b2a12" + integrity sha512-X7iWvwo7QqOp35IBz8WELDVfuVK110vZCcfuXwo0MbnH0aXS3+2CEUxqZnYHNcDrf+eXaact/IPKVl5Z/mA70A== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.2.0.tgz#16e41d3432117bbcd9012c6f735c49c543255879" - integrity sha512-aRmluu6SkIl+JgCzSSJZrDPkYr6WWaQdY0iJAOz6NHtffa7Aumh1IUOrLVKL0T1pQn6QKs0Z7JDGyYMdh1HPkQ== +"@abp/bootstrap@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.3.0.tgz#e53ead2fae02cef04e8d44c1fd38d3368d0db8df" + integrity sha512-PsmCRUEF82Co903JxdvvPaBaiP+BFpQvMhM0PMqZzJ4AKGq0qG4kdCTAhFYhusy1e/UqBaNwCp7URDN/I+Xr7A== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" bootstrap "^4.3.1" -"@abp/core@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.2.0.tgz#4eea0a06458c90acb8566a11eb841fe65d15d256" - integrity sha512-tBGHa5CUr0ewT31g689RAfQ6Su2p4uyn2PzmrW/8lahBrvqkoCb41fkCDLQJkTY5rKPrEKZd/s9OoyOnS20DLg== +"@abp/core@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.3.0.tgz#3bb600c6b3e77060561d90db06e0052e04fa59b6" + integrity sha512-LGtOSYZqINZuX6Hy9vDDxxLJpEfZYyzdTxFdQt9UBtE/AuypILG8lOQjd96OJpRTeqyOUHBYo8AXtYzEyR6ZiA== -"@abp/datatables.net-bs4@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.2.0.tgz#c7cc49e889b295ae10fb24ed62b154ef79ffc85a" - integrity sha512-zjJRPqOCWPfkHt1QztfFHKrsTE9o6Je2EpfA7hRMej2FlGbsMWUxOqx/btK1vjD6YIU8DtVDpIdj1WvPOITQ4Q== +"@abp/datatables.net-bs4@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.3.0.tgz#f7268173bd5070471999e3e694509b49e4fc2e87" + integrity sha512-nA913hyrZRl8gQlGAmg+n7Z4iav4U+XrPgC0CfTUkZda7ReHj50jFZPQREfnmGdM77FVA+3y4q4LZELGB65GMQ== dependencies: - "@abp/datatables.net" "^2.2.0" + "@abp/datatables.net" "^2.3.0" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.2.0.tgz#22f9c7ca90c2d4af264483b4f8286b0feb7c3d52" - integrity sha512-L4MnpdloSWr/px3mvV75sxsxL68MyALB2LKdzCFMQWILCZVkxMmQb9LARINYIrn461Wrc+zbYWNEBD0MAq7flg== +"@abp/datatables.net@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.3.0.tgz#420ab84c54ca6b81a555c8525a96de62c54aca75" + integrity sha512-CAIF/+eQzCPltfQsvojOE5ojbbOv0u9MqtAIjgCiQ0ccCLe0j+68ZJhizDK1e3JA1o9jZXcBZnEWIGPdhpcRcA== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" datatables.net "^1.10.20" -"@abp/font-awesome@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.2.0.tgz#2de39e3c6c3e8c30394d82861761a66c5b4032f0" - integrity sha512-RT06MYUGgaWBEpW5c7wUcfMXgxcOHWdX/C01LDO/j6iVoKBuBHOkkvcUoTWII068ECrLYOkj+RyT59dCKm8FFw== +"@abp/font-awesome@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.3.0.tgz#30988351f7ca7ccf84b414e95848016df701bafe" + integrity sha512-lco8ArQi1xeKqypmvCubXrwO0/a+uP33vqQy+d3JRcmAXJgc5+AeQrzEq9KRcD/BGeWQUi8aJobW0rGFTAZxxQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.2.0.tgz#951653fac4013a7bbec065b5101b86d575e0eca7" - integrity sha512-ji44E3Ud0S3LNXn1WJ/Aw44qAIG7EITEW1KOe46oz+/awPpbiiA4dDDNleTvO2jI2/s8mNyR0bNanP6BUsc7tw== +"@abp/jquery-form@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.3.0.tgz#91e088fd1861c2a6224ce127c0fe0071baec9eef" + integrity sha512-cVPFdKpgAPSsG4mxrREfmslkgVJEZI9LpHask/6vy5gE/eFKZ9t6BZg+gop7bj6co3NcjekjDxhM7c0Iq+auyA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.2.0.tgz#6d39ba9f7bf026d1380796bf5dff76c8d16b42ce" - integrity sha512-SuS/dRRVz7ZR4HK/h9x0jRRVLPqXN0CPRGPdJZ1LJraXVEJ9/eDEGf1rMlHmEGt1FXXFTD01/zjisbweDE786w== +"@abp/jquery-validation-unobtrusive@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.3.0.tgz#18dcd10ac0d6678716b42170fca1810b23cebaab" + integrity sha512-CAR3zZ4Oxbu5MK7VO2QhZjwYW81NCEqOViKPpPzk/K2qkgphHbDpRei3XMbi+476KMhrAgQE6KzlrafWBtsdRA== dependencies: - "@abp/jquery-validation" "^2.2.0" + "@abp/jquery-validation" "^2.3.0" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.2.0.tgz#02bb8ba883e72c1204867ee4d1c1094bd91c4c4c" - integrity sha512-ypITQloO4iEDgqlA6qb3taj+7HMX0Cf/ACA2OvtrvOgJejx6J4wfrPjwuFZu1WWJ0xtc9yTdbovdcSVcQbIGaA== +"@abp/jquery-validation@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.3.0.tgz#af723abf5950729ef2763cecb7f5a9c5cbed0031" + integrity sha512-YvFCbvx9hWzi7BytYRBb/0tFdiibWT9CFz7vcHTrZiXjjSfZ1koh3DeXPErj091VR9X4q4nzRfCETA+0lINQbA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-validation "^1.19.1" -"@abp/jquery@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.2.0.tgz#0e641b1109e78eff4c34331ca2b123b67cc30cbe" - integrity sha512-vEfRoFEAmDmRgSq98Y9EZExfQFSWtmjaHrodUu+MadTcRlnn+wHq8wwkKKxpj/eYtNc8aFORpyHMMH7uliAKxg== +"@abp/jquery@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.3.0.tgz#c17fcc3559a0285af3d6e534a5a076e99fc0ba37" + integrity sha512-376LnHco1kW6U094Tx3cbkM5y3ZAA02Lp3yrN/b0Qc1th84Xr2twix2YZG+GqcqlwdljH4ihdgpAM/ZO7REEaw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" jquery "^3.4.1" -"@abp/lodash@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.2.0.tgz#af0a2ebcb28fd0a8c02da5026479d9370ed19719" - integrity sha512-wOMLqIpuq4a7ww7pB138G6YxBiTGBgxNW/IWGUiWbfgrr88cGPKIYYv/8O8mvr8PLNGjizNynuwQRj522yA3Dw== +"@abp/lodash@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.3.0.tgz#20219d872db7eba372cbaea168494fa54eb1cf12" + integrity sha512-I2KKEJaGwfpCKUox32lkllLRKgP25mszJuGpj571KTsvuT0Zo6BlNov4xoy8wbHC7vZF7dvkJpiCGg2yKnxc8Q== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" lodash "^4.17.15" -"@abp/luxon@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.2.0.tgz#0d0e78edc249853fa31eceecc00df2846a879aa9" - integrity sha512-WbOW0PcMks+WXRPWt/+H4pOa5waM331WkY0F+EJx8fpxemNGQNUEXLkuMXzN3MrN6LrplM9AZ9i+NRA9PWHbNw== +"@abp/luxon@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.3.0.tgz#5e08cdff00682f317707d9f34da6a1fb21402914" + integrity sha512-UAbh+HyVwr+ytJpJEddHp0aRpIKQIWknvrDmcyIOaTY6ZSJPZSxJlDmIC56d094JopeRf/+E/cTMMS5bM8nmrA== dependencies: luxon "^1.21.3" -"@abp/malihu-custom-scrollbar-plugin@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.2.0.tgz#e11fd46dccbb28d44fb199e880b91d27c94f1919" - integrity sha512-YDu/NLpIzMA96NDHxd27/+liTm3sow9M+oWH29+9JW8o/AEpXUH3T3AmoXXcTgsBlzLaewgHEFM8yxsAAFoj8Q== +"@abp/malihu-custom-scrollbar-plugin@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.3.0.tgz#1b2535ca6f30dd49ea5ec3de283f3ac4d1d5f6a0" + integrity sha512-dCeJMRn+zHhGi1Uwg0h0ET21+sZ/Zf2trwfVJrd8bXan5bMKPRd3UtXrJlxZg3NHqVJmUiwWe2dzEHt1fexCDQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.2.0.tgz#4639d4e5b72b1736fa4476bd9b6a78e036400421" - integrity sha512-tc87JyM0kvVF388kyGUjDby49Zrrb089jVRRipoIaxXeu4M1YxEFSKBEcUK1MohZWjVtWrNs8MoxPlfukaMpyw== +"@abp/select2@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.3.0.tgz#edc5ae4655ccdf6b9ec7546dd156cda33bf907d3" + integrity sha512-s7TMBe2zUndVkfDTD0cBX/F4Fm9alA1BUx7l0b2+CmbJkdIp3YkjA4Oqsi4RinpP6/vVSYpTiTGWX4cYogbcFw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" select2 "^4.0.12" -"@abp/sweetalert@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.2.0.tgz#dfc60ba085522d8390e41b90bf5a3d474f4ae624" - integrity sha512-HS6TKOwP91UjzjZHaheurZ1AYUSMkQyCSmoX6g5LAK4eH8IIgpojVSp1AFCSPATrFsFWY/dzkDGcfu90FWsVBg== +"@abp/sweetalert@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.3.0.tgz#2120b1f98e2530afc65f6c11fb7ea8d087a98777" + integrity sha512-Kq7UAOwi2sH/lxIrwoEhUCt5n8OAv17SubLWE/Ud3gWgcSw5XSmAZb13S6e78yydlV89Ny3LeYeGjqfU6nnSug== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" sweetalert "^2.1.2" -"@abp/timeago@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.2.0.tgz#9a8297f36a46cdc4cc62f44d0fdc91b70def389c" - integrity sha512-8qjmKscsTvPznHKWEsddYxdSBiU+l+OgLG6vzMcSWqngYbDQGXqNA93BwJI2qiwd+FkNcfGgYg7CN7bcwzmaiw== +"@abp/timeago@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.3.0.tgz#79bb1019f135d3342916bb61f52f3be35914f11b" + integrity sha512-TogWr4bdFl/DsB3QLa1iOkRGmeWNPyR60buI3D+WSJGlEtbjU9L5I3cGDEWJGYOxPKU9WuqV4DiraBbq/xNGLw== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" timeago "^1.6.7" -"@abp/toastr@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.2.0.tgz#1cad83a89da244685b3c82adff64260b7ccf4742" - integrity sha512-HHfSaw4M/9zS+KgzxGvbHYiQ5qcJgpf21cRZEo16aUwnTeKr4SRaewAWryNn4dKcIO2YNrhzDLH+OYbEaJJlDQ== +"@abp/toastr@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.3.0.tgz#0c0201e00a8070b831a33fe9763e0fb3a1981523" + integrity sha512-MlS9KXPuo1vYW78QvJUR1CXGMq7qo2wGKRxZJEloxWTI8bg7zEZwa27LGJJmHLQacOqdhUP9c5t9D136eUhu6A== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json index 6e36dde3bf..504aafc075 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^2.3.0" } } \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock index 157d0f2e34..a900560181 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.2.0.tgz#e7f4e57d2b17cc76388e9c56bc34d50c9658873b" - integrity sha512-S9GQ9YVg4DWrgjujwiXBER6KqdqW5nZ1Bmt+YEePn5gEoPvoVrh6ojthpHYRjBJtGFqBSzRAQ9eVZLebT22Ozg== +"@abp/aspnetcore.mvc.ui.theme.basic@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.3.0.tgz#482c236565268d305c0c86399e837bdddecf97ad" + integrity sha512-PJqGAHllBoZv/97DalfMFQr4oPA6PatObaj/+oxkjUjQcPD4z2sJO5Z+d8t6plo3ZvjzMvwm+VwzhZgdJhtwKw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.shared" "^2.3.0" -"@abp/aspnetcore.mvc.ui.theme.shared@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.2.0.tgz#e0df953853be2a184d323931573f9f98aebbaa62" - integrity sha512-urxziaCdvfEqN5cjiiM5f5dx2Yr+AoGqCJVCo0Okjl2dosdaj5DH4SBzMvKAaLXzo3Ep1h4b3Wvws4BThL/6rA== - dependencies: - "@abp/aspnetcore.mvc.ui" "^2.2.0" - "@abp/bootstrap" "^2.2.0" - "@abp/bootstrap-datepicker" "^2.2.0" - "@abp/datatables.net-bs4" "^2.2.0" - "@abp/font-awesome" "^2.2.0" - "@abp/jquery-form" "^2.2.0" - "@abp/jquery-validation-unobtrusive" "^2.2.0" - "@abp/lodash" "^2.2.0" - "@abp/luxon" "^2.2.0" - "@abp/malihu-custom-scrollbar-plugin" "^2.2.0" - "@abp/select2" "^2.2.0" - "@abp/sweetalert" "^2.2.0" - "@abp/timeago" "^2.2.0" - "@abp/toastr" "^2.2.0" - -"@abp/aspnetcore.mvc.ui@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.2.0.tgz#b2cdd421eed09ec1d30ae85e14434b7efc094ade" - integrity sha512-IO/AjhJu+LUa9zOaT8JlEnV+Pcp9oQ3q9kTq8kmMakC35vTIyvBpB3nnykXIOytZSyjsBgFYB/uMxPgBOjWagg== +"@abp/aspnetcore.mvc.ui.theme.shared@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.3.0.tgz#553ba6983308a8da3336226b8c20f9191da8a5cc" + integrity sha512-LLf89lXILM0MiSv/Mk4GXXl+eu+J5obTMfA9obLNiXD5fpwlYxnTtMwxh+sfZe9KcsZTuYEcXJgVk/A8HKydeg== + dependencies: + "@abp/aspnetcore.mvc.ui" "^2.3.0" + "@abp/bootstrap" "^2.3.0" + "@abp/bootstrap-datepicker" "^2.3.0" + "@abp/datatables.net-bs4" "^2.3.0" + "@abp/font-awesome" "^2.3.0" + "@abp/jquery-form" "^2.3.0" + "@abp/jquery-validation-unobtrusive" "^2.3.0" + "@abp/lodash" "^2.3.0" + "@abp/luxon" "^2.3.0" + "@abp/malihu-custom-scrollbar-plugin" "^2.3.0" + "@abp/select2" "^2.3.0" + "@abp/sweetalert" "^2.3.0" + "@abp/timeago" "^2.3.0" + "@abp/toastr" "^2.3.0" + +"@abp/aspnetcore.mvc.ui@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.3.0.tgz#166a1235b70b460be0c84171c229c1c5543dcbb7" + integrity sha512-5vitUltSBEVf97tJwonMkL6YQ0acKF2JEtbkfer3GN63MuU4+8ayYT8bwlieV6iC20dm69dCLI3dIfezvFnAfA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^3.0.0" -"@abp/bootstrap-datepicker@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.2.0.tgz#a2f50b422824f18ed4b7e80be6852e2979119f8e" - integrity sha512-X9jT5mU42QFfVhOZdun7aEJUf3bMko6NsG3NFQVjqTqKH+iYGKfHPFpXD0gP/6Nb4KgZUdId8hSyQTZyOK2JEA== +"@abp/bootstrap-datepicker@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.3.0.tgz#fc235d1fb47e44cd6950cd6179b045fbd19b2a12" + integrity sha512-X7iWvwo7QqOp35IBz8WELDVfuVK110vZCcfuXwo0MbnH0aXS3+2CEUxqZnYHNcDrf+eXaact/IPKVl5Z/mA70A== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.2.0.tgz#16e41d3432117bbcd9012c6f735c49c543255879" - integrity sha512-aRmluu6SkIl+JgCzSSJZrDPkYr6WWaQdY0iJAOz6NHtffa7Aumh1IUOrLVKL0T1pQn6QKs0Z7JDGyYMdh1HPkQ== +"@abp/bootstrap@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.3.0.tgz#e53ead2fae02cef04e8d44c1fd38d3368d0db8df" + integrity sha512-PsmCRUEF82Co903JxdvvPaBaiP+BFpQvMhM0PMqZzJ4AKGq0qG4kdCTAhFYhusy1e/UqBaNwCp7URDN/I+Xr7A== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" bootstrap "^4.3.1" -"@abp/core@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.2.0.tgz#4eea0a06458c90acb8566a11eb841fe65d15d256" - integrity sha512-tBGHa5CUr0ewT31g689RAfQ6Su2p4uyn2PzmrW/8lahBrvqkoCb41fkCDLQJkTY5rKPrEKZd/s9OoyOnS20DLg== +"@abp/core@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.3.0.tgz#3bb600c6b3e77060561d90db06e0052e04fa59b6" + integrity sha512-LGtOSYZqINZuX6Hy9vDDxxLJpEfZYyzdTxFdQt9UBtE/AuypILG8lOQjd96OJpRTeqyOUHBYo8AXtYzEyR6ZiA== -"@abp/datatables.net-bs4@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.2.0.tgz#c7cc49e889b295ae10fb24ed62b154ef79ffc85a" - integrity sha512-zjJRPqOCWPfkHt1QztfFHKrsTE9o6Je2EpfA7hRMej2FlGbsMWUxOqx/btK1vjD6YIU8DtVDpIdj1WvPOITQ4Q== +"@abp/datatables.net-bs4@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.3.0.tgz#f7268173bd5070471999e3e694509b49e4fc2e87" + integrity sha512-nA913hyrZRl8gQlGAmg+n7Z4iav4U+XrPgC0CfTUkZda7ReHj50jFZPQREfnmGdM77FVA+3y4q4LZELGB65GMQ== dependencies: - "@abp/datatables.net" "^2.2.0" + "@abp/datatables.net" "^2.3.0" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.2.0.tgz#22f9c7ca90c2d4af264483b4f8286b0feb7c3d52" - integrity sha512-L4MnpdloSWr/px3mvV75sxsxL68MyALB2LKdzCFMQWILCZVkxMmQb9LARINYIrn461Wrc+zbYWNEBD0MAq7flg== +"@abp/datatables.net@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.3.0.tgz#420ab84c54ca6b81a555c8525a96de62c54aca75" + integrity sha512-CAIF/+eQzCPltfQsvojOE5ojbbOv0u9MqtAIjgCiQ0ccCLe0j+68ZJhizDK1e3JA1o9jZXcBZnEWIGPdhpcRcA== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" datatables.net "^1.10.20" -"@abp/font-awesome@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.2.0.tgz#2de39e3c6c3e8c30394d82861761a66c5b4032f0" - integrity sha512-RT06MYUGgaWBEpW5c7wUcfMXgxcOHWdX/C01LDO/j6iVoKBuBHOkkvcUoTWII068ECrLYOkj+RyT59dCKm8FFw== +"@abp/font-awesome@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.3.0.tgz#30988351f7ca7ccf84b414e95848016df701bafe" + integrity sha512-lco8ArQi1xeKqypmvCubXrwO0/a+uP33vqQy+d3JRcmAXJgc5+AeQrzEq9KRcD/BGeWQUi8aJobW0rGFTAZxxQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.2.0.tgz#951653fac4013a7bbec065b5101b86d575e0eca7" - integrity sha512-ji44E3Ud0S3LNXn1WJ/Aw44qAIG7EITEW1KOe46oz+/awPpbiiA4dDDNleTvO2jI2/s8mNyR0bNanP6BUsc7tw== +"@abp/jquery-form@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.3.0.tgz#91e088fd1861c2a6224ce127c0fe0071baec9eef" + integrity sha512-cVPFdKpgAPSsG4mxrREfmslkgVJEZI9LpHask/6vy5gE/eFKZ9t6BZg+gop7bj6co3NcjekjDxhM7c0Iq+auyA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.2.0.tgz#6d39ba9f7bf026d1380796bf5dff76c8d16b42ce" - integrity sha512-SuS/dRRVz7ZR4HK/h9x0jRRVLPqXN0CPRGPdJZ1LJraXVEJ9/eDEGf1rMlHmEGt1FXXFTD01/zjisbweDE786w== +"@abp/jquery-validation-unobtrusive@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.3.0.tgz#18dcd10ac0d6678716b42170fca1810b23cebaab" + integrity sha512-CAR3zZ4Oxbu5MK7VO2QhZjwYW81NCEqOViKPpPzk/K2qkgphHbDpRei3XMbi+476KMhrAgQE6KzlrafWBtsdRA== dependencies: - "@abp/jquery-validation" "^2.2.0" + "@abp/jquery-validation" "^2.3.0" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.2.0.tgz#02bb8ba883e72c1204867ee4d1c1094bd91c4c4c" - integrity sha512-ypITQloO4iEDgqlA6qb3taj+7HMX0Cf/ACA2OvtrvOgJejx6J4wfrPjwuFZu1WWJ0xtc9yTdbovdcSVcQbIGaA== +"@abp/jquery-validation@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.3.0.tgz#af723abf5950729ef2763cecb7f5a9c5cbed0031" + integrity sha512-YvFCbvx9hWzi7BytYRBb/0tFdiibWT9CFz7vcHTrZiXjjSfZ1koh3DeXPErj091VR9X4q4nzRfCETA+0lINQbA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-validation "^1.19.1" -"@abp/jquery@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.2.0.tgz#0e641b1109e78eff4c34331ca2b123b67cc30cbe" - integrity sha512-vEfRoFEAmDmRgSq98Y9EZExfQFSWtmjaHrodUu+MadTcRlnn+wHq8wwkKKxpj/eYtNc8aFORpyHMMH7uliAKxg== +"@abp/jquery@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.3.0.tgz#c17fcc3559a0285af3d6e534a5a076e99fc0ba37" + integrity sha512-376LnHco1kW6U094Tx3cbkM5y3ZAA02Lp3yrN/b0Qc1th84Xr2twix2YZG+GqcqlwdljH4ihdgpAM/ZO7REEaw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" jquery "^3.4.1" -"@abp/lodash@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.2.0.tgz#af0a2ebcb28fd0a8c02da5026479d9370ed19719" - integrity sha512-wOMLqIpuq4a7ww7pB138G6YxBiTGBgxNW/IWGUiWbfgrr88cGPKIYYv/8O8mvr8PLNGjizNynuwQRj522yA3Dw== +"@abp/lodash@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.3.0.tgz#20219d872db7eba372cbaea168494fa54eb1cf12" + integrity sha512-I2KKEJaGwfpCKUox32lkllLRKgP25mszJuGpj571KTsvuT0Zo6BlNov4xoy8wbHC7vZF7dvkJpiCGg2yKnxc8Q== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" lodash "^4.17.15" -"@abp/luxon@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.2.0.tgz#0d0e78edc249853fa31eceecc00df2846a879aa9" - integrity sha512-WbOW0PcMks+WXRPWt/+H4pOa5waM331WkY0F+EJx8fpxemNGQNUEXLkuMXzN3MrN6LrplM9AZ9i+NRA9PWHbNw== +"@abp/luxon@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.3.0.tgz#5e08cdff00682f317707d9f34da6a1fb21402914" + integrity sha512-UAbh+HyVwr+ytJpJEddHp0aRpIKQIWknvrDmcyIOaTY6ZSJPZSxJlDmIC56d094JopeRf/+E/cTMMS5bM8nmrA== dependencies: luxon "^1.21.3" -"@abp/malihu-custom-scrollbar-plugin@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.2.0.tgz#e11fd46dccbb28d44fb199e880b91d27c94f1919" - integrity sha512-YDu/NLpIzMA96NDHxd27/+liTm3sow9M+oWH29+9JW8o/AEpXUH3T3AmoXXcTgsBlzLaewgHEFM8yxsAAFoj8Q== +"@abp/malihu-custom-scrollbar-plugin@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.3.0.tgz#1b2535ca6f30dd49ea5ec3de283f3ac4d1d5f6a0" + integrity sha512-dCeJMRn+zHhGi1Uwg0h0ET21+sZ/Zf2trwfVJrd8bXan5bMKPRd3UtXrJlxZg3NHqVJmUiwWe2dzEHt1fexCDQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.2.0.tgz#4639d4e5b72b1736fa4476bd9b6a78e036400421" - integrity sha512-tc87JyM0kvVF388kyGUjDby49Zrrb089jVRRipoIaxXeu4M1YxEFSKBEcUK1MohZWjVtWrNs8MoxPlfukaMpyw== +"@abp/select2@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.3.0.tgz#edc5ae4655ccdf6b9ec7546dd156cda33bf907d3" + integrity sha512-s7TMBe2zUndVkfDTD0cBX/F4Fm9alA1BUx7l0b2+CmbJkdIp3YkjA4Oqsi4RinpP6/vVSYpTiTGWX4cYogbcFw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" select2 "^4.0.12" -"@abp/sweetalert@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.2.0.tgz#dfc60ba085522d8390e41b90bf5a3d474f4ae624" - integrity sha512-HS6TKOwP91UjzjZHaheurZ1AYUSMkQyCSmoX6g5LAK4eH8IIgpojVSp1AFCSPATrFsFWY/dzkDGcfu90FWsVBg== +"@abp/sweetalert@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.3.0.tgz#2120b1f98e2530afc65f6c11fb7ea8d087a98777" + integrity sha512-Kq7UAOwi2sH/lxIrwoEhUCt5n8OAv17SubLWE/Ud3gWgcSw5XSmAZb13S6e78yydlV89Ny3LeYeGjqfU6nnSug== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" sweetalert "^2.1.2" -"@abp/timeago@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.2.0.tgz#9a8297f36a46cdc4cc62f44d0fdc91b70def389c" - integrity sha512-8qjmKscsTvPznHKWEsddYxdSBiU+l+OgLG6vzMcSWqngYbDQGXqNA93BwJI2qiwd+FkNcfGgYg7CN7bcwzmaiw== +"@abp/timeago@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.3.0.tgz#79bb1019f135d3342916bb61f52f3be35914f11b" + integrity sha512-TogWr4bdFl/DsB3QLa1iOkRGmeWNPyR60buI3D+WSJGlEtbjU9L5I3cGDEWJGYOxPKU9WuqV4DiraBbq/xNGLw== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" timeago "^1.6.7" -"@abp/toastr@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.2.0.tgz#1cad83a89da244685b3c82adff64260b7ccf4742" - integrity sha512-HHfSaw4M/9zS+KgzxGvbHYiQ5qcJgpf21cRZEo16aUwnTeKr4SRaewAWryNn4dKcIO2YNrhzDLH+OYbEaJJlDQ== +"@abp/toastr@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.3.0.tgz#0c0201e00a8070b831a33fe9763e0fb3a1981523" + integrity sha512-MlS9KXPuo1vYW78QvJUR1CXGMq7qo2wGKRxZJEloxWTI8bg7zEZwa27LGJJmHLQacOqdhUP9c5t9D136eUhu6A== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index bd98cfb809..54f912a6f6 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -12,11 +12,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~2.2.0", - "@abp/ng.theme.basic": "~2.2.0", - "@abp/ng.identity": "~2.2.0", - "@abp/ng.tenant-management": "~2.2.0", - "@abp/ng.setting-management": "~2.2.0", + "@abp/ng.account": "~2.3.0", + "@abp/ng.theme.basic": "~2.3.0", + "@abp/ng.identity": "~2.3.0", + "@abp/ng.tenant-management": "~2.3.0", + "@abp/ng.setting-management": "~2.3.0", "@angular/animations": "~8.2.14", "@angular/common": "~8.2.14", "@angular/compiler": "~8.2.14", diff --git a/templates/module/angular/projects/my-project-name-config/package.json b/templates/module/angular/projects/my-project-name-config/package.json index a7e2e66bf3..1e696ae26f 100644 --- a/templates/module/angular/projects/my-project-name-config/package.json +++ b/templates/module/angular/projects/my-project-name-config/package.json @@ -2,6 +2,6 @@ "name": "my-project-name.config", "version": "0.0.1", "peerDependencies": { - "@abp/ng.core": "~2.2.0" + "@abp/ng.core": "~2.3.0" } } diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index d41e9f74be..c25ed33234 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -2,7 +2,7 @@ "name": "my-project-name", "version": "0.0.1", "dependencies": { - "@abp/ng.theme.shared": "~2.2.0", + "@abp/ng.theme.shared": "~2.3.0", "my-project-name.config": "^0.0.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json index 5d035c76c9..b467e1767f 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^2.3.0" } } \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock index b3b0eb268b..3c0e460076 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.2.0.tgz#e7f4e57d2b17cc76388e9c56bc34d50c9658873b" - integrity sha512-S9GQ9YVg4DWrgjujwiXBER6KqdqW5nZ1Bmt+YEePn5gEoPvoVrh6ojthpHYRjBJtGFqBSzRAQ9eVZLebT22Ozg== +"@abp/aspnetcore.mvc.ui.theme.basic@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.3.0.tgz#482c236565268d305c0c86399e837bdddecf97ad" + integrity sha512-PJqGAHllBoZv/97DalfMFQr4oPA6PatObaj/+oxkjUjQcPD4z2sJO5Z+d8t6plo3ZvjzMvwm+VwzhZgdJhtwKw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.shared" "^2.3.0" -"@abp/aspnetcore.mvc.ui.theme.shared@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.2.0.tgz#e0df953853be2a184d323931573f9f98aebbaa62" - integrity sha512-urxziaCdvfEqN5cjiiM5f5dx2Yr+AoGqCJVCo0Okjl2dosdaj5DH4SBzMvKAaLXzo3Ep1h4b3Wvws4BThL/6rA== - dependencies: - "@abp/aspnetcore.mvc.ui" "^2.2.0" - "@abp/bootstrap" "^2.2.0" - "@abp/bootstrap-datepicker" "^2.2.0" - "@abp/datatables.net-bs4" "^2.2.0" - "@abp/font-awesome" "^2.2.0" - "@abp/jquery-form" "^2.2.0" - "@abp/jquery-validation-unobtrusive" "^2.2.0" - "@abp/lodash" "^2.2.0" - "@abp/luxon" "^2.2.0" - "@abp/malihu-custom-scrollbar-plugin" "^2.2.0" - "@abp/select2" "^2.2.0" - "@abp/sweetalert" "^2.2.0" - "@abp/timeago" "^2.2.0" - "@abp/toastr" "^2.2.0" - -"@abp/aspnetcore.mvc.ui@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.2.0.tgz#b2cdd421eed09ec1d30ae85e14434b7efc094ade" - integrity sha512-IO/AjhJu+LUa9zOaT8JlEnV+Pcp9oQ3q9kTq8kmMakC35vTIyvBpB3nnykXIOytZSyjsBgFYB/uMxPgBOjWagg== +"@abp/aspnetcore.mvc.ui.theme.shared@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.3.0.tgz#553ba6983308a8da3336226b8c20f9191da8a5cc" + integrity sha512-LLf89lXILM0MiSv/Mk4GXXl+eu+J5obTMfA9obLNiXD5fpwlYxnTtMwxh+sfZe9KcsZTuYEcXJgVk/A8HKydeg== + dependencies: + "@abp/aspnetcore.mvc.ui" "^2.3.0" + "@abp/bootstrap" "^2.3.0" + "@abp/bootstrap-datepicker" "^2.3.0" + "@abp/datatables.net-bs4" "^2.3.0" + "@abp/font-awesome" "^2.3.0" + "@abp/jquery-form" "^2.3.0" + "@abp/jquery-validation-unobtrusive" "^2.3.0" + "@abp/lodash" "^2.3.0" + "@abp/luxon" "^2.3.0" + "@abp/malihu-custom-scrollbar-plugin" "^2.3.0" + "@abp/select2" "^2.3.0" + "@abp/sweetalert" "^2.3.0" + "@abp/timeago" "^2.3.0" + "@abp/toastr" "^2.3.0" + +"@abp/aspnetcore.mvc.ui@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.3.0.tgz#166a1235b70b460be0c84171c229c1c5543dcbb7" + integrity sha512-5vitUltSBEVf97tJwonMkL6YQ0acKF2JEtbkfer3GN63MuU4+8ayYT8bwlieV6iC20dm69dCLI3dIfezvFnAfA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^3.0.0" -"@abp/bootstrap-datepicker@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.2.0.tgz#a2f50b422824f18ed4b7e80be6852e2979119f8e" - integrity sha512-X9jT5mU42QFfVhOZdun7aEJUf3bMko6NsG3NFQVjqTqKH+iYGKfHPFpXD0gP/6Nb4KgZUdId8hSyQTZyOK2JEA== +"@abp/bootstrap-datepicker@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.3.0.tgz#fc235d1fb47e44cd6950cd6179b045fbd19b2a12" + integrity sha512-X7iWvwo7QqOp35IBz8WELDVfuVK110vZCcfuXwo0MbnH0aXS3+2CEUxqZnYHNcDrf+eXaact/IPKVl5Z/mA70A== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.2.0.tgz#16e41d3432117bbcd9012c6f735c49c543255879" - integrity sha512-aRmluu6SkIl+JgCzSSJZrDPkYr6WWaQdY0iJAOz6NHtffa7Aumh1IUOrLVKL0T1pQn6QKs0Z7JDGyYMdh1HPkQ== +"@abp/bootstrap@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.3.0.tgz#e53ead2fae02cef04e8d44c1fd38d3368d0db8df" + integrity sha512-PsmCRUEF82Co903JxdvvPaBaiP+BFpQvMhM0PMqZzJ4AKGq0qG4kdCTAhFYhusy1e/UqBaNwCp7URDN/I+Xr7A== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" bootstrap "^4.3.1" -"@abp/core@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.2.0.tgz#4eea0a06458c90acb8566a11eb841fe65d15d256" - integrity sha512-tBGHa5CUr0ewT31g689RAfQ6Su2p4uyn2PzmrW/8lahBrvqkoCb41fkCDLQJkTY5rKPrEKZd/s9OoyOnS20DLg== +"@abp/core@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.3.0.tgz#3bb600c6b3e77060561d90db06e0052e04fa59b6" + integrity sha512-LGtOSYZqINZuX6Hy9vDDxxLJpEfZYyzdTxFdQt9UBtE/AuypILG8lOQjd96OJpRTeqyOUHBYo8AXtYzEyR6ZiA== -"@abp/datatables.net-bs4@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.2.0.tgz#c7cc49e889b295ae10fb24ed62b154ef79ffc85a" - integrity sha512-zjJRPqOCWPfkHt1QztfFHKrsTE9o6Je2EpfA7hRMej2FlGbsMWUxOqx/btK1vjD6YIU8DtVDpIdj1WvPOITQ4Q== +"@abp/datatables.net-bs4@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.3.0.tgz#f7268173bd5070471999e3e694509b49e4fc2e87" + integrity sha512-nA913hyrZRl8gQlGAmg+n7Z4iav4U+XrPgC0CfTUkZda7ReHj50jFZPQREfnmGdM77FVA+3y4q4LZELGB65GMQ== dependencies: - "@abp/datatables.net" "^2.2.0" + "@abp/datatables.net" "^2.3.0" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.2.0.tgz#22f9c7ca90c2d4af264483b4f8286b0feb7c3d52" - integrity sha512-L4MnpdloSWr/px3mvV75sxsxL68MyALB2LKdzCFMQWILCZVkxMmQb9LARINYIrn461Wrc+zbYWNEBD0MAq7flg== +"@abp/datatables.net@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.3.0.tgz#420ab84c54ca6b81a555c8525a96de62c54aca75" + integrity sha512-CAIF/+eQzCPltfQsvojOE5ojbbOv0u9MqtAIjgCiQ0ccCLe0j+68ZJhizDK1e3JA1o9jZXcBZnEWIGPdhpcRcA== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" datatables.net "^1.10.20" -"@abp/font-awesome@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.2.0.tgz#2de39e3c6c3e8c30394d82861761a66c5b4032f0" - integrity sha512-RT06MYUGgaWBEpW5c7wUcfMXgxcOHWdX/C01LDO/j6iVoKBuBHOkkvcUoTWII068ECrLYOkj+RyT59dCKm8FFw== +"@abp/font-awesome@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.3.0.tgz#30988351f7ca7ccf84b414e95848016df701bafe" + integrity sha512-lco8ArQi1xeKqypmvCubXrwO0/a+uP33vqQy+d3JRcmAXJgc5+AeQrzEq9KRcD/BGeWQUi8aJobW0rGFTAZxxQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.2.0.tgz#951653fac4013a7bbec065b5101b86d575e0eca7" - integrity sha512-ji44E3Ud0S3LNXn1WJ/Aw44qAIG7EITEW1KOe46oz+/awPpbiiA4dDDNleTvO2jI2/s8mNyR0bNanP6BUsc7tw== +"@abp/jquery-form@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.3.0.tgz#91e088fd1861c2a6224ce127c0fe0071baec9eef" + integrity sha512-cVPFdKpgAPSsG4mxrREfmslkgVJEZI9LpHask/6vy5gE/eFKZ9t6BZg+gop7bj6co3NcjekjDxhM7c0Iq+auyA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.2.0.tgz#6d39ba9f7bf026d1380796bf5dff76c8d16b42ce" - integrity sha512-SuS/dRRVz7ZR4HK/h9x0jRRVLPqXN0CPRGPdJZ1LJraXVEJ9/eDEGf1rMlHmEGt1FXXFTD01/zjisbweDE786w== +"@abp/jquery-validation-unobtrusive@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.3.0.tgz#18dcd10ac0d6678716b42170fca1810b23cebaab" + integrity sha512-CAR3zZ4Oxbu5MK7VO2QhZjwYW81NCEqOViKPpPzk/K2qkgphHbDpRei3XMbi+476KMhrAgQE6KzlrafWBtsdRA== dependencies: - "@abp/jquery-validation" "^2.2.0" + "@abp/jquery-validation" "^2.3.0" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.2.0.tgz#02bb8ba883e72c1204867ee4d1c1094bd91c4c4c" - integrity sha512-ypITQloO4iEDgqlA6qb3taj+7HMX0Cf/ACA2OvtrvOgJejx6J4wfrPjwuFZu1WWJ0xtc9yTdbovdcSVcQbIGaA== +"@abp/jquery-validation@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.3.0.tgz#af723abf5950729ef2763cecb7f5a9c5cbed0031" + integrity sha512-YvFCbvx9hWzi7BytYRBb/0tFdiibWT9CFz7vcHTrZiXjjSfZ1koh3DeXPErj091VR9X4q4nzRfCETA+0lINQbA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-validation "^1.19.1" -"@abp/jquery@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.2.0.tgz#0e641b1109e78eff4c34331ca2b123b67cc30cbe" - integrity sha512-vEfRoFEAmDmRgSq98Y9EZExfQFSWtmjaHrodUu+MadTcRlnn+wHq8wwkKKxpj/eYtNc8aFORpyHMMH7uliAKxg== +"@abp/jquery@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.3.0.tgz#c17fcc3559a0285af3d6e534a5a076e99fc0ba37" + integrity sha512-376LnHco1kW6U094Tx3cbkM5y3ZAA02Lp3yrN/b0Qc1th84Xr2twix2YZG+GqcqlwdljH4ihdgpAM/ZO7REEaw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" jquery "^3.4.1" -"@abp/lodash@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.2.0.tgz#af0a2ebcb28fd0a8c02da5026479d9370ed19719" - integrity sha512-wOMLqIpuq4a7ww7pB138G6YxBiTGBgxNW/IWGUiWbfgrr88cGPKIYYv/8O8mvr8PLNGjizNynuwQRj522yA3Dw== +"@abp/lodash@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.3.0.tgz#20219d872db7eba372cbaea168494fa54eb1cf12" + integrity sha512-I2KKEJaGwfpCKUox32lkllLRKgP25mszJuGpj571KTsvuT0Zo6BlNov4xoy8wbHC7vZF7dvkJpiCGg2yKnxc8Q== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" lodash "^4.17.15" -"@abp/luxon@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.2.0.tgz#0d0e78edc249853fa31eceecc00df2846a879aa9" - integrity sha512-WbOW0PcMks+WXRPWt/+H4pOa5waM331WkY0F+EJx8fpxemNGQNUEXLkuMXzN3MrN6LrplM9AZ9i+NRA9PWHbNw== +"@abp/luxon@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.3.0.tgz#5e08cdff00682f317707d9f34da6a1fb21402914" + integrity sha512-UAbh+HyVwr+ytJpJEddHp0aRpIKQIWknvrDmcyIOaTY6ZSJPZSxJlDmIC56d094JopeRf/+E/cTMMS5bM8nmrA== dependencies: luxon "^1.21.3" -"@abp/malihu-custom-scrollbar-plugin@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.2.0.tgz#e11fd46dccbb28d44fb199e880b91d27c94f1919" - integrity sha512-YDu/NLpIzMA96NDHxd27/+liTm3sow9M+oWH29+9JW8o/AEpXUH3T3AmoXXcTgsBlzLaewgHEFM8yxsAAFoj8Q== +"@abp/malihu-custom-scrollbar-plugin@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.3.0.tgz#1b2535ca6f30dd49ea5ec3de283f3ac4d1d5f6a0" + integrity sha512-dCeJMRn+zHhGi1Uwg0h0ET21+sZ/Zf2trwfVJrd8bXan5bMKPRd3UtXrJlxZg3NHqVJmUiwWe2dzEHt1fexCDQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.2.0.tgz#4639d4e5b72b1736fa4476bd9b6a78e036400421" - integrity sha512-tc87JyM0kvVF388kyGUjDby49Zrrb089jVRRipoIaxXeu4M1YxEFSKBEcUK1MohZWjVtWrNs8MoxPlfukaMpyw== +"@abp/select2@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.3.0.tgz#edc5ae4655ccdf6b9ec7546dd156cda33bf907d3" + integrity sha512-s7TMBe2zUndVkfDTD0cBX/F4Fm9alA1BUx7l0b2+CmbJkdIp3YkjA4Oqsi4RinpP6/vVSYpTiTGWX4cYogbcFw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" select2 "^4.0.12" -"@abp/sweetalert@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.2.0.tgz#dfc60ba085522d8390e41b90bf5a3d474f4ae624" - integrity sha512-HS6TKOwP91UjzjZHaheurZ1AYUSMkQyCSmoX6g5LAK4eH8IIgpojVSp1AFCSPATrFsFWY/dzkDGcfu90FWsVBg== +"@abp/sweetalert@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.3.0.tgz#2120b1f98e2530afc65f6c11fb7ea8d087a98777" + integrity sha512-Kq7UAOwi2sH/lxIrwoEhUCt5n8OAv17SubLWE/Ud3gWgcSw5XSmAZb13S6e78yydlV89Ny3LeYeGjqfU6nnSug== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" sweetalert "^2.1.2" -"@abp/timeago@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.2.0.tgz#9a8297f36a46cdc4cc62f44d0fdc91b70def389c" - integrity sha512-8qjmKscsTvPznHKWEsddYxdSBiU+l+OgLG6vzMcSWqngYbDQGXqNA93BwJI2qiwd+FkNcfGgYg7CN7bcwzmaiw== +"@abp/timeago@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.3.0.tgz#79bb1019f135d3342916bb61f52f3be35914f11b" + integrity sha512-TogWr4bdFl/DsB3QLa1iOkRGmeWNPyR60buI3D+WSJGlEtbjU9L5I3cGDEWJGYOxPKU9WuqV4DiraBbq/xNGLw== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" timeago "^1.6.7" -"@abp/toastr@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.2.0.tgz#1cad83a89da244685b3c82adff64260b7ccf4742" - integrity sha512-HHfSaw4M/9zS+KgzxGvbHYiQ5qcJgpf21cRZEo16aUwnTeKr4SRaewAWryNn4dKcIO2YNrhzDLH+OYbEaJJlDQ== +"@abp/toastr@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.3.0.tgz#0c0201e00a8070b831a33fe9763e0fb3a1981523" + integrity sha512-MlS9KXPuo1vYW78QvJUR1CXGMq7qo2wGKRxZJEloxWTI8bg7zEZwa27LGJJmHLQacOqdhUP9c5t9D136eUhu6A== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": 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 6e36dde3bf..504aafc075 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": "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^2.3.0" } } \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock index b3b0eb268b..3c0e460076 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.2.0.tgz#e7f4e57d2b17cc76388e9c56bc34d50c9658873b" - integrity sha512-S9GQ9YVg4DWrgjujwiXBER6KqdqW5nZ1Bmt+YEePn5gEoPvoVrh6ojthpHYRjBJtGFqBSzRAQ9eVZLebT22Ozg== +"@abp/aspnetcore.mvc.ui.theme.basic@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.3.0.tgz#482c236565268d305c0c86399e837bdddecf97ad" + integrity sha512-PJqGAHllBoZv/97DalfMFQr4oPA6PatObaj/+oxkjUjQcPD4z2sJO5Z+d8t6plo3ZvjzMvwm+VwzhZgdJhtwKw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.shared" "^2.3.0" -"@abp/aspnetcore.mvc.ui.theme.shared@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.2.0.tgz#e0df953853be2a184d323931573f9f98aebbaa62" - integrity sha512-urxziaCdvfEqN5cjiiM5f5dx2Yr+AoGqCJVCo0Okjl2dosdaj5DH4SBzMvKAaLXzo3Ep1h4b3Wvws4BThL/6rA== - dependencies: - "@abp/aspnetcore.mvc.ui" "^2.2.0" - "@abp/bootstrap" "^2.2.0" - "@abp/bootstrap-datepicker" "^2.2.0" - "@abp/datatables.net-bs4" "^2.2.0" - "@abp/font-awesome" "^2.2.0" - "@abp/jquery-form" "^2.2.0" - "@abp/jquery-validation-unobtrusive" "^2.2.0" - "@abp/lodash" "^2.2.0" - "@abp/luxon" "^2.2.0" - "@abp/malihu-custom-scrollbar-plugin" "^2.2.0" - "@abp/select2" "^2.2.0" - "@abp/sweetalert" "^2.2.0" - "@abp/timeago" "^2.2.0" - "@abp/toastr" "^2.2.0" - -"@abp/aspnetcore.mvc.ui@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.2.0.tgz#b2cdd421eed09ec1d30ae85e14434b7efc094ade" - integrity sha512-IO/AjhJu+LUa9zOaT8JlEnV+Pcp9oQ3q9kTq8kmMakC35vTIyvBpB3nnykXIOytZSyjsBgFYB/uMxPgBOjWagg== +"@abp/aspnetcore.mvc.ui.theme.shared@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.3.0.tgz#553ba6983308a8da3336226b8c20f9191da8a5cc" + integrity sha512-LLf89lXILM0MiSv/Mk4GXXl+eu+J5obTMfA9obLNiXD5fpwlYxnTtMwxh+sfZe9KcsZTuYEcXJgVk/A8HKydeg== + dependencies: + "@abp/aspnetcore.mvc.ui" "^2.3.0" + "@abp/bootstrap" "^2.3.0" + "@abp/bootstrap-datepicker" "^2.3.0" + "@abp/datatables.net-bs4" "^2.3.0" + "@abp/font-awesome" "^2.3.0" + "@abp/jquery-form" "^2.3.0" + "@abp/jquery-validation-unobtrusive" "^2.3.0" + "@abp/lodash" "^2.3.0" + "@abp/luxon" "^2.3.0" + "@abp/malihu-custom-scrollbar-plugin" "^2.3.0" + "@abp/select2" "^2.3.0" + "@abp/sweetalert" "^2.3.0" + "@abp/timeago" "^2.3.0" + "@abp/toastr" "^2.3.0" + +"@abp/aspnetcore.mvc.ui@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.3.0.tgz#166a1235b70b460be0c84171c229c1c5543dcbb7" + integrity sha512-5vitUltSBEVf97tJwonMkL6YQ0acKF2JEtbkfer3GN63MuU4+8ayYT8bwlieV6iC20dm69dCLI3dIfezvFnAfA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^3.0.0" -"@abp/bootstrap-datepicker@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.2.0.tgz#a2f50b422824f18ed4b7e80be6852e2979119f8e" - integrity sha512-X9jT5mU42QFfVhOZdun7aEJUf3bMko6NsG3NFQVjqTqKH+iYGKfHPFpXD0gP/6Nb4KgZUdId8hSyQTZyOK2JEA== +"@abp/bootstrap-datepicker@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.3.0.tgz#fc235d1fb47e44cd6950cd6179b045fbd19b2a12" + integrity sha512-X7iWvwo7QqOp35IBz8WELDVfuVK110vZCcfuXwo0MbnH0aXS3+2CEUxqZnYHNcDrf+eXaact/IPKVl5Z/mA70A== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.2.0.tgz#16e41d3432117bbcd9012c6f735c49c543255879" - integrity sha512-aRmluu6SkIl+JgCzSSJZrDPkYr6WWaQdY0iJAOz6NHtffa7Aumh1IUOrLVKL0T1pQn6QKs0Z7JDGyYMdh1HPkQ== +"@abp/bootstrap@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.3.0.tgz#e53ead2fae02cef04e8d44c1fd38d3368d0db8df" + integrity sha512-PsmCRUEF82Co903JxdvvPaBaiP+BFpQvMhM0PMqZzJ4AKGq0qG4kdCTAhFYhusy1e/UqBaNwCp7URDN/I+Xr7A== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" bootstrap "^4.3.1" -"@abp/core@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.2.0.tgz#4eea0a06458c90acb8566a11eb841fe65d15d256" - integrity sha512-tBGHa5CUr0ewT31g689RAfQ6Su2p4uyn2PzmrW/8lahBrvqkoCb41fkCDLQJkTY5rKPrEKZd/s9OoyOnS20DLg== +"@abp/core@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.3.0.tgz#3bb600c6b3e77060561d90db06e0052e04fa59b6" + integrity sha512-LGtOSYZqINZuX6Hy9vDDxxLJpEfZYyzdTxFdQt9UBtE/AuypILG8lOQjd96OJpRTeqyOUHBYo8AXtYzEyR6ZiA== -"@abp/datatables.net-bs4@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.2.0.tgz#c7cc49e889b295ae10fb24ed62b154ef79ffc85a" - integrity sha512-zjJRPqOCWPfkHt1QztfFHKrsTE9o6Je2EpfA7hRMej2FlGbsMWUxOqx/btK1vjD6YIU8DtVDpIdj1WvPOITQ4Q== +"@abp/datatables.net-bs4@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.3.0.tgz#f7268173bd5070471999e3e694509b49e4fc2e87" + integrity sha512-nA913hyrZRl8gQlGAmg+n7Z4iav4U+XrPgC0CfTUkZda7ReHj50jFZPQREfnmGdM77FVA+3y4q4LZELGB65GMQ== dependencies: - "@abp/datatables.net" "^2.2.0" + "@abp/datatables.net" "^2.3.0" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.2.0.tgz#22f9c7ca90c2d4af264483b4f8286b0feb7c3d52" - integrity sha512-L4MnpdloSWr/px3mvV75sxsxL68MyALB2LKdzCFMQWILCZVkxMmQb9LARINYIrn461Wrc+zbYWNEBD0MAq7flg== +"@abp/datatables.net@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.3.0.tgz#420ab84c54ca6b81a555c8525a96de62c54aca75" + integrity sha512-CAIF/+eQzCPltfQsvojOE5ojbbOv0u9MqtAIjgCiQ0ccCLe0j+68ZJhizDK1e3JA1o9jZXcBZnEWIGPdhpcRcA== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" datatables.net "^1.10.20" -"@abp/font-awesome@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.2.0.tgz#2de39e3c6c3e8c30394d82861761a66c5b4032f0" - integrity sha512-RT06MYUGgaWBEpW5c7wUcfMXgxcOHWdX/C01LDO/j6iVoKBuBHOkkvcUoTWII068ECrLYOkj+RyT59dCKm8FFw== +"@abp/font-awesome@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.3.0.tgz#30988351f7ca7ccf84b414e95848016df701bafe" + integrity sha512-lco8ArQi1xeKqypmvCubXrwO0/a+uP33vqQy+d3JRcmAXJgc5+AeQrzEq9KRcD/BGeWQUi8aJobW0rGFTAZxxQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.2.0.tgz#951653fac4013a7bbec065b5101b86d575e0eca7" - integrity sha512-ji44E3Ud0S3LNXn1WJ/Aw44qAIG7EITEW1KOe46oz+/awPpbiiA4dDDNleTvO2jI2/s8mNyR0bNanP6BUsc7tw== +"@abp/jquery-form@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.3.0.tgz#91e088fd1861c2a6224ce127c0fe0071baec9eef" + integrity sha512-cVPFdKpgAPSsG4mxrREfmslkgVJEZI9LpHask/6vy5gE/eFKZ9t6BZg+gop7bj6co3NcjekjDxhM7c0Iq+auyA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.2.0.tgz#6d39ba9f7bf026d1380796bf5dff76c8d16b42ce" - integrity sha512-SuS/dRRVz7ZR4HK/h9x0jRRVLPqXN0CPRGPdJZ1LJraXVEJ9/eDEGf1rMlHmEGt1FXXFTD01/zjisbweDE786w== +"@abp/jquery-validation-unobtrusive@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.3.0.tgz#18dcd10ac0d6678716b42170fca1810b23cebaab" + integrity sha512-CAR3zZ4Oxbu5MK7VO2QhZjwYW81NCEqOViKPpPzk/K2qkgphHbDpRei3XMbi+476KMhrAgQE6KzlrafWBtsdRA== dependencies: - "@abp/jquery-validation" "^2.2.0" + "@abp/jquery-validation" "^2.3.0" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.2.0.tgz#02bb8ba883e72c1204867ee4d1c1094bd91c4c4c" - integrity sha512-ypITQloO4iEDgqlA6qb3taj+7HMX0Cf/ACA2OvtrvOgJejx6J4wfrPjwuFZu1WWJ0xtc9yTdbovdcSVcQbIGaA== +"@abp/jquery-validation@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.3.0.tgz#af723abf5950729ef2763cecb7f5a9c5cbed0031" + integrity sha512-YvFCbvx9hWzi7BytYRBb/0tFdiibWT9CFz7vcHTrZiXjjSfZ1koh3DeXPErj091VR9X4q4nzRfCETA+0lINQbA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-validation "^1.19.1" -"@abp/jquery@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.2.0.tgz#0e641b1109e78eff4c34331ca2b123b67cc30cbe" - integrity sha512-vEfRoFEAmDmRgSq98Y9EZExfQFSWtmjaHrodUu+MadTcRlnn+wHq8wwkKKxpj/eYtNc8aFORpyHMMH7uliAKxg== +"@abp/jquery@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.3.0.tgz#c17fcc3559a0285af3d6e534a5a076e99fc0ba37" + integrity sha512-376LnHco1kW6U094Tx3cbkM5y3ZAA02Lp3yrN/b0Qc1th84Xr2twix2YZG+GqcqlwdljH4ihdgpAM/ZO7REEaw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" jquery "^3.4.1" -"@abp/lodash@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.2.0.tgz#af0a2ebcb28fd0a8c02da5026479d9370ed19719" - integrity sha512-wOMLqIpuq4a7ww7pB138G6YxBiTGBgxNW/IWGUiWbfgrr88cGPKIYYv/8O8mvr8PLNGjizNynuwQRj522yA3Dw== +"@abp/lodash@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.3.0.tgz#20219d872db7eba372cbaea168494fa54eb1cf12" + integrity sha512-I2KKEJaGwfpCKUox32lkllLRKgP25mszJuGpj571KTsvuT0Zo6BlNov4xoy8wbHC7vZF7dvkJpiCGg2yKnxc8Q== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" lodash "^4.17.15" -"@abp/luxon@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.2.0.tgz#0d0e78edc249853fa31eceecc00df2846a879aa9" - integrity sha512-WbOW0PcMks+WXRPWt/+H4pOa5waM331WkY0F+EJx8fpxemNGQNUEXLkuMXzN3MrN6LrplM9AZ9i+NRA9PWHbNw== +"@abp/luxon@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.3.0.tgz#5e08cdff00682f317707d9f34da6a1fb21402914" + integrity sha512-UAbh+HyVwr+ytJpJEddHp0aRpIKQIWknvrDmcyIOaTY6ZSJPZSxJlDmIC56d094JopeRf/+E/cTMMS5bM8nmrA== dependencies: luxon "^1.21.3" -"@abp/malihu-custom-scrollbar-plugin@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.2.0.tgz#e11fd46dccbb28d44fb199e880b91d27c94f1919" - integrity sha512-YDu/NLpIzMA96NDHxd27/+liTm3sow9M+oWH29+9JW8o/AEpXUH3T3AmoXXcTgsBlzLaewgHEFM8yxsAAFoj8Q== +"@abp/malihu-custom-scrollbar-plugin@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.3.0.tgz#1b2535ca6f30dd49ea5ec3de283f3ac4d1d5f6a0" + integrity sha512-dCeJMRn+zHhGi1Uwg0h0ET21+sZ/Zf2trwfVJrd8bXan5bMKPRd3UtXrJlxZg3NHqVJmUiwWe2dzEHt1fexCDQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.2.0.tgz#4639d4e5b72b1736fa4476bd9b6a78e036400421" - integrity sha512-tc87JyM0kvVF388kyGUjDby49Zrrb089jVRRipoIaxXeu4M1YxEFSKBEcUK1MohZWjVtWrNs8MoxPlfukaMpyw== +"@abp/select2@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.3.0.tgz#edc5ae4655ccdf6b9ec7546dd156cda33bf907d3" + integrity sha512-s7TMBe2zUndVkfDTD0cBX/F4Fm9alA1BUx7l0b2+CmbJkdIp3YkjA4Oqsi4RinpP6/vVSYpTiTGWX4cYogbcFw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" select2 "^4.0.12" -"@abp/sweetalert@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.2.0.tgz#dfc60ba085522d8390e41b90bf5a3d474f4ae624" - integrity sha512-HS6TKOwP91UjzjZHaheurZ1AYUSMkQyCSmoX6g5LAK4eH8IIgpojVSp1AFCSPATrFsFWY/dzkDGcfu90FWsVBg== +"@abp/sweetalert@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.3.0.tgz#2120b1f98e2530afc65f6c11fb7ea8d087a98777" + integrity sha512-Kq7UAOwi2sH/lxIrwoEhUCt5n8OAv17SubLWE/Ud3gWgcSw5XSmAZb13S6e78yydlV89Ny3LeYeGjqfU6nnSug== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" sweetalert "^2.1.2" -"@abp/timeago@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.2.0.tgz#9a8297f36a46cdc4cc62f44d0fdc91b70def389c" - integrity sha512-8qjmKscsTvPznHKWEsddYxdSBiU+l+OgLG6vzMcSWqngYbDQGXqNA93BwJI2qiwd+FkNcfGgYg7CN7bcwzmaiw== +"@abp/timeago@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.3.0.tgz#79bb1019f135d3342916bb61f52f3be35914f11b" + integrity sha512-TogWr4bdFl/DsB3QLa1iOkRGmeWNPyR60buI3D+WSJGlEtbjU9L5I3cGDEWJGYOxPKU9WuqV4DiraBbq/xNGLw== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" timeago "^1.6.7" -"@abp/toastr@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.2.0.tgz#1cad83a89da244685b3c82adff64260b7ccf4742" - integrity sha512-HHfSaw4M/9zS+KgzxGvbHYiQ5qcJgpf21cRZEo16aUwnTeKr4SRaewAWryNn4dKcIO2YNrhzDLH+OYbEaJJlDQ== +"@abp/toastr@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.3.0.tgz#0c0201e00a8070b831a33fe9763e0fb3a1981523" + integrity sha512-MlS9KXPuo1vYW78QvJUR1CXGMq7qo2wGKRxZJEloxWTI8bg7zEZwa27LGJJmHLQacOqdhUP9c5t9D136eUhu6A== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": 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 6e36dde3bf..504aafc075 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": "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "^2.3.0" } } \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock index 857eab952e..b86b8606c6 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.2.0.tgz#e7f4e57d2b17cc76388e9c56bc34d50c9658873b" - integrity sha512-S9GQ9YVg4DWrgjujwiXBER6KqdqW5nZ1Bmt+YEePn5gEoPvoVrh6ojthpHYRjBJtGFqBSzRAQ9eVZLebT22Ozg== +"@abp/aspnetcore.mvc.ui.theme.basic@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-2.3.0.tgz#482c236565268d305c0c86399e837bdddecf97ad" + integrity sha512-PJqGAHllBoZv/97DalfMFQr4oPA6PatObaj/+oxkjUjQcPD4z2sJO5Z+d8t6plo3ZvjzMvwm+VwzhZgdJhtwKw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "^2.2.0" + "@abp/aspnetcore.mvc.ui.theme.shared" "^2.3.0" -"@abp/aspnetcore.mvc.ui.theme.shared@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.2.0.tgz#e0df953853be2a184d323931573f9f98aebbaa62" - integrity sha512-urxziaCdvfEqN5cjiiM5f5dx2Yr+AoGqCJVCo0Okjl2dosdaj5DH4SBzMvKAaLXzo3Ep1h4b3Wvws4BThL/6rA== - dependencies: - "@abp/aspnetcore.mvc.ui" "^2.2.0" - "@abp/bootstrap" "^2.2.0" - "@abp/bootstrap-datepicker" "^2.2.0" - "@abp/datatables.net-bs4" "^2.2.0" - "@abp/font-awesome" "^2.2.0" - "@abp/jquery-form" "^2.2.0" - "@abp/jquery-validation-unobtrusive" "^2.2.0" - "@abp/lodash" "^2.2.0" - "@abp/luxon" "^2.2.0" - "@abp/malihu-custom-scrollbar-plugin" "^2.2.0" - "@abp/select2" "^2.2.0" - "@abp/sweetalert" "^2.2.0" - "@abp/timeago" "^2.2.0" - "@abp/toastr" "^2.2.0" - -"@abp/aspnetcore.mvc.ui@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.2.0.tgz#b2cdd421eed09ec1d30ae85e14434b7efc094ade" - integrity sha512-IO/AjhJu+LUa9zOaT8JlEnV+Pcp9oQ3q9kTq8kmMakC35vTIyvBpB3nnykXIOytZSyjsBgFYB/uMxPgBOjWagg== +"@abp/aspnetcore.mvc.ui.theme.shared@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-2.3.0.tgz#553ba6983308a8da3336226b8c20f9191da8a5cc" + integrity sha512-LLf89lXILM0MiSv/Mk4GXXl+eu+J5obTMfA9obLNiXD5fpwlYxnTtMwxh+sfZe9KcsZTuYEcXJgVk/A8HKydeg== + dependencies: + "@abp/aspnetcore.mvc.ui" "^2.3.0" + "@abp/bootstrap" "^2.3.0" + "@abp/bootstrap-datepicker" "^2.3.0" + "@abp/datatables.net-bs4" "^2.3.0" + "@abp/font-awesome" "^2.3.0" + "@abp/jquery-form" "^2.3.0" + "@abp/jquery-validation-unobtrusive" "^2.3.0" + "@abp/lodash" "^2.3.0" + "@abp/luxon" "^2.3.0" + "@abp/malihu-custom-scrollbar-plugin" "^2.3.0" + "@abp/select2" "^2.3.0" + "@abp/sweetalert" "^2.3.0" + "@abp/timeago" "^2.3.0" + "@abp/toastr" "^2.3.0" + +"@abp/aspnetcore.mvc.ui@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-2.3.0.tgz#166a1235b70b460be0c84171c229c1c5543dcbb7" + integrity sha512-5vitUltSBEVf97tJwonMkL6YQ0acKF2JEtbkfer3GN63MuU4+8ayYT8bwlieV6iC20dm69dCLI3dIfezvFnAfA== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,135 +41,135 @@ path "^0.12.7" rimraf "^3.0.0" -"@abp/bootstrap-datepicker@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.2.0.tgz#a2f50b422824f18ed4b7e80be6852e2979119f8e" - integrity sha512-X9jT5mU42QFfVhOZdun7aEJUf3bMko6NsG3NFQVjqTqKH+iYGKfHPFpXD0gP/6Nb4KgZUdId8hSyQTZyOK2JEA== +"@abp/bootstrap-datepicker@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-2.3.0.tgz#fc235d1fb47e44cd6950cd6179b045fbd19b2a12" + integrity sha512-X7iWvwo7QqOp35IBz8WELDVfuVK110vZCcfuXwo0MbnH0aXS3+2CEUxqZnYHNcDrf+eXaact/IPKVl5Z/mA70A== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.2.0.tgz#16e41d3432117bbcd9012c6f735c49c543255879" - integrity sha512-aRmluu6SkIl+JgCzSSJZrDPkYr6WWaQdY0iJAOz6NHtffa7Aumh1IUOrLVKL0T1pQn6QKs0Z7JDGyYMdh1HPkQ== +"@abp/bootstrap@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-2.3.0.tgz#e53ead2fae02cef04e8d44c1fd38d3368d0db8df" + integrity sha512-PsmCRUEF82Co903JxdvvPaBaiP+BFpQvMhM0PMqZzJ4AKGq0qG4kdCTAhFYhusy1e/UqBaNwCp7URDN/I+Xr7A== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" bootstrap "^4.3.1" -"@abp/core@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.2.0.tgz#4eea0a06458c90acb8566a11eb841fe65d15d256" - integrity sha512-tBGHa5CUr0ewT31g689RAfQ6Su2p4uyn2PzmrW/8lahBrvqkoCb41fkCDLQJkTY5rKPrEKZd/s9OoyOnS20DLg== +"@abp/core@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-2.3.0.tgz#3bb600c6b3e77060561d90db06e0052e04fa59b6" + integrity sha512-LGtOSYZqINZuX6Hy9vDDxxLJpEfZYyzdTxFdQt9UBtE/AuypILG8lOQjd96OJpRTeqyOUHBYo8AXtYzEyR6ZiA== -"@abp/datatables.net-bs4@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.2.0.tgz#c7cc49e889b295ae10fb24ed62b154ef79ffc85a" - integrity sha512-zjJRPqOCWPfkHt1QztfFHKrsTE9o6Je2EpfA7hRMej2FlGbsMWUxOqx/btK1vjD6YIU8DtVDpIdj1WvPOITQ4Q== +"@abp/datatables.net-bs4@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-2.3.0.tgz#f7268173bd5070471999e3e694509b49e4fc2e87" + integrity sha512-nA913hyrZRl8gQlGAmg+n7Z4iav4U+XrPgC0CfTUkZda7ReHj50jFZPQREfnmGdM77FVA+3y4q4LZELGB65GMQ== dependencies: - "@abp/datatables.net" "^2.2.0" + "@abp/datatables.net" "^2.3.0" datatables.net-bs4 "^1.10.20" -"@abp/datatables.net@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.2.0.tgz#22f9c7ca90c2d4af264483b4f8286b0feb7c3d52" - integrity sha512-L4MnpdloSWr/px3mvV75sxsxL68MyALB2LKdzCFMQWILCZVkxMmQb9LARINYIrn461Wrc+zbYWNEBD0MAq7flg== +"@abp/datatables.net@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-2.3.0.tgz#420ab84c54ca6b81a555c8525a96de62c54aca75" + integrity sha512-CAIF/+eQzCPltfQsvojOE5ojbbOv0u9MqtAIjgCiQ0ccCLe0j+68ZJhizDK1e3JA1o9jZXcBZnEWIGPdhpcRcA== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" datatables.net "^1.10.20" -"@abp/font-awesome@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.2.0.tgz#2de39e3c6c3e8c30394d82861761a66c5b4032f0" - integrity sha512-RT06MYUGgaWBEpW5c7wUcfMXgxcOHWdX/C01LDO/j6iVoKBuBHOkkvcUoTWII068ECrLYOkj+RyT59dCKm8FFw== +"@abp/font-awesome@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-2.3.0.tgz#30988351f7ca7ccf84b414e95848016df701bafe" + integrity sha512-lco8ArQi1xeKqypmvCubXrwO0/a+uP33vqQy+d3JRcmAXJgc5+AeQrzEq9KRcD/BGeWQUi8aJobW0rGFTAZxxQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" "@fortawesome/fontawesome-free" "^5.11.2" -"@abp/jquery-form@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.2.0.tgz#951653fac4013a7bbec065b5101b86d575e0eca7" - integrity sha512-ji44E3Ud0S3LNXn1WJ/Aw44qAIG7EITEW1KOe46oz+/awPpbiiA4dDDNleTvO2jI2/s8mNyR0bNanP6BUsc7tw== +"@abp/jquery-form@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-2.3.0.tgz#91e088fd1861c2a6224ce127c0fe0071baec9eef" + integrity sha512-cVPFdKpgAPSsG4mxrREfmslkgVJEZI9LpHask/6vy5gE/eFKZ9t6BZg+gop7bj6co3NcjekjDxhM7c0Iq+auyA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-form "^4.2.2" -"@abp/jquery-validation-unobtrusive@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.2.0.tgz#6d39ba9f7bf026d1380796bf5dff76c8d16b42ce" - integrity sha512-SuS/dRRVz7ZR4HK/h9x0jRRVLPqXN0CPRGPdJZ1LJraXVEJ9/eDEGf1rMlHmEGt1FXXFTD01/zjisbweDE786w== +"@abp/jquery-validation-unobtrusive@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-2.3.0.tgz#18dcd10ac0d6678716b42170fca1810b23cebaab" + integrity sha512-CAR3zZ4Oxbu5MK7VO2QhZjwYW81NCEqOViKPpPzk/K2qkgphHbDpRei3XMbi+476KMhrAgQE6KzlrafWBtsdRA== dependencies: - "@abp/jquery-validation" "^2.2.0" + "@abp/jquery-validation" "^2.3.0" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.2.0.tgz#02bb8ba883e72c1204867ee4d1c1094bd91c4c4c" - integrity sha512-ypITQloO4iEDgqlA6qb3taj+7HMX0Cf/ACA2OvtrvOgJejx6J4wfrPjwuFZu1WWJ0xtc9yTdbovdcSVcQbIGaA== +"@abp/jquery-validation@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-2.3.0.tgz#af723abf5950729ef2763cecb7f5a9c5cbed0031" + integrity sha512-YvFCbvx9hWzi7BytYRBb/0tFdiibWT9CFz7vcHTrZiXjjSfZ1koh3DeXPErj091VR9X4q4nzRfCETA+0lINQbA== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" jquery-validation "^1.19.1" -"@abp/jquery@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.2.0.tgz#0e641b1109e78eff4c34331ca2b123b67cc30cbe" - integrity sha512-vEfRoFEAmDmRgSq98Y9EZExfQFSWtmjaHrodUu+MadTcRlnn+wHq8wwkKKxpj/eYtNc8aFORpyHMMH7uliAKxg== +"@abp/jquery@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-2.3.0.tgz#c17fcc3559a0285af3d6e534a5a076e99fc0ba37" + integrity sha512-376LnHco1kW6U094Tx3cbkM5y3ZAA02Lp3yrN/b0Qc1th84Xr2twix2YZG+GqcqlwdljH4ihdgpAM/ZO7REEaw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" jquery "^3.4.1" -"@abp/lodash@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.2.0.tgz#af0a2ebcb28fd0a8c02da5026479d9370ed19719" - integrity sha512-wOMLqIpuq4a7ww7pB138G6YxBiTGBgxNW/IWGUiWbfgrr88cGPKIYYv/8O8mvr8PLNGjizNynuwQRj522yA3Dw== +"@abp/lodash@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-2.3.0.tgz#20219d872db7eba372cbaea168494fa54eb1cf12" + integrity sha512-I2KKEJaGwfpCKUox32lkllLRKgP25mszJuGpj571KTsvuT0Zo6BlNov4xoy8wbHC7vZF7dvkJpiCGg2yKnxc8Q== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" lodash "^4.17.15" -"@abp/luxon@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.2.0.tgz#0d0e78edc249853fa31eceecc00df2846a879aa9" - integrity sha512-WbOW0PcMks+WXRPWt/+H4pOa5waM331WkY0F+EJx8fpxemNGQNUEXLkuMXzN3MrN6LrplM9AZ9i+NRA9PWHbNw== +"@abp/luxon@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-2.3.0.tgz#5e08cdff00682f317707d9f34da6a1fb21402914" + integrity sha512-UAbh+HyVwr+ytJpJEddHp0aRpIKQIWknvrDmcyIOaTY6ZSJPZSxJlDmIC56d094JopeRf/+E/cTMMS5bM8nmrA== dependencies: luxon "^1.21.3" -"@abp/malihu-custom-scrollbar-plugin@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.2.0.tgz#e11fd46dccbb28d44fb199e880b91d27c94f1919" - integrity sha512-YDu/NLpIzMA96NDHxd27/+liTm3sow9M+oWH29+9JW8o/AEpXUH3T3AmoXXcTgsBlzLaewgHEFM8yxsAAFoj8Q== +"@abp/malihu-custom-scrollbar-plugin@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-2.3.0.tgz#1b2535ca6f30dd49ea5ec3de283f3ac4d1d5f6a0" + integrity sha512-dCeJMRn+zHhGi1Uwg0h0ET21+sZ/Zf2trwfVJrd8bXan5bMKPRd3UtXrJlxZg3NHqVJmUiwWe2dzEHt1fexCDQ== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.2.0.tgz#4639d4e5b72b1736fa4476bd9b6a78e036400421" - integrity sha512-tc87JyM0kvVF388kyGUjDby49Zrrb089jVRRipoIaxXeu4M1YxEFSKBEcUK1MohZWjVtWrNs8MoxPlfukaMpyw== +"@abp/select2@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-2.3.0.tgz#edc5ae4655ccdf6b9ec7546dd156cda33bf907d3" + integrity sha512-s7TMBe2zUndVkfDTD0cBX/F4Fm9alA1BUx7l0b2+CmbJkdIp3YkjA4Oqsi4RinpP6/vVSYpTiTGWX4cYogbcFw== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" select2 "^4.0.12" -"@abp/sweetalert@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.2.0.tgz#dfc60ba085522d8390e41b90bf5a3d474f4ae624" - integrity sha512-HS6TKOwP91UjzjZHaheurZ1AYUSMkQyCSmoX6g5LAK4eH8IIgpojVSp1AFCSPATrFsFWY/dzkDGcfu90FWsVBg== +"@abp/sweetalert@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-2.3.0.tgz#2120b1f98e2530afc65f6c11fb7ea8d087a98777" + integrity sha512-Kq7UAOwi2sH/lxIrwoEhUCt5n8OAv17SubLWE/Ud3gWgcSw5XSmAZb13S6e78yydlV89Ny3LeYeGjqfU6nnSug== dependencies: - "@abp/core" "^2.2.0" + "@abp/core" "^2.3.0" sweetalert "^2.1.2" -"@abp/timeago@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.2.0.tgz#9a8297f36a46cdc4cc62f44d0fdc91b70def389c" - integrity sha512-8qjmKscsTvPznHKWEsddYxdSBiU+l+OgLG6vzMcSWqngYbDQGXqNA93BwJI2qiwd+FkNcfGgYg7CN7bcwzmaiw== +"@abp/timeago@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-2.3.0.tgz#79bb1019f135d3342916bb61f52f3be35914f11b" + integrity sha512-TogWr4bdFl/DsB3QLa1iOkRGmeWNPyR60buI3D+WSJGlEtbjU9L5I3cGDEWJGYOxPKU9WuqV4DiraBbq/xNGLw== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" timeago "^1.6.7" -"@abp/toastr@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.2.0.tgz#1cad83a89da244685b3c82adff64260b7ccf4742" - integrity sha512-HHfSaw4M/9zS+KgzxGvbHYiQ5qcJgpf21cRZEo16aUwnTeKr4SRaewAWryNn4dKcIO2YNrhzDLH+OYbEaJJlDQ== +"@abp/toastr@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-2.3.0.tgz#0c0201e00a8070b831a33fe9763e0fb3a1981523" + integrity sha512-MlS9KXPuo1vYW78QvJUR1CXGMq7qo2wGKRxZJEloxWTI8bg7zEZwa27LGJJmHLQacOqdhUP9c5t9D136eUhu6A== dependencies: - "@abp/jquery" "^2.2.0" + "@abp/jquery" "^2.3.0" toastr "^2.1.4" "@fortawesome/fontawesome-free@^5.11.2": From b51b26174250e3ec30e0364276c8f5632e1416f2 Mon Sep 17 00:00:00 2001 From: erolarkat Date: Thu, 19 Mar 2020 12:11:43 +0300 Subject: [PATCH 09/29] version update --- common.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.props b/common.props index 7cf44d4a2c..92d87d3d76 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ - + latest - 2.3.0 + 2.3.0 $(NoWarn);CS1591 https://abp.io/assets/abp_nupkg.png https://abp.io From 9ec86adf83d9594cefe06ade59929af6848fb45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ak=C4=B1n=20Sabri=20=C3=87am?= Date: Thu, 19 Mar 2020 12:19:58 +0300 Subject: [PATCH 10/29] refactored async method --- .../src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs index 68aef8ee4c..014088983a 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs @@ -147,7 +147,7 @@ namespace Volo.Abp.Account.Web.Pages.Account var properties = SignInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl); properties.Items["scheme"] = provider; - return Challenge(properties, provider); + return await Task.FromResult(Challenge(properties, provider)); } [UnitOfWork] From 1eee1ef81fe4ce43c6bd7cc4c772c443b1903f02 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 19 Mar 2020 12:46:56 +0300 Subject: [PATCH 11/29] Cli: Don't create "aspnet-core" folder when new project is mvc and doesn't have mobile app resolved https://github.com/abpframework/abp/issues/3206 --- .../Volo/Abp/Cli/Commands/NewCommand.cs | 6 ++++ .../Building/Steps/RemoveRootFolderStep.cs | 29 +++++++++++++++++++ .../TemplateProjectBuildPipelineBuilder.cs | 5 ++++ 3 files changed, 40 insertions(+) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveRootFolderStep.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index 51950de215..28fcf4b3f6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -135,6 +135,12 @@ namespace Volo.Abp.Cli.Commands var zipEntry = zipInputStream.GetNextEntry(); while (zipEntry != null) { + if (string.IsNullOrWhiteSpace(zipEntry.Name)) + { + zipEntry = zipInputStream.GetNextEntry(); + continue; + } + var fullZipToPath = Path.Combine(outputFolder, zipEntry.Name); var directoryName = Path.GetDirectoryName(fullZipToPath); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveRootFolderStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveRootFolderStep.cs new file mode 100644 index 0000000000..b6e8cc3852 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveRootFolderStep.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Volo.Abp.Cli.ProjectBuilding.Files; + +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps +{ + public class RemoveRootFolderStep : ProjectBuildPipelineStep + { + public override void Execute(ProjectBuildContext context) + { + foreach (var file in context.Files) + { + file.SetName(RemoveRootFolder(file.Name)); + } + } + + private string RemoveRootFolder(string fileName) + { + if (!fileName.Contains('/')) + { + return fileName; + } + + return string.Join("/", fileName.Split('/').Skip(1)); + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs index e5916f3cbc..a68de8ef62 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs @@ -23,6 +23,11 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building pipeline.Steps.Add(new LicenseCodeReplaceStep()); } + if (context.BuildArgs.UiFramework == UiFramework.Mvc && context.BuildArgs.MobileApp == MobileApp.None) + { + pipeline.Steps.Add(new RemoveRootFolderStep()); + } + pipeline.Steps.Add(new CreateProjectResultZipStep()); return pipeline; From fcf013c990c1710d6381bc54798eb633723ba7e8 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 19 Mar 2020 13:50:02 +0300 Subject: [PATCH 12/29] add-module: alternative tiered target --- .../ProjectModification/NuGetPackageInfo.cs | 2 ++ .../ProjectFileNameHelper.cs | 18 ++++++++++++++++++ .../Cli/ProjectModification/ProjectFinder.cs | 9 +-------- .../ProjectModification/SolutionModuleAdder.cs | 13 ++++++++++++- 4 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFileNameHelper.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageInfo.cs index 03c5c5493b..6bd6297384 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageInfo.cs @@ -7,5 +7,7 @@ public string ModuleClass { get; set; } public NuGetPackageTarget Target { get; set; } + + public NuGetPackageTarget TieredTarget { get; set; } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFileNameHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFileNameHelper.cs new file mode 100644 index 0000000000..2c86fe54f5 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFileNameHelper.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; + +namespace Volo.Abp.Cli.ProjectModification +{ + public static class ProjectFileNameHelper + { + + public static string GetAssemblyNameFromProjectPath(string projectFile) + { + return projectFile + .Substring(projectFile.LastIndexOf(Path.DirectorySeparatorChar) + 1) + .RemovePostFix(StringComparison.OrdinalIgnoreCase, ".csproj"); + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs index 9d155ba079..b2f5421e6e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs @@ -94,14 +94,7 @@ namespace Volo.Abp.Cli.ProjectModification public static string[] GetAssemblyNames(string[] projectFiles) { - return projectFiles.Select(GetAssemblyName).ToArray(); - } - - public static string GetAssemblyName(string projectFile) - { - return projectFile - .Substring(projectFile.LastIndexOf(Path.DirectorySeparatorChar) + 1) - .RemovePostFix(StringComparison.OrdinalIgnoreCase, ".csproj"); + return projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath).ToArray(); } private static string FindProjectEndsWith( diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index e369690785..106ce97d8c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -143,7 +143,12 @@ namespace Volo.Abp.Cli.ProjectModification { foreach (var nugetPackage in module.NugetPackages) { - var targetProjectFile = ProjectFinder.FindNuGetTargetProjectFile(projectFiles, nugetPackage.Target); + var nugetTarget = + await IsProjectTiered(projectFiles) && nugetPackage.TieredTarget != NuGetPackageTarget.Undefined + ? nugetPackage.TieredTarget + : nugetPackage.Target; + + var targetProjectFile = ProjectFinder.FindNuGetTargetProjectFile(projectFiles, nugetTarget); if (targetProjectFile == null) { Logger.LogDebug($"Target project is not available for this NuGet package '{nugetPackage.Name}'"); @@ -234,5 +239,11 @@ namespace Volo.Abp.Cli.ProjectModification return JsonSerializer.Deserialize(responseContent); } } + + protected virtual async Task IsProjectTiered(string[] projectFiles) + { + return projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath) + .Any(p => p.EndsWith(".IdentityServer") || p.EndsWith(".HttpApi.Host")); + } } } \ No newline at end of file From 65b6a76b6ebc98498816f0f2573db1f7434424fc Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 19 Mar 2020 14:34:39 +0300 Subject: [PATCH 13/29] fix build error --- .../Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectFinder_Tests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectFinder_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectFinder_Tests.cs index 5576960dfa..71d2de51fa 100644 --- a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectFinder_Tests.cs +++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectFinder_Tests.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.Cli [Fact] public void GetAssemblyName_Tests() { - var assemblyName = ProjectFinder.GetAssemblyName( + var assemblyName = ProjectFileNameHelper.GetAssemblyNameFromProjectPath( GetNormalizedPath( @"c:\temp\project\folder\src\Acme.PhoneBook.Host.csproj" ) From b23988432f283b9f484b262aaa87da576e2ed645 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Thu, 19 Mar 2020 14:46:28 +0300 Subject: [PATCH 14/29] added abp-card tag documentation --- docs/en/UI/AspNetCore/Tag-Helpers/Cards.md | 190 +++++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 docs/en/UI/AspNetCore/Tag-Helpers/Cards.md diff --git a/docs/en/UI/AspNetCore/Tag-Helpers/Cards.md b/docs/en/UI/AspNetCore/Tag-Helpers/Cards.md new file mode 100644 index 0000000000..a9531c83df --- /dev/null +++ b/docs/en/UI/AspNetCore/Tag-Helpers/Cards.md @@ -0,0 +1,190 @@ +# Cards + +## Introduction + +`abp-card` is a content container derived from bootstrap card element. + +Basic usage: + +````xml + + + + Card Title + Some quick example text to build on the card title and make up the bulk of the card's content. + Go somewhere + + +```` + + + +##### Using Titles, Text and Links: + +Following tags can be used under main `abp-card` tag + +* `abp-card-title` +* `abp-card-subtitle` +* `a abp-card-link` + +Sample: + +````xml + + + Card title + Card subtitle + Some quick example text to build on the card title and make up the bulk of the card's content. + Card link + Another link + + +```` + + + +##### Using List Groups: + +* `abp-list-group flush="true"` : `flush` attribute renders into bootstrap `list-group-flush` class which is used for removing borders and rounded corners to render list group items edge to edge in a parent container. +* `abp-list-group-item` + +Kitchen Sink Sample: + +````xml + + + + Card Title + Some quick example text to build on the card title and make up the bulk of the card's content. + + + Cras justo odio + Dapibus ac facilisis in + Vestibulum at eros + + + Card link + Another link + + +```` + + + +##### Using Header, Footer and Blockquote: + +* `abp-card-header` +* `abp-card-footer` +* `abp-blockquote` + +Sample: + +```xml + + Featured + + Special title treatment + With supporting text below as a natural lead-in to additional content. + Go somewhere + + +``` + +Quote Sample: + +```xml + + Quote + + +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+
Someone famous in Source Title
+ + + +``` + +Footer Sample: + +```xml + + Featured + + +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+
Someone famous in Source Title
+ + + 2 days ago + +``` + + + +## Demo + +See the [cards demo page](https://bootstrap-taghelpers.abp.io/Components/Cards) to see it in action. + +## abp-card Attributes + +- **background:** A value indicates the background color of the card. +- **text-color**: A value indicates the color of the text inside the card. +- **border:** A value indicates the color of the border inside the card. + +Should be one of the following values: + +* `Default` (default value) +* `Primary` +* `Secondary` +* `Success` +* `Danger` +* `Warning` +* `Info` +* `Light` +* `Dark` + +Example: + +````xml + +```` + +### sizing + +Cards has default 100% with and can be changed with custom CSS, grid classes, grid Sass mixins or [utilities](https://getbootstrap.com/docs/4.0/utilities/sizing/). + +````xml + +```` + +### card-deck and card-columns + +`abp-card` can be used inside `card-deck` or `card-columns` aswell. + +````xml +
+ + First Deck + + Ace + Here is the content for Ace. + + + + Second Deck + + Beta + Beta content. + + + + Third Deck + + Epsilon + Content for Epsilon. + + +
+```` + +### \ No newline at end of file From 9949b1352b9e390072c438f82cfbb7a26601dbdc Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Thu, 19 Mar 2020 14:48:14 +0300 Subject: [PATCH 15/29] removed empty space at the end --- docs/en/UI/AspNetCore/Tag-Helpers/Cards.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/en/UI/AspNetCore/Tag-Helpers/Cards.md b/docs/en/UI/AspNetCore/Tag-Helpers/Cards.md index a9531c83df..d7f3896cdd 100644 --- a/docs/en/UI/AspNetCore/Tag-Helpers/Cards.md +++ b/docs/en/UI/AspNetCore/Tag-Helpers/Cards.md @@ -186,5 +186,3 @@ Cards has default 100% with and can be changed with custom CSS, grid classes, gr ```` - -### \ No newline at end of file From 8722a6b2b3ba1d898f5068581fbfe26e348dfe7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 19 Mar 2020 15:43:41 +0300 Subject: [PATCH 16/29] Increment to v2.4. --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 92d87d3d76..bd6b976758 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 2.3.0 + 2.4.0 $(NoWarn);CS1591 https://abp.io/assets/abp_nupkg.png https://abp.io From f401a053a4327fa785f6c920a0e43db62171c178 Mon Sep 17 00:00:00 2001 From: Erol Arkat <46989033+erolarkat@users.noreply.github.com> Date: Thu, 19 Mar 2020 16:07:37 +0300 Subject: [PATCH 17/29] generate proxy added --- docs/en/CLI.md | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/docs/en/CLI.md b/docs/en/CLI.md index 68a5923a9f..837ba26a11 100644 --- a/docs/en/CLI.md +++ b/docs/en/CLI.md @@ -178,6 +178,29 @@ Logs you out by removing the session token from your computer. abp logout ``` +### generate-proxy + +Generates typescript service proxies and DTOs + +Basic usage: + +````bash +abp generate-proxy [options] +```` + +Example: + +````bash +abp generate-proxy --apiUrl https://localhost:44305 --ui angular --module all +```` + +#### Options + +* `--apiUrl` or `-a`: If you don't give this option, the default api url in your environment.ts file is used, but you can always use a specific api source with this option. +* `--ui` or `-u`: Specifies the UI framework. Default framework is angular. Currently there is only angular option, but we will increase the options with our new cli updates. Stay tuned! +* `--module` or `-m`: Specifies the module name. Default module name is app. If you want to all modules. You can give `--module all` command. + + ### help Writes basic usage information of the CLI. @@ -193,4 +216,4 @@ Examples: ````bash abp help # Shows a general help. abp help new # Shows help about the "new" command. -```` \ No newline at end of file +```` From cee7f461b64da3bade5a2c2e0be0dfe34209777e Mon Sep 17 00:00:00 2001 From: Arkat Erol Date: Thu, 19 Mar 2020 16:19:04 +0300 Subject: [PATCH 18/29] npm cli login removed from preview publish --- npm/preview-publish.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/npm/preview-publish.ps1 b/npm/preview-publish.ps1 index 953dda9d63..8f92022378 100644 --- a/npm/preview-publish.ps1 +++ b/npm/preview-publish.ps1 @@ -20,7 +20,6 @@ $Registry = "http://localhost:4873"; } $commands = ( - "npm-cli-login -u $User -p $Pass -e $Email -r $Registry", "cd ng-packs\scripts", "npm install", "npm run publish-packages -- --nextVersion $Version --preview", From 9181f3f8d3eef67baa6e4dd207b7b1902ee8b854 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Thu, 19 Mar 2020 16:24:08 +0300 Subject: [PATCH 19/29] feat(ci): take next version from common props --- npm/get-version.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/npm/get-version.js b/npm/get-version.js index 7f3dd79e3b..5198ee913a 100644 --- a/npm/get-version.js +++ b/npm/get-version.js @@ -1,3 +1,10 @@ -const fse = require("fs-extra"); +const fse = require('fs-extra'); -console.log(fse.readJSONSync("package.json").version); +const commonProps = fse.readFileSync('../common.props').toString(); + +const versionTag = ''; +const versionEndTag = ''; +const first = commonProps.indexOf(versionTag) + versionTag.length; +const last = commonProps.indexOf(versionEndTag); + +console.log(commonProps.substring(first, last)); From 8a0b2e31d67a53ac18ee29b86faca5a6b7c82130 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 19 Mar 2020 21:52:38 +0800 Subject: [PATCH 20/29] Translate customizing application module extending entities doc --- ...-Application-Modules-Extending-Entities.md | 147 +++++++++++++++++- 1 file changed, 146 insertions(+), 1 deletion(-) diff --git a/docs/zh-Hans/Customizing-Application-Modules-Extending-Entities.md b/docs/zh-Hans/Customizing-Application-Modules-Extending-Entities.md index ea5345f822..745861e2c3 100644 --- a/docs/zh-Hans/Customizing-Application-Modules-Extending-Entities.md +++ b/docs/zh-Hans/Customizing-Application-Modules-Extending-Entities.md @@ -1,3 +1,148 @@ # 自定义应用模块: 扩展实体 -TODO... \ No newline at end of file +在某些情况下你可能希望为依赖模块中定义的实体添加一些额外的属性(和数据库字段). 本节将介绍一些实现这一目标的不同方法. + +## Extra Properties + +[Extra properties](Entities.md)是一种存储实体的一些额外数据但不用更改实体的方式. 实体应该实现 `IHasExtraProperties` 接口. 所有预构建模块定义的聚合根实体都实现了 `IHasExtraProperties` 接口,所以你可以在这些实体中存储额外的属性. + +示例: + +````csharp +//SET AN EXTRA PROPERTY +var user = await _identityUserRepository.GetAsync(userId); +user.SetProperty("Title", "My custom title value!"); +await _identityUserRepository.UpdateAsync(user); + +//GET AN EXTRA PROPERTY +var user = await _identityUserRepository.GetAsync(userId); +return user.GetProperty("Title"); +```` + +这种方法开箱即用并且非常简单,你可以使用不同的属性名称(如这里的`Title`)在同一时间存储多个属性. + +对于EF Core额外的属性被格式化成单个 `JSON` 字符值串存储在数据库中. 对于MongoDB它们做为单独的字段存储. + +参阅[实体文档](Entities.md)了解更多关于额外系统. + +> 可以基于额外的属性执行**业务逻辑**. 你可以**override**服务方法获取或设置值. 重写服务在下面进行讨论. + +## 创建新实体映射到同一个数据库表/Collection + +尽管额外属性方法**易于使用**并且适用于一些场景,但它具有[实体文档](Entities.md)中描述的一些缺点. + +另一个方法是**创建你自己的实体**映射到**同一个数据库库**(对于MongoDB数据库是collection) + +[应用程序启动模板](Startup-Templates/Application.md)的 `AppUser` 已经实现了这种方法. [EF Core迁移文档](Entity-Framework-Core-Migrations.md)描述了在这些情况下如何实现和管理**EF Core数据库迁移**. 这种方法同样适用于MongoDB,但你不需要处理数据库迁移问题. + +## 创建一个拥有自己数据库表/Collection的新实体 + +映射你的实体到依赖模块的**已存在的表**有一些缺点; + +* 你需要处理EF Core的**数据库迁移架构**. 需要特别注意迁移代码,特别是当你需要在实体间添加**关系**时. +* 你的应用程序数据库和模块数据库将是 **同一个物理数据库**. 通常需要时可以将模块数据库分开,但使用相同的表会对其进行限制. + +如果你想要使你的实体或模块定义的实体**低耦合**,那么可以创建自己的数据库表/collection并且将你的实体映射到自己的数据库表. + +在这种情况下你需要处理**同步问题**,尤其是你要**复制**相关实体的某些属性/字段时,有一些解决方案; + +* 如果你构建的是一个 **单体** 应用程序(或者在同一进程管理你的实体和依赖模块的实体),那么你可以使用[本地事件总线](Local-Event-Bus.md)监听实体更改. +* 如果你构建的是一个 **分布式** 系统,模块的实体和你的实体在不同的 进程/服务 管理(创建/更新/删除),那么你可以使用[分布式事件总线](Distributed-Event-Bus.md)订阅实体的更改事件. + +在你处理事件时,你可以在自己的数据库中更改自己的实体. + +### 订阅本地事件总线 + +[本地事件总线](Local-Event-Bus.md)系统是发布和订阅同一应用程序中发生的事件的方法. + +假设你想要获取 `IdentityUser` 实体的更改信息(创建,更改或删除). 你可以创建一个类实现 `ILocalEventHandler>` 接口. + +````csharp +public class MyLocalIdentityUserChangeEventHandler : + ILocalEventHandler>, + ITransientDependency +{ + public async Task HandleEventAsync(EntityChangedEventData eventData) + { + var userId = eventData.Entity.Id; + var userName = eventData.Entity.UserName; + //... + } +} +```` + +* `EntityChangedEventData` 涵盖了给定实体的创建,更新或删除事件. 如果你需要你可以分别订阅创建,更新或删除事件(在同一个类或不同的类中). +* 这里的代码在**本地事务之外执行**,因为它监听 `EntityChanged` 事件. 如果当前[工作单元](Unit-Of-Work.md)是事务性的,你可以订阅 `EntityChangingEventData` 事件,它在**同一本地(进行)事务**中执行事件处理. + +> 提醒:这些方法需要在包含处理类的同一进程中更改 `IdentityUser` 实体. 即使在集群环境(同一应用程序的多个实例在不同的服务器进行),它也完美工作. + +### 订阅分布式事件总线 + +[分布式事件总线](Distributed-Event-Bus.md)是在一个应用程序中发布事件,并在相同服务器或不同服务器运行的相同应用程序或不同应用程序中接收事件的方法. + +假设你想要获取 `IdentityUser` 实体的创建,更改或删除信息. 你可以像以下一样创建一个类: + +````csharp +public class MyDistributedIdentityUserChangeEventHandler : + IDistributedEventHandler>, + IDistributedEventHandler>, + IDistributedEventHandler>, + ITransientDependency +{ + public async Task HandleEventAsync(EntityCreatedEto eventData) + { + if (eventData.Entity.EntityType == "Volo.Abp.Identity.IdentityUser") + { + var userId = Guid.Parse(eventData.Entity.KeysAsString); + //...handle the "created" event + } + } + + public async Task HandleEventAsync(EntityUpdatedEto eventData) + { + if (eventData.Entity.EntityType == "Volo.Abp.Identity.IdentityUser") + { + var userId = Guid.Parse(eventData.Entity.KeysAsString); + //...handle the "updated" event + } + } + + public async Task HandleEventAsync(EntityDeletedEto eventData) + { + if (eventData.Entity.EntityType == "Volo.Abp.Identity.IdentityUser") + { + var userId = Guid.Parse(eventData.Entity.KeysAsString); + //...handle the "deleted" event + } + } +} +```` + +* 它实现了多个 `IDistributedEventHandler` 接口: **创建**,**更改**和**删除**,因为分布式事件总线单独发布事件,没有本地事件总线那样的"Changed"事件. +* 它订阅了 `EntityEto`, 这是一个通用的事件类,ABP框架针对所有类型的实体**自动发布**. 这就是为什么它检查**实体类型**(因为我们没有假设有对 `IdentityUser` 实体有安全的类型引用,所以它是字符串类型的). + +预构建应用模块没有定义专门的事件类型(如`IdentityUserEto` - "ETO" 意思是 "事件传输对象"). 此功能在路线图上([关注这个issue](https://github.com/abpframework/abp/issues/3033)),一旦完成后,你就可以订阅独立的实体类型: + +````csharp +public class MyDistributedIdentityUserCreatedEventHandler : + IDistributedEventHandler>, + ITransientDependency +{ + public async Task HandleEventAsync(EntityCreatedEto eventData) + { + var userId = eventData.Entity.Id; + var userName = eventData.Entity.UserName; + //...handle the "created" event + } + + //... +} +```` + +* 这个处理程序只会在新用户创建时执行. + +> 唯一预定义的专门事件类是 `UserEto`, 你可以订阅 `EntityCreatedEto` 获取用户创建时的通知. 此事件也适用于身份模块. + +## 另请参阅 + +* [自定义已存在的模块](Customizing-Application-Modules-Guide.md) \ No newline at end of file From 09b3f461deb1cf2d5174ae19ec2c27653becf562 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 19 Mar 2020 22:09:36 +0800 Subject: [PATCH 21/29] Update CLI.md --- docs/zh-Hans/CLI.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/zh-Hans/CLI.md b/docs/zh-Hans/CLI.md index c65312e0d5..ab1eba8fe7 100644 --- a/docs/zh-Hans/CLI.md +++ b/docs/zh-Hans/CLI.md @@ -59,6 +59,7 @@ abp new Acme.BookStore * `--output-folder` 或者 `-o`: 指定输出文件夹,默认是当前目录. * `--version` 或者 `-v`: 指定ABP和模板的版本.它可以是 [release tag](https://github.com/abpframework/abp/releases) 或者 [branch name](https://github.com/abpframework/abp/branches). 如果没有指定,则使用最新版本.大多数情况下,您会希望使用最新的版本. * `--template-source` 或者 `-ts`: 指定自定义模板源用于生成项目,可以使用本地源和网络源(例如 `D\localTemplate` 或 `https://.zip`). +* `--create-solution-folder` 或者 `-csf`: 指定项目是在输出文件夹中的新文件夹中还是直接在输出文件夹中. ### add-package @@ -171,6 +172,28 @@ abp login abp logout ``` +### generate-proxy + +生成typescript服务和DTO代理 + +基本用法: + +````bash +abp generate-proxy [options] +```` + +示例: + +````bash +abp generate-proxy --apiUrl https://localhost:44305 --ui angular --module all +```` + +#### Options + +* `--apiUrl` 或者 `-a`：如果未指定这个选项,默认使用你的environment.ts文件的API URL, 你可以随时使用这个选项指定API源. +* `--ui` 或者 `-u`: 指定UI框架,默认框架是angular.当前只有angular一个选项, 但我们会通过更改CLI增加新的选项. 尽请关注! +* `--module` 或者 `-m`：指定模块名. 默认模块名称为app. 如果你想所有模块,你可以指定 `--module all` 命令. + ### help CLI的基本用法信息. From d72dbb994ef4e0defa6f0dfb4f60490c221bd6d6 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Thu, 19 Mar 2020 17:28:55 +0300 Subject: [PATCH 22/29] refactor CLI new command for tiered option --- .../Volo/Abp/Cli/Commands/NewCommand.cs | 26 ++++++++++++------- .../ProjectBuilding/TemplateProjectBuilder.cs | 4 +-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index 28fcf4b3f6..3afc32ec4d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -55,6 +55,12 @@ namespace Volo.Abp.Cli.Commands Logger.LogInformation("Version: " + version); } + var isTiered = commandLineArgs.Options.ContainsKey(Options.Tiered.Long); + if (isTiered) + { + Logger.LogInformation("Tiered: yes"); + } + var databaseProvider = GetDatabaseProvider(commandLineArgs); if (databaseProvider != DatabaseProvider.NotSpecified) { @@ -96,14 +102,9 @@ namespace Volo.Abp.Cli.Commands var outputFolderRoot = outputFolder != null ? Path.GetFullPath(outputFolder) : Directory.GetCurrentDirectory(); - if (createSolutionFolder) - { - outputFolder = Path.Combine(outputFolderRoot, SolutionName.Parse(projectName).FullName); - } - else - { - outputFolder = outputFolderRoot; - } + outputFolder = createSolutionFolder ? + Path.Combine(outputFolderRoot, SolutionName.Parse(projectName).FullName) : + outputFolderRoot; if (!Directory.Exists(outputFolder)) { @@ -232,7 +233,7 @@ namespace Volo.Abp.Cli.Commands } } - private UiFramework GetUiFramework(CommandLineArgs commandLineArgs) + protected virtual UiFramework GetUiFramework(CommandLineArgs commandLineArgs) { var optionValue = commandLineArgs.Options.GetOrNull(Options.UiFramework.Short, Options.UiFramework.Long); switch (optionValue) @@ -248,7 +249,7 @@ namespace Volo.Abp.Cli.Commands } } - private MobileApp GetMobilePreference(CommandLineArgs commandLineArgs) + protected virtual MobileApp GetMobilePreference(CommandLineArgs commandLineArgs) { var optionValue = commandLineArgs.Options.GetOrNull(Options.Mobile.Short, Options.Mobile.Long); switch (optionValue) @@ -316,6 +317,11 @@ namespace Volo.Abp.Cli.Commands public const string Short = "csf"; public const string Long = "create-solution-folder"; } + + public static class Tiered + { + public const string Long = "tiered"; + } } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs index f7d9eaf3be..6d3fa4b7b8 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs @@ -82,7 +82,7 @@ namespace Volo.Abp.Cli.ProjectBuilding // Exclude unwanted or known options. var options = args.ExtraProperties .Where(x => !x.Key.Equals(CliConsts.Command, StringComparison.InvariantCultureIgnoreCase)) - .Where(x => !x.Key.Equals("tiered", StringComparison.InvariantCultureIgnoreCase)) + .Where(x => !x.Key.Equals(NewCommand.Options.Tiered.Long, StringComparison.InvariantCultureIgnoreCase)) .Where(x => !x.Key.Equals(NewCommand.Options.DatabaseProvider.Long, StringComparison.InvariantCultureIgnoreCase) && !x.Key.Equals(NewCommand.Options.DatabaseProvider.Short, StringComparison.InvariantCultureIgnoreCase)) .Where(x => !x.Key.Equals(NewCommand.Options.OutputFolder.Long, StringComparison.InvariantCultureIgnoreCase) && @@ -102,7 +102,7 @@ namespace Volo.Abp.Cli.ProjectBuilding Tool = Options.ToolName, Command = args.ExtraProperties.ContainsKey(CliConsts.Command) ? args.ExtraProperties[CliConsts.Command] : "", DatabaseProvider = args.DatabaseProvider.ToProviderName(), - IsTiered = args.ExtraProperties.ContainsKey("tiered"), + IsTiered = args.ExtraProperties.ContainsKey(NewCommand.Options.Tiered.Long), UiFramework = args.UiFramework.ToFrameworkName(), Options = JsonSerializer.Serialize(options), ProjectName = args.SolutionName.FullName, From d5c0c8c278f0d54dea5add70c122b57d044980c8 Mon Sep 17 00:00:00 2001 From: Arkat Erol Date: Thu, 19 Mar 2020 17:54:20 +0300 Subject: [PATCH 23/29] preview npm publish version create changed --- npm/preview-publish.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/preview-publish.ps1 b/npm/preview-publish.ps1 index 8f92022378..b1e5d8abe1 100644 --- a/npm/preview-publish.ps1 +++ b/npm/preview-publish.ps1 @@ -8,7 +8,7 @@ param( npm install -$NextVersion = $(node get-version.js) + '-preview' + (Get-Date).tostring("yyyyMMdd") +$NextVersion = $(node get-version.js) $rootFolder = (Get-Item -Path "./" -Verbose).FullName if(-Not $Version) { From 36991b91223706ede49a0055458e229951d03694 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Thu, 19 Mar 2020 19:10:33 +0300 Subject: [PATCH 24/29] fixes volosoft/volo#1559 --- .../Cli/ProjectBuilding/TemplateProjectBuilder.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs index 6d3fa4b7b8..924fdaf2c9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs @@ -8,6 +8,7 @@ using Volo.Abp.Cli.Commands; using Volo.Abp.Cli.Licensing; using Volo.Abp.Cli.ProjectBuilding.Analyticses; using Volo.Abp.Cli.ProjectBuilding.Building; +using Volo.Abp.Cli.ProjectBuilding.Templates.App; using Volo.Abp.DependencyInjection; using Volo.Abp.Json; @@ -55,9 +56,16 @@ namespace Volo.Abp.Cli.ProjectBuilding ); var apiKeyResult = await ApiKeyService.GetApiKeyOrNullAsync(); - if (apiKeyResult?.ApiKey != null) + if (apiKeyResult != null) { - args.ExtraProperties["api-key"] = apiKeyResult.ApiKey; + if (apiKeyResult.ApiKey != null) + { + args.ExtraProperties["api-key"] = apiKeyResult.ApiKey; + } + else if (templateInfo.Name == AppProTemplate.TemplateName) + { + throw new UserFriendlyException(apiKeyResult.ErrorMessage); + } } if (apiKeyResult?.LicenseCode != null) From d934a7fc214f570f645bf5c95dc52ca073274208 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Thu, 19 Mar 2020 19:11:38 +0300 Subject: [PATCH 25/29] Refactor AbpIoSourceCodeStore --- .../ProjectBuilding/AbpIoSourceCodeStore.cs | 91 ++++++++++++------- 1 file changed, 56 insertions(+), 35 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs index 263b675a2a..1ffdefbe61 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs @@ -94,36 +94,48 @@ namespace Volo.Abp.Cli.ProjectBuilding private async Task GetLatestSourceCodeVersionAsync(string name, string type) { - using (var client = new CliHttpClient()) + var url = $"{CliUrls.WwwAbpIo}api/download/{type}/get-version/"; + + try { - var response = await client.PostAsync( - $"{CliUrls.WwwAbpIo}api/download/{type}/get-version/", - new StringContent( - JsonSerializer.Serialize( - new GetLatestSourceCodeVersionDto { Name = name } + using (var client = new CliHttpClient(TimeSpan.FromMinutes(10))) + { + var response = await client.PostAsync( + url, + new StringContent( + JsonSerializer.Serialize( + new GetLatestSourceCodeVersionDto { Name = name } + ), + Encoding.UTF8, + MimeTypes.Application.Json ), - Encoding.UTF8, - MimeTypes.Application.Json - ), - CancellationTokenProvider.Token - ); + CancellationTokenProvider.Token + ); - await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response); + await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response); - var result = await response.Content.ReadAsStringAsync(); + var result = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(result).Version; + return JsonSerializer.Deserialize(result).Version; + } + } + catch (Exception ex) + { + Console.WriteLine("Error occured while getting the latest version from {0} : {1}", url, ex.Message); + throw; } } private async Task GetTemplateNugetVersionAsync(string name, string type, string version) { + var url = $"{CliUrls.WwwAbpIo}api/download/{type}/get-nuget-version/"; + try { using (var client = new CliHttpClient(TimeSpan.FromMinutes(10))) { var response = await client.PostAsync( - $"{CliUrls.WwwAbpIo}api/download/{type}/get-nuget-version/", + url, new StringContent( JsonSerializer.Serialize( new GetTemplateNugetVersionDto { Name = name, Version = version } @@ -141,40 +153,49 @@ namespace Volo.Abp.Cli.ProjectBuilding return JsonSerializer.Deserialize(result).Version; } } - catch (Exception) + catch (Exception ex) { + Console.WriteLine("Error occured while getting the NuGet version from {0} : {1}", url, ex.Message); return null; } } private async Task DownloadSourceCodeContentAsync(SourceCodeDownloadInputDto input) { - var postData = JsonSerializer.Serialize(input); + var url = $"{CliUrls.WwwAbpIo}api/download/{input.Type}/"; - using (var client = new CliHttpClient(TimeSpan.FromMinutes(10))) + try { - HttpResponseMessage responseMessage; - - if (input.TemplateSource.IsNullOrWhiteSpace()) - { - responseMessage = await client.PostAsync( - $"{CliUrls.WwwAbpIo}api/download/{input.Type}/", - new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json), - CancellationTokenProvider.Token - ); - } - else + using (var client = new CliHttpClient(TimeSpan.FromMinutes(10))) { - responseMessage = await client.GetAsync(input.TemplateSource, CancellationTokenProvider.Token); + HttpResponseMessage responseMessage; + + if (input.TemplateSource.IsNullOrWhiteSpace()) + { + responseMessage = await client.PostAsync( + url, + new StringContent(JsonSerializer.Serialize(input), Encoding.UTF8, MimeTypes.Application.Json), + CancellationTokenProvider.Token + ); + } + else + { + responseMessage = await client.GetAsync(input.TemplateSource, CancellationTokenProvider.Token); + } + + await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage); + + return await responseMessage.Content.ReadAsByteArrayAsync(); } - - await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage); - - return await responseMessage.Content.ReadAsByteArrayAsync(); + } + catch (Exception ex) + { + Console.WriteLine("Error occured while downloading source-code from {0} : {1}", url, ex.Message); + throw; } } - private bool IsNetworkSource(string source) + private static bool IsNetworkSource(string source) { return source.ToLower().StartsWith("http"); } From 5ff6a7e1b70878268868f974d33e43f00bdd0692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 19 Mar 2020 19:21:30 +0300 Subject: [PATCH 26/29] Added blog post: ABP Framework v2.3.0 Has Been Released --- .../2020-03-19 v2_3_Release/Post.md | 142 ++++++++++++++++++ .../2020-03-19 v2_3_Release/mobile-ui.png | Bin 0 -> 56841 bytes 2 files changed, 142 insertions(+) create mode 100644 docs/en/Blog-Posts/2020-03-19 v2_3_Release/Post.md create mode 100644 docs/en/Blog-Posts/2020-03-19 v2_3_Release/mobile-ui.png diff --git a/docs/en/Blog-Posts/2020-03-19 v2_3_Release/Post.md b/docs/en/Blog-Posts/2020-03-19 v2_3_Release/Post.md new file mode 100644 index 0000000000..a1d1623988 --- /dev/null +++ b/docs/en/Blog-Posts/2020-03-19 v2_3_Release/Post.md @@ -0,0 +1,142 @@ +# ABP Framework v2.3.0 Has Been Released + +In the days of **coronavirus**, we have a good news: We've released **ABP Framework v2.3** and this post will explain **what's new** with this release and **what we've done** in the last two weeks. + +## About the Coronavirus & Our Team + +**We are very sad** about the coronavirus case. As [Volosoft](https://volosoft.com/) team, we have **remote workers** working in their home in different countries. Beginning from the last week, we've **completely started to work remotely** from home including our main office employees. + +We believe in and pray for that the World will overcome this issue in a short time. + +## About the Release Cycle + +Beginning from the ABP v2.1.0, we have started to release feature versions once **in two weeks**, on Thursdays. This is the 3rd release after that decision and we see that it works fine for now and improved our agility. + +We will continue to release **feature versions** (like v2.4, v2.5) in every two weeks. In addition, we may release **hotfix versions** (like v2.3.1, v2.3.2) whenever needed. + +## What's New in ABP Framework v2.3.0 + +We've completed & merged **[104](https://github.com/abpframework/abp/milestone/30?closed=1) issues and pull requests** with **393 commits** in this two weeks development period. + +I will introduce some new features and enhancements introduced with this release. + +### React Native Mobile Application + +We have finally completed the **react native mobile application**. It currently allows you to **login**, manage your **users** and **tenants**. It utilizes the same setting, authorization and localization systems of the ABP Framework. + +A few screenshots from the application: + +![mobile-ui](mobile-ui.png) + +It doesn't have much functionality but it is a **perfect starting point** for your own mobile application since it is completely integrated to the backend. + +### Angular TypeScript Proxy Generator + +It is common to call a REST endpoint in the server from our Angular applications. In this case, we generally create **services** (those have methods for each service method on he server side) and **model objects** (matches to [DTOs](https://docs.abp.io/en/abp/latest/Data-Transfer-Objects) in the server side). + +In addition to manually creating such server-interacting services, we could use tools like [NSWAG](https://github.com/RicoSuter/NSwag) to generate service proxies for us. But NSWAG has the following problems we've experienced: + +* It generates a **big, single** .ts file which has some problems; + * It get **too large** when your application grows. + * It doesn't fit into the **[modular](https://docs.abp.io/en/abp/latest/Module-Development-Basics) approach** of the ABP framework. +* It creates a bit **ugly code**. We want to have a clean code (just like if we write manually). +* It can not generate the same **method signature** declared in the server side (because swagger.json doesn't exactly reflect the method signature of the backend service). We've created an endpoint that exposes server side method contacts to allow clients generate a better aligned client proxies. + +So, we've decided to create an ABP CLI command to automatically generate the typescript client proxies ([#2222](https://github.com/abpframework/abp/issues/2222)) for your REST API developed with the ABP Framework. + +It is easy to use. Just run the following command in the **root folder** of the angular application: + +````bash +abp generate-proxy +```` + +It only creates proxies only for your own application's services. It doesn't create proxies for the services of the application modules you're using (by default). There are several options. See the [CLI documentation](https://docs.abp.io/en/abp/latest/CLI). + +### CRUD Application Services for Entities with Composite Keys + +` CrudAppService ` is a useful base class to create CRUD application services for your entities. But it doesn't support entities with **composite primary keys**. `AbstractKeyCrudAppService` is the new base class that is developed to support entities with composite primary keys. See [the documentation](https://docs.abp.io/en/abp/latest/Application-Services#abstractkeycrudappservice) for more. + +### Add Source Code of the Modules + +The application startup template comes with some [application modules](https://docs.abp.io/en/abp/latest/Modules/Index) **pre-installed** as **NuGet & NPM packages**. This have a few important advantages: + +* You can **easily [upgrade](https://docs.abp.io/en/abp/latest/CLI#update)** these modules when a new version is available. +* Your solution becomes **cleaner**, so you can focus on your own code. + +However, when you need to make **major customizations** for a depended module, it is not easy as its source code is in your applications. To solve this problem, we've introduces a new command to the [ABP CLI](https://docs.abp.io/en/abp/latest/CLI) that **replaces** NuGet packages with their **source code** in your solution. The usage is simple: + +````bash +abp add-module --with-source-code +```` + +This command adds a module with source code or replaces with its source code if it is already added as package references. + +> It is suggested to **save your changes** to your source control system before using this command since it makes a lot of changes in your source code. + +In addition, we've documented how to customize depended modules without changing their source code (see the section below). It is suggested to use modules as packages to easily upgrade them in the future. + +> Source code of the free modules are licensed under **MIT**, so you can freely change them and add into your solution. + +### Switch to Preview + +ABP Framework is rapidly evolving and we are frequently releasing new versions. However, if you want to follow it closer, you can use the **daily preview packages**. + +We've created an ABP CLI command to easily **update to the latest preview packages** for your solution. Run the following command in the root folder of your solution: + +````bash +abp switch-to-preview +```` + +It will change the versions of all ABP related NuGet and NPM packages. You can **switch back to the latest stable** when you want: + +````bash +abp switch-to-stable +```` + +See the [ABP CLI document](https://docs.abp.io/en/abp/latest/CLI#switch-to-preview) fore more. + +### Documentation Improvements + +#### Extending/Customizing Depended Application Modules + +We've created a huge documentation that explains how to customize a depended module without changing its source code. See [the documentation](https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Guide). + +In addition to the documentation, we've revised all the modules ([#3166](https://github.com/abpframework/abp/issues/3166)) to make their services easily extensible & customizable. + +#### EF Core Migration Guide + +We've recently created a guide to explain the migration system that is used by the ABP startup templates. [This guide](https://docs.abp.io/en/abp/latest/Entity-Framework-Core-Migrations) also explains how to customize the migration structure, split your modules across multiple databases, reusing a module's table and son on. + +#### Migration from the ASP.NET Boilerplate + +If you have a solution built on the ASP.NET Boilerplate, we've [created a guide](https://docs.abp.io/en/abp/latest/AspNet-Boilerplate-Migration-Guide) that tries to help you if you want to migrate your solution to the new ABP Framework. + +### Some Other Features + +#### The Framework + +* Add `IRepository.GetAsync` and `IRepository.FindAsync` methods ([#3184](https://github.com/abpframework/abp/issues/3148)). + +#### Modules + +* Get password & email address of the admin while creating a new tenant, for the tenant management module ([#3088](https://github.com/abpframework/abp/issues/3088)). +* Elastic search integrated full text search for the docs module ([#2901](https://github.com/abpframework/abp/pull/2901)). +* New Quartz background worker module ([#2762](https://github.com/abpframework/abp/issues/2762)) + +#### Samples + +* Add multi-tenancy support to the microservice demo ([#3032](https://github.com/abpframework/abp/pull/3032)). + +See [the release notes](https://github.com/abpframework/abp/releases/tag/2.3.0) for all feature, enhancement and bugfixes. + +## What's Next? + +We have the following goals for the next few months: + +* Complete the documentation and samples, write more tutorials. +* Make the framework and existing modules more customizable and extensible. +* Integrate to gRPC & implement gRPC endpoint for pre-built modules ([#2882](https://github.com/abpframework/abp/issues/2882)). +* Create a Blazor UI for the ABP Framework & implement it for all the modules and startup templates ([#394](https://github.com/abpframework/abp/issues/394)). +* Add new features to pre-built modules and create new modules for the [ABP Commercial](https://commercial.abp.io/). + +See [the GitHub milestones](https://github.com/abpframework/abp/milestones) for details. \ No newline at end of file diff --git a/docs/en/Blog-Posts/2020-03-19 v2_3_Release/mobile-ui.png b/docs/en/Blog-Posts/2020-03-19 v2_3_Release/mobile-ui.png new file mode 100644 index 0000000000000000000000000000000000000000..ba16f6af1d45eef3e161d331dd45ba47a62f055e GIT binary patch literal 56841 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 Date: Thu, 19 Mar 2020 19:33:12 +0300 Subject: [PATCH 27/29] Update CLI.md --- docs/en/CLI.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/en/CLI.md b/docs/en/CLI.md index 837ba26a11..2b4864efc7 100644 --- a/docs/en/CLI.md +++ b/docs/en/CLI.md @@ -22,7 +22,7 @@ dotnet tool update -g Volo.Abp.Cli Generates a new solution based on the ABP [startup templates](Startup-Templates/Index.md). -Basic usage: +Usage: ````bash abp new [options] @@ -94,7 +94,7 @@ Adds a [multi-package application module](Modules/Index) to a solution by findin > A business module generally consists of several packages (because of layering, different database provider options or other reasons). Using `add-module` command dramatically simplifies adding a module to a solution. However, each module may require some additional configurations which is generally indicated in the documentation of the related module. -Basic usage: +Usage ````bash abp add-module [options] @@ -180,26 +180,26 @@ abp logout ### generate-proxy -Generates typescript service proxies and DTOs +Generates client proxies for your HTTP APIs to make easy to consume your services from the client side. -Basic usage: +Usage: ````bash abp generate-proxy [options] ```` -Example: +#### Options + +* `--apiUrl` or `-a`: Specifies the root URL of the HTTP API. The default value is retrieved from the `environment.ts` file for an Angular application. +* `--ui` or `-u`: Specifies the UI framework. Default value is `angular` and it is the only UI framework supported for now. Creates TypeScript code. +* `--module` or `-m`: Specifies the module name. Default module name is `app`, which indicates your own application (you typically want this since every module is responsible to maintain its own client proxies). Set `all` for to generate proxies for all the modules. + +Example usage with the options: ````bash abp generate-proxy --apiUrl https://localhost:44305 --ui angular --module all ```` -#### Options - -* `--apiUrl` or `-a`: If you don't give this option, the default api url in your environment.ts file is used, but you can always use a specific api source with this option. -* `--ui` or `-u`: Specifies the UI framework. Default framework is angular. Currently there is only angular option, but we will increase the options with our new cli updates. Stay tuned! -* `--module` or `-m`: Specifies the module name. Default module name is app. If you want to all modules. You can give `--module all` command. - ### help From a438ba61745ece5d75d9be33132b6dbf8e031d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=87otur?= Date: Thu, 19 Mar 2020 20:15:59 +0300 Subject: [PATCH 28/29] etos' added --- .../Volo/Docs/Documents/DocumentEto.cs | 40 +++++++++++++++++++ .../Volo/Docs/Projects/ProjectEto.cs | 29 ++++++++++++++ .../Volo.Docs.Domain/Volo.Docs.Domain.csproj | 1 + .../Volo/Docs/DocsDomainMappingProfile.cs | 15 +++++++ .../Volo/Docs/DocsDomainModule.cs | 15 +++++++ 5 files changed, 100 insertions(+) create mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentEto.cs create mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/ProjectEto.cs create mode 100644 modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentEto.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentEto.cs new file mode 100644 index 0000000000..342ad59bcb --- /dev/null +++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentEto.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; + +namespace Volo.Docs.Documents +{ + public class DocumentEto + { + public Guid Id { get; set; } + + public Guid ProjectId { get; set; } + + public string Name { get; set; } + + public string Version { get; set; } + + public string LanguageCode { get; set; } + + public string FileName { get; set; } + + public string Content { get; set; } + + public string Format { get; set; } + + public string EditLink { get; set; } + + public string RootUrl { get; set; } + + public string RawRootUrl { get; set; } + + public string LocalDirectory { get; set; } + + public DateTime CreationTime { get; set; } + + public DateTime LastUpdatedTime { get; set; } + + public DateTime? LastSignificantUpdateTime { get; set; } + + public DateTime LastCachedTime { get; set; } + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/ProjectEto.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/ProjectEto.cs new file mode 100644 index 0000000000..110e497b43 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/ProjectEto.cs @@ -0,0 +1,29 @@ +using System; + +namespace Volo.Docs.Projects +{ + public class ProjectEto + { + public Guid Id { get; set; } + + public string Name { get; set; } + + public string ShortName { get; set; } + + public string Format { get; set; } + + public string DefaultDocumentName { get; set; } + + public string NavigationDocumentName { get; set; } + + public string ParametersDocumentName { get; set; } + + public string MinimumVersion { get; set; } + + public string DocumentStoreType { get; set; } + + public string MainWebsiteUrl { get; set; } + + public string LatestVersionBranchName { get; set; } + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj index c2540754a3..3fc2eafb9d 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj @@ -25,6 +25,7 @@ + diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs new file mode 100644 index 0000000000..74f7224ea6 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs @@ -0,0 +1,15 @@ +using AutoMapper; +using Volo.Docs.Documents; +using Volo.Docs.Projects; + +namespace Volo.Docs +{ + public class DocsDomainMappingProfile : Profile + { + public DocsDomainMappingProfile() + { + CreateMap(); + CreateMap(); + } + } +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs index ba2ee6018d..f392ca8875 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs @@ -2,7 +2,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp; +using Volo.Abp.AutoMapper; using Volo.Abp.Domain; +using Volo.Abp.EventBus.Distributed; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.Threading; @@ -12,6 +14,7 @@ using Volo.Docs.Documents.FullSearch.Elastic; using Volo.Docs.FileSystem.Documents; using Volo.Docs.GitHub.Documents; using Volo.Docs.Localization; +using Volo.Docs.Projects; namespace Volo.Docs { @@ -23,6 +26,18 @@ namespace Volo.Docs { public override void ConfigureServices(ServiceConfigurationContext context) { + Configure(options => + { + options.EtoMappings.Add(); + options.EtoMappings.Add(); + }); + + + Configure(options => + { + options.AddProfile(validate: true); + }); + Configure(options => { options.FileSets From 08f89512538ff49a0cb13e9b916874f38d7d2be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=87otur?= Date: Thu, 19 Mar 2020 20:17:40 +0300 Subject: [PATCH 29/29] Revert "etos' added" This reverts commit a438ba61745ece5d75d9be33132b6dbf8e031d45. --- .../Volo/Docs/Documents/DocumentEto.cs | 40 ------------------- .../Volo/Docs/Projects/ProjectEto.cs | 29 -------------- .../Volo.Docs.Domain/Volo.Docs.Domain.csproj | 1 - .../Volo/Docs/DocsDomainMappingProfile.cs | 15 ------- .../Volo/Docs/DocsDomainModule.cs | 15 ------- 5 files changed, 100 deletions(-) delete mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentEto.cs delete mode 100644 modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/ProjectEto.cs delete mode 100644 modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentEto.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentEto.cs deleted file mode 100644 index 342ad59bcb..0000000000 --- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentEto.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Volo.Docs.Documents -{ - public class DocumentEto - { - public Guid Id { get; set; } - - public Guid ProjectId { get; set; } - - public string Name { get; set; } - - public string Version { get; set; } - - public string LanguageCode { get; set; } - - public string FileName { get; set; } - - public string Content { get; set; } - - public string Format { get; set; } - - public string EditLink { get; set; } - - public string RootUrl { get; set; } - - public string RawRootUrl { get; set; } - - public string LocalDirectory { get; set; } - - public DateTime CreationTime { get; set; } - - public DateTime LastUpdatedTime { get; set; } - - public DateTime? LastSignificantUpdateTime { get; set; } - - public DateTime LastCachedTime { get; set; } - } -} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/ProjectEto.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/ProjectEto.cs deleted file mode 100644 index 110e497b43..0000000000 --- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/ProjectEto.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; - -namespace Volo.Docs.Projects -{ - public class ProjectEto - { - public Guid Id { get; set; } - - public string Name { get; set; } - - public string ShortName { get; set; } - - public string Format { get; set; } - - public string DefaultDocumentName { get; set; } - - public string NavigationDocumentName { get; set; } - - public string ParametersDocumentName { get; set; } - - public string MinimumVersion { get; set; } - - public string DocumentStoreType { get; set; } - - public string MainWebsiteUrl { get; set; } - - public string LatestVersionBranchName { get; set; } - } -} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj index 3fc2eafb9d..c2540754a3 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj @@ -25,7 +25,6 @@ - diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs deleted file mode 100644 index 74f7224ea6..0000000000 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs +++ /dev/null @@ -1,15 +0,0 @@ -using AutoMapper; -using Volo.Docs.Documents; -using Volo.Docs.Projects; - -namespace Volo.Docs -{ - public class DocsDomainMappingProfile : Profile - { - public DocsDomainMappingProfile() - { - CreateMap(); - CreateMap(); - } - } -} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs index f392ca8875..ba2ee6018d 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs @@ -2,9 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp; -using Volo.Abp.AutoMapper; using Volo.Abp.Domain; -using Volo.Abp.EventBus.Distributed; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.Threading; @@ -14,7 +12,6 @@ using Volo.Docs.Documents.FullSearch.Elastic; using Volo.Docs.FileSystem.Documents; using Volo.Docs.GitHub.Documents; using Volo.Docs.Localization; -using Volo.Docs.Projects; namespace Volo.Docs { @@ -26,18 +23,6 @@ namespace Volo.Docs { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => - { - options.EtoMappings.Add(); - options.EtoMappings.Add(); - }); - - - Configure(options => - { - options.AddProfile(validate: true); - }); - Configure(options => { options.FileSets