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

Commit 8036985

Browse files
t3chguyt3chguy
authored
Update matrix-analytics-events to @matrix-org/analytics-events (#8778)
* Update matrix-analytics-events to @matrix-org/analytics-events * Update install-deps.sh * Update layered.sh * Update BeaconMarker-test.tsx.snap * Update BeaconStatus-test.tsx.snap
1 parent 3a20cb1 commit 8036985

19 files changed

+29
-26
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
},
5757
"dependencies": {
5858
"@babel/runtime": "^7.12.5",
59+
"@matrix-org/analytics-events": "^0.1.1",
5960
"@sentry/browser": "^6.11.0",
6061
"@sentry/tracing": "^6.11.0",
6162
"@testing-library/react": "^12.1.5",
@@ -89,7 +90,6 @@
8990
"linkifyjs": "4.0.0-beta.4",
9091
"lodash": "^4.17.20",
9192
"maplibre-gl": "^1.15.2",
92-
"matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#a0687ca6fbdb7258543d49b99fb88b9201e900b0",
9393
"matrix-encrypt-attachment": "^1.0.3",
9494
"matrix-events-sdk": "^0.0.1-beta.7",
9595
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",

‎scripts/ci/install-deps.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ scripts/fetchdep.sh matrix-org matrix-analytics-events main
1919
pushd matrix-analytics-events
2020
yarn link
2121
yarn install --pure-lockfile $@
22+
yarn build:ts
2223
popd
2324

2425
yarn link matrix-js-sdk
25-
yarn link matrix-analytics-events
26+
yarn link @matrix-org/analytics-events
2627
yarn install --pure-lockfile $@

‎scripts/ci/layered.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ scripts/fetchdep.sh matrix-org matrix-analytics-events main
2424
pushd matrix-analytics-events
2525
yarn link
2626
yarn install --pure-lockfile
27+
yarn build:ts
2728
popd
2829

2930
# Now set up the react-sdk
3031
yarn link matrix-js-sdk
31-
yarn link matrix-analytics-events
32+
yarn link @matrix-org/analytics-events
3233
yarn link
3334
yarn install --pure-lockfile
3435

‎src/DecryptionFailureTracker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
import { MatrixError } from "matrix-js-sdk/src/http-api";
1818
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
19-
import { Error as ErrorEvent } from "matrix-analytics-events/types/typescript/Error";
19+
import { Error as ErrorEvent } from "@matrix-org/analytics-events/types/typescript/Error";
2020

2121
import Analytics from "./Analytics";
2222
import { PosthogAnalytics } from './PosthogAnalytics';

‎src/PosthogAnalytics.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
import posthog, { PostHog } from 'posthog-js';
1818
import { MatrixClient } from "matrix-js-sdk/src/client";
1919
import { logger } from "matrix-js-sdk/src/logger";
20-
import { UserProperties } from "matrix-analytics-events/types/typescript/UserProperties";
21-
import { Signup } from 'matrix-analytics-events/types/typescript/Signup';
20+
import { UserProperties } from "@matrix-org/analytics-events/types/typescript/UserProperties";
21+
import { Signup } from '@matrix-org/analytics-events/types/typescript/Signup';
2222

2323
import PlatformPeg from './PlatformPeg';
2424
import SdkConfig from './SdkConfig';

‎src/PosthogTrackers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ limitations under the License.
1515
*/
1616

1717
import { PureComponent, SyntheticEvent } from "react";
18-
import { WebScreen as ScreenEvent } from "matrix-analytics-events/types/typescript/WebScreen";
19-
import { Interaction as InteractionEvent } from "matrix-analytics-events/types/typescript/Interaction";
18+
import { WebScreen as ScreenEvent } from "@matrix-org/analytics-events/types/typescript/WebScreen";
19+
import { Interaction as InteractionEvent } from "@matrix-org/analytics-events/types/typescript/Interaction";
2020

2121
import PageType from "./PageTypes";
2222
import Views from "./Views";

‎src/SlashCommands.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import * as ContentHelpers from 'matrix-js-sdk/src/content-helpers';
2525
import { Element as ChildElement, parseFragment as parseHtml } from "parse5";
2626
import { logger } from "matrix-js-sdk/src/logger";
2727
import { IContent } from 'matrix-js-sdk/src/models/event';
28-
import { SlashCommand as SlashCommandEvent } from "matrix-analytics-events/types/typescript/SlashCommand";
28+
import { SlashCommand as SlashCommandEvent } from "@matrix-org/analytics-events/types/typescript/SlashCommand";
2929

3030
import { MatrixClientPeg } from './MatrixClientPeg';
3131
import dis from './dispatcher/dispatcher';

‎src/components/views/dialogs/SpotlightDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { normalize } from "matrix-js-sdk/src/utils";
3030
import { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces";
3131
import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
3232
import { RoomType } from "matrix-js-sdk/src/@types/event";
33-
import { WebSearch as WebSearchEvent } from "matrix-analytics-events/types/typescript/WebSearch";
33+
import { WebSearch as WebSearchEvent } from "@matrix-org/analytics-events/types/typescript/WebSearch";
3434

3535
import { IDialogProps } from "./IDialogProps";
3636
import { _t } from "../../../languageHandler";

‎src/components/views/elements/SSOButtons.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import React from "react";
1818
import { chunk } from "lodash";
1919
import classNames from "classnames";
2020
import { MatrixClient } from "matrix-js-sdk/src/client";
21-
import { Signup } from "matrix-analytics-events/types/typescript/Signup";
21+
import { Signup } from "@matrix-org/analytics-events/types/typescript/Signup";
2222

2323
import PlatformPeg from "../../../PlatformPeg";
2424
import AccessibleButton from "./AccessibleButton";

‎src/components/views/rooms/EditMessageComposer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { EventStatus, IContent, MatrixEvent } from 'matrix-js-sdk/src/models/eve
2020
import { MsgType } from 'matrix-js-sdk/src/@types/event';
2121
import { Room } from 'matrix-js-sdk/src/models/room';
2222
import { logger } from "matrix-js-sdk/src/logger";
23-
import { Composer as ComposerEvent } from "matrix-analytics-events/types/typescript/Composer";
23+
import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer";
2424

2525
import { _t } from '../../../languageHandler';
2626
import dis from '../../../dispatcher/dispatcher';

‎src/components/views/rooms/SendMessageComposer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { DebouncedFunc, throttle } from 'lodash';
2121
import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
2222
import { logger } from "matrix-js-sdk/src/logger";
2323
import { Room } from 'matrix-js-sdk/src/models/room';
24-
import { Composer as ComposerEvent } from "matrix-analytics-events/types/typescript/Composer";
24+
import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer";
2525
import { THREAD_RELATION_TYPE } from 'matrix-js-sdk/src/models/thread';
2626

2727
import dis from '../../../dispatcher/dispatcher';

‎src/dispatcher/payloads/JoinRoomPayload.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
import { JoinedRoom as JoinedRoomEvent } from "matrix-analytics-events/types/typescript/JoinedRoom";
17+
import { JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom";
1818
import { IJoinRoomOpts } from "matrix-js-sdk/src/@types/requests";
1919

2020
import { ActionPayload } from "../payloads";

‎src/dispatcher/payloads/JoinRoomReadyPayload.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
import { JoinedRoom as JoinedRoomEvent } from "matrix-analytics-events/types/typescript/JoinedRoom";
17+
import { JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom";
1818

1919
import { ActionPayload } from "../payloads";
2020
import { Action } from "../actions";

‎src/dispatcher/payloads/ViewRoomPayload.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
*/
1616

1717
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
18-
import { ViewRoom as ViewRoomEvent } from "matrix-analytics-events/types/typescript/ViewRoom";
18+
import { ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom";
1919

2020
import { ActionPayload } from "../payloads";
2121
import { Action } from "../actions";

‎src/stores/RoomViewStore.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import React, { ReactNode } from "react";
2020
import { Store } from 'flux/utils';
2121
import { MatrixError } from "matrix-js-sdk/src/http-api";
2222
import { logger } from "matrix-js-sdk/src/logger";
23-
import { ViewRoom as ViewRoomEvent } from "matrix-analytics-events/types/typescript/ViewRoom";
24-
import { JoinedRoom as JoinedRoomEvent } from "matrix-analytics-events/types/typescript/JoinedRoom";
23+
import { ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom";
24+
import { JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom";
2525
import { JoinRule } from "matrix-js-sdk/src/@types/partials";
2626
import { Room } from "matrix-js-sdk/src/models/room";
2727
import { ClientEvent } from "matrix-js-sdk/src/client";

‎src/utils/rooms.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
*/
1616

1717
import { IInstance, IProtocol, IPublicRoomsChunkRoom, MatrixClient } from "matrix-js-sdk/src/client";
18-
import { ViewRoom as ViewRoomEvent } from "matrix-analytics-events/types/typescript/ViewRoom";
18+
import { ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom";
1919

2020
import { Action } from "../dispatcher/actions";
2121
import { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload";

‎test/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ exports[`<BeaconMarker /> renders marker when beacon has location 1`] = `
3333
},
3434
"_maxListeners": undefined,
3535
"clearLatestLocation": [Function],
36-
"livenessWatchInterval": undefined,
36+
"livenessWatchTimeout": undefined,
3737
"roomId": "!room:server",
3838
"rootEvent": Object {
3939
"content": Object {

‎test/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ exports[`<BeaconStatus /> active state renders without children 1`] = `
1919
"_latestLocationState": undefined,
2020
"_maxListeners": undefined,
2121
"clearLatestLocation": [Function],
22-
"livenessWatchInterval": undefined,
22+
"livenessWatchTimeout": undefined,
2323
"roomId": "!room:server",
2424
"rootEvent": Object {
2525
"content": Object {
@@ -81,7 +81,7 @@ exports[`<BeaconStatus /> active state renders without children 1`] = `
8181
"_latestLocationState": undefined,
8282
"_maxListeners": undefined,
8383
"clearLatestLocation": [Function],
84-
"livenessWatchInterval": undefined,
84+
"livenessWatchTimeout": undefined,
8585
"roomId": "!room:server",
8686
"rootEvent": Object {
8787
"content": Object {

‎yarn.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,6 +1468,11 @@
14681468
resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
14691469
integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==
14701470

1471+
"@matrix-org/analytics-events@^0.1.1":
1472+
version "0.1.1"
1473+
resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.1.1.tgz#ae95b0c1fb86a094c5f51d121f10e6a1b1ddca68"
1474+
integrity sha512-PIDkfYMNmph6x/rfgtIeQXUWj9hGzTLnOCFUYZFBnoTiS4UXkH73bz77Ho12uoUezUz4v40mxTXdrFxp8Zo6zA==
1475+
14711476
"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz":
14721477
version "3.2.8"
14731478
resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz#8d53636d045e1776e2a2ec6613e57330dd9ce856"
@@ -6851,10 +6856,6 @@ mathml-tag-names@^2.1.3:
68516856
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
68526857
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
68536858

6854-
"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#a0687ca6fbdb7258543d49b99fb88b9201e900b0":
6855-
version "0.0.1"
6856-
resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/a0687ca6fbdb7258543d49b99fb88b9201e900b0"
6857-
68586859
matrix-encrypt-attachment@^1.0.3:
68596860
version "1.0.3"
68606861
resolved "https://registry.yarnpkg.com/matrix-encrypt-attachment/-/matrix-encrypt-attachment-1.0.3.tgz#6e016587728c396549c833985f39cbf6c07ee97b"

0 commit comments

Comments
 (0)