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

Upgrade to TS 4.9 #19646

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions .vscode/settings.json
@@ -1,6 +1,9 @@
{
"deepscan.enable": true,
"eslint.workingDirectories": ["./code", "./scripts"],
"eslint.workingDirectories": [
"./code",
"./scripts"
],
"typescript.tsdk": "./code/node_modules/typescript/lib",
"[javascript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
Expand All @@ -18,4 +21,4 @@
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.formatOnSave": true
},
}
}
5 changes: 5 additions & 0 deletions code/.eslintignore
Expand Up @@ -21,3 +21,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 @@ -79,7 +79,7 @@
},
"devDependencies": {
"@testing-library/react": "^11.2.2",
"typescript": "^4.9.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 @@ -96,7 +96,7 @@
},
"devDependencies": {
"@types/lodash": "^4.14.167",
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
1 change: 1 addition & 0 deletions code/addons/actions/src/containers/ActionLogger/index.tsx
Expand Up @@ -26,6 +26,7 @@ const safeDeepEqual = (a: any, b: any): boolean => {
};

export default class ActionLogger extends Component<ActionLoggerProps, ActionLoggerState> {
// @ts-expect-error Unused, possibly remove, leaving, because it could be accessed even though it is private
private mounted: boolean;

constructor(props: ActionLoggerProps) {
Expand Down
2 changes: 1 addition & 1 deletion code/addons/backgrounds/package.json
Expand Up @@ -88,7 +88,7 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"typescript": "^4.9.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 @@ -105,7 +105,7 @@
},
"devDependencies": {
"@babel/core": "^7.20.2",
"typescript": "^4.9.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 @@ -130,7 +130,7 @@
"devDependencies": {
"@babel/core": "^7.20.2",
"@storybook/vue": "7.0.0-alpha.53",
"typescript": "^4.9.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 @@ -67,7 +67,7 @@
},
"devDependencies": {
"@types/webpack-env": "^1.16.0",
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion code/addons/interactions/package.json
Expand Up @@ -92,7 +92,7 @@
"@storybook/testing-library": "0.0.14-next.0",
"@types/node": "^16.0.0",
"formik": "^2.2.9",
"typescript": "^4.9.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 @@ -81,7 +81,7 @@
"upath": "^1.2.0"
},
"devDependencies": {
"typescript": "^4.9.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 @@ -88,7 +88,7 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"typescript": "^4.9.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 @@ -84,7 +84,7 @@
"global": "^4.4.0"
},
"devDependencies": {
"typescript": "^4.9.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 @@ -88,7 +88,7 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"typescript": "^4.9.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 @@ -68,7 +68,7 @@
"devDependencies": {
"@types/react": "^16.14.34",
"@types/react-syntax-highlighter": "11.0.5",
"typescript": "^4.9.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 @@ -75,7 +75,7 @@
"@storybook/theming": "7.0.0-alpha.53"
},
"devDependencies": {
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
Expand Down
10 changes: 1 addition & 9 deletions code/addons/toolbars/src/components/ToolbarMenuList.tsx
@@ -1,4 +1,4 @@
import type { FC, ReactNode } from 'react';
import type { FC } from 'react';
import React, { useCallback } from 'react';
import { useGlobals } from '@storybook/manager-api';
import { deprecate } from '@storybook/client-logger';
Expand All @@ -10,14 +10,6 @@ import { getSelectedIcon, getSelectedTitle } from '../utils/get-selected';
import type { ToolbarMenuProps } from '../types';
import { ToolbarMenuListItem } from './ToolbarMenuListItem';

type ItemProps = {
left?: ReactNode;
title?: ReactNode;
right?: ReactNode;
active?: boolean;
onClick?: () => void;
};

type ToolbarMenuListProps = ToolbarMenuProps & WithKeyboardCycleProps;

export const ToolbarMenuList: FC<ToolbarMenuListProps> = withKeyboardCycle(
Expand Down
2 changes: 1 addition & 1 deletion code/addons/viewport/package.json
Expand Up @@ -84,7 +84,7 @@
"prop-types": "^15.7.2"
},
"devDependencies": {
"typescript": "^4.9.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/frameworks/angular/package.json
Expand Up @@ -86,7 +86,7 @@
"jest-specific-snapshot": "^6.0.0",
"rimraf": "^3.0.2",
"tmp": "^0.2.1",
"typescript": "^4.9.3",
"typescript": "4.9.0-dev.20221026",
"webpack": "5",
"zone.js": "^0.11.0"
},
Expand Down
Expand Up @@ -306,7 +306,7 @@ describe('RendererFactory', () => {
.appendChild(global.document.createElement('👾'));

expect(global.document.getElementById('storybook-root').innerHTML).toContain('Canvas 🖼');
const render = await rendererFactory.getRendererInstance(
await rendererFactory.getRendererInstance(
'my-story-in-docs',
rootDocstargetDOMNode
);
Expand Down
Expand Up @@ -34,11 +34,8 @@ describe('framework-preset-angular-cli', () => {
});

describe('without angular.json', () => {
let consoleErrorSpy: jest.SpyInstance;

beforeEach(() => {
initMockWorkspace('');
consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
});
it('should return webpack base config and display log error', async () => {
const webpackBaseConfig = newWebpackConfiguration();
Expand Down Expand Up @@ -421,10 +418,6 @@ describe('framework-preset-angular-cli', () => {
it('should set webpack "module.rules"', async () => {
const baseWebpackConfig = newWebpackConfiguration();
const webpackFinalConfig = await webpackFinal(baseWebpackConfig, options);
const stylePaths = [
path.join(workspaceRoot, 'src', 'styles.css'),
path.join(workspaceRoot, 'src', 'styles.scss'),
];

const expectedRules: any = [
{
Expand Down Expand Up @@ -507,10 +500,6 @@ describe('framework-preset-angular-cli', () => {
it('should set webpack "module.rules"', async () => {
const baseWebpackConfig = newWebpackConfiguration();
const webpackFinalConfig = await webpackFinal(baseWebpackConfig, options);
const stylePaths = [
path.join(workspaceRoot, 'src', 'styles.css'),
path.join(workspaceRoot, 'src', 'styles.scss'),
];

const expectedRules: any = [
{
Expand Down
3 changes: 2 additions & 1 deletion code/frameworks/angular/tsconfig.build.json
Expand Up @@ -15,7 +15,8 @@
"allowJs": true,
"pretty": true,
"noErrorTruncation": true,
"listEmittedFiles": false
"listEmittedFiles": false,
"noUnusedLocals": false
},
"include": ["src/**/*", "src/**/*.json"]
}
2 changes: 1 addition & 1 deletion code/frameworks/ember/package.json
Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"ember-source": "~3.28.1",
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "*",
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/html-webpack5/package.json
Expand Up @@ -60,7 +60,7 @@
"react-dom": "16.14.0"
},
"devDependencies": {
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "*"
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/nextjs/package.json
Expand Up @@ -83,7 +83,7 @@
"devDependencies": {
"@storybook/addon-actions": "7.0.0-alpha.53",
"next": "^12.2.4",
"typescript": "^4.9.3",
"typescript": "4.9.0-dev.20221026",
"webpack": "^5.65.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/preact-webpack5/package.json
Expand Up @@ -60,7 +60,7 @@
},
"devDependencies": {
"preact": "^10.5.13",
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "*",
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/react-vite/package.json
Expand Up @@ -67,7 +67,7 @@
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "^4.9.3",
"typescript": "4.9.0-dev.20221026",
"vite": "^3.1.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/react-webpack5/package.json
Expand Up @@ -58,7 +58,7 @@
},
"devDependencies": {
"jest-specific-snapshot": "^6.0.0",
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"@babel/core": "^7.11.5",
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/server-webpack5/package.json
Expand Up @@ -59,7 +59,7 @@
"react-dom": "16.14.0"
},
"devDependencies": {
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"engines": {
"node": ">=10.13.0"
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/svelte-vite/package.json
Expand Up @@ -67,7 +67,7 @@
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "^4.9.3",
"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.9.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 @@ -63,7 +63,7 @@
"vue-docgen-api": "^4.40.0"
},
"devDependencies": {
"typescript": "^4.9.3",
"typescript": "4.9.0-dev.20221026",
"vue": "^2.7.10"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/vue-webpack5/package.json
Expand Up @@ -59,7 +59,7 @@
"react-dom": "16.14.0"
},
"devDependencies": {
"typescript": "^4.9.3",
"typescript": "4.9.0-dev.20221026",
"vue": "^2.6.12",
"vue-loader": "^15.7.0",
"vue-template-compiler": "^2.6.14"
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/vue3-vite/package.json
Expand Up @@ -65,7 +65,7 @@
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "^4.9.3",
"typescript": "4.9.0-dev.20221026",
"vite": "^3.1.3"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/vue3-webpack5/package.json
Expand Up @@ -60,7 +60,7 @@
},
"devDependencies": {
"@vue/compiler-sfc": "3.0.0",
"typescript": "^4.9.3",
"typescript": "4.9.0-dev.20221026",
"vue": "3.0.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/web-components-vite/package.json
Expand Up @@ -64,7 +64,7 @@
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "^4.9.3",
"typescript": "4.9.0-dev.20221026",
"vite": "^3.1.0"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/web-components-webpack5/package.json
Expand Up @@ -63,7 +63,7 @@
},
"devDependencies": {
"lit-html": "2.0.2",
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"peerDependencies": {
"lit-html": "^1.4.1 || ^2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/builder-manager/package.json
Expand Up @@ -58,7 +58,7 @@
"util": "^0.12.4"
},
"devDependencies": {
"typescript": "^4.9.3"
"typescript": "4.9.0-dev.20221026"
},
"publishConfig": {
"access": "public"
Expand Down