Skip to content

Commit

Permalink
Upgrade to TS 4.9
Browse files Browse the repository at this point in the history
  • Loading branch information
kasperpeulen committed Nov 17, 2022
1 parent 0c36f0a commit e8ed15f
Show file tree
Hide file tree
Showing 89 changed files with 1,025 additions and 590 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ jobs:
destination: react-vite-default-ts-bench.tar.gz
lint:
executor:
class: medium
class: large
name: sb_node_16_classic
steps:
- checkout_advanced:
Expand Down
2 changes: 1 addition & 1 deletion code/addons/a11y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
},
"devDependencies": {
"@testing-library/react": "^11.2.2",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
},
"devDependencies": {
"@types/lodash": "^4.14.167",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/backgrounds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
6 changes: 3 additions & 3 deletions code/addons/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@babel/plugin-transform-react-jsx": "^7.12.12",
"@babel/plugin-transform-react-jsx": "^7.19.0",
"@jest/transform": "^28.0.0",
"@mdx-js/react": "^2.1.5",
"@storybook/blocks": "7.0.0-alpha.50",
Expand All @@ -103,8 +103,8 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.10",
"typescript": "~4.6.3"
"@babel/core": "^7.20.2",
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
4 changes: 2 additions & 2 deletions code/addons/essentials/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.10",
"@babel/core": "^7.20.2",
"@storybook/vue": "7.0.0-alpha.50",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"@babel/core": "^7.9.6"
Expand Down
2 changes: 1 addition & 1 deletion code/addons/highlight/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
},
"devDependencies": {
"@types/webpack-env": "^1.16.0",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions code/addons/interactions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@
"devDependencies": {
"@storybook/jest": "^0.0.10",
"@storybook/testing-library": "0.0.14-next.0",
"@types/node": "^16.0.0",
"@types/node": "^18.11.9",
"formik": "^2.2.9",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"upath": "^1.2.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/links/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/measure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"global": "^4.4.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/outline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/storyshots/storyshots-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@storybook/react": "7.0.0-alpha.50",
"@storybook/vue": "7.0.0-alpha.50",
"@storybook/vue3": "7.0.0-alpha.50",
"babel-loader": "^8.2.5",
"babel-loader": "^8.3.0",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.1",
"jest-preset-angular": "^8.3.2",
Expand Down
4 changes: 2 additions & 2 deletions code/addons/storysource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
"react-syntax-highlighter": "^15.5.0"
},
"devDependencies": {
"@types/react": "^16.14.23",
"@types/react": "^16.14.34",
"@types/react-syntax-highlighter": "11.0.5",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/toolbars/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@storybook/theming": "7.0.0-alpha.50"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/viewport/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"prop-types": "^15.7.2"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
11 changes: 8 additions & 3 deletions code/addons/viewport/src/shortcuts.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import type { API } from '@storybook/api';
import { ADDON_ID } from './constants';

type State = {
selected: string;
isRotated: boolean;
};

const getCurrentViewportIndex = (viewportsKeys: string[], current: string): number =>
viewportsKeys.indexOf(current);

Expand All @@ -24,7 +29,7 @@ export const registerShortcuts = async (api: API, setState: any, viewportsKeys:
defaultShortcut: ['shift', 'V'],
actionName: 'previous',
action: () => {
const { selected, isRotated } = api.getAddonState(ADDON_ID);
const { selected, isRotated } = api.getAddonState<State>(ADDON_ID);
setState({
selected: getPreviousViewport(viewportsKeys, selected),
isRotated,
Expand All @@ -37,7 +42,7 @@ export const registerShortcuts = async (api: API, setState: any, viewportsKeys:
defaultShortcut: ['V'],
actionName: 'next',
action: () => {
const { selected, isRotated } = api.getAddonState(ADDON_ID);
const { selected, isRotated } = api.getAddonState<State>(ADDON_ID);
setState({
selected: getNextViewport(viewportsKeys, selected),
isRotated,
Expand All @@ -50,7 +55,7 @@ export const registerShortcuts = async (api: API, setState: any, viewportsKeys:
defaultShortcut: ['alt', 'V'],
actionName: 'reset',
action: () => {
const { isRotated } = api.getAddonState(ADDON_ID);
const { isRotated } = api.getAddonState<State>(ADDON_ID);
setState({
selected: 'reset',
isRotated,
Expand Down
6 changes: 3 additions & 3 deletions code/frameworks/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"@storybook/node-logger": "7.0.0-alpha.50",
"@storybook/store": "7.0.0-alpha.50",
"@storybook/types": "7.0.0-alpha.50",
"@types/node": "^16.0.0",
"@types/react": "^16.14.23",
"@types/node": "^18.11.9",
"@types/react": "^16.14.34",
"@types/react-dom": "^16.9.14",
"@types/semver": "^7.3.4",
"@types/webpack-env": "^1.18.0",
Expand Down Expand Up @@ -86,7 +86,7 @@
"jest-specific-snapshot": "^6.0.0",
"rimraf": "^3.0.2",
"tmp": "^0.2.1",
"typescript": "~4.6.3",
"typescript": "^4.9.3",
"webpack": "5",
"zone.js": "^0.11.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/ember/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"devDependencies": {
"ember-source": "~3.28.1",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"@babel/core": "*",
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/html-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/html": "7.0.0-alpha.50",
"@storybook/preset-html-webpack": "7.0.0-alpha.50",
"@types/node": "^16.0.0",
"@types/node": "^18.11.9",
"global": "^4.4.0",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"@babel/core": "*"
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@storybook/node-logger": "7.0.0-alpha.50",
"@storybook/preset-react-webpack": "7.0.0-alpha.50",
"@storybook/react": "7.0.0-alpha.50",
"@types/node": "^14.14.20 || ^16.0.0",
"@types/node": "^18.11.9",
"find-up": "^5.0.0",
"fs-extra": "^9.0.1",
"image-size": "^1.0.0",
Expand All @@ -83,7 +83,7 @@
"devDependencies": {
"@storybook/addon-actions": "7.0.0-alpha.50",
"next": "^12.2.4",
"typescript": "~4.6.3",
"typescript": "^4.9.3",
"webpack": "^5.65.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/preact-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/preact": "7.0.0-alpha.50",
"@storybook/preset-preact-webpack": "7.0.0-alpha.50",
"@types/node": "^16.0.0",
"@types/node": "^18.11.9",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"preact": "^10.5.13",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"@babel/core": "*",
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/react-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
"vite": "^3.1.3"
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "~4.6.3",
"@types/node": "^18.11.9",
"typescript": "^4.9.3",
"vite": "^3.1.3"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/react-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
"@storybook/builder-webpack5": "7.0.0-alpha.50",
"@storybook/preset-react-webpack": "7.0.0-alpha.50",
"@storybook/react": "7.0.0-alpha.50",
"@types/node": "^16.0.0"
"@types/node": "^18.11.9"
},
"devDependencies": {
"jest-specific-snapshot": "^6.0.0",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"@babel/core": "^7.11.5",
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/server-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/preset-server-webpack": "7.0.0-alpha.50",
"@storybook/server": "7.0.0-alpha.50",
"@types/node": "^16.0.0",
"@types/node": "^18.11.9",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"engines": {
"node": ">=10.13.0"
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/svelte-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
"vite": "^3.1.3"
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "~4.6.3",
"@types/node": "^18.11.9",
"typescript": "^4.9.3",
"vite": "^3.1.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/svelte-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"devDependencies": {
"svelte": "^3.48.0",
"svelte-loader": "^3.1.2",
"typescript": "~4.6.3"
"typescript": "^4.9.3"
},
"peerDependencies": {
"@babel/core": "*",
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/vue-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"vue-docgen-api": "^4.40.0"
},
"devDependencies": {
"typescript": "~4.6.3",
"typescript": "^4.9.3",
"vue": "^2.7.10"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/vue-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/preset-vue-webpack": "7.0.0-alpha.50",
"@storybook/vue": "7.0.0-alpha.50",
"@types/node": "^16.0.0",
"@types/node": "^18.11.9",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"typescript": "~4.6.3",
"typescript": "^4.9.3",
"vue": "^2.6.12",
"vue-loader": "^15.7.0",
"vue-template-compiler": "^2.6.14"
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/vue3-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"vue-docgen-api": "^4.40.0"
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "~4.6.3",
"@types/node": "^18.11.9",
"typescript": "^4.9.3",
"vite": "^3.1.3"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/vue3-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/preset-vue3-webpack": "7.0.0-alpha.50",
"@storybook/vue3": "7.0.0-alpha.50",
"@types/node": "^16.0.0",
"@types/node": "^18.11.9",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"@vue/compiler-sfc": "3.0.0",
"typescript": "~4.6.3",
"typescript": "^4.9.3",
"vue": "3.0.0"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit e8ed15f

Please sign in to comment.