Skip to content

Commit

Permalink
feat(core): update to latest SlickGrid version and update npm packages (
Browse files Browse the repository at this point in the history
#140)

* feat(core): update to latest SlickGrid version and update npm packages
  • Loading branch information
ghiscoding authored Oct 14, 2020
1 parent 2a5280f commit d73a44e
Show file tree
Hide file tree
Showing 6 changed files with 267 additions and 232 deletions.
16 changes: 8 additions & 8 deletions examples/webpack-demo-vanilla-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@
"moment-mini": "^2.24.0"
},
"devDependencies": {
"@types/jquery": "^3.5.2",
"@types/jquery": "^3.5.3",
"@types/moment": "^2.13.0",
"@types/node": "^14.11.5",
"@types/node": "^14.11.8",
"@types/webpack": "^4.41.22",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.2.0",
"copy-webpack-plugin": "^6.2.1",
"css-loader": "^4.3.0",
"file-loader": "^6.1.0",
"file-loader": "^6.1.1",
"fork-ts-checker-webpack-plugin": "^5.2.0",
"html-loader": "^1.3.1",
"html-loader": "^1.3.2",
"html-webpack-plugin": "^4.5.0",
"json-loader": "^0.5.7",
"mini-css-extract-plugin": "^0.12.0",
"node-sass": "4.14.1",
"sass-loader": "^10.0.2",
"sass-loader": "^10.0.3",
"style-loader": "^1.3.0",
"ts-loader": "^8.0.4",
"ts-loader": "^8.0.5",
"ts-node": "^9.0.0",
"url-loader": "^4.1.0",
"url-loader": "^4.1.1",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0"
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@
},
"devDependencies": {
"@types/jest": "^26.0.14",
"@types/node": "^14.11.5",
"@typescript-eslint/eslint-plugin": "^4.4.0",
"@typescript-eslint/parser": "^4.4.0",
"@types/node": "^14.11.8",
"@typescript-eslint/eslint-plugin": "^4.4.1",
"@typescript-eslint/parser": "^4.4.1",
"cypress": "^5.3.0",
"eslint": "^7.10.0",
"eslint": "^7.11.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-prefer-arrow": "^1.2.2",
"http-server": "^0.12.3",
"jest": "^26.5.2",
"jest-cli": "^26.5.2",
"jest": "^26.5.3",
"jest-cli": "^26.5.3",
"jest-environment-jsdom": "^26.5.2",
"jest-extended": "^0.11.5",
"jest-junit": "^12.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,21 @@
"lodash.isequal": "^4.5.0",
"moment-mini": "^2.24.0",
"multiple-select-modified": "^1.3.4",
"slickgrid": "github:6pac/SlickGrid"
"slickgrid": "^2.4.30"
},
"devDependencies": {
"@types/dompurify": "^2.0.4",
"@types/jquery": "^3.5.2",
"@types/jquery": "^3.5.3",
"@types/moment": "^2.13.0",
"autoprefixer": "^10.0.1",
"copyfiles": "^2.4.0",
"cross-env": "^7.0.2",
"mini-css-extract-plugin": "^0.12.0",
"node-sass": "4.14.1",
"nodemon": "^2.0.4",
"nodemon": "^2.0.5",
"npm-run-all": "^4.1.5",
"postcss": "^8.1.1",
"postcss-cli": "^8.0.0",
"postcss-cli": "^8.1.0",
"rimraf": "^3.0.2"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/vanilla-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
"archiver": "^5.0.2",
"cross-env": "^7.0.2",
"dts-bundle-webpack": "^1.0.2",
"html-loader": "^1.3.1",
"html-loader": "^1.3.2",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
"ts-loader": "^8.0.4",
"ts-loader": "^8.0.5",
"webpack": "^4.44.2"
}
}
3 changes: 1 addition & 2 deletions test/cypress/integration/example12.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ describe('Example 12 - Composite Editor Modal', () => {
});

it('should open the Composite Editor (Mass Update) and be able to change some of the inputs in the form', () => {
cy.get(`[style="top:${GRID_ROW_HEIGHT * 0}px"] > .slick-cell:nth(3)`).click();
cy.get('[data-test="open-modal-mass-update-btn"]').wait(200).click();
cy.get('.slick-editor-modal-title').should('contain', 'Mass Update All Records');
cy.get('.footer-status-text').should('contain', 'All 501 records selected');
Expand Down Expand Up @@ -366,7 +365,7 @@ describe('Example 12 - Composite Editor Modal', () => {
cy.get(`[style="top:${GRID_ROW_HEIGHT * 1}px"] > .slick-cell:nth(0)`).click();
cy.get(`[style="top:${GRID_ROW_HEIGHT * 2}px"] > .slick-cell:nth(0)`).click();
cy.get('[data-test="open-modal-mass-selection-btn"]').should('not.be.disabled');
cy.get('[data-test="open-modal-mass-selection-btn"]').wait(200).click();
cy.get('[data-test="open-modal-mass-selection-btn"]').wait(50).click();
});

it('should be able to open the Composite Editor (Mass Selection) and be able to change some of the inputs in the form', () => {
Expand Down
Loading

0 comments on commit d73a44e

Please sign in to comment.