Merge pull request #85 from DataDog/yoann/refactor-testing-telemetry

[testing] Refactor testing telemetry

.eslintrc.js

@@ -373,23 +373,13 @@ module.exports = {
             },
         },
         {
-            files: [
-                'rollup.config.mjs',
-                'packages/core/**/*',
-                'packages/webpack-plugin/**/*',
-                'packages/esbuild-plugin/**/*',
-            ],
+            files: ['rollup.config.mjs', 'packages/core/**/*', 'packages/*-plugin/**/*'],
             rules: {
                 'import/no-extraneous-dependencies': 'off',
             },
         },
         {
-            files: [
-                'packages/core/**/*',
-                'packages/esbuild-plugin/**/*',
-                'packages/plugins/**/*',
-                'packages/webpack-plugin/**/*',
-            ],
+            files: ['packages/core/**/*', 'packages/plugins/**/*', 'packages/*-plugin/**/*'],
             rules: {
                 'no-console': 'error',
             },

.gitignore

@@ -6,7 +6,5 @@ yarn-error.log
 !.yarn/plugins
 !.vscode
 
-webpack-profile-debug
-esbuild-profile-debug
 node_modules/
 dist/

LICENSES-3rdparty.csv

@@ -185,7 +185,7 @@ Component,Origin,Licence,Copyright
 @types/chalk,npm,MIT,(https://www.npmjs.com/package/@types/chalk)
 @types/color-name,npm,MIT,(https://www.npmjs.com/package/@types/color-name)
 @types/eslint,npm,MIT,(https://www.npmjs.com/package/@types/eslint)
-@types/eslint-scope,npm,MIT,(https://www.npmjs.com/package/@types/eslint-scope)
+@types/eslint-scope,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/eslint-scope)
 @types/estree,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/estree)
 @types/fs-extra,npm,MIT,(https://www.npmjs.com/package/@types/fs-extra)
 @types/glob,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/glob)
@@ -203,7 +203,12 @@ Component,Origin,Licence,Copyright
 @types/resolve,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/resolve)
 @types/retry,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/retry)
 @types/semver,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/semver)
+@types/source-list-map,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/source-list-map)
 @types/stack-utils,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/stack-utils)
+@types/tapable,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/tapable)
+@types/uglify-js,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/uglify-js)
+@types/webpack,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/webpack)
+@types/webpack-sources,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/webpack-sources)
 @types/wrap-ansi,npm,MIT,(https://www.npmjs.com/package/@types/wrap-ansi)
 @types/yargs,npm,MIT,(https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/yargs)
 @types/yargs-parser,npm,MIT,(https://www.npmjs.com/package/@types/yargs-parser)
@@ -235,13 +240,11 @@ Component,Origin,Licence,Copyright
 @webassemblyjs/wasm-parser,npm,MIT,Sven Sauleau (https://www.npmjs.com/package/@webassemblyjs/wasm-parser)
 @webassemblyjs/wast-parser,npm,MIT,Sven Sauleau (https://www.npmjs.com/package/@webassemblyjs/wast-parser)
 @webassemblyjs/wast-printer,npm,MIT,Sven Sauleau (https://www.npmjs.com/package/@webassemblyjs/wast-printer)
-@webpack-cli/info,virtual,MIT,(https://github.com/webpack/webpack-cli/tree/master/packages/info)
-@webpack-cli/serve,virtual,MIT,(https://github.com/webpack/webpack-cli/tree/master/packages/serve)
 @xtuc/ieee754,npm,BSD-3-Clause,Feross Aboukhadijeh (http://feross.org)
 @xtuc/long,npm,Apache-2.0,Daniel Wirtz (https://www.npmjs.com/package/@xtuc/long)
 abbrev,npm,ISC,Isaac Z. Schlueter (https://www.npmjs.com/package/abbrev)
 acorn,npm,MIT,(https://github.com/acornjs/acorn)
-acorn-import-assertions,virtual,MIT,Sven Sauleau (https://www.npmjs.com/package/acorn-import-assertions)
+acorn-import-attributes,virtual,MIT,Sven Sauleau (https://www.npmjs.com/package/acorn-import-attributes)
 acorn-jsx,virtual,MIT,(https://github.com/acornjs/acorn-jsx)
 acorn-walk,npm,MIT,(https://github.com/acornjs/acorn)
 aggregate-error,npm,MIT,Sindre Sorhus (sindresorhus.com)
@@ -261,7 +264,6 @@ argparse,npm,MIT,(https://www.npmjs.com/package/argparse)
 arr-diff,npm,MIT,Jon Schlinkert (https://github.com/jonschlinkert/arr-diff)
 arr-flatten,npm,MIT,Jon Schlinkert (https://github.com/jonschlinkert/arr-flatten)
 arr-union,npm,MIT,Jon Schlinkert (https://github.com/jonschlinkert/arr-union)
-array-back,npm,MIT,Lloyd Brookes (https://www.npmjs.com/package/array-back)
 array-buffer-byte-length,npm,MIT,Jordan Harband (https://github.com/inspect-js/array-buffer-byte-length#readme)
 array-includes,npm,MIT,Jordan Harband (http://ljharb.codes)
 array-union,npm,MIT,Sindre Sorhus (sindresorhus.com)
@@ -347,9 +349,7 @@ collect-v8-coverage,npm,MIT,(https://www.npmjs.com/package/collect-v8-coverage)
 collection-visit,npm,MIT,Jon Schlinkert (https://github.com/jonschlinkert/collection-visit)
 color-convert,npm,MIT,Heather Arthur (https://www.npmjs.com/package/color-convert)
 color-name,npm,MIT,DY (https://github.com/dfcreative/color-name)
-colorette,npm,MIT,Jorge Bucaran (https://www.npmjs.com/package/colorette)
 combined-stream,npm,MIT,Felix Geisendörfer (https://github.com/felixge/node-combined-stream)
-command-line-usage,npm,MIT,Lloyd Brookes (https://www.npmjs.com/package/command-line-usage)
 commander,npm,MIT,TJ Holowaychuk (https://www.npmjs.com/package/commander)
 commondir,npm,MIT,James Halliday (http://substack.net)
 compare-versions,npm,MIT,Ole Michelsen (https://github.com/omichelsen/compare-versions#readme)
@@ -380,7 +380,6 @@ data-view-byte-offset,npm,MIT,Jordan Harband (https://github.com/ljharb/data-vie
 debug,virtual,MIT,Josh Junon (https://www.npmjs.com/package/debug)
 decode-uri-component,npm,MIT,Sam Verschueren (github.com/SamVerschueren)
 dedent,virtual,MIT,Desmond Brand (https://github.com/dmnd/dedent)
-deep-extend,npm,MIT,Viacheslav Lotsmanov (https://github.com/unclechu/node-deep-extend)
 deep-is,npm,MIT,Thorsten Lorenz (http://thlorenz.com)
 deepmerge,npm,MIT,(https://github.com/TehShrike/deepmerge)
 defaults,npm,MIT,Elijah Insua (https://www.npmjs.com/package/defaults)
@@ -409,7 +408,6 @@ end-of-stream,npm,MIT,Mathias Buus (https://github.com/mafintosh/end-of-stream)
 enhanced-resolve,npm,MIT,Tobias Koppers @sokra (http://github.com/webpack/enhanced-resolve)
 enquirer,npm,MIT,Jon Schlinkert (https://github.com/enquirer/enquirer)
 env-paths,npm,MIT,Sindre Sorhus (sindresorhus.com)
-envinfo,npm,MIT,[email protected] (https://www.npmjs.com/package/envinfo)
 errno,npm,MIT,(https://www.npmjs.com/package/errno)
 error-ex,npm,MIT,(https://www.npmjs.com/package/error-ex)
 es-abstract,npm,MIT,Jordan Harband (http://ljharb.codes)
@@ -534,7 +532,6 @@ infer-owner,npm,ISC,Isaac Z. Schlueter (https://izs.me)
 inflight,npm,ISC,Isaac Z. Schlueter (https://github.com/isaacs/inflight)
 inherits,npm,ISC,(https://www.npmjs.com/package/inherits)
 internal-slot,npm,MIT,Jordan Harband (https://github.com/ljharb/internal-slot#readme)
-interpret,npm,MIT,Gulp Team (http://gulpjs.com/)
 is-accessor-descriptor,npm,MIT,Jon Schlinkert (https://github.com/jonschlinkert/is-accessor-descriptor)
 is-array-buffer,npm,MIT,Jordan Harband (https://github.com/inspect-js/is-array-buffer#readme)
 is-arrayish,npm,MIT,Qix (http://github.com/qix-)
@@ -633,7 +630,6 @@ listr2,npm,MIT,Cenk Kilic (https://srcs.kilic.dev)
 loader-runner,npm,MIT,Tobias Koppers @sokra (https://github.com/webpack/loader-runner#readme)
 loader-utils,npm,MIT,Tobias Koppers @sokra (https://www.npmjs.com/package/loader-utils)
 locate-path,npm,MIT,Sindre Sorhus (sindresorhus.com)
-lodash,npm,MIT,John-David Dalton (https://lodash.com/)
 lodash.debounce,npm,MIT,John-David Dalton (https://lodash.com/)
 lodash.memoize,npm,MIT,John-David Dalton (https://lodash.com/)
 lodash.merge,npm,MIT,John-David Dalton (https://lodash.com/)
@@ -758,8 +754,6 @@ randomfill,npm,MIT,(https://github.com/crypto-browserify/randomfill)
 react-is,npm,MIT,(https://reactjs.org/)
 readable-stream,npm,MIT,(https://www.npmjs.com/package/readable-stream)
 readdirp,npm,MIT,Thorsten Lorenz (https://github.com/paulmillr/readdirp)
-rechoir,npm,MIT,Gulp Team (http://gulpjs.com/)
-reduce-flatten,npm,MIT,Lloyd Brookes (https://www.npmjs.com/package/reduce-flatten)
 regenerate,npm,MIT,Mathias Bynens (https://mths.be/regenerate)
 regenerate-unicode-properties,npm,MIT,Mathias Bynens (https://github.com/mathiasbynens/regenerate-unicode-properties)
 regenerator-runtime,npm,MIT,Ben Newman (https://www.npmjs.com/package/regenerator-runtime)
@@ -848,7 +842,6 @@ strip-json-comments,npm,MIT,Sindre Sorhus (https://sindresorhus.com)
 supports-color,npm,MIT,Sindre Sorhus (sindresorhus.com)
 supports-preserve-symlinks-flag,npm,MIT,Jordan Harband (https://github.com/inspect-js/node-supports-preserve-symlinks-flag#readme)
 synckit,npm,MIT,JounQin (https://www.1stG.me)
-table-layout,npm,MIT,Lloyd Brookes (https://www.npmjs.com/package/table-layout)
 tapable,npm,MIT,Tobias Koppers @sokra (https://github.com/webpack/tapable)
 tar,npm,ISC,Isaac Z. Schlueter (http://blog.izs.me/)
 terser,npm,BSD-2-Clause,Mihai Bazon (https://terser.org)
@@ -884,7 +877,6 @@ typed-array-byte-length,npm,MIT,Jordan Harband (https://github.com/inspect-js/ty
 typed-array-byte-offset,npm,MIT,Jordan Harband (https://github.com/inspect-js/typed-array-byte-offset#readme)
 typed-array-length,npm,MIT,Jordan Harband (https://github.com/inspect-js/typed-array-length#readme)
 typedarray,npm,MIT,James Halliday (https://github.com/substack/typedarray)
-typical,npm,MIT,Lloyd Brookes (https://www.npmjs.com/package/typical)
 unbox-primitive,npm,MIT,Jordan Harband (https://github.com/ljharb/unbox-primitive#readme)
 undici-types,npm,MIT,(https://undici.nodejs.org)
 unicode-canonical-property-names-ecmascript,npm,MIT,Mathias Bynens (https://github.com/mathiasbynens/unicode-canonical-property-names-ecmascript)
@@ -906,7 +898,6 @@ use,npm,MIT,Jon Schlinkert (https://github.com/jonschlinkert/use)
 util,npm,MIT,Joyent (https://github.com/defunctzombie/node-util)
 util-deprecate,npm,MIT,Nathan Rajlich (https://github.com/TooTallNate/util-deprecate)
 uuid,npm,MIT,(https://www.npmjs.com/package/uuid)
-v8-compile-cache,npm,MIT,Andres Suarez (https://www.npmjs.com/package/v8-compile-cache)
 v8-compile-cache-lib,npm,MIT,Andrew Bradley (https://www.npmjs.com/package/v8-compile-cache-lib)
 v8-to-istanbul,npm,ISC,Ben Coe (https://www.npmjs.com/package/v8-to-istanbul)
 verror,npm,MIT,(https://www.npmjs.com/package/verror)
@@ -916,16 +907,13 @@ watchpack,npm,MIT,Tobias Koppers @sokra (https://github.com/webpack/watchpack)
 watchpack-chokidar2,npm,MIT,Tobias Koppers @sokra (https://github.com/webpack/watchpack)
 wcwidth,npm,MIT,Tim Oxley (https://github.com/timoxley/wcwidth#readme)
 webpack,virtual,MIT,Tobias Koppers @sokra (https://github.com/webpack/webpack)
-webpack-cli,virtual,MIT,(https://www.npmjs.com/package/webpack-cli)
-webpack-merge,npm,MIT,Juho Vepsalainen (https://github.com/survivejs/webpack-merge)
 webpack-sources,npm,MIT,Tobias Koppers @sokra (https://github.com/webpack/webpack-sources#readme)
 webpack-virtual-modules,npm,MIT,SysGears INC (https://github.com/sysgears/webpack-virtual-modules#readme)
 which,npm,ISC,Isaac Z. Schlueter (http://blog.izs.me)
 which-boxed-primitive,npm,MIT,Jordan Harband (https://github.com/inspect-js/which-boxed-primitive#readme)
 which-pm-runs,npm,MIT,Zoltan Kochan (https://github.com/zkochan/which-pm-runs#readme)
 which-typed-array,npm,MIT,Jordan Harband (http://ljharb.codes)
 wide-align,npm,ISC,Rebecca Turner (http://re-becca.org/)
-wordwrapjs,npm,MIT,Lloyd Brookes (https://www.npmjs.com/package/wordwrapjs)
 worker-farm,npm,MIT,(https://github.com/rvagg/node-worker-farm)
 wrap-ansi,npm,MIT,Sindre Sorhus (sindresorhus.com)
 wrappy,npm,ISC,Isaac Z. Schlueter (https://github.com/npm/wrappy)

package.json

@@ -16,18 +16,16 @@
         "yarn": "1.22.19"
     },
     "scripts": {
-        "build:all": "yarn workspaces foreach -Apti --exclude \"project-*\" run build",
-        "build:tests": "yarn workspaces foreach -Apti --include \"project-*\" run build",
+        "build:all": "yarn workspaces foreach -Apti --exclude \"@dd/*\" run build",
         "cli": "yarn workspace @dd/tools cli",
         "format": "yarn lint --fix",
         "lint": "eslint ./packages/**/*.{ts,js} --quiet",
         "oss": "yarn cli oss -d packages -l mit",
         "publish:all": "yarn workspaces foreach -A --include \"@datadog/*\" --exclude \"@datadog/build-plugins\" --no-private npm publish",
-        "test": "yarn build:all && yarn build:tests && yarn test:only",
-        "test:only": "yarn workspace @dd/tests test",
-        "typecheck:all": "yarn workspaces foreach -Apti --exclude \"project-*\" run typecheck",
+        "test": "yarn workspace @dd/tests test",
+        "typecheck:all": "yarn workspaces foreach -Apti run typecheck",
         "version:all": "yarn workspaces foreach -Apti --include \"@datadog/*\" --exclude \"@datadog/build-plugins\" version --deferred ${0} && yarn version apply --all",
-        "watch:all": "yarn workspaces foreach -Apti --exclude \"project-*\" run watch"
+        "watch:all": "yarn workspaces foreach -Apti run watch"
     },
     "husky": {
         "hooks": {

packages/esbuild-plugin/package.json

@@ -57,8 +57,8 @@
         "@rollup/plugin-node-resolve": "15.2.3",
         "@types/babel__core": "^7",
         "@types/babel__preset-env": "^7",
-        "esbuild": "0.20.2",
-        "rollup": "4.17.1",
+        "esbuild": "0.21.5",
+        "rollup": "4.18.0",
         "rollup-plugin-dts": "6.1.0",
         "rollup-plugin-esbuild": "6.1.1",
         "typescript": "5.4.3"

packages/plugins/telemetry/package.json

@@ -26,11 +26,11 @@
     "dependencies": {
         "@dd/core": "workspace:*",
         "chalk": "2.3.1",
-        "esbuild": "0.20.2",
+        "esbuild": "0.21.5",
         "fs-extra": "7.0.1",
         "pretty-bytes": "5.6.0",
         "unplugin": "patch:unplugin@npm%3A1.10.1#~/.yarn/patches/unplugin-npm-1.10.1-b23391b255.patch",
-        "webpack": "5.49.0"
+        "webpack": "5.92.1"
     },
     "devDependencies": {
         "@types/chalk": "2.2.0",

packages/tests/jest.config.js

@@ -5,18 +5,9 @@
 module.exports = {
     // Automatically clear mock calls and instances between every test
     clearMocks: true,
-    preset: 'ts-jest',
+    preset: 'ts-jest/presets/js-with-ts',
     reporters: [['default', { summaryThreshold: 0 }]],
     testEnvironment: 'node',
     testMatch: ['**/*.test.*'],
-    transform: {
-        '^.+\\.tsx?$': [
-            'ts-jest',
-            {
-                tsconfig: 'tsconfig.json',
-                packageJson: 'package.json',
-            },
-        ],
-    },
     roots: ['./src/'],
 };

packages/tests/package.json

@@ -11,13 +11,10 @@
         "url": "https://github.com/DataDog/build-plugins",
         "directory": "packages/tests"
     },
-    "workspaces": [
-        "src/plugins/**/mocks/projects/*",
-        "src/plugins/**/mocks/projects/*/workspaces/*"
-    ],
     "exports": {
         "./*": "./src/*.ts",
         "./fixtures/*": "./src/fixtures/*",
+        "./helpers/*": "./src/helpers/*.ts",
         "./plugins/telemetry/*": "./src/plugins/telemetry/*.ts"
     },
     "scripts": {
@@ -38,10 +35,12 @@
     "devDependencies": {
         "@types/jest": "29.5.12",
         "@types/node": "^18",
-        "esbuild": "0.20.2",
+        "@types/webpack4": "npm:@types/[email protected]",
+        "esbuild": "0.21.5",
         "memfs": "4.9.2",
         "nock": "14.0.0-beta.7",
         "typescript": "5.4.3",
-        "webpack": "5.49.0"
+        "webpack": "5.92.1",
+        "webpack4": "npm:[email protected]"
     }
 }

packages/tests/src/core/plugins/git/index.test.ts

@@ -4,7 +4,8 @@
 
 import { getRepositoryData } from '@dd/core/plugins/git/helpers';
 import { getPlugins } from '@dd/telemetry-plugins';
-import { defaultPluginOptions, runBundlers } from '@dd/tests/helpers';
+import { defaultPluginOptions } from '@dd/tests/helpers/mocks';
+import { runBundlers } from '@dd/tests/helpers/runBundlers';
 import { API_PATH, FAKE_URL, getSourcemapsConfiguration } from '@dd/tests/plugins/rum/testHelpers';
 import nock from 'nock';
 

packages/tests/src/core/plugins/global-context/index.test.ts

@@ -3,7 +3,8 @@
 // Copyright 2019-Present Datadog, Inc.
 
 import { getPlugins } from '@dd/telemetry-plugins';
-import { defaultPluginOptions, runBundlers } from '@dd/tests/helpers';
+import { defaultPluginOptions } from '@dd/tests/helpers/mocks';
+import { runBundlers } from '@dd/tests/helpers/runBundlers';
 
 jest.mock('@dd/telemetry-plugins', () => {
     const originalModule = jest.requireActual('@dd/telemetry-plugins');

packages/tests/src/factory/index.test.ts

@@ -3,8 +3,7 @@
 // Copyright 2019-Present Datadog, Inc.
 
 import { getPlugins } from '@dd/telemetry-plugins';
-
-import { runBundlers } from '../helpers';
+import { runBundlers } from '@dd/tests/helpers/runBundlers';
 
 jest.mock('@dd/telemetry-plugins', () => {
     const originalModule = jest.requireActual('@dd/telemetry-plugins');

packages/tests/src/fixtures/project/.gitignore

@@ -0,0 +1,3 @@
+esbuild-output
+webpack5-output
+webpack4-output