Skip to content

Commit

Permalink
chore(deps): update dependency typescript to v4 (#1695)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency typescript to v4

* fix: type errors

* docs: changeset

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Nicola Molinari <nicola.molinari@commercetools.de>
  • Loading branch information
3 people authored Nov 23, 2020
1 parent 636fc45 commit e2d519f
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 23 deletions.
6 changes: 6 additions & 0 deletions .changeset/good-zebras-promise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@commercetools-backend/express": patch
"@commercetools-frontend/application-shell": patch
---

Migrate to Typescript v4
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"stylelint-config-standard": "20.0.0",
"stylelint-order": "4.1.0",
"stylelint-value-no-unknown-custom-properties": "3.0.0",
"typescript": "3.9.7",
"typescript": "4.1.2",
"vfile-message": "2.0.4"
},
"resolutions": {
Expand Down
17 changes: 10 additions & 7 deletions packages-backend/express/src/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,18 @@ type TDecodedJWT = {
const decodedTokenKey = 'decoded_token';
// Assign a session object to the request object.
const writeSessionContext = <Request extends IncomingMessage>(
request: Request & { decoded_token: TDecodedJWT; session?: TSession }
request: Request & { decoded_token?: TDecodedJWT; session?: TSession }
) => {
const decodedToken = request[decodedTokenKey];
const publicClaimForProjectKey = `${decodedToken.iss}/claims/project_key`;

request.session = {
userId: decodedToken.sub,
projectKey: decodedToken[publicClaimForProjectKey],
};
if (decodedToken) {
const publicClaimForProjectKey = `${decodedToken.iss}/claims/project_key`;

request.session = {
userId: decodedToken.sub,
projectKey: decodedToken[publicClaimForProjectKey],
};
}

// Remove the field used by the JWT middleware.
delete request.decoded_token;
Expand Down Expand Up @@ -149,7 +152,7 @@ function createSessionAuthVerifier<
const requestUrlPath = request.originalUrl ?? request.url;
const audience = getConfiguredAudience(options, requestUrlPath);

return new Promise((resolve, reject) => {
return new Promise<void>((resolve, reject) => {
expressJwtMiddleware({
// Dynamically provide a signing key based on the kid in the header
// and the singing keys provided by the JWKS endpoint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe.each`
originalUrl: '/foo/bar',
};
const fakeResponse = {};
await new Promise((resolve, reject) => {
await new Promise<void>((resolve, reject) => {
// @ts-ignore
sessionMiddleware(fakeRequest, fakeResponse, (error) => {
if (error) reject(error);
Expand Down Expand Up @@ -83,7 +83,7 @@ describe.each`
originalUrl: '/foo/bar',
};
const fakeResponse = {};
await new Promise((resolve, reject) => {
await new Promise<void>((resolve, reject) => {
// @ts-ignore
sessionMiddleware(fakeRequest, fakeResponse, (error) => {
if (error) reject(error);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const defaultApiUrl = window.location.origin;
function useApplicationsMenu<Key extends MenuKey>(
menuKey: Key,
config: Config<Key> = {}
) {
): MenuLoaderResult<Key> | undefined {
const [menu, setMenu] = React.useState<MenuLoaderResult<Key>>();

// Trigger loading the menu from local file, for local development
Expand Down Expand Up @@ -65,12 +65,11 @@ function useApplicationsMenu<Key extends MenuKey>(

// Return the local config
if (config.skipRemoteQuery === true) {
const fakeGraphqlResponse = menu
? Array.isArray(menu)
? menu
: [menu]
: undefined;
return fakeGraphqlResponse;
if (menu) {
const fakeGraphqlResponse = Array.isArray(menu) ? menu : [menu];
return fakeGraphqlResponse as MenuLoaderResult<Key>;
}
return;
}

// Fetch the query remotely
Expand All @@ -80,7 +79,7 @@ function useApplicationsMenu<Key extends MenuKey>(
}

if (menuQueryResult && menuQueryResult.applicationsMenu) {
return menuQueryResult.applicationsMenu[menuKey];
return menuQueryResult.applicationsMenu[menuKey] as MenuLoaderResult<Key>;
}

return;
Expand Down
2 changes: 1 addition & 1 deletion packages/application-shell/src/test-utils/test-utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const defaultUser = {
launchdarklyTrackingTenant: 'gcp-eu',
};

const defaultEnvironment = {
const defaultEnvironment: Partial<TProviderProps<{}>['environment']> = {
applicationName: 'my-app',
frontendHost: 'localhost:3001',
mcApiUrl: 'https://mc-api.europe-west1.gcp.commercetools.com',
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26966,10 +26966,10 @@ typeface-roboto@1.1.13:
resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-1.1.13.tgz#9c4517cb91e311706c74823e857b4bac9a764ae5"
integrity sha512-YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw==

typescript@3.9.7:
version "3.9.7"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
typescript@4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==

typescript@^4.0:
version "4.0.5"
Expand Down

1 comment on commit e2d519f

@vercel
Copy link

@vercel vercel bot commented on e2d519f Nov 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.