Rework the dts generation (#576)

* Switch to using virtual _bundled directory * js bundling works * try to avoid using \0, still unsure what's better * port preconstruct dts plkugin * tweak * fix cwd * working dts emit without replacements * fixed issues * test change * wip * switch to vfs module * make sure that unique ids are generated for bundled modules * use the correct system 😭😭😭 * simplify bundled plugin * fix resolve errors * tweak resolve Errors plugin further * ignore resolve errors for entries * getting closer * fix bundling scenarios * rollback temp changes * bring back dev dep * fix build crashes with multiple bundled dependencies * fix dep * fix user agent thing * remove redundant check from `esbuild` plugin * small tweak * call init functions where appropriate * fix reference
replayio · Jul 1, 2024 · adb0dff · adb0dff
1 parent dd41fa8
commit adb0dff
Show file tree

Hide file tree

Showing 15 changed files with 644 additions and 221 deletions.
diff --git a/packages/cypress/src/reporter.ts b/packages/cypress/src/reporter.ts
@@ -7,13 +7,16 @@ import {
   fetchWorkspaceConfig,
   ReplayReporterConfig,
 } from "@replayio/test-utils";
+import * as pkgJson from "../package.json";
 import dbg from "debug";
 
 import { Errors } from "./error";
 import { appendToFixtureFile, initFixtureFile } from "./fixture";
 import { getTestsFromResults, groupStepsByTest, sortSteps } from "./steps";
 import type { StepEvent } from "./support";
 import { PluginFeature, getFeatures, isFeatureEnabled } from "./features";
+import { setUserAgent } from "@replay-cli/shared/userAgent";
+import { initLogger } from "@replay-cli/shared/logger";
 
 type Test = TestMetadataV2.Test;
 
@@ -59,6 +62,8 @@ class CypressReporter {
   private _extraEnv: NodeJS.ProcessEnv = {};
 
   constructor(config: Cypress.PluginConfigOptions, options: PluginOptions) {
+    setUserAgent(`${pkgJson.name}/${pkgJson.version}`);
+    initLogger(pkgJson.name, pkgJson.version);
     initFixtureFile();
 
     this.config = config;

diff --git a/packages/cypress/tsconfig.json b/packages/cypress/tsconfig.json
@@ -2,7 +2,8 @@
   "extends": "@replay-cli/tsconfig/base.json",
   "compilerOptions": {
     "target": "es2022",
-    "lib": ["dom", "es2023"]
+    "lib": ["dom", "es2023"],
+    "resolveJsonModule": true
   },
   "include": ["src/**/*.ts"],
   "references": [

diff --git a/packages/jest/package.json b/packages/jest/package.json
@@ -37,6 +37,7 @@
     "@jest/test-result": "^27.5.1",
     "@jest/types": "^27.5.1",
     "@replay-cli/pkg-build": "workspace:^",
+    "@replay-cli/shared": "workspace:^",
     "@replay-cli/tsconfig": "workspace:^",
     "@replayio/test-utils": "workspace:^",
     "@types/node": "^20.11.27",

diff --git a/packages/jest/src/runner.ts b/packages/jest/src/runner.ts
@@ -9,6 +9,9 @@ import {
 } from "@replayio/test-utils";
 import type Runtime from "jest-runtime";
 import path from "path";
+import * as pkgJson from "../package.json";
+import { setUserAgent } from "@replay-cli/shared/userAgent";
+import { initLogger } from "@replay-cli/shared/logger";
 
 const runner = require("jest-circus/runner");
 const pluginVersion = require("@replayio/jest/package.json").version;
@@ -35,6 +38,8 @@ const ReplayRunner = async (
   testPath: string,
   sendMessageToJest?: TestFileEvent
 ): Promise<TestResult> => {
+  setUserAgent(`${pkgJson.name}/${pkgJson.version}`);
+  initLogger(pkgJson.name, pkgJson.version);
   if (!version) {
     try {
       version = require(require.resolve("jest/package.json", {

diff --git a/packages/jest/tsconfig.json b/packages/jest/tsconfig.json
@@ -1,6 +1,8 @@
 {
   "extends": "@replay-cli/tsconfig/base.json",
-  "compilerOptions": {},
+  "compilerOptions": {
+    "resolveJsonModule": true
+  },
   "include": ["src/**/*.ts"],
   "references": [
     {

diff --git a/packages/playwright/src/reporter.ts b/packages/playwright/src/reporter.ts
@@ -23,7 +23,8 @@ import { FixtureStepStart, ParsedErrorFrame, TestExecutionIdData } from "./fixtu
 import { StackFrame } from "./playwrightTypes";
 import { getServerPort, startServer } from "./server";
 import { initLogger, logger } from "@replay-cli/shared/logger";
-import packageJson from "../package.json";
+import pkgJson from "../package.json";
+import { setUserAgent } from "@replay-cli/shared/userAgent";
 
 export function getMetadataFilePath(workerIndex = 0) {
   return getMetadataFilePathBase("PLAYWRIGHT", workerIndex);
@@ -79,7 +80,8 @@ class ReplayPlaywrightReporter implements Reporter {
   private _foundReplayBrowser = false;
 
   constructor(config: ReplayPlaywrightConfig) {
-    initLogger(packageJson.name, packageJson.version);
+    setUserAgent(`${pkgJson.name}/${pkgJson.version}`);
+    initLogger(pkgJson.name, pkgJson.version);
     if (!config || typeof config !== "object") {
       throw new Error(
         `Expected an object for @replayio/playwright/reporter configuration but received: ${config}`
@@ -91,7 +93,7 @@ class ReplayPlaywrightReporter implements Reporter {
       {
         name: "playwright",
         version: undefined,
-        plugin: packageJson.version,
+        plugin: pkgJson.version,
       },
       "2.2.0",
       { ...this.config, metadataKey: "PLAYWRIGHT_REPLAY_METADATA" }

diff --git a/packages/test-utils/src/legacy-cli/upload.ts b/packages/test-utils/src/legacy-cli/upload.ts
@@ -10,7 +10,8 @@ import ProtocolClient from "./client";
 import dbg, { logPath } from "./debug";
 import { sanitize as sanitizeMetadata } from "./metadata";
 import { Options, OriginalSourceEntry, RecordingMetadata, SourceMapEntry } from "./types";
-import { defer, getUserAgent, isValidUUID, maybeLog } from "./utils";
+import { defer, isValidUUID, maybeLog } from "./utils";
+import { getUserAgent } from "@replay-cli/shared/userAgent";
 
 const debug = dbg("replay:cli:upload");
 

diff --git a/packages/test-utils/src/legacy-cli/utils.ts b/packages/test-utils/src/legacy-cli/utils.ts
@@ -8,7 +8,6 @@ import dbg from "debug";
 import { AgentOptions, Agent as HttpAgent } from "http";
 import { Agent as HttpsAgent } from "https";
 import path from "path";
-import { name as packageName, version as packageVersion } from "../../package.json";
 
 import { Options } from "./types";
 
@@ -65,14 +64,6 @@ function isValidUUID(str: unknown) {
   return true;
 }
 
-function getNameAndVersion() {
-  return `${packageName}/${packageVersion}`;
-}
-
-function getUserAgent() {
-  return getNameAndVersion();
-}
-
 function getHttpAgent(server: string, agentOptions?: AgentOptions) {
   const serverURL = new URL(server);
   if (!agentOptions) {
@@ -88,4 +79,4 @@ function getHttpAgent(server: string, agentOptions?: AgentOptions) {
   throw new Error(`Unsupported protocol: ${serverURL.protocol} for URL ${serverURL}`);
 }
 
-export { defer, getDirectory, getHttpAgent, getUserAgent, isValidUUID, maybeLog };
+export { defer, getDirectory, getHttpAgent, isValidUUID, maybeLog };
diff --git a/packages/test-utils/src/reporter.ts b/packages/test-utils/src/reporter.ts
@@ -1,15 +1,13 @@
 import { retryWithExponentialBackoff } from "@replay-cli/shared/async/retryOnFailure";
 import { getAuthInfo } from "@replay-cli/shared/graphql/getAuthInfo";
 import { queryGraphQL } from "@replay-cli/shared/graphql/queryGraphQL";
-import { initLogger, logger } from "@replay-cli/shared/logger";
+import { logger } from "@replay-cli/shared/logger";
 import { UnstructuredMetadata } from "@replay-cli/shared/recording/types";
-import { setUserAgent } from "@replay-cli/shared/userAgent";
 import { spawnSync } from "child_process";
 import { mkdirSync, writeFileSync } from "fs";
 import assert from "node:assert/strict";
 import { dirname } from "path";
 import { v4 as uuid } from "uuid";
-import * as pkgJson from "../package.json";
 import { listAllRecordings, removeRecording, uploadRecording } from "./legacy-cli";
 import { add, source as sourceMetadata, test as testMetadata } from "./legacy-cli/metadata";
 import type { TestMetadataV1, TestMetadataV2 } from "./legacy-cli/metadata/test";
@@ -264,7 +262,6 @@ class ReplayReporter<TRecordingMetadata extends UnstructuredMetadata = Unstructu
     schemaVersion: string,
     config?: ReplayReporterConfig<TRecordingMetadata>
   ) {
-    setUserAgent(`${pkgJson.name}/${pkgJson.version}`);
     this._runner = runner;
     this._schemaVersion = schemaVersion;
 

diff --git a/scripts/pkg-build/package.json b/scripts/pkg-build/package.json
@@ -5,16 +5,15 @@
   "bin": "./bin.js",
   "dependencies": {
     "@manypkg/get-packages": "^2.2.1",
-    "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
+    "@typescript/vfs": "^1.5.3",
     "builtin-modules": "^3.3.0",
     "chalk": "^4.1.2",
     "esbuild": "^0.21.5",
     "fast-glob": "^3.3.2",
     "normalize-path": "^3.0.0",
     "rollup": "^4.18.0",
-    "rollup-plugin-dts": "^6.1.1",
     "tsx": "^4.15.7"
   },
   "devDependencies": {