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 1, 2022
1 parent 0f5575c commit fc0cab5
Show file tree
Hide file tree
Showing 101 changed files with 1,090 additions and 452 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
@@ -1,4 +1,5 @@
{
"deepscan.enable": true,
"typescript.tsdk": "./code/node_modules/typescript/lib"
"typescript.tsdk": "./code/node_modules/typescript/lib",
"eslint.workingDirectories": ["./code", "./scripts"]
}
5 changes: 5 additions & 0 deletions code/.eslintignore
Expand Up @@ -24,3 +24,8 @@ ember-output
!.jest.config.js
!.storybook

## TODO remove this before merging
*public-types.test.ts
*public-types.test.tsx
*public-types.test.tsx
**/template/cli/ts/**/*stories.ts
3 changes: 3 additions & 0 deletions code/.prettierignore
@@ -0,0 +1,3 @@
## TODO remove this before merging
*public-types.test.ts
*public-types.test.tsx
2 changes: 1 addition & 1 deletion code/addons/a11y/package.json
Expand Up @@ -78,7 +78,7 @@
},
"devDependencies": {
"@testing-library/react": "^11.2.2",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/actions/package.json
Expand Up @@ -82,7 +82,7 @@
},
"devDependencies": {
"@types/lodash": "^4.14.167",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/backgrounds/package.json
Expand Up @@ -74,7 +74,7 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/docs/package.json
Expand Up @@ -77,7 +77,7 @@
},
"devDependencies": {
"@babel/core": "^7.12.10",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/essentials/package.json
Expand Up @@ -60,7 +60,7 @@
"@babel/core": "^7.12.10",
"@storybook/vue": "7.0.0-alpha.47",
"@types/jest": "^26.0.16",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "^7.9.6"
Expand Down
2 changes: 1 addition & 1 deletion code/addons/highlight/package.json
Expand Up @@ -56,7 +56,7 @@
},
"devDependencies": {
"@types/webpack-env": "^1.16.0",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions code/addons/interactions/package.json
Expand Up @@ -76,9 +76,9 @@
"devDependencies": {
"@storybook/jest": "^0.0.10",
"@storybook/testing-library": "0.0.14-next.0",
"@types/node": "^16.0.0",
"@types/node": "18.11.6",
"formik": "^2.2.9",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/jest/package.json
Expand Up @@ -70,7 +70,7 @@
"upath": "^1.2.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/links/package.json
Expand Up @@ -74,7 +74,7 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/measure/package.json
Expand Up @@ -70,7 +70,7 @@
"global": "^4.4.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/outline/package.json
Expand Up @@ -74,7 +74,7 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/storysource/package.json
Expand Up @@ -67,7 +67,7 @@
"devDependencies": {
"@types/react": "^16.14.23",
"@types/react-syntax-highlighter": "11.0.5",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/toolbars/package.json
Expand Up @@ -64,7 +64,7 @@
"@storybook/theming": "7.0.0-alpha.47"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/viewport/package.json
Expand Up @@ -70,7 +70,7 @@
"prop-types": "^15.7.2"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"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
@@ -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
4 changes: 2 additions & 2 deletions code/frameworks/angular/package.json
Expand Up @@ -47,7 +47,7 @@
"@storybook/node-logger": "7.0.0-alpha.47",
"@storybook/store": "7.0.0-alpha.47",
"@storybook/types": "7.0.0-alpha.47",
"@types/node": "^16.0.0",
"@types/node": "18.11.6",
"@types/react": "^16.14.23",
"@types/react-dom": "^16.9.14",
"@types/semver": "^7.3.4",
Expand Down Expand Up @@ -85,7 +85,7 @@
"jest-specific-snapshot": "^5.0.0",
"rimraf": "^3.0.2",
"tmp": "^0.2.1",
"typescript": "~4.6.3",
"typescript": "4.9.0-dev.20221026",
"webpack": "5",
"zone.js": "^0.11.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/ember/package.json
Expand Up @@ -45,7 +45,7 @@
},
"devDependencies": {
"ember-source": "~3.28.1",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "*",
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/html-webpack5/package.json
Expand Up @@ -54,13 +54,13 @@
"@storybook/core-common": "7.0.0-alpha.47",
"@storybook/html": "7.0.0-alpha.47",
"@storybook/preset-html-webpack": "7.0.0-alpha.47",
"@types/node": "^16.0.0",
"@types/node": "18.11.6",
"global": "^4.4.0",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "*"
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/nextjs/package.json
Expand Up @@ -66,7 +66,7 @@
"@storybook/node-logger": "7.0.0-alpha.47",
"@storybook/preset-react-webpack": "7.0.0-alpha.47",
"@storybook/react": "7.0.0-alpha.47",
"@types/node": "^14.14.20 || ^16.0.0",
"@types/node": "18.11.6",
"find-up": "^5.0.0",
"fs-extra": "^9.0.1",
"image-size": "^1.0.0",
Expand All @@ -84,7 +84,7 @@
"@storybook/addon-actions": "7.0.0-alpha.47",
"@types/loader-utils": "^2.0.3",
"next": "^12.2.4",
"typescript": "~4.6.3",
"typescript": "4.9.0-dev.20221026",
"webpack": "^5.65.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/preact-webpack5/package.json
Expand Up @@ -54,13 +54,13 @@
"@storybook/core-common": "7.0.0-alpha.47",
"@storybook/preact": "7.0.0-alpha.47",
"@storybook/preset-preact-webpack": "7.0.0-alpha.47",
"@types/node": "^16.0.0",
"@types/node": "18.11.6",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"preact": "^10.5.13",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "*",
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/react-vite/package.json
Expand Up @@ -67,8 +67,8 @@
"vite": "^3.1.3"
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "~4.6.3",
"@types/node": "18.11.6",
"typescript": "4.9.0-dev.20221026",
"vite": "^3.1.3"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/react-webpack5/package.json
Expand Up @@ -54,11 +54,11 @@
"@storybook/builder-webpack5": "7.0.0-alpha.47",
"@storybook/preset-react-webpack": "7.0.0-alpha.47",
"@storybook/react": "7.0.0-alpha.47",
"@types/node": "^16.0.0"
"@types/node": "18.11.6"
},
"devDependencies": {
"jest-specific-snapshot": "^4.0.0",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "^7.11.5",
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/server-webpack5/package.json
Expand Up @@ -54,12 +54,12 @@
"@storybook/core-common": "7.0.0-alpha.47",
"@storybook/preset-server-webpack": "7.0.0-alpha.47",
"@storybook/server": "7.0.0-alpha.47",
"@types/node": "^16.0.0",
"@types/node": "18.11.6",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"engines": {
"node": ">=10.13.0"
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/svelte-vite/package.json
Expand Up @@ -67,8 +67,8 @@
"vite": "^3.1.3"
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "~4.6.3",
"@types/node": "18.11.6",
"typescript": "4.9.0-dev.20221026",
"vite": "^3.1.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/svelte-webpack5/package.json
Expand Up @@ -61,7 +61,7 @@
"devDependencies": {
"svelte": "^3.48.0",
"svelte-loader": "^3.1.2",
"typescript": "~4.6.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "*",
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/vue-vite/package.json
Expand Up @@ -64,7 +64,7 @@
"vue-docgen-api": "^4.40.0"
},
"devDependencies": {
"typescript": "~4.6.3",
"typescript": "4.9.0-dev.20221026",
"vue": "^2.7.10"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/vue-webpack5/package.json
Expand Up @@ -54,12 +54,12 @@
"@storybook/core-common": "7.0.0-alpha.47",
"@storybook/preset-vue-webpack": "7.0.0-alpha.47",
"@storybook/vue": "7.0.0-alpha.47",
"@types/node": "^16.0.0",
"@types/node": "18.11.6",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"typescript": "~4.6.3",
"typescript": "4.9.0-dev.20221026",
"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
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.6",
"typescript": "4.9.0-dev.20221026",
"vite": "^3.1.3"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/vue3-webpack5/package.json
Expand Up @@ -54,13 +54,13 @@
"@storybook/core-common": "7.0.0-alpha.47",
"@storybook/preset-vue3-webpack": "7.0.0-alpha.47",
"@storybook/vue3": "7.0.0-alpha.47",
"@types/node": "^16.0.0",
"@types/node": "18.11.6",
"react": "16.14.0",
"react-dom": "16.14.0"
},
"devDependencies": {
"@vue/compiler-sfc": "3.0.0",
"typescript": "~4.6.3",
"typescript": "4.9.0-dev.20221026",
"vue": "3.0.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/web-components-vite/package.json
Expand Up @@ -64,8 +64,8 @@
"vite": "3"
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "~4.6.3",
"@types/node": "18.11.6",
"typescript": "4.9.0-dev.20221026",
"vite": "^3.1.0"
},
"engines": {
Expand Down

0 comments on commit fc0cab5

Please sign in to comment.