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

Author: t3chguy

package.json

@@ -56,6 +56,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
+    "@matrix-org/analytics-events": "^0.1.1",
     "@sentry/browser": "^6.11.0",
     "@sentry/tracing": "^6.11.0",
     "@testing-library/react": "^12.1.5",
@@ -89,7 +90,6 @@
     "linkifyjs": "4.0.0-beta.4",
     "lodash": "^4.17.20",
     "maplibre-gl": "^1.15.2",
-    "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#a0687ca6fbdb7258543d49b99fb88b9201e900b0",
     "matrix-encrypt-attachment": "^1.0.3",
     "matrix-events-sdk": "^0.0.1-beta.7",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",

scripts/ci/install-deps.sh

@@ -19,8 +19,9 @@ scripts/fetchdep.sh matrix-org matrix-analytics-events main
 pushd matrix-analytics-events
 yarn link
 yarn install --pure-lockfile $@
+yarn build:ts
 popd
 
 yarn link matrix-js-sdk
-yarn link matrix-analytics-events
+yarn link @matrix-org/analytics-events
 yarn install --pure-lockfile $@

scripts/ci/layered.sh

@@ -24,11 +24,12 @@ scripts/fetchdep.sh matrix-org matrix-analytics-events main
 pushd matrix-analytics-events
 yarn link
 yarn install --pure-lockfile
+yarn build:ts
 popd
 
 # Now set up the react-sdk
 yarn link matrix-js-sdk
-yarn link matrix-analytics-events
+yarn link @matrix-org/analytics-events
 yarn link
 yarn install --pure-lockfile
 

src/DecryptionFailureTracker.ts

@@ -16,7 +16,7 @@ limitations under the License.
 
 import { MatrixError } from "matrix-js-sdk/src/http-api";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { Error as ErrorEvent } from "matrix-analytics-events/types/typescript/Error";
+import { Error as ErrorEvent } from "@matrix-org/analytics-events/types/typescript/Error";
 
 import Analytics from "./Analytics";
 import { PosthogAnalytics } from './PosthogAnalytics';

src/PosthogAnalytics.ts

@@ -17,8 +17,8 @@ limitations under the License.
 import posthog, { PostHog } from 'posthog-js';
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { logger } from "matrix-js-sdk/src/logger";
-import { UserProperties } from "matrix-analytics-events/types/typescript/UserProperties";
-import { Signup } from 'matrix-analytics-events/types/typescript/Signup';
+import { UserProperties } from "@matrix-org/analytics-events/types/typescript/UserProperties";
+import { Signup } from '@matrix-org/analytics-events/types/typescript/Signup';
 
 import PlatformPeg from './PlatformPeg';
 import SdkConfig from './SdkConfig';

src/PosthogTrackers.ts

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import { PureComponent, SyntheticEvent } from "react";
-import { WebScreen as ScreenEvent } from "matrix-analytics-events/types/typescript/WebScreen";
-import { Interaction as InteractionEvent } from "matrix-analytics-events/types/typescript/Interaction";
+import { WebScreen as ScreenEvent } from "@matrix-org/analytics-events/types/typescript/WebScreen";
+import { Interaction as InteractionEvent } from "@matrix-org/analytics-events/types/typescript/Interaction";
 
 import PageType from "./PageTypes";
 import Views from "./Views";

src/SlashCommands.tsx

@@ -25,7 +25,7 @@ import * as ContentHelpers from 'matrix-js-sdk/src/content-helpers';
 import { Element as ChildElement, parseFragment as parseHtml } from "parse5";
 import { logger } from "matrix-js-sdk/src/logger";
 import { IContent } from 'matrix-js-sdk/src/models/event';
-import { SlashCommand as SlashCommandEvent } from "matrix-analytics-events/types/typescript/SlashCommand";
+import { SlashCommand as SlashCommandEvent } from "@matrix-org/analytics-events/types/typescript/SlashCommand";
 
 import { MatrixClientPeg } from './MatrixClientPeg';
 import dis from './dispatcher/dispatcher';

src/components/views/dialogs/SpotlightDialog.tsx

@@ -30,7 +30,7 @@ import { normalize } from "matrix-js-sdk/src/utils";
 import { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces";
 import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
 import { RoomType } from "matrix-js-sdk/src/@types/event";
-import { WebSearch as WebSearchEvent } from "matrix-analytics-events/types/typescript/WebSearch";
+import { WebSearch as WebSearchEvent } from "@matrix-org/analytics-events/types/typescript/WebSearch";
 
 import { IDialogProps } from "./IDialogProps";
 import { _t } from "../../../languageHandler";

src/components/views/elements/SSOButtons.tsx

@@ -18,7 +18,7 @@ import React from "react";
 import { chunk } from "lodash";
 import classNames from "classnames";
 import { MatrixClient } from "matrix-js-sdk/src/client";
-import { Signup } from "matrix-analytics-events/types/typescript/Signup";
+import { Signup } from "@matrix-org/analytics-events/types/typescript/Signup";
 
 import PlatformPeg from "../../../PlatformPeg";
 import AccessibleButton from "./AccessibleButton";

src/components/views/rooms/EditMessageComposer.tsx

@@ -20,7 +20,7 @@ import { EventStatus, IContent, MatrixEvent } from 'matrix-js-sdk/src/models/eve
 import { MsgType } from 'matrix-js-sdk/src/@types/event';
 import { Room } from 'matrix-js-sdk/src/models/room';
 import { logger } from "matrix-js-sdk/src/logger";
-import { Composer as ComposerEvent } from "matrix-analytics-events/types/typescript/Composer";
+import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer";
 
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher/dispatcher';