Skip to content

Commit

Permalink
chore(deps): update vue-tsc to allow latest TypeScript update & fix…
Browse files Browse the repository at this point in the history
… flaky E2E test (#1789)

* chore(deps): update `vue-tsc` to allow latest TypeScript update
- latest `vue-tsc` fixed the issue they had with updating to latest TypeScript v5.7.x

* chore: fix Composite example flaky Cypress test
  • Loading branch information
ghiscoding authored Dec 30, 2024
1 parent 0fe7bd6 commit 38cc4b1
Show file tree
Hide file tree
Showing 8 changed files with 165 additions and 145 deletions.
4 changes: 2 additions & 2 deletions demos/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"cypress": "^13.16.1",
"cypress-real-events": "^1.13.0",
"sass": "^1.83.0",
"typescript": "~5.6.2",
"typescript": "^5.7.2",
"vite": "^6.0.3"
}
}
}
2 changes: 1 addition & 1 deletion demos/vue/src/components/Example30.vue
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ function loadData(count: number) {
start: new Date(randomYear, randomMonth, randomDay, randomDay, randomTime, randomTime, randomTime),
finish: isCompleted || (i % 3 === 0 && randomFinish > new Date() && i > 3) ? (isCompleted ? new Date() : randomFinish) : '', // make sure the random date is earlier than today and it's index is bigger than 3
cost: i % 33 === 0 ? null : Math.round(Math.random() * 10000) / 100,
completed: isCompleted || (i % 3 === 0 && randomFinish > new Date() && i > 3),
completed: (isCompleted && i > 5) || (i % 3 === 0 && randomFinish > new Date() && i > 3),
product: { id: mockProducts()[randomItemId]?.id, itemName: mockProducts()[randomItemId]?.itemName },
origin: i % 2 ? { code: 'CA', name: 'Canada' } : { code: 'US', name: 'United States' },
};
Expand Down
2 changes: 1 addition & 1 deletion examples/vite-demo-vanilla-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@types/node": "^22.5.1",
"@types/whatwg-fetch": "^0.0.33",
"sass": "^1.79.3",
"typescript": "~5.6.2",
"typescript": "^5.7.2",
"vite": "^6.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ export default class Example12 {
start: new Date(randomYear, randomMonth, randomDay, randomDay, randomTime, randomTime, randomTime),
finish: isCompleted || (i % 3 === 0 && randomFinish > new Date() && i > 3) ? (isCompleted ? new Date() : randomFinish) : '', // make sure the random date is earlier than today and it's index is bigger than 3
cost: i % 33 === 0 ? null : Math.round(Math.random() * 10000) / 100,
completed: isCompleted || (i % 3 === 0 && randomFinish > new Date() && i > 3),
completed: (isCompleted && i > 5) || (i % 3 === 0 && randomFinish > new Date() && i > 3),
product: { id: this.mockProducts()[randomItemId]?.id, itemName: this.mockProducts()[randomItemId]?.itemName },
origin: i % 2 ? { code: 'CA', name: 'Canada' } : { code: 'US', name: 'United States' },
};
Expand Down
4 changes: 2 additions & 2 deletions frameworks/slickgrid-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@
"strong-log-transformer": "^2.1.0",
"tinyexec": "^0.3.1",
"tinyrainbow": "^1.2.0",
"typescript": "~5.6.2",
"typescript": "^5.7.2",
"vite": "^6.0.3",
"vite-plugin-dts": "^4.3.0",
"vue": "^3.5.13",
"vue-tsc": "^2.1.10",
"vue-tsc": "^2.2.0",
"yargs": "^17.7.2"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"rxjs": "^7.8.1",
"servor": "^4.0.2",
"sortablejs": "^1.15.6",
"typescript": "~5.6.2",
"typescript": "^5.7.2",
"typescript-eslint": "^8.18.0",
"vitest": "^3.0.0-beta.2",
"whatwg-fetch": "^3.6.20"
Expand Down
290 changes: 155 additions & 135 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/cypress/e2e/example12.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ describe('Example 12 - Composite Editor Modal', () => {
it('should not be able to change the "Finish" dates on first 2 rows', () => {
cy.get(`[style="top: ${GRID_ROW_HEIGHT * 1}px;"] > .slick-cell:nth(8)`)
.should('contain', '')
.click(); // this date should also always be initially empty
.click({ force: true }); // this date should also always be initially empty
cy.get(`.vanilla-calendar-day__btn_today:visible`).should('not.exist');

cy.get(`[style="top: ${GRID_ROW_HEIGHT * 0}px;"] > .slick-cell:nth(8)`)
.should('contain', '')
.click(); // this date should also always be initially empty
.click({ force: true }); // this date should also always be initially empty
cy.get(`.vanilla-calendar-day__btn_today:visible`).should('not.exist');
});

Expand Down

0 comments on commit 38cc4b1

Please sign in to comment.