Some build and watch changes

ejsmith · ejsmith · commit 33021ecc81ef · 2021-05-22T23:26:31.000-05:00
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -33,6 +33,41 @@
       "script": "lint",
       "problemMatcher": "$eslint-stylish",
       "label": "npm: lint"
+    },
+    {
+      "type": "npm",
+      "script": "watch --workspace=packages/browser",
+      "isBackground": true,
+      "problemMatcher": "$tsc",
+      "label": "npm: watch browser"
+    },
+    {
+      "type": "npm",
+      "script": "watch --workspace=packages/core",
+      "isBackground": true,
+      "problemMatcher": "$tsc",
+      "label": "npm: watch core"
+    },
+    {
+      "type": "npm",
+      "script": "watch --workspace=packages/react",
+      "isBackground": true,
+      "problemMatcher": "$tsc",
+      "label": "npm: watch react"
+    },
+    {
+      "type": "npm",
+      "script": "watch --workspace=packages/vue",
+      "isBackground": true,
+      "problemMatcher": "$tsc",
+      "label": "npm: watch vue"
+    },
+    {
+      "type": "npm",
+      "script": "watch --workspace=packages/node",
+      "isBackground": true,
+      "problemMatcher": "$tsc",
+      "label": "npm: watch node"
     }
   ]
 }
diff --git a/example/browser/index.js b/example/browser/index.js
@@ -1,4 +1,4 @@
-import { Exceptionless } from "../../node_modules/@exceptionless/browser/dist/index.min.js";
+import { Exceptionless } from "../../node_modules/@exceptionless/browser/dist/index.bundle.js";
 import { divide } from "./math.js";
 import { TextAreaLogger } from "./text-area-logger.js";
 
diff --git a/packages/angularjs/package.json b/packages/angularjs/package.json
@@ -31,8 +31,8 @@
     "./package.json": "./package.json"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "watch": "tsc -p tsconfig.json -w --preserveWatchOutput",
+    "build": "tsc -p tsconfig.json && esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --outfile=dist/index.bundle.js && esbuild src/index.ts --bundle --minify --sourcemap --target=es2019 --format=esm --outfile=dist/index.bundle.min.js",
+    "watch": "tsc -p ../core/tsconfig.json -w --preserveWatchOutput & tsc -p tsconfig.json -w --preserveWatchOutput & esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --watch --outfile=dist/index.bundle.js",
     "test": ""
   },
   "sideEffects": false,
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -45,8 +45,8 @@
     "testEnvironment": "jsdom"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json && esbuild src/index.ts --bundle --minify --sourcemap --target=es2019 --format=esm --outfile=dist/index.min.js",
-    "watch": "tsc -p tsconfig.json -w --preserveWatchOutput",
+    "build": "tsc -p tsconfig.json && esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --outfile=dist/index.bundle.js && esbuild src/index.ts --bundle --minify --sourcemap --target=es2019 --format=esm --outfile=dist/index.bundle.min.js",
+    "watch": "tsc -p ../core/tsconfig.json -w --preserveWatchOutput & tsc -p tsconfig.json -w --preserveWatchOutput & esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --watch --outfile=dist/index.bundle.js",
     "test": ""
   },
   "sideEffects": false,
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -42,8 +42,8 @@
     "resolver": "jest-ts-webcompat-resolver"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "watch": "tsc -p tsconfig.json -w --preserveWatchOutput",
+    "build": "tsc -p tsconfig.json && esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --outfile=dist/index.bundle.js && esbuild src/index.ts --bundle --minify --sourcemap --target=es2019 --format=esm --outfile=dist/index.bundle.min.js",
+    "watch": "tsc -p tsconfig.json -w --preserveWatchOutput & esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --watch --outfile=dist/index.bundle.js",
     "test": "jest"
   },
   "sideEffects": false,
diff --git a/packages/core/src/submission/DefaultSubmissionClient.ts b/packages/core/src/submission/DefaultSubmissionClient.ts
@@ -33,10 +33,7 @@ export class DefaultSubmissionClient implements ISubmissionClient {
     return response;
   }
 
-  public async submitUserDescription(
-    referenceId: string,
-    description: UserDescription,
-  ): Promise<Response> {
+  public async submitUserDescription(referenceId: string, description: UserDescription): Promise<Response> {
     const url = `${this.config.serverUrl}/api/v2/events/by-ref/${encodeURIComponent(referenceId)
       }/user-description`;
 
@@ -50,10 +47,7 @@ export class DefaultSubmissionClient implements ISubmissionClient {
     return response;
   }
 
-  public async submitHeartbeat(
-    sessionIdOrUserId: string,
-    closeSession: boolean,
-  ): Promise<Response<void>> {
+  public async submitHeartbeat(sessionIdOrUserId: string, closeSession: boolean): Promise<Response<void>> {
     const url =
       `${this.config.heartbeatServerUrl}/api/v2/events/session/heartbeat?id=${sessionIdOrUserId}&close=${closeSession}`;
     return await this.apiFetch<void>(url, {
@@ -90,12 +84,15 @@ export class DefaultSubmissionClient implements ISubmissionClient {
     const rateLimitRemaining: number = parseInt(response.headers.get(this.RateLimitRemainingHeader) || "", 10);
     const settingsVersion: number = parseInt(response.headers.get(this.ConfigurationVersionHeader) || "", 10);
 
+    const responseText = await response.text();
+    const data = responseText && responseText.length > 0 ? JSON.parse(responseText) as T : null;
+
     return new Response<T>(
       response.status,
       response.statusText,
       rateLimitRemaining,
       settingsVersion,
-      await response.json() as T,
+      data,
     );
   }
 
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -43,8 +43,8 @@
     "testEnvironment": "node"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "watch": "tsc -p tsconfig.json -w --preserveWatchOutput",
+    "build": "tsc -p tsconfig.json && esbuild src/index.ts --bundle --sourcemap --platform=node --target=node12 --format=cjs --outfile=dist/index.bundle.js",
+    "watch": "tsc -p ../core/tsconfig.json -w --preserveWatchOutput & tsc -p tsconfig.json -w --preserveWatchOutput & esbuild src/index.ts --bundle --platform=node --sourcemap --target=node12 --format=cjs --watch --outfile=dist/index.bundle.js",
     "test": "jest"
   },
   "sideEffects": false,
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -31,8 +31,8 @@
     "./package.json": "./package.json"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "watch": "tsc -p tsconfig.json -w --preserveWatchOutput",
+    "build": "tsc -p tsconfig.json && esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --outfile=dist/index.bundle.js && esbuild src/index.ts --bundle --minify --sourcemap --target=es2019 --format=esm --outfile=dist/index.bundle.min.js",
+    "watch": "tsc -p ../core/tsconfig.json -w --preserveWatchOutput & tsc -p tsconfig.json -w --preserveWatchOutput & esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --watch --outfile=dist/index.bundle.js",
     "test": ""
   },
   "sideEffects": false,
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -30,8 +30,8 @@
     "./package.json": "./package.json"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "watch": "tsc -p tsconfig.json -w --preserveWatchOutput",
+    "build": "tsc -p tsconfig.json && esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --outfile=dist/index.bundle.js && esbuild src/index.ts --bundle --minify --sourcemap --target=es2019 --format=esm --outfile=dist/index.bundle.min.js",
+    "watch": "tsc -p tsconfig.json -w --preserveWatchOutput & && esbuild src/index.ts --bundle --sourcemap --target=es2017 --format=esm --watch --outfile=dist/index.bundle.js &",
     "test": ""
   },
   "sideEffects": false,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Exceptionless } from "../../node_modules/@exceptionless/browser/dist/index.min.js";`
	`1`	`+import { Exceptionless } from "../../node_modules/@exceptionless/browser/dist/index.bundle.js";`
`2`	`2`	`import { divide } from "./math.js";`
`3`	`3`	`import { TextAreaLogger } from "./text-area-logger.js";`
`4`	`4`