Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for TS5.3 + PNPM #9

Merged
merged 6 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 7
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 7
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
6 changes: 3 additions & 3 deletions lib/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ export const Router: FC<

// as of Chrome 102, this seems to be the only thing that works
// as of Chrome 108, this no longer works
else if (e.canTransition && e.transitionWhile) {
e.transitionWhile(handler());
}
// else if (e.canTransition && e.transitionWhile) {
// e.transitionWhile(handler());
// }
};

const eventName = 'navigate';
Expand Down
59 changes: 31 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,39 +39,42 @@
},
"devDependencies": {
"@block65/bundlesize": "^1.0.1",
"@block65/eslint-config": "^9.2.0",
"@block65/react-design-system": "^0.31.0",
"@testing-library/dom": "^9.3.0",
"@testing-library/jest-dom": "^5.16.5",
"@block65/eslint-config": "^11.0.0",
"@block65/react-design-system": "0.32.0-beta.1",
"@testing-library/dom": "^9.3.3",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.0.0",
"@types/jest": "^29.5.1",
"@types/node": "^20.2.3",
"@types/react": "^18.2.6",
"@types/react-dom": "^18.2.4",
"@typescript-eslint/eslint-plugin": "^5.59.7",
"@typescript-eslint/parser": "^5.59.7",
"@vitejs/plugin-react": "^4.0.0",
"eslint": "^8.41.0",
"eslint-plugin-formatjs": "^4.10.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": ">=4.2.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": ">=4.6.0",
"eslint-plugin-react-refresh": "^0.4.1",
"jsdom": "^22.0.0",
"navigation-api-types": "^0.3.1",
"prettier": "^2.8.8",
"@types/jest": "^29.5.7",
"@types/node": "^20.8.10",
"@types/react": "^18.2.36",
"@types/react-dom": "^18.2.14",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"@vitejs/plugin-react": "^4.1.1",
"eslint": "^8.53.0",
"eslint-plugin-formatjs": "^4.11.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.4",
"jsdom": "^22.1.0",
"navigation-api-types": "^0.5.0",
"prettier": "^3.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intl": "^6.4.2",
"the-new-css-reset": "^1.8.4",
"typescript": "^5.0.4",
"vite": "^4.3.8",
"vitest": "^0.31.1"
"react-intl": "^6.5.2",
"the-new-css-reset": "^1.11.1",
"typescript": "^5.2.2",
"vite": "^4.5.0",
"vitest": "^0.34.6"
},
"peerDependencies": {
"react": "^18.2.0"
"react": "^18.2.0",
"react-dom": "^18.2.0",
"@types/react": "^18.2.36",
"@types/react-dom": "^18.2.14"
},
"engines": {
"node": ">=16.0.0"
Expand Down
Loading