Skip to content

Commit

Permalink
Merge branch 'master' into feat/update-column-defs-when-plugin-modify…
Browse files Browse the repository at this point in the history
…-them
  • Loading branch information
ghiscoding authored Nov 17, 2022
2 parents 52eb11a + f9ff4f6 commit 8f1fab4
Show file tree
Hide file tree
Showing 9 changed files with 1,780 additions and 2,377 deletions.
35 changes: 17 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
},
Expand All @@ -149,7 +148,7 @@
"npm": ">=6.14.13"
},
"resolutions": {
"caniuse-lite": "1.0.30001419"
"caniuse-lite": "1.0.30001431"
},
"aurelia": {
"build": {
Expand Down
1 change: 1 addition & 0 deletions src/aurelia-slickgrid/custom-elements/aurelia-slickgrid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions src/aurelia-slickgrid/models/aureliaGridInstance.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
SortService,
TreeDataService
} from '@slickgrid-universal/common';
import { EventPubSubService } from '@slickgrid-universal/event-pub-sub';

import { SlickGrid } from '../models/index';

Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/examples/slickgrid/example14.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class Example14 {
</ul>
`;

angularGrid2!: AureliaGridInstance;
aureliaGrid2!: AureliaGridInstance;
gridObj2: any;
columnDefinitions1: Column[] = [];
columnDefinitions2: Column[] = [];
Expand All @@ -36,7 +36,7 @@ export class Example14 {
}

aureliaGridReady2(aureliaGrid: AureliaGridInstance) {
this.angularGrid2 = aureliaGrid;
this.aureliaGrid2 = aureliaGrid;
this.gridObj2 = aureliaGrid.slickGrid;
}

Expand Down
2 changes: 1 addition & 1 deletion src/examples/slickgrid/example28.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
// }

Expand Down
2 changes: 1 addition & 1 deletion src/examples/slickgrid/example33.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 (<a href="https://github.com/ghiscoding/Angular-Slickgrid/wiki/Custom-Tooltip-(plugin)" target="_blank">Wiki docs</a>)
This demo shows how to create Regular & Custom Tooltips (<a href="https://github.com/ghiscoding/aurelia-slickgrid/wiki/Custom-Tooltip-(plugin)" target="_blank">Wiki docs</a>)
<br/>
<ul class="small">
<li>optionally parse regular [title] attributes and transform them into tooltips</li>
Expand Down
2 changes: 1 addition & 1 deletion test/cypress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"license": "MIT",
"devDependencies": {
"@4tw/cypress-drag-drop": "^2.2.1",
"cypress": "^10.10.0"
"cypress": "^11.1.0"
}
}
8 changes: 4 additions & 4 deletions test/cypress/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,10 @@ cross-spawn@^7.0.0:
shebang-command "^2.0.0"
which "^2.0.1"

cypress@^10.10.0:
version "10.10.0"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.10.0.tgz#fd671297b2ca3e64dfffd55fe3857c388cfbb695"
integrity sha512-bU8r44x1NIYAUNNXt3CwJpLOVth7HUv2hUhYCxZmgZ1IugowDvuHNpevnoZRQx1KKOEisLvIJW+Xen5Pjn41pg==
cypress@^11.1.0:
version "11.1.0"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-11.1.0.tgz#b8f16495a8a5d8f9a7dd3374ae7b2cef45e9c779"
integrity sha512-kzizbG9s3p3ahWqxUwG/21NqLWEGtScMevMyUPeYlcmMX9RzVxWM18MkA3B4Cb3jKx72hSyIE2mHgHymfCM1bg==
dependencies:
"@cypress/request" "^2.88.10"
"@cypress/xvfb" "^1.2.4"
Expand Down
Loading

0 comments on commit 8f1fab4

Please sign in to comment.