Browse Source
Merge pull request #18617 from abpframework/auto-merge/rel-8-0/2398
Merge branch dev with rel-8.0
pull/18637/head
maliming
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
10 additions and
9 deletions
-
npm/ng-packs/packages/core/package.json
-
npm/ng-packs/packages/core/src/lib/core.module.ts
-
npm/ng-packs/packages/oauth/package.json
|
|
@ -7,10 +7,9 @@ |
|
|
"url": "https://github.com/abpframework/abp.git" |
|
|
"url": "https://github.com/abpframework/abp.git" |
|
|
}, |
|
|
}, |
|
|
"dependencies": { |
|
|
"dependencies": { |
|
|
"@abp/utils": "~8.0.0", |
|
|
"@abp/utils": "~7.4.4", |
|
|
"angular-oauth2-oidc": "^15.0.1", |
|
|
"just-clone": "^6.0.0", |
|
|
"just-clone": "^6.1.1", |
|
|
"just-compare": "^2.0.0", |
|
|
"just-compare": "^2.3.0", |
|
|
|
|
|
"ts-toolbelt": "6.15.4", |
|
|
"ts-toolbelt": "6.15.4", |
|
|
"tslib": "^2.0.0" |
|
|
"tslib": "^2.0.0" |
|
|
}, |
|
|
}, |
|
|
|
|
|
@ -39,8 +39,10 @@ import { QUEUE_MANAGER } from './tokens/queue.token'; |
|
|
import { DefaultQueueManager } from './utils/queue'; |
|
|
import { DefaultQueueManager } from './utils/queue'; |
|
|
import { IncludeLocalizationResourcesProvider } from './providers/include-localization-resources.provider'; |
|
|
import { IncludeLocalizationResourcesProvider } from './providers/include-localization-resources.provider'; |
|
|
import { SORT_COMPARE_FUNC, compareFuncFactory } from './tokens/compare-func.token'; |
|
|
import { SORT_COMPARE_FUNC, compareFuncFactory } from './tokens/compare-func.token'; |
|
|
import {DYNAMIC_LAYOUTS_TOKEN} from "./tokens/dynamic-layout.token"; |
|
|
import { AuthErrorFilterService } from './abstracts'; |
|
|
import {DEFAULT_DYNAMIC_LAYOUTS} from "./constants"; |
|
|
import { DYNAMIC_LAYOUTS_TOKEN } from "./tokens/dynamic-layout.token"; |
|
|
|
|
|
import { DEFAULT_DYNAMIC_LAYOUTS } from "./constants"; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const standaloneDirectives = [ |
|
|
const standaloneDirectives = [ |
|
|
AutofocusDirective, |
|
|
AutofocusDirective, |
|
|
|
|
|
@ -9,9 +9,9 @@ |
|
|
"dependencies": { |
|
|
"dependencies": { |
|
|
"@abp/ng.core": "~8.0.0", |
|
|
"@abp/ng.core": "~8.0.0", |
|
|
"@abp/utils": "~8.0.0", |
|
|
"@abp/utils": "~8.0.0", |
|
|
"angular-oauth2-oidc": "^15.0.1", |
|
|
"angular-oauth2-oidc": "^15.0.0", |
|
|
"just-clone": "^6.1.1", |
|
|
"just-clone": "^6.0.0", |
|
|
"just-compare": "^2.3.0", |
|
|
"just-compare": "^2.0.0", |
|
|
"tslib": "^2.0.0" |
|
|
"tslib": "^2.0.0" |
|
|
}, |
|
|
}, |
|
|
"publishConfig": { |
|
|
"publishConfig": { |
|
|
|