Skip to content

Commit

Permalink
rename occurences
Browse files Browse the repository at this point in the history
  • Loading branch information
s1gr1d committed Mar 19, 2024
1 parent 5b35d02 commit 0a56cb3
Show file tree
Hide file tree
Showing 39 changed files with 573 additions and 32 deletions.
12 changes: 8 additions & 4 deletions .craft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,23 @@ targets:
- name: npm
id: '@sentry-internal/tracing'
includeNames: /^sentry-internal-tracing-\d.*\.tgz$/
## 1.5 Replay package (browser only)
## 1.5 Replay Internal package (browser only)
- name: npm
id: '@sentry-internal/replay'
includeNames: /^sentry-internal-replay-\d.*\.tgz$/
## 1.6 Replay package (browser only)
- name: npm
id: '@sentry/replay'
includeNames: /^sentry-replay-\d.*\.tgz$/
## 1.6. OpenTelemetry package
## 1.7 OpenTelemetry package
- name: npm
id: '@sentry/opentelemetry'
includeNames: /^sentry-opentelemetry-\d.*\.tgz$/
## 1.7 Feedback package (browser only)
## 1.8 Feedback package (browser only)
- name: npm
id: '@sentry-internal/feedback'
includeNames: /^sentry-internal-feedback-\d.*\.tgz$/
## 1.8 ReplayCanvas package (browser only)
## 1.9 ReplayCanvas package (browser only)
- name: npm
id: '@sentry-internal/replay-canvas'
includeNames: /^sentry-internal-replay-canvas-\d.*\.tgz$/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from '@playwright/test';
import type { replayIntegration as actualReplayIntegration } from '@sentry/replay';
import type { ReplayContainer } from '@sentry/replay/build/npm/types/types';
import type { replayIntegration as actualReplayIntegration } from '@sentry-internal/replay';
import type { ReplayContainer } from '@sentry-internal/replay/build/npm/types/types';

import { sentryTest } from '../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../utils/helpers';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { replayIntegration } from '@sentry-internal/replay';
import * as Sentry from '@sentry/browser';
import { replayIntegration } from '@sentry/replay';

window.Sentry = Sentry;
window.Replay = replayIntegration({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { SDK_VERSION } from '@sentry/browser';
import { sentryTest } from '../../../utils/fixtures';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';

sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTestPath, page }) => {
sentryTest('should capture replays (@sentry-internal/replay export)', async ({ getLocalTestPath, page }) => {
if (shouldSkipReplayTest()) {
sentryTest.skip();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class SentryScenarioGenerationPlugin {
? {
// To help Webpack resolve Sentry modules in `import` statements in cases where they're provided in bundles rather than in `node_modules`
'@sentry/browser': 'Sentry',
'@sentry/replay': 'Sentry',
'@sentry-internal/replay': 'Sentry',
'@sentry/wasm': 'Sentry',
}
: {};
Expand Down
8 changes: 4 additions & 4 deletions dev-packages/browser-integration-tests/utils/replayHelpers.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import type { Page, Request, Response } from '@playwright/test';
/* eslint-disable max-lines */
import type { ReplayCanvasIntegrationOptions } from '@sentry-internal/replay-canvas';
import type { fullSnapshotEvent, incrementalSnapshotEvent } from '@sentry-internal/rrweb';
import { EventType } from '@sentry-internal/rrweb';
import type { ReplayEventWithTime } from '@sentry/browser';
import type {
InternalEventContext,
RecordingEvent,
ReplayContainer,
ReplayPluginOptions,
Session,
} from '@sentry/replay/build/npm/types/types';
} from '@sentry-internal/replay/build/npm/types/types';
import type { fullSnapshotEvent, incrementalSnapshotEvent } from '@sentry-internal/rrweb';
import { EventType } from '@sentry-internal/rrweb';
import type { ReplayEventWithTime } from '@sentry/browser';
import type { Breadcrumb, Event, ReplayEvent, ReplayRecordingMode } from '@sentry/types';
import pako from 'pako';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// biome-ignore lint/nursery/noUnusedImports:
import * as _SentryReplay from '@sentry-internal/replay';
// biome-ignore lint/nursery/noUnusedImports: we need to import the SDK to ensure tsc check the types
import * as _SentryBrowser from '@sentry/browser';
// biome-ignore lint/nursery/noUnusedImports:
import * as _SentryCore from '@sentry/core';
// biome-ignore lint/nursery/noUnusedImports:
import * as _SentryNode from '@sentry/node';
// biome-ignore lint/nursery/noUnusedImports:
import * as _SentryReplay from '@sentry/replay';
// biome-ignore lint/nursery/noUnusedImports:
import * as _SentryTypes from '@sentry/types';
// biome-ignore lint/nursery/noUnusedImports:
import * as _SentryUtils from '@sentry/utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@sentry/browser": "latest || *",
"@sentry/core": "latest || *",
"@sentry/node": "latest || *",
"@sentry/replay": "latest || *",
"@sentry-internal/replay": "latest || *",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/wasm": "latest || *"
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"packages/react",
"packages/remix",
"packages/replay",
"packages/replay-internal",
"packages/replay-canvas",
"packages/replay-worker",
"packages/svelte",
Expand Down
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
},
"dependencies": {
"@sentry-internal/feedback": "8.0.0-alpha.4",
"@sentry-internal/replay": "8.0.0-alpha.4",
"@sentry-internal/replay-canvas": "8.0.0-alpha.4",
"@sentry-internal/tracing": "8.0.0-alpha.4",
"@sentry/core": "8.0.0-alpha.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/src/index.bundle.replay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
} from '@sentry-internal/integration-shims';
import { replayIntegration } from '@sentry/replay';
import { replayIntegration } from '@sentry-internal/replay';

export * from './index.bundle.base';
export {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { feedbackIntegration } from '@sentry-internal/feedback';
import { replayIntegration } from '@sentry-internal/replay';
import { browserTracingIntegration } from '@sentry-internal/tracing';
import { addTracingExtensions } from '@sentry/core';
import { replayIntegration } from '@sentry/replay';

// We are patching the global object with our hub extension methods
addTracingExtensions();
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/src/index.bundle.tracing.replay.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
import { replayIntegration } from '@sentry-internal/replay';
import { browserTracingIntegration } from '@sentry-internal/tracing';
import { addTracingExtensions } from '@sentry/core';
import { replayIntegration } from '@sentry/replay';

// We are patching the global object with our hub extension methods
addTracingExtensions();
Expand Down
4 changes: 2 additions & 2 deletions packages/browser/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export {
export {
replayIntegration,
getReplay,
} from '@sentry/replay';
} from '@sentry-internal/replay';
export type {
ReplayEventType,
ReplayEventWithTime,
Expand All @@ -43,7 +43,7 @@ export type {
ReplayFrameEvent,
ReplaySpanFrame,
ReplaySpanFrameEvent,
} from '@sentry/replay';
} from '@sentry-internal/replay';

export { replayCanvasIntegration } from '@sentry-internal/replay-canvas';

Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/test/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@sentry/node-experimental": "file:../../../node",
"@sentry/opentelemetry": "file:../../../opentelemetry",
"@sentry/react": "file:../../../react",
"@sentry/replay": "file:../../../replay",
"@sentry-internal/replay": "file:../../../replay-internal",
"@sentry-internal/replay-canvas": "file:../../../replay-canvas",
"@sentry-internal/tracing": "file:../../../tracing-internal",
"@sentry-internal/feedback": "file:../../../feedback",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/test/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@sentry/node": "file:../../../node-experimental",
"@sentry/opentelemetry": "file:../../../opentelemetry",
"@sentry/react": "file:../../../react",
"@sentry/replay": "file:../../../replay",
"@sentry-internal/replay": "file:../../../replay-internal",
"@sentry-internal/replay-canvas": "file:../../../replay-canvas",
"@sentry-internal/tracing": "file:../../../tracing-internal",
"@sentry-internal/feedback": "file:../../../feedback",
Expand Down
2 changes: 1 addition & 1 deletion packages/replay-canvas/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
When
[updating the `rrweb` dependency](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/package.json?plain=1#LL55),
please be aware that
[`@sentry/replay`'s README.md](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/README.md?plain=1#LL204)
[`@sentry-internal/replay`'s README.md](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/README.md?plain=1#LL204)
also needs to be updated.
2 changes: 1 addition & 1 deletion packages/replay-canvas/src/canvas.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { CanvasManagerInterface, CanvasManagerOptions } from '@sentry-internal/replay';
import { CanvasManager } from '@sentry-internal/rrweb';
import { defineIntegration } from '@sentry/core';
import type { CanvasManagerInterface, CanvasManagerOptions } from '@sentry/replay';
import type { IntegrationFn } from '@sentry/types';

interface ReplayCanvasOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/replay-internal/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
When
[updating the `rrweb` dependency](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/package.json?plain=1#LL55),
please be aware that
[`@sentry/replay`'s README.md](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/README.md?plain=1#LL204)
[`@sentry-internal/replay`'s README.md](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/README.md?plain=1#LL204)
also needs to be updated.
2 changes: 1 addition & 1 deletion packages/replay-internal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

## Pre-requisites

`@sentry/replay` requires Node 14+, and browsers newer than IE11.
`@sentry-internal/replay` requires Node 14+, and browsers newer than IE11.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/replay-internal/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@sentry/replay",
"name": "@sentry-internal/replay",
"version": "8.0.0-alpha.4",
"description": "User replays for Sentry",
"main": "build/npm/cjs/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/replay-internal/rollup.bundle.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal
const baseBundleConfig = makeBaseBundleConfig({
bundleType: 'addon',
entrypoints: ['src/index.ts'],
licenseTitle: '@sentry/replay',
licenseTitle: '@sentry-internal/replay',
outputFileBase: () => 'bundles/replay',
});

Expand Down
2 changes: 1 addition & 1 deletion packages/replay-worker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Sentry Session Replay Worker

This is an internal package that is used by @sentry/replay. It generates a web worker and converts it to a string, so
This is an internal package that is used by @sentry-internal/replay. It generates a web worker and converts it to a string, so
that we can process it easier in replay.

By extracting this into a dedicated (private, internal) package, we can streamline the build of replay.
Expand Down
2 changes: 1 addition & 1 deletion packages/replay-worker/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sentry-internal/replay-worker",
"version": "8.0.0-alpha.4",
"description": "Worker for @sentry/replay",
"description": "Worker for @sentry-internal/replay",
"main": "build/npm/esm/index.js",
"module": "build/npm/esm/index.js",
"types": "build/npm/types/index.d.ts",
Expand Down
6 changes: 6 additions & 0 deletions packages/replay/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules/
build/
demo/build/
# TODO: Check if we can re-introduce linting in demo
demo
metrics
39 changes: 39 additions & 0 deletions packages/replay/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Note: All paths are relative to the directory in which eslint is being run, rather than the directory where this file
// lives

// ESLint config docs: https://eslint.org/docs/user-guide/configuring/

module.exports = {
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['src/**/*.ts'],
},
{
files: ['jest.setup.ts', 'jest.config.ts'],
parserOptions: {
project: ['tsconfig.test.json'],
},
rules: {
'no-console': 'off',
},
},
{
files: ['test/**/*.ts'],

rules: {
// most of these errors come from `new Promise(process.nextTick)`
'@typescript-eslint/unbound-method': 'off',
// TODO: decide if we want to enable this again after the migration
// We can take the freedom to be a bit more lenient with tests
'@typescript-eslint/no-floating-promises': 'off',
},
},
{
files: ['src/types/deprecated.ts'],
rules: {
'@typescript-eslint/naming-convention': 'off',
},
},
],
};
4 changes: 4 additions & 0 deletions packages/replay/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules
/*.tgz
.eslintcache
build
7 changes: 7 additions & 0 deletions packages/replay/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## Updating the rrweb dependency

When
[updating the `rrweb` dependency](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/package.json?plain=1#LL55),
please be aware that
[`@sentry/replay`'s README.md](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/README.md?plain=1#LL204)
also needs to be updated.
14 changes: 14 additions & 0 deletions packages/replay/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Copyright (c) 2022 Sentry (https://sentry.io) and individual contributors. All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
File renamed without changes.
Loading

0 comments on commit 0a56cb3

Please sign in to comment.