Merge pull request #4853 from backstage/rugvip/pretty-sync

prettier,cli: bump deps to support TypeScript 4.1
This commit is contained in:
Fredrik Adelöw
2021-03-08 07:54:08 +01:00
committed by GitHub
15 changed files with 95 additions and 111 deletions
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/cli': patch
---
Add support for most TypeScript 4.1 syntax.
+1 -1
View File
@@ -52,7 +52,7 @@
"husky": "^4.2.3",
"lerna": "^4.0.0",
"lint-staged": "^10.1.0",
"prettier": "^2.0.5",
"prettier": "^2.2.1",
"recursive-readdir": "^2.2.2",
"shx": "^0.3.2"
},
+1 -1
View File
@@ -66,7 +66,7 @@
</script>
<% } %>
</head>
<body style="margin: 0;">
<body style="margin: 0">
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
+3 -4
View File
@@ -63,7 +63,7 @@
"css-loader": "^3.5.3",
"dashify": "^2.0.0",
"diff": "^4.0.2",
"esbuild": "^0.8.16",
"esbuild": "^0.8.56",
"eslint": "^7.1.0",
"eslint-config-prettier": "^6.0.0",
"eslint-formatter-friendly": "^7.0.0",
@@ -93,16 +93,15 @@
"recursive-readdir": "^2.2.2",
"replace-in-file": "^6.0.0",
"rollup": "2.33.x",
"rollup-plugin-dts": "1.4.13",
"rollup-plugin-dts": "^2.0.1",
"rollup-plugin-esbuild": "2.6.x",
"rollup-plugin-peer-deps-external": "^2.2.2",
"rollup-plugin-postcss": "^3.1.1",
"rollup-plugin-typescript2": "^0.29.0",
"rollup-pluginutils": "^2.8.2",
"semver": "^7.3.2",
"start-server-webpack-plugin": "^2.2.5",
"style-loader": "^1.2.1",
"sucrase": "^3.16.0",
"sucrase": "^3.17.1",
"tar": "^6.0.1",
"terser-webpack-plugin": "^1.4.3",
"ts-jest": "^26.4.3",
+7 -4
View File
@@ -37,7 +37,8 @@ class RouteRefBase {
}
}
export class RouteRefImpl<Params extends AnyParams> extends RouteRefBase
export class RouteRefImpl<Params extends AnyParams>
extends RouteRefBase
implements RouteRef<Params> {
readonly [routeRefType] = 'absolute';
@@ -91,9 +92,11 @@ export function createRouteRef<
}
export class ExternalRouteRefImpl<
Params extends AnyParams,
Optional extends boolean
> extends RouteRefBase implements ExternalRouteRef<Params, Optional> {
Params extends AnyParams,
Optional extends boolean
>
extends RouteRefBase
implements ExternalRouteRef<Params, Optional> {
readonly [routeRefType] = 'external';
constructor(
+4 -3
View File
@@ -133,9 +133,10 @@ export const SidebarIntro = () => {
starredItemsDismissed: false,
recentlyViewedItemsDismissed: false,
};
const [dismissedIntro, setDismissedIntro] = useLocalStorage<
SidebarIntroLocalStorage
>(SIDEBAR_INTRO_LOCAL_STORAGE);
const [
dismissedIntro,
setDismissedIntro,
] = useLocalStorage<SidebarIntroLocalStorage>(SIDEBAR_INTRO_LOCAL_STORAGE);
const { starredItemsDismissed, recentlyViewedItemsDismissed } =
dismissedIntro ?? {};
@@ -55,9 +55,13 @@ export const PreparePullRequestForm = <
onSubmit,
render,
}: Props<TFieldValues>) => {
const { handleSubmit, watch, control, register, errors } = useForm<
TFieldValues
>({ mode: 'onTouched', defaultValues });
const {
handleSubmit,
watch,
control,
register,
errors,
} = useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
return (
<form onSubmit={handleSubmit(onSubmit)}>
@@ -74,9 +74,10 @@ const CatalogPageContents = () => {
const errorApi = useApi(errorApiRef);
const { isStarredEntity } = useStarredEntities();
const [selectedTab, setSelectedTab] = useState<string>();
const [selectedSidebarItem, setSelectedSidebarItem] = useState<
CatalogFilterType
>();
const [
selectedSidebarItem,
setSelectedSidebarItem,
] = useState<CatalogFilterType>();
const orgName = configApi.getOptionalString('organization.name') ?? 'Company';
const createComponentLink = useRouteRef(createComponentRouteRef);
const addMockData = useCallback(async () => {
@@ -17,9 +17,7 @@ import { useAsync } from 'react-use';
import { ActionsListWorkflowRunsForRepoResponseData } from '../../api/types';
export const useWorkflowRunJobs = (jobsUrl?: string) => {
const jobs = useAsync(async (): Promise<
ActionsListWorkflowRunsForRepoResponseData
> => {
const jobs = useAsync(async (): Promise<ActionsListWorkflowRunsForRepoResponseData> => {
if (jobsUrl === undefined) {
return {
builds: [],
@@ -38,9 +38,7 @@ type PartialPropsWithChildren<T> = PropsWithChildren<Partial<T>>;
export const MockGroups: Group[] = [{ id: 'tech' }, { id: 'mock-group' }];
export type MockFilterProviderProps = PartialPropsWithChildren<
FilterContextProps
>;
export type MockFilterProviderProps = PartialPropsWithChildren<FilterContextProps>;
export const MockFilterProvider = ({
children,
@@ -64,9 +62,7 @@ export const MockFilterProvider = ({
);
};
export type MockLoadingProviderProps = PartialPropsWithChildren<
LoadingContextProps
>;
export type MockLoadingProviderProps = PartialPropsWithChildren<LoadingContextProps>;
export const MockLoadingProvider = ({
children,
@@ -84,9 +80,7 @@ export const MockLoadingProvider = ({
);
};
export type MockConfigProviderProps = PartialPropsWithChildren<
ConfigContextProps
>;
export type MockConfigProviderProps = PartialPropsWithChildren<ConfigContextProps>;
export const MockConfigProvider = ({
children,
@@ -106,9 +100,7 @@ export const MockConfigProvider = ({
);
};
export type MockCurrencyProviderProps = PartialPropsWithChildren<
CurrencyContextProps
>;
export type MockCurrencyProviderProps = PartialPropsWithChildren<CurrencyContextProps>;
export const MockCurrencyProvider = ({
children,
@@ -129,9 +121,7 @@ export const MockCurrencyProvider = ({
);
};
export type MockBillingDateProviderProps = PartialPropsWithChildren<
BillingDateContextProps
>;
export type MockBillingDateProviderProps = PartialPropsWithChildren<BillingDateContextProps>;
export const MockBillingDateProvider = ({
children,
@@ -161,9 +151,7 @@ export const MockScrollProvider = ({ children }: MockScrollProviderProps) => {
);
};
export type MockGroupsProviderProps = PartialPropsWithChildren<
GroupsContextProps
>;
export type MockGroupsProviderProps = PartialPropsWithChildren<GroupsContextProps>;
export const MockGroupsProvider = ({
children,
@@ -23,12 +23,13 @@ export interface KubernetesAuthProvider {
): Promise<KubernetesRequestBody>;
}
export const kubernetesAuthProvidersApiRef = createApiRef<
KubernetesAuthProvidersApi
>({
id: 'plugin.kubernetes-auth-providers.service',
description: 'Used by the Kubernetes plugin to fetch KubernetesAuthProviders',
});
export const kubernetesAuthProvidersApiRef = createApiRef<KubernetesAuthProvidersApi>(
{
id: 'plugin.kubernetes-auth-providers.service',
description:
'Used by the Kubernetes plugin to fetch KubernetesAuthProviders',
},
);
export interface KubernetesAuthProvidersApi {
decorateRequestBodyForAuth(
+4 -3
View File
@@ -125,9 +125,10 @@ export class LighthouseRestApi implements LighthouseApi {
return await resp.json();
}
async getWebsiteList({ limit, offset }: LASListRequest = {}): Promise<
WebsiteListResponse
> {
async getWebsiteList({
limit,
offset,
}: LASListRequest = {}): Promise<WebsiteListResponse> {
const params = new URLSearchParams();
if (typeof limit === 'number') params.append('limit', limit.toString());
if (typeof offset === 'number') params.append('offset', offset.toString());
@@ -125,14 +125,13 @@ export const MembersListCard = (_props: {
kind: 'User',
},
});
const groupMembersList = ((membersList.items as unknown) as Array<
UserEntity
>).filter(member =>
member?.relations?.some(
r =>
r.type === RELATION_MEMBER_OF &&
r.target.name.toLowerCase() === groupName.toLowerCase(),
),
const groupMembersList = ((membersList.items as unknown) as Array<UserEntity>).filter(
member =>
member?.relations?.some(
r =>
r.type === RELATION_MEMBER_OF &&
r.target.name.toLowerCase() === groupName.toLowerCase(),
),
);
return groupMembersList;
}, [catalogApi]);
@@ -127,9 +127,9 @@ describe('buildMiddleware', () => {
'user-agent': 'mocked',
cookie: 'mocked',
} as Partial<http.IncomingHttpHeaders>;
const expectedHeaders = { ...testHeaders } as Partial<
http.IncomingHttpHeaders
>;
const expectedHeaders = {
...testHeaders,
} as Partial<http.IncomingHttpHeaders>;
delete expectedHeaders.cookie;
expect(testHeaders).toBeDefined();
@@ -160,9 +160,9 @@ describe('buildMiddleware', () => {
authorization: 'mocked',
cookie: 'mocked',
} as Partial<http.IncomingHttpHeaders>;
const expectedHeaders = { ...testHeaders } as Partial<
http.IncomingHttpHeaders
>;
const expectedHeaders = {
...testHeaders,
} as Partial<http.IncomingHttpHeaders>;
delete expectedHeaders.cookie;
expect(testHeaders).toBeDefined();
@@ -192,9 +192,9 @@ describe('buildMiddleware', () => {
cookie: 'mocked',
'x-auth-request-user': 'mocked',
} as Partial<http.IncomingHttpHeaders>;
const expectedHeaders = { ...testHeaders } as Partial<
http.IncomingHttpHeaders
>;
const expectedHeaders = {
...testHeaders,
} as Partial<http.IncomingHttpHeaders>;
delete expectedHeaders['x-auth-request-user'];
expect(testHeaders).toBeDefined();
+29 -45
View File
@@ -12346,10 +12346,10 @@ es6-weak-map@^2.0.3:
es6-iterator "^2.0.3"
es6-symbol "^3.1.1"
esbuild@^0.8.16:
version "0.8.16"
resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.8.16.tgz#8ae34b15d938e8b8b5ac2459414fe3e7fd7dd6b2"
integrity sha512-HMvPNxDIhEGO/YUh8oO8oxQ1g+ttWz2anUF7NJmQglj2XfJS8zd8mP0Sb2y+jE1SVk3UjD/rYhdsEOFULN9/xw==
esbuild@^0.8.56:
version "0.8.56"
resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.8.56.tgz#9c7c3d6e614db7367afa348adb0ab287c296735e"
integrity sha512-PTMdAWK3JI2MNW811znGssGP5GR44tQPr++VQ1rPP0n8Z1cTKbCPD3S/kXPLr3ZZDIwAaVm08fuFym6Rp8l/0A==
escalade@^3.0.1:
version "3.0.2"
@@ -13604,15 +13604,6 @@ fs-constants@^1.0.0:
resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
fs-extra@8.1.0, fs-extra@^8.1.0:
version "8.1.0"
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
dependencies:
graceful-fs "^4.2.0"
jsonfile "^4.0.0"
universalify "^0.1.0"
fs-extra@9.0.1:
version "9.0.1"
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
@@ -13643,6 +13634,15 @@ fs-extra@^7.0.1:
jsonfile "^4.0.0"
universalify "^0.1.0"
fs-extra@^8.1.0:
version "8.1.0"
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
dependencies:
graceful-fs "^4.2.0"
jsonfile "^4.0.0"
universalify "^0.1.0"
fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
version "9.1.0"
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -21233,7 +21233,12 @@ prettier@^1.18.2, prettier@^1.19.1:
resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
prettier@^2.0.5, prettier@~2.0.5:
prettier@^2.2.1:
version "2.2.1"
resolved "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
prettier@~2.0.5:
version "2.0.5"
resolved "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
@@ -22888,13 +22893,6 @@ resolve-url@^0.2.1:
resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
resolve@1.17.0:
version "1.17.0"
resolved "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
dependencies:
path-parse "^1.0.6"
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.16.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2:
version "1.19.0"
resolved "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
@@ -23026,10 +23024,12 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"
rollup-plugin-dts@1.4.13:
version "1.4.13"
resolved "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-1.4.13.tgz#4f086e84f4fdcc1f49160799ebc66f6b09db292b"
integrity sha512-7mxoQ6PcmCkBE5ZhrjGDL4k42XLy8BkSqpiRi1MipwiGs+7lwi4mQkp2afX+OzzLjJp/TGM8llfe8uayIUhPEw==
rollup-plugin-dts@^2.0.1:
version "2.0.1"
resolved "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-2.0.1.tgz#333f50a637e199a073d490b198746f3c6bd07701"
integrity sha512-y38NSXIY37YExCumbGBTL5dXg7pL7XD+Kbe98iEHWFN9yiKJf7t4kKBOkml5ylUDjQIXBnNClGDeRktc1T5dmA==
dependencies:
magic-string "^0.25.7"
optionalDependencies:
"@babel/code-frame" "^7.10.4"
@@ -23067,17 +23067,6 @@ rollup-plugin-postcss@^3.1.1:
safe-identifier "^0.4.1"
style-inject "^0.3.0"
rollup-plugin-typescript2@^0.29.0:
version "0.29.0"
resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.29.0.tgz#b7ad83f5241dbc5bdf1e98d9c3fca005ffe39e1a"
integrity sha512-YytahBSZCIjn/elFugEGQR5qTsVhxhUwGZIsA9TmrSsC88qroGo65O5HZP/TTArH2dm0vUmYWhKchhwi2wL9bw==
dependencies:
"@rollup/pluginutils" "^3.1.0"
find-cache-dir "^3.3.1"
fs-extra "8.1.0"
resolve "1.17.0"
tslib "2.0.1"
rollup-pluginutils@^2.8.2:
version "2.8.2"
resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
@@ -24457,10 +24446,10 @@ subscriptions-transport-ws@0.9.18, subscriptions-transport-ws@^0.9.11, subscript
symbol-observable "^1.0.4"
ws "^5.2.0"
sucrase@^3.16.0:
version "3.17.0"
resolved "https://registry.npmjs.org/sucrase/-/sucrase-3.17.0.tgz#d9fe5d7e359d884cdb31130358fbdfc18bfb4c24"
integrity sha512-wtiqaokYRjFSSrv8fQu7pThKTIZSLwiffW+PHQG52hlI8eJO47v1tXbKt6fYb8Z1kCyuCkNH9etpTUebb7g+pA==
sucrase@^3.17.1:
version "3.17.1"
resolved "https://registry.npmjs.org/sucrase/-/sucrase-3.17.1.tgz#b5e35ca7d99db2cc82b3e942934c3746b41ff8e2"
integrity sha512-04cNLFAhS4NBG2Z/MTkLY6HdoBsqErv3wCncymFlfFtnpMthurlWYML2RlID4M2BbiJSu1eZdQnE8Lcz4PCe2g==
dependencies:
commander "^4.0.0"
glob "7.1.6"
@@ -25312,11 +25301,6 @@ tslib@2.0.0:
resolved "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
tslib@2.0.1:
version "2.0.1"
resolved "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
version "1.14.1"
resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"