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
parent
commit
d1cf59532f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      npm/ng-packs/packages/core/package.json
  2. 6
      npm/ng-packs/packages/core/src/lib/core.module.ts
  3. 6
      npm/ng-packs/packages/oauth/package.json

7
npm/ng-packs/packages/core/package.json

@ -7,10 +7,9 @@
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
"@abp/utils": "~8.0.0",
"angular-oauth2-oidc": "^15.0.1",
"just-clone": "^6.1.1",
"just-compare": "^2.3.0",
"@abp/utils": "~7.4.4",
"just-clone": "^6.0.0",
"just-compare": "^2.0.0",
"ts-toolbelt": "6.15.4",
"tslib": "^2.0.0"
},

6
npm/ng-packs/packages/core/src/lib/core.module.ts

@ -39,8 +39,10 @@ import { QUEUE_MANAGER } from './tokens/queue.token';
import { DefaultQueueManager } from './utils/queue';
import { IncludeLocalizationResourcesProvider } from './providers/include-localization-resources.provider';
import { SORT_COMPARE_FUNC, compareFuncFactory } from './tokens/compare-func.token';
import {DYNAMIC_LAYOUTS_TOKEN} from "./tokens/dynamic-layout.token";
import {DEFAULT_DYNAMIC_LAYOUTS} from "./constants";
import { AuthErrorFilterService } from './abstracts';
import { DYNAMIC_LAYOUTS_TOKEN } from "./tokens/dynamic-layout.token";
import { DEFAULT_DYNAMIC_LAYOUTS } from "./constants";
const standaloneDirectives = [
AutofocusDirective,

6
npm/ng-packs/packages/oauth/package.json

@ -9,9 +9,9 @@
"dependencies": {
"@abp/ng.core": "~8.0.0",
"@abp/utils": "~8.0.0",
"angular-oauth2-oidc": "^15.0.1",
"just-clone": "^6.1.1",
"just-compare": "^2.3.0",
"angular-oauth2-oidc": "^15.0.0",
"just-clone": "^6.0.0",
"just-compare": "^2.0.0",
"tslib": "^2.0.0"
},
"publishConfig": {

Loading…
Cancel
Save