Skip to content

Commit a6563ad

Browse files
authored
Merge pull request #118 from DataDog/yoann/move-sourcemaps
[sourcemaps] Move sourcemaps
2 parents f3a8fb4 + 8bb2a78 commit a6563ad

File tree

39 files changed

+188
-181
lines changed

39 files changed

+188
-181
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ packages/tests/src/plugins/injection @yoannmoin
2323
packages/plugins/telemetry @DataDog/frontend-devx @yoannmoinet
2424
packages/tests/src/plugins/telemetry @DataDog/frontend-devx @yoannmoinet
2525

26-
# Rum
27-
packages/plugins/rum @DataDog/rum @yoannmoinet
28-
packages/tests/src/plugins/rum @DataDog/rum @yoannmoinet
26+
# Error Tracking
27+
packages/plugins/error-tracking @yoannmoinet
28+
packages/tests/src/plugins/error-tracking @yoannmoinet

.github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
with:
2222
node-version: ${{matrix.node}}.x
2323
- run: yarn install
24+
- run: yarn build:all
2425
- run: yarn test
2526

2627
lint:

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To interact with Datadog directly from your builds.
2424
- [Vite](#-vite)
2525
- [Webpack](#-webpack)
2626
- [Features](#features)
27-
- [RUM](#rum-----)
27+
- [Error Tracking](#error-tracking-----)
2828
- [Telemetry](#telemetry-----)
2929
- [Configuration](#configuration)
3030
- [`auth.apiKey`](#authapikey)
@@ -235,13 +235,13 @@ module.exports = {
235235
## Features
236236
237237
<!-- #list-of-packages -->
238-
### RUM <img src="packages/assets/src/esbuild.svg" alt="ESBuild" width="17" /> <img src="packages/assets/src/rollup.svg" alt="Rollup" width="17" /> <img src="packages/assets/src/rspack.svg" alt="Rspack" width="17" /> <img src="packages/assets/src/vite.svg" alt="Vite" width="17" /> <img src="packages/assets/src/webpack.svg" alt="Webpack" width="17" />
238+
### Error Tracking <img src="packages/assets/src/esbuild.svg" alt="ESBuild" width="17" /> <img src="packages/assets/src/rollup.svg" alt="Rollup" width="17" /> <img src="packages/assets/src/rspack.svg" alt="Rspack" width="17" /> <img src="packages/assets/src/vite.svg" alt="Vite" width="17" /> <img src="packages/assets/src/webpack.svg" alt="Webpack" width="17" />
239239
240-
> Interact with our Real User Monitoring product (RUM) in Datadog directly from your build system.
240+
> Interact with Error Tracking directly from your build system.
241241
242242
```typescript
243243
datadogWebpackPlugin({
244-
rum?: {
244+
errorTracking?: {
245245
disabled?: boolean,
246246
sourcemaps?: {
247247
bailOnError?: boolean,
@@ -256,7 +256,7 @@ datadogWebpackPlugin({
256256
});
257257
```
258258
259-
<kbd>[📝 Full documentation ➡️](/packages/plugins/rum#readme)</kbd>
259+
<kbd>[📝 Full documentation ➡️](/packages/plugins/error-tracking#readme)</kbd>
260260
261261
### Telemetry <img src="packages/assets/src/esbuild.svg" alt="ESBuild" width="17" /> <img src="packages/assets/src/rollup.svg" alt="Rollup" width="17" /> <img src="packages/assets/src/rspack.svg" alt="Rspack" width="17" /> <img src="packages/assets/src/vite.svg" alt="Vite" width="17" /> <img src="packages/assets/src/webpack.svg" alt="Webpack" width="17" />
262262
@@ -296,7 +296,7 @@ datadogWebpackPlugin({
296296
};
297297
customPlugins?: (options: Options, context: GlobalContext, log: Logger) => UnpluginPlugin[];
298298
logLevel?: 'debug' | 'info' | 'warn' | 'error' | 'none';
299-
rum?: {
299+
errorTracking?: {
300300
disabled?: boolean;
301301
sourcemaps?: {
302302
bailOnError?: boolean;

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
"loop": "yarn workspaces foreach -Apti --include \"@datadog/*\" --exclude \"@datadog/build-plugins\"",
2828
"oss": "yarn cli oss -d packages -l mit",
2929
"publish:all": "yarn loop --no-private npm publish",
30-
"test": "yarn build:all && yarn workspace @dd/tests test",
31-
"test:noisy": "yarn workspace @dd/tests test:noisy",
30+
"test": "yarn workspace @dd/tests test",
3231
"typecheck:all": "yarn workspaces foreach -Apti run typecheck",
3332
"version:all": "yarn loop version --deferred ${0} && yarn version apply --all",
3433
"watch:all": "yarn loop run watch"

packages/core/src/types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import type { TrackedFilesMatcher } from '@dd/internal-git-plugin/trackedFilesMatcher';
1010
/* eslint-disable arca/import-ordering */
1111
// #imports-injection-marker
12-
import type { RumOptions } from '@dd/rum-plugin/types';
13-
import type * as rum from '@dd/rum-plugin';
12+
import type { ErrorTrackingOptions } from '@dd/error-tracking-plugin/types';
13+
import type * as errorTracking from '@dd/error-tracking-plugin';
1414
import type { TelemetryOptions } from '@dd/telemetry-plugin/types';
1515
import type * as telemetry from '@dd/telemetry-plugin';
1616
// #imports-injection-marker
@@ -127,7 +127,7 @@ export interface BaseOptions {
127127
export interface Options extends BaseOptions {
128128
// Each product should have a unique entry.
129129
// #types-injection-marker
130-
[rum.CONFIG_KEY]?: RumOptions;
130+
[errorTracking.CONFIG_KEY]?: ErrorTrackingOptions;
131131
[telemetry.CONFIG_KEY]?: TelemetryOptions;
132132
// #types-injection-marker
133133
customPlugins?: GetCustomPlugins;

packages/factory/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
},
1818
"dependencies": {
1919
"@dd/core": "workspace:*",
20+
"@dd/error-tracking-plugin": "workspace:*",
2021
"@dd/internal-build-report-plugin": "workspace:*",
2122
"@dd/internal-bundler-report-plugin": "workspace:*",
2223
"@dd/internal-git-plugin": "workspace:*",
2324
"@dd/internal-injection-plugin": "workspace:*",
24-
"@dd/rum-plugin": "workspace:*",
2525
"@dd/telemetry-plugin": "workspace:*",
2626
"chalk": "2.3.1",
2727
"unplugin": "1.16.0"

packages/factory/src/index.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import { getContext, getLoggerFactory, validateOptions } from './helpers';
2727

2828
/* eslint-disable arca/import-ordering, arca/newline-after-import-section */
2929
// #imports-injection-marker
30-
import type { OptionsWithRum } from '@dd/rum-plugin/types';
31-
import * as rum from '@dd/rum-plugin';
30+
import type { OptionsWithErrorTracking } from '@dd/error-tracking-plugin/types';
31+
import * as errorTracking from '@dd/error-tracking-plugin';
3232
import type { OptionsWithTelemetry } from '@dd/telemetry-plugin/types';
3333
import * as telemetry from '@dd/telemetry-plugin';
3434
import { getBuildReportPlugins } from '@dd/internal-build-report-plugin';
@@ -37,7 +37,7 @@ import { getGitPlugins } from '@dd/internal-git-plugin';
3737
import { getInjectionPlugins } from '@dd/internal-injection-plugin';
3838
// #imports-injection-marker
3939
// #types-export-injection-marker
40-
export type { types as RumTypes } from '@dd/rum-plugin';
40+
export type { types as ErrorTrackingTypes } from '@dd/error-tracking-plugin';
4141
export type { types as TelemetryTypes } from '@dd/telemetry-plugin';
4242
// #types-export-injection-marker
4343
/* eslint-enable arca/import-ordering, arca/newline-after-import-section */
@@ -110,9 +110,16 @@ export const buildPluginFactory = ({
110110

111111
// Based on configuration add corresponding plugin.
112112
// #configs-injection-marker
113-
if (options[rum.CONFIG_KEY] && options[rum.CONFIG_KEY].disabled !== true) {
113+
if (
114+
options[errorTracking.CONFIG_KEY] &&
115+
options[errorTracking.CONFIG_KEY].disabled !== true
116+
) {
114117
plugins.push(
115-
...rum.getPlugins(options as OptionsWithRum, context, getLogger(rum.PLUGIN_NAME)),
118+
...errorTracking.getPlugins(
119+
options as OptionsWithErrorTracking,
120+
context,
121+
getLogger(errorTracking.PLUGIN_NAME),
122+
),
116123
);
117124
}
118125
if (options[telemetry.CONFIG_KEY] && options[telemetry.CONFIG_KEY].disabled !== true) {

packages/plugins/rum/README.md renamed to packages/plugins/error-tracking/README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# RUM Plugin <!-- #omit in toc -->
1+
# Error Tracking Plugin <!-- #omit in toc -->
22

3-
Interact with our Real User Monitoring product (RUM) in Datadog directly from your build system.
3+
Interact with Error Tracking directly from your build system.
44

55
<!-- The title and the following line will both be added to the root README.md -->
66

@@ -11,19 +11,19 @@ Interact with our Real User Monitoring product (RUM) in Datadog directly from yo
1111
<!-- #toc -->
1212
- [Configuration](#configuration)
1313
- [Sourcemaps Upload](#sourcemaps-upload)
14-
- [`rum.sourcemaps.bailOnError`](#rumsourcemapsbailonerror)
15-
- [`rum.sourcemaps.dryRun`](#rumsourcemapsdryrun)
16-
- [`rum.sourcemaps.intakeUrl`](#rumsourcemapsintakeurl)
17-
- [`rum.sourcemaps.maxConcurrency`](#rumsourcemapsmaxconcurrency)
18-
- [`rum.sourcemaps.minifiedPathPrefix`](#rumsourcemapsminifiedpathprefix)
19-
- [`rum.sourcemaps.releaseVersion`](#rumsourcemapsreleaseversion)
20-
- [`rum.sourcemaps.service`](#rumsourcemapsservice)
14+
- [errorTracking.sourcemaps.bailOnError](#errortrackingsourcemapsbailonerror)
15+
- [errorTracking.sourcemaps.dryRun](#errortrackingsourcemapsdryrun)
16+
- [errorTracking.sourcemaps.intakeUrl](#errortrackingsourcemapsintakeurl)
17+
- [errorTracking.sourcemaps.maxConcurrency](#errortrackingsourcemapsmaxconcurrency)
18+
- [errorTracking.sourcemaps.minifiedPathPrefix](#errortrackingsourcemapsminifiedpathprefix)
19+
- [errorTracking.sourcemaps.releaseVersion](#errortrackingsourcemapsreleaseversion)
20+
- [errorTracking.sourcemaps.service](#errortrackingsourcemapsservice)
2121
<!-- #toc -->
2222

2323
## Configuration
2424

2525
```ts
26-
rum?: {
26+
errorTracking?: {
2727
disabled?: boolean;
2828
sourcemaps?: {
2929
bailOnError?: boolean;
@@ -45,31 +45,31 @@ Upload JavaScript sourcemaps to Datadog to un-minify your errors.
4545
> You can override the intake URL by setting the `DATADOG_SOURCEMAP_INTAKE_URL` environment variable (eg. `https://sourcemap-intake.datadoghq.com/v1/input`).
4646
> Or only the domain with the `DATADOG_SITE` environment variable (eg. `datadoghq.com`).
4747
48-
### `rum.sourcemaps.bailOnError`
48+
### errorTracking.sourcemaps.bailOnError
4949

5050
> default: `false`
5151
5252
Should the upload of sourcemaps fail the build on first error?
5353

54-
### `rum.sourcemaps.dryRun`
54+
### errorTracking.sourcemaps.dryRun
5555

5656
> default: `false`
5757
5858
It will not upload the sourcemaps to Datadog, but will do everything else.
5959

60-
### `rum.sourcemaps.intakeUrl`
60+
### errorTracking.sourcemaps.intakeUrl
6161

6262
> default: `https://sourcemap-intake.datadoghq.com/api/v2/srcmap`
6363
6464
Against which endpoint do you want to upload the sourcemaps.
6565

66-
### `rum.sourcemaps.maxConcurrency`
66+
### errorTracking.sourcemaps.maxConcurrency
6767

6868
> default: `20`
6969
7070
Number of concurrent upload to the API.
7171

72-
### `rum.sourcemaps.minifiedPathPrefix`
72+
### errorTracking.sourcemaps.minifiedPathPrefix
7373

7474
> required
7575
@@ -79,13 +79,13 @@ The prefix can be a full URL or an absolute path.
7979

8080
Example: if you're uploading `dist/file.js` to `https://example.com/static/file.js`, you can use `minifiedPathPrefix: 'https://example.com/static/'` or `minifiedPathPrefix: '/static/'`.`minifiedPathPrefix: '/'` is a valid input when you upload JS at the root directory of the server.
8181

82-
### `rum.sourcemaps.releaseVersion`
82+
### errorTracking.sourcemaps.releaseVersion
8383

8484
> required
8585
8686
Is similar and will be used to match the `version` tag set on the RUM SDK.
8787

88-
### `rum.sourcemaps.service`
88+
### errorTracking.sourcemaps.service
8989

9090
> required
9191

packages/plugins/rum/package.json renamed to packages/plugins/error-tracking/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"name": "@dd/rum-plugin",
2+
"name": "@dd/error-tracking-plugin",
33
"packageManager": "[email protected]",
44
"license": "MIT",
55
"private": true,
66
"author": "Datadog",
7-
"description": "Interact with our Real User Monitoring product (RUM) in Datadog directly from your build system.",
8-
"homepage": "https://github.com/DataDog/build-plugins/tree/main/packages/plugins/rum#readme",
7+
"description": "Interact with Error Tracking directly from your build system.",
8+
"homepage": "https://github.com/DataDog/build-plugins/tree/main/packages/plugins/error-tracking#readme",
99
"repository": {
1010
"type": "git",
1111
"url": "https://github.com/DataDog/build-plugins",
12-
"directory": "packages/plugins/rum"
12+
"directory": "packages/plugins/error-tracking"
1313
},
1414
"exports": {
1515
".": "./src/index.ts",

packages/plugins/rum/src/constants.ts renamed to packages/plugins/error-tracking/src/constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
import type { PluginName } from '@dd/core/types';
66

7-
export const CONFIG_KEY = 'rum' as const;
8-
export const PLUGIN_NAME: PluginName = 'datadog-rum-plugin' as const;
7+
export const CONFIG_KEY = 'errorTracking' as const;
8+
export const PLUGIN_NAME: PluginName = 'datadog-error-tracking-plugin' as const;

0 commit comments

Comments
 (0)