createBrowserRouter auto instrumentation

Author: Miz85

packages/core/src/types.ts

@@ -85,7 +85,7 @@ export enum InjectPosition {
 export type ToInjectItem = {
     type: 'file' | 'code';
     value: InjectedValue;
-    position: InjectPosition;
+    position?: InjectPosition;
     fallback?: ToInjectItem;
 };
 
@@ -149,7 +149,7 @@ export interface Options extends BaseOptions {
     customPlugins?: GetCustomPlugins;
 }
 
-export type GetPluginsOptions = Required<BaseOptions>;
+export type GetPluginsOptions = BaseOptions;
 export type OptionsWithDefaults = Assign<Options, GetPluginsOptions>;
 
 export type PluginName = `datadog-${Lowercase<string>}-plugin`;

packages/plugins/injection/src/helpers.ts

@@ -3,7 +3,8 @@
 // Copyright 2019-Present Datadog, Inc.
 
 import { doRequest, truncateString } from '@dd/core/helpers';
-import type { InjectPosition, Logger, ToInjectItem } from '@dd/core/types';
+import type { Logger, ToInjectItem } from '@dd/core/types';
+import { InjectPosition } from '@dd/core/types';
 import { getAbsolutePath } from '@dd/internal-build-report-plugin/helpers';
 import { readFile } from 'fs/promises';
 
@@ -86,7 +87,7 @@ export const processInjections = async (
         // eslint-disable-next-line no-await-in-loop
         const value = await processItem(item, log);
         if (value) {
-            toReturn.set(id, { value, position: item.position });
+            toReturn.set(id, { value, position: item.position ?? InjectPosition.AFTER });
         }
     }
 

packages/plugins/rum/src/index.ts

@@ -46,11 +46,6 @@ export const getPlugins: GetPlugins<OptionsWithRum> = (
                 position: InjectPosition.MIDDLE,
                 value: path.join(__dirname, './rum-react-plugin.js'),
             });
-            context.inject({
-                type: 'file',
-                position: InjectPosition.MIDDLE,
-                value: path.join(__dirname, './rum-react-router-6.js'),
-            });
         }
 
         context.inject({
@@ -90,7 +85,11 @@ export const getPlugins: GetPlugins<OptionsWithRum> = (
                 return updatedCode;
             },
             transformInclude(id) {
-                return id.match(new RegExp(/.*\.(js|jsx|ts|tsx)$/)) !== null;
+                return (
+                    // @ts-ignore
+                    options?.react?.router === true &&
+                    id.match(new RegExp(/.*\.(js|jsx|ts|tsx)$/)) !== null
+                );
             },
         },
     ];

packages/plugins/rum/src/sdk.ts

@@ -16,9 +16,16 @@ type RumAppResponse = {
 };
 
 const getContent = (opts: RumOptionsWithDefaults) => {
-    const pluginContent = opts.react ? ', plugins: [reactPlugin({ router: true})]' : '';
-    return `DD_RUM.init({${JSON.stringify(opts.sdk).replace(/(^{|}$)/g, '')}${pluginContent}});
-`;
+    const pluginContent = opts.react
+        ? // @ts-ignore
+          `, plugins: [reactPlugin({router: ${opts.react.router}})]`
+        : '';
+    const sessionReplayStartCommand = opts.startSessionReplayRecording
+        ? 'DD_RUM.startSessionReplayRecording();\n'
+        : '';
+
+    return `DD_RUM.init({${JSON.stringify(opts.sdk).replace(/(^{|}$)/g, '')}${pluginContent}});${sessionReplayStartCommand}
+    `;
 };
 
 export const getInjectionValue = (

packages/plugins/rum/src/types.ts

@@ -10,6 +10,7 @@ export type RumOptions = {
     disabled?: boolean;
     sdk?: SDKOptions;
     react?: ReactOptions;
+    startSessionReplayRecording?: boolean;
 };
 
 export type SDKOptions = {
@@ -68,6 +69,7 @@ export type RumOptionsWithDefaults = {
     disabled?: boolean;
     sdk?: SDKOptionsWithDefaults;
     react?: ReactOptionsWithDefaults;
+    startSessionReplayRecording?: boolean;
 };
 
 export type RumOptionsWithSdk = {

packages/published/esbuild-plugin/package.json

@@ -21,12 +21,7 @@
     "main": "./dist/src/index.js",
     "module": "./dist/src/index.mjs",
     "exports": {
-        "./package.json": "./package.json",
-        ".": {
-            "import": "./dist/src/index.mjs",
-            "require": "./dist/src/index.js",
-            "types": "./dist/src/index.d.ts"
-        }
+        ".": "./src/index.ts"
     },
     "publishConfig": {
         "access": "public",

packages/published/rollup-plugin/package.json

@@ -21,12 +21,7 @@
     "main": "./dist/src/index.js",
     "module": "./dist/src/index.mjs",
     "exports": {
-        "./package.json": "./package.json",
-        ".": {
-            "import": "./dist/src/index.mjs",
-            "require": "./dist/src/index.js",
-            "types": "./dist/src/index.d.ts"
-        }
+        ".": "./src/index.ts"
     },
     "publishConfig": {
         "access": "public",

packages/published/rspack-plugin/package.json

@@ -21,12 +21,7 @@
     "main": "./dist/src/index.js",
     "module": "./dist/src/index.mjs",
     "exports": {
-        "./package.json": "./package.json",
-        ".": {
-            "import": "./dist/src/index.mjs",
-            "require": "./dist/src/index.js",
-            "types": "./dist/src/index.d.ts"
-        }
+        ".": "./src/index.ts"
     },
     "publishConfig": {
         "access": "public",

packages/published/vite-plugin/package.json

@@ -21,12 +21,7 @@
     "main": "./dist/src/index.js",
     "module": "./dist/src/index.mjs",
     "exports": {
-        "./package.json": "./package.json",
-        ".": {
-            "import": "./dist/src/index.mjs",
-            "require": "./dist/src/index.js",
-            "types": "./dist/src/index.d.ts"
-        }
+        ".": "./src/index.ts"
     },
     "publishConfig": {
         "access": "public",

packages/published/webpack-plugin/package.json

@@ -21,12 +21,7 @@
     "main": "./dist/src/index.js",
     "module": "./dist/src/index.mjs",
     "exports": {
-        "./package.json": "./package.json",
-        ".": {
-            "import": "./dist/src/index.mjs",
-            "require": "./dist/src/index.js",
-            "types": "./dist/src/index.d.ts"
-        }
+        ".": "./src/index.ts"
     },
     "publishConfig": {
         "access": "public",