diff --git a/package.json b/package.json index 6edaddb79..97bffb4f9 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "aurelia-framework": "^1.4.1", "aurelia-i18n": "^4.0.3", "aurelia-pal": "^1.8.2", - "dompurify": "^2.4.0", - "i18next": ">=21.0.0", + "dompurify": "^2.4.1", + "i18next": ">=21.10.0", "jquery": "^3.6.1", "sortablejs": "^1.15.0" }, @@ -82,16 +82,16 @@ "@slickgrid-universal/rxjs-observable": "2.1.0", "@slickgrid-universal/text-export": "2.1.0", "@types/bluebird": "^3.5.37", - "@types/dompurify": "^2.3.4", + "@types/dompurify": "^2.4.0", "@types/fnando__sparkline": "^0.3.4", "@types/i18next-xhr-backend": "^1.4.2", - "@types/jest": "^29.2.0", + "@types/jest": "^29.2.3", "@types/jquery": "^3.5.14", - "@types/node": "^18.7.16", + "@types/node": "^18.11.9", "@types/sortablejs": "^1.15.0", "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^5.40.1", - "@typescript-eslint/parser": "^5.40.1", + "@typescript-eslint/eslint-plugin": "^5.43.0", + "@typescript-eslint/parser": "^5.43.0", "@webpack-cli/serve": "^1.7.0", "aurelia-animator-css": "^1.0.4", "aurelia-bootstrapper": "^2.4.0", @@ -106,13 +106,12 @@ "aurelia-webpack-plugin": "^5.0.4", "bootstrap": "^5.2.2", "clean-webpack-plugin": "^4.0.0", - "concurrently": "^7.4.0", "copy-webpack-plugin": "^11.0.0", "copyfiles": "^2.4.1", "cross-env": "^7.0.3", - "css-loader": "6.7.1", + "css-loader": "6.7.2", "duplicate-package-checker-webpack-plugin": "^3.0.0", - "eslint": "^8.25.0", + "eslint": "^8.27.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prefer-arrow": "^1.2.3", "file-loader": "6.2.0", @@ -121,26 +120,26 @@ "html-webpack-plugin": "5.5.0", "i18next-xhr-backend": "^3.2.2", "isomorphic-fetch": "^3.0.0", - "jest": "^29.2.1", - "jest-cli": "^29.2.1", - "jest-environment-jsdom": "^29.2.1", + "jest": "^29.3.1", + "jest-cli": "^29.3.1", + "jest-environment-jsdom": "^29.3.1", "jest-extended": "^3.1.0", "jsdom-global": "^3.0.2", - "mini-css-extract-plugin": "^2.6.1", + "mini-css-extract-plugin": "^2.7.0", "moment-mini": "^2.29.4", "npm-run-all": "^4.1.5", "promise-polyfill": "^8.2.3", "release-it": "^15.5.0", "rimraf": "^3.0.2", "rxjs": "^7.5.7", - "sass": "^1.55.0", - "sass-loader": "^13.1.0", + "sass": "^1.56.1", + "sass-loader": "^13.2.0", "style-loader": "3.3.1", "ts-jest": "^29.0.3", "ts-loader": "^9.4.1", "ts-node": "^10.9.1", "typescript": "^4.8.4", - "webpack": "^5.74.0", + "webpack": "^5.75.0", "webpack-cli": "^4.10.0", "webpack-dev-server": "^4.11.1" }, @@ -149,7 +148,7 @@ "npm": ">=6.14.13" }, "resolutions": { - "caniuse-lite": "1.0.30001419" + "caniuse-lite": "1.0.30001431" }, "aurelia": { "build": { diff --git a/src/aurelia-slickgrid/custom-elements/aurelia-slickgrid.ts b/src/aurelia-slickgrid/custom-elements/aurelia-slickgrid.ts index cd3c20c8e..9278b45c3 100644 --- a/src/aurelia-slickgrid/custom-elements/aurelia-slickgrid.ts +++ b/src/aurelia-slickgrid/custom-elements/aurelia-slickgrid.ts @@ -472,6 +472,7 @@ export class AureliaSlickgridCustomElement { // return all available Services (non-singleton) backendService: this.gridOptions?.backendServiceApi?.service, + eventPubSubService: this._eventPubSubService, filterService: this.filterService, gridEventService: this.gridEventService, gridStateService: this.gridStateService, diff --git a/src/aurelia-slickgrid/models/aureliaGridInstance.interface.ts b/src/aurelia-slickgrid/models/aureliaGridInstance.interface.ts index e9d7f2250..4b1a02789 100644 --- a/src/aurelia-slickgrid/models/aureliaGridInstance.interface.ts +++ b/src/aurelia-slickgrid/models/aureliaGridInstance.interface.ts @@ -12,6 +12,7 @@ import { SortService, TreeDataService } from '@slickgrid-universal/common'; +import { EventPubSubService } from '@slickgrid-universal/event-pub-sub'; import { SlickGrid } from '../models/index'; @@ -33,6 +34,9 @@ export interface AureliaGridInstance { /** Backend Service, when available */ backendService?: BackendService; + /** EventPubSub Service instance that is used internal by the lib and could be used externally to subscribe to Aurelia-Slickgrid events */ + eventPubSubService?: EventPubSubService; + /** Extension (Plugins & Controls) Service */ extensionService: ExtensionService; diff --git a/src/examples/slickgrid/example14.ts b/src/examples/slickgrid/example14.ts index a92063682..2d855c634 100644 --- a/src/examples/slickgrid/example14.ts +++ b/src/examples/slickgrid/example14.ts @@ -15,7 +15,7 @@ export class Example14 { `; - angularGrid2!: AureliaGridInstance; + aureliaGrid2!: AureliaGridInstance; gridObj2: any; columnDefinitions1: Column[] = []; columnDefinitions2: Column[] = []; @@ -36,7 +36,7 @@ export class Example14 { } aureliaGridReady2(aureliaGrid: AureliaGridInstance) { - this.angularGrid2 = aureliaGrid; + this.aureliaGrid2 = aureliaGrid; this.gridObj2 = aureliaGrid.slickGrid; } diff --git a/src/examples/slickgrid/example28.scss b/src/examples/slickgrid/example28.scss index 9bac83ad2..a398d858e 100644 --- a/src/examples/slickgrid/example28.scss +++ b/src/examples/slickgrid/example28.scss @@ -30,7 +30,7 @@ // /** 1. use `filter` color */ // // filter: invert(62%) sepia(93%) saturate(5654%) hue-rotate(325deg) brightness(100%) contrast(90%); -// /** 2. or use the SASS @mixin (from Angular-Slickgrid "sass-utilities.scss") that will produce the `filter` color */ +// /** 2. or use the SASS @mixin (from Aurelia-Slickgrid "sass-utilities.scss") that will produce the `filter` color */ // @include recolor(#f14668, 0.9); // } diff --git a/src/examples/slickgrid/example33.ts b/src/examples/slickgrid/example33.ts index d9bcf04d9..8d182366b 100644 --- a/src/examples/slickgrid/example33.ts +++ b/src/examples/slickgrid/example33.ts @@ -24,7 +24,7 @@ const NB_ITEMS = 500; export class Example33 { title = 'Example 33: Regular & Custom Tooltips'; subTitle = ` - This demo shows how to create Regular & Custom Tooltips (Wiki docs) + This demo shows how to create Regular & Custom Tooltips (Wiki docs)