Skip to content

Commit

Permalink
Merge pull request #360 from ghiscoding/feat/deps-2021-05-31
Browse files Browse the repository at this point in the history
chore(deps): upgrade few npm packages to latest
  • Loading branch information
ghiscoding committed May 31, 2021
2 parents 195923e + 8fe9c7b commit 80073fe
Show file tree
Hide file tree
Showing 16 changed files with 1,017 additions and 841 deletions.
14 changes: 7 additions & 7 deletions examples/webpack-demo-vanilla-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,24 @@
"devDependencies": {
"@types/jquery": "^3.5.5",
"@types/moment": "^2.13.0",
"@types/node": "^15.3.0",
"@types/node": "^15.6.1",
"@types/webpack": "^5.28.0",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^8.1.1",
"css-loader": "^5.2.4",
"copy-webpack-plugin": "^9.0.0",
"css-loader": "^5.2.6",
"file-loader": "^6.2.0",
"fork-ts-checker-webpack-plugin": "^6.2.10",
"html-loader": "^2.1.2",
"html-webpack-plugin": "5.3.1",
"mini-css-extract-plugin": "^1.6.0",
"rxjs": "^7.0.1",
"rxjs": "^7.1.0",
"sass": "^1.34.0",
"sass-loader": "^11.1.1",
"style-loader": "^2.0.0",
"ts-loader": "^9.2.0",
"ts-node": "^9.1.1",
"ts-loader": "^9.2.2",
"ts-node": "^10.0.0",
"url-loader": "^4.1.1",
"webpack": "^5.37.0",
"webpack": "^5.38.1",
"webpack-cli": "^4.7.0",
"webpack-dev-server": "^3.11.2"
}
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,28 @@
},
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/node": "^15.3.0",
"@typescript-eslint/eslint-plugin": "^4.24.0",
"@typescript-eslint/parser": "^4.24.0",
"@types/node": "^15.6.1",
"@typescript-eslint/eslint-plugin": "^4.25.0",
"@typescript-eslint/parser": "^4.25.0",
"cypress": "^7.4.0",
"eslint": "^7.26.0",
"eslint-plugin-import": "^2.23.2",
"eslint": "^7.27.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-prefer-arrow": "^1.2.3",
"jest": "^26.6.3",
"jest-cli": "^26.6.3",
"jest-environment-jsdom": "^26.6.2",
"jest": "^27.0.3",
"jest-cli": "^27.0.3",
"jest-environment-jsdom": "^27.0.3",
"jest-extended": "^0.11.5",
"jest-junit": "^12.0.0",
"jsdom": "^16.5.3",
"jest-junit": "^12.1.0",
"jsdom": "^16.6.0",
"jsdom-global": "^3.0.2",
"lerna": "^3.22.1",
"mocha": "^8.4.0",
"mochawesome": "^6.2.2",
"npm-run-all": "^4.1.5",
"rxjs": "^7.0.1",
"rxjs": "^7.1.0",
"serve": "^11.3.2",
"ts-jest": "^26.5.6",
"typescript": "^4.2.4"
"ts-jest": "^27.0.2",
"typescript": "^4.3.2"
},
"engines": {
"node": ">=14.15.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@
"@types/dompurify": "^2.2.2",
"@types/jquery": "^3.5.5",
"@types/moment": "^2.13.0",
"autoprefixer": "^10.2.5",
"autoprefixer": "^10.2.6",
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"mini-css-extract-plugin": "^1.6.0",
"nodemon": "^2.0.7",
"npm-run-all": "^4.1.5",
"postcss": "^8.2.15",
"postcss": "^8.3.0",
"postcss-cli": "^8.3.1",
"rimraf": "^3.0.2",
"sass": "^1.34.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ describe('InputPasswordEditor', () => {
editor.editorDomElement.value = 'task 2';
editor.editorDomElement.dispatchEvent(new (window.window as any).Event('input'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);
editor.destroy();

expect(getCellSpy).toHaveBeenCalled();
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/editors/__tests__/dualInputEditor.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ describe('DualInputEditor', () => {
editor.setValues([4, 5]);
editor.editorDomElement.leftInput.dispatchEvent(new (window.window as any).Event('input'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);

expect(getCellSpy).toHaveBeenCalled();
expect(onBeforeEditSpy).toHaveBeenCalledWith({ ...activeCellMock, column: mockColumn, item: mockItemData, grid: gridStub, target: 'composite', compositeEditorOptions: editorArguments.compositeEditorOptions });
Expand All @@ -955,7 +955,7 @@ describe('DualInputEditor', () => {
editor.setValues([4, 5]);
editor.editorDomElement.rightInput.dispatchEvent(new (window.window as any).Event('input'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);
editor.destroy();

expect(getCellSpy).toHaveBeenCalled();
Expand Down
6 changes: 3 additions & 3 deletions packages/common/src/editors/__tests__/floatEditor.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ describe('FloatEditor', () => {
editor.editorDomElement.value = 35;
editor.editorDomElement.dispatchEvent(new (window.window as any).Event('input'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);

expect(getCellSpy).toHaveBeenCalled();
expect(onBeforeEditSpy).toHaveBeenCalledWith({ ...activeCellMock, column: mockColumn, item: mockItemData, grid: gridStub, target: 'composite', compositeEditorOptions: editorArguments.compositeEditorOptions });
Expand All @@ -768,7 +768,7 @@ describe('FloatEditor', () => {
editor.editorDomElement.value = 35;
editor.editorDomElement.dispatchEvent(new (window.window as any).Event('input'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);

expect(getCellSpy).toHaveBeenCalled();
expect(editor.isValueTouched()).toBe(true);
Expand All @@ -793,7 +793,7 @@ describe('FloatEditor', () => {
editor.editorDomElement.value = 35;
editor.editorDomElement.dispatchEvent(new (window.window as any).Event('wheel'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);

expect(getCellSpy).toHaveBeenCalled();
expect(editor.isValueTouched()).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/editors/__tests__/inputEditor.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ describe('InputEditor (TextEditor)', () => {
editor.editorDomElement.value = 'task 2';
editor.editorDomElement.dispatchEvent(new (window.window as any).Event('input'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);
editor.destroy();

expect(getCellSpy).toHaveBeenCalled();
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/editors/__tests__/integerEditor.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ describe('IntegerEditor', () => {
editor.editorDomElement.value = 35;
editor.editorDomElement.dispatchEvent(new (window.window as any).Event('input'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);

expect(getCellSpy).toHaveBeenCalled();
expect(editor.isValueTouched()).toBe(true);
Expand All @@ -699,7 +699,7 @@ describe('IntegerEditor', () => {
editor.editorDomElement.value = 35;
editor.editorDomElement.dispatchEvent(new (window.window as any).Event('wheel'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);

expect(getCellSpy).toHaveBeenCalled();
expect(editor.isValueTouched()).toBe(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ describe('LongTextEditor', () => {
editorElm.value = 'task 2';
editorElm.dispatchEvent(new (window.window as any).Event('input'));

jest.runTimersToTime(50);
jest.advanceTimersByTime(50);

expect(getCellSpy).toHaveBeenCalled();
expect(onBeforeEditSpy).toHaveBeenCalledWith({ ...activeCellMock, column: mockColumn, item: mockItemData, grid: gridStub, target: 'composite', compositeEditorOptions: editorArguments.compositeEditorOptions });
Expand Down
3 changes: 1 addition & 2 deletions packages/common/src/filters/__tests__/selectFilter.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -789,15 +789,14 @@ describe('SelectFilter', () => {
expect(filterListElm[2].textContent).toBe('Other');
});

it('should throw an error when "collectionAsync" Promise does not return a valid array', async (done) => {
it('should throw an error when "collectionAsync" Promise does not return a valid array', async () => {
const promise = Promise.resolve({ hello: 'world' });
mockColumn.filter!.collectionAsync = promise;

try {
await filter.init(filterArguments);
} catch (e) {
expect(e.toString()).toContain(`Something went wrong while trying to pull the collection from the "collectionAsync" call in the Filter, the collection is not a valid array.`);
done();
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1108,15 +1108,14 @@ describe('FilterService', () => {
sharedService.allColumns = [mockColumn1, mockColumn2];
});

it('should throw an error when there are no filters defined in the column definitions', async (done) => {
it('should throw an error when there are no filters defined in the column definitions', async () => {
try {
gridOptionMock.enableFiltering = false;
service.init(gridStub);
service.bindLocalOnFilter(gridStub);
await service.updateFilters([{ columnId: 'firstName', searchTerms: ['John'] }]);
} catch (e) {
expect(e.toString()).toContain('[Slickgrid-Universal] in order to use "updateFilters" method, you need to have Filterable Columns defined in your grid');
done();
}
});

Expand Down

0 comments on commit 80073fe

Please sign in to comment.