Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update matrix-analytics-events to @matrix-org/analytics-events (#8778)

Browse Source 
* 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
This commit is contained in:
Michael Telatynski 2022-06-07 20:08:36 +01:00 committed by GitHub
parent 3a20cb1703
commit 8036985204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

3
scripts/ci/install-deps.sh
View File

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

3
scripts/ci/layered.sh
View File

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

2
src/DecryptionFailureTracker.ts
View File

@ -16,7 +16,7 @@ limitations under the License.
import { MatrixError } from "matrix-js-sdk/src/http-api"; import { MatrixError } from "matrix-js-sdk/src/http-api";
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; 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 Analytics from "./Analytics";
import { PosthogAnalytics } from './PosthogAnalytics'; import { PosthogAnalytics } from './PosthogAnalytics';

4
src/PosthogAnalytics.ts
View File

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

4
src/PosthogTrackers.ts
View File

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

2
src/SlashCommands.tsx
View File

@ -25,7 +25,7 @@ import * as ContentHelpers from 'matrix-js-sdk/src/content-helpers';
import { Element as ChildElement, parseFragment as parseHtml } from "parse5"; import { Element as ChildElement, parseFragment as parseHtml } from "parse5";
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
import { IContent } from 'matrix-js-sdk/src/models/event'; 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 { MatrixClientPeg } from './MatrixClientPeg';
import dis from './dispatcher/dispatcher'; import dis from './dispatcher/dispatcher';

2
src/components/views/dialogs/SpotlightDialog.tsx
View File

@ -30,7 +30,7 @@ import { normalize } from "matrix-js-sdk/src/utils";
import { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces"; import { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces";
import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy"; import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
import { RoomType } from "matrix-js-sdk/src/@types/event"; 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 { IDialogProps } from "./IDialogProps";
import { _t } from "../../../languageHandler"; import { _t } from "../../../languageHandler";

2
src/components/views/elements/SSOButtons.tsx
View File

@ -18,7 +18,7 @@ import React from "react";
import { chunk } from "lodash"; import { chunk } from "lodash";
import classNames from "classnames"; import classNames from "classnames";
import { MatrixClient } from "matrix-js-sdk/src/client"; 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 PlatformPeg from "../../../PlatformPeg";
import AccessibleButton from "./AccessibleButton"; import AccessibleButton from "./AccessibleButton";

2
src/components/views/rooms/EditMessageComposer.tsx
View File

@ -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 { MsgType } from 'matrix-js-sdk/src/@types/event';
import { Room } from 'matrix-js-sdk/src/models/room'; import { Room } from 'matrix-js-sdk/src/models/room';
import { logger } from "matrix-js-sdk/src/logger"; 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 { _t } from '../../../languageHandler';
import dis from '../../../dispatcher/dispatcher'; import dis from '../../../dispatcher/dispatcher';

2
src/components/views/rooms/SendMessageComposer.tsx
View File

@ -21,7 +21,7 @@ import { DebouncedFunc, throttle } from 'lodash';
import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
import { Room } from 'matrix-js-sdk/src/models/room'; import { Room } from 'matrix-js-sdk/src/models/room';
import { Composer as ComposerEvent } from "matrix-analytics-events/types/typescript/Composer"; import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer";
import { THREAD_RELATION_TYPE } from 'matrix-js-sdk/src/models/thread'; import { THREAD_RELATION_TYPE } from 'matrix-js-sdk/src/models/thread';
import dis from '../../../dispatcher/dispatcher'; import dis from '../../../dispatcher/dispatcher';

2
src/dispatcher/payloads/JoinRoomPayload.ts
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import { JoinedRoom as JoinedRoomEvent } from "matrix-analytics-events/types/typescript/JoinedRoom"; import { JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom";
import { IJoinRoomOpts } from "matrix-js-sdk/src/@types/requests"; import { IJoinRoomOpts } from "matrix-js-sdk/src/@types/requests";
import { ActionPayload } from "../payloads"; import { ActionPayload } from "../payloads";

2
src/dispatcher/payloads/JoinRoomReadyPayload.ts
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import { JoinedRoom as JoinedRoomEvent } from "matrix-analytics-events/types/typescript/JoinedRoom"; import { JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom";
import { ActionPayload } from "../payloads"; import { ActionPayload } from "../payloads";
import { Action } from "../actions"; import { Action } from "../actions";

2
src/dispatcher/payloads/ViewRoomPayload.ts
View File

@ -15,7 +15,7 @@ limitations under the License.
*/ */
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { ViewRoom as ViewRoomEvent } from "matrix-analytics-events/types/typescript/ViewRoom"; import { ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom";
import { ActionPayload } from "../payloads"; import { ActionPayload } from "../payloads";
import { Action } from "../actions"; import { Action } from "../actions";

4
src/stores/RoomViewStore.tsx
View File

@ -20,8 +20,8 @@ import React, { ReactNode } from "react";
import { Store } from 'flux/utils'; import { Store } from 'flux/utils';
import { MatrixError } from "matrix-js-sdk/src/http-api"; import { MatrixError } from "matrix-js-sdk/src/http-api";
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
import { ViewRoom as ViewRoomEvent } from "matrix-analytics-events/types/typescript/ViewRoom"; import { ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom";
import { JoinedRoom as JoinedRoomEvent } from "matrix-analytics-events/types/typescript/JoinedRoom"; import { JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom";
import { JoinRule } from "matrix-js-sdk/src/@types/partials"; import { JoinRule } from "matrix-js-sdk/src/@types/partials";
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { ClientEvent } from "matrix-js-sdk/src/client"; import { ClientEvent } from "matrix-js-sdk/src/client";

2
src/utils/rooms.ts
View File

@ -15,7 +15,7 @@ limitations under the License.
*/ */
import { IInstance, IProtocol, IPublicRoomsChunkRoom, MatrixClient } from "matrix-js-sdk/src/client"; import { IInstance, IProtocol, IPublicRoomsChunkRoom, MatrixClient } from "matrix-js-sdk/src/client";
import { ViewRoom as ViewRoomEvent } from "matrix-analytics-events/types/typescript/ViewRoom"; import { ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom";
import { Action } from "../dispatcher/actions"; import { Action } from "../dispatcher/actions";
import { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload"; import { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload";

2
test/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap
View File

@ -33,7 +33,7 @@ exports[`<BeaconMarker /> renders marker when beacon has location 1`] = `
}, },
"_maxListeners": undefined, "_maxListeners": undefined,
"clearLatestLocation": [Function], "clearLatestLocation": [Function],
"livenessWatchInterval": undefined, "livenessWatchTimeout": undefined,
"roomId": "!room:server", "roomId": "!room:server",
"rootEvent": Object { "rootEvent": Object {
"content": Object { "content": Object {

4
test/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap
View File

@ -19,7 +19,7 @@ exports[`<BeaconStatus /> active state renders without children 1`] = `
"_latestLocationState": undefined, "_latestLocationState": undefined,
"_maxListeners": undefined, "_maxListeners": undefined,
"clearLatestLocation": [Function], "clearLatestLocation": [Function],
"livenessWatchInterval": undefined, "livenessWatchTimeout": undefined,
"roomId": "!room:server", "roomId": "!room:server",
"rootEvent": Object { "rootEvent": Object {
"content": Object { "content": Object {
@ -81,7 +81,7 @@ exports[`<BeaconStatus /> active state renders without children 1`] = `
"_latestLocationState": undefined, "_latestLocationState": undefined,
"_maxListeners": undefined, "_maxListeners": undefined,
"clearLatestLocation": [Function], "clearLatestLocation": [Function],
"livenessWatchInterval": undefined, "livenessWatchTimeout": undefined,
"roomId": "!room:server", "roomId": "!room:server",
"rootEvent": Object { "rootEvent": Object {
"content": Object { "content": Object {

9
yarn.lock
View File

@ -1468,6 +1468,11 @@
resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==
"@matrix-org/analytics-events@^0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.1.1.tgz#ae95b0c1fb86a094c5f51d121f10e6a1b1ddca68"
integrity sha512-PIDkfYMNmph6x/rfgtIeQXUWj9hGzTLnOCFUYZFBnoTiS4UXkH73bz77Ho12uoUezUz4v40mxTXdrFxp8Zo6zA==
"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz": "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz":
version "3.2.8" version "3.2.8"
resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz#8d53636d045e1776e2a2ec6613e57330dd9ce856" 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:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#a0687ca6fbdb7258543d49b99fb88b9201e900b0":
version "0.0.1"
resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/a0687ca6fbdb7258543d49b99fb88b9201e900b0"
matrix-encrypt-attachment@^1.0.3: matrix-encrypt-attachment@^1.0.3:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/matrix-encrypt-attachment/-/matrix-encrypt-attachment-1.0.3.tgz#6e016587728c396549c833985f39cbf6c07ee97b" resolved "https://registry.yarnpkg.com/matrix-encrypt-attachment/-/matrix-encrypt-attachment-1.0.3.tgz#6e016587728c396549c833985f39cbf6c07ee97b"