Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Update all non-major dependencies #9674

Merged
merged 16 commits into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
path: webapp

- name: Run Cypress tests
uses: cypress-io/github-action@v4.1.1
uses: cypress-io/github-action@v4.2.2
with:
# The built-in Electron runner seems to grind to a halt trying
# to run the tests, so use chrome.
Expand Down
18 changes: 8 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"blurhash": "^1.1.3",
"cheerio": "^1.0.0-rc.9",
"classnames": "^2.2.6",
"commonmark": "^0.29.3",
"commonmark": "^0.30.0",
"counterpart": "^0.18.6",
"diff-dom": "^4.2.2",
"diff-match-patch": "^1.0.5",
Expand All @@ -84,7 +84,7 @@
"html-entities": "^2.0.0",
"is-ip": "^3.1.0",
"jszip": "^3.7.0",
"katex": "^0.12.0",
"katex": "^0.16.0",
"linkify-element": "4.0.0-beta.4",
"linkify-string": "4.0.0-beta.4",
"linkifyjs": "4.0.0-beta.4",
Expand All @@ -99,12 +99,12 @@
"pako": "^2.0.3",
"parse5": "^6.0.1",
"png-chunks-extract": "^1.0.0",
"posthog-js": "1.12.2",
"qrcode": "1.4.4",
"posthog-js": "1.36.0",
"qrcode": "1.5.1",
"re-resizable": "^6.9.0",
"react": "17.0.2",
"react-beautiful-dnd": "^13.1.0",
"react-blurhash": "^0.1.3",
"react-blurhash": "^0.2.0",
"react-dom": "17.0.2",
"react-focus-lock": "^2.5.1",
"react-transition-group": "^4.4.1",
Expand Down Expand Up @@ -138,7 +138,6 @@
"@peculiar/webcrypto": "^1.4.1",
"@percy/cli": "^1.11.0",
"@percy/cypress": "^3.1.2",
"@sentry/types": "^7.0.0",
"@sinonjs/fake-timers": "^9.1.2",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.5",
Expand Down Expand Up @@ -172,7 +171,7 @@
"@types/zxcvbn": "^4.4.0",
"@typescript-eslint/eslint-plugin": "^5.35.1",
"@typescript-eslint/parser": "^5.6.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
"allchange": "^1.1.0",
"axe-core": "4.4.3",
"babel-jest": "^29.0.0",
Expand All @@ -183,12 +182,12 @@
"cypress-real-events": "^1.7.1",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.2",
"eslint": "8.9.0",
"eslint": "8.28.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-deprecate": "^0.7.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-matrix-org": "^0.7.0",
"eslint-plugin-matrix-org": "0.7.0",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-unicorn": "^45.0.0",
Expand All @@ -207,7 +206,6 @@
"raw-loader": "^4.0.2",
"react-test-renderer": "^17.0.2",
"rimraf": "^3.0.2",
"rrweb-snapshot": "1.1.7",
"stylelint": "^14.9.1",
"stylelint-config-standard": "^29.0.0",
"stylelint-scss": "^4.2.0",
Expand Down
8 changes: 4 additions & 4 deletions src/PosthogAnalytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

import posthog, { PostHog } from 'posthog-js';
import posthog, { PostHog, Properties } from 'posthog-js';
import { MatrixClient } from "matrix-js-sdk/src/client";
import { logger } from "matrix-js-sdk/src/logger";
import { UserProperties } from "@matrix-org/analytics-events/types/typescript/UserProperties";
Expand Down Expand Up @@ -196,7 +196,7 @@ export class PosthogAnalytics {
// we persist the last `$screen_name` and send it for all events until it is replaced
private lastScreen: ScreenName = "Loading";

private sanitizeProperties = (properties: posthog.Properties, eventName: string): posthog.Properties => {
private sanitizeProperties = (properties: Properties, eventName: string): Properties => {
// Callback from posthog to sanitize properties before sending them to the server.
//
// Here we sanitize posthog's built in properties which leak PII e.g. url reporting.
Expand All @@ -222,7 +222,7 @@ export class PosthogAnalytics {
return properties;
};

private registerSuperProperties(properties: posthog.Properties) {
private registerSuperProperties(properties: Properties) {
if (this.enabled) {
this.posthog.register(properties);
}
Expand All @@ -245,7 +245,7 @@ export class PosthogAnalytics {
}

// eslint-disable-nextline no-unused-varsx
private capture(eventName: string, properties: posthog.Properties, options?: IPostHogEventOptions) {
private capture(eventName: string, properties: Properties, options?: IPostHogEventOptions) {
if (!this.enabled) {
return;
}
Expand Down
6 changes: 2 additions & 4 deletions src/audio/PlaybackClock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,8 @@ export class PlaybackClock implements IDestroyable {
}

if (!this.timerId) {
// cast to number because the types are wrong
// 100ms interval to make sure the time is as accurate as possible without
// being overly insane
this.timerId = <number><any>window.setInterval(this.checkTime, 100);
// 100ms interval to make sure the time is as accurate as possible without being overly insane
this.timerId = window.setInterval(this.checkTime, 100);
}
}

Expand Down
Loading