unify packages for datadog

dylibso · Jan 3, 2024 · 85e7c41 · 85e7c41
1 parent 9f30639
commit 85e7c41
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 142 deletions.
diff --git a/js/packages/observe-sdk-datadog-workers/.npmignore b/js/packages/observe-sdk-datadog-workers/.npmignore
diff --git a/js/packages/observe-sdk-datadog-workers/index.ts b/js/packages/observe-sdk-datadog-workers/index.ts
diff --git a/js/packages/observe-sdk-datadog-workers/package-lock.json b/js/packages/observe-sdk-datadog-workers/package-lock.json
diff --git a/js/packages/observe-sdk-datadog-workers/package.json b/js/packages/observe-sdk-datadog-workers/package.json
diff --git a/js/packages/observe-sdk-datadog-workers/tsconfig.json b/js/packages/observe-sdk-datadog-workers/tsconfig.json
diff --git a/js/packages/observe-sdk-datadog/package.json b/js/packages/observe-sdk-datadog/package.json
@@ -8,15 +8,20 @@
     "main": "./dist/cjs/index.js",
     "module": "./dist/esm/index.js",
     "types": "./dist/types/index.d.ts",
+    "exports": {
+        "workerd": "./dist/workerd/index.js"
+    },
     "scripts": {
         "build:esm": "node ../../esbuild/esbuild.js -b -e ./index.js -o ../observe-sdk-datadog/dist/esm/index.js -p browser -f esm",
         "build:cjs": "node ../../esbuild/esbuild.js -b -e ./index.js -o ../observe-sdk-datadog/dist/cjs/index.js -p browser -f cjs",
+        "build:workerd": "node ../../esbuild/esbuild.js -b -e ./index.js -o ./dist/workerd/index.js -p browser -f esm --workerd",
         "build:types": "tsc -b",
-        "build": "npm run build:esm && npm run build:cjs && npm run build:types",
+        "build": "npm run build:esm && npm run build:cjs && npm run build:workerd && npm run build:types",
         "build:web-test": "node ../../esbuild/esbuild.js -b -e ./test/web/index.js -o ./test/web/build.js -p browser",
         "test:node": "node test/node/index.js",
         "test:deno": "deno run -A test/deno/index.ts",
-        "test:web": "npm run build:web-test && npx serve ./test/web"
+        "test:web": "npm run build:web-test && npx serve ./test/web",
+        "test:workerd": "npx wrangler dev -c ./test/workerd/wrangler.toml"
     },
     "keywords": [
         "dylibso",

diff --git a/...datadog-workers/test/worker/.editorconfig → ...ve-sdk-datadog/test/workerd/.editorconfig b/...datadog-workers/test/worker/.editorconfig → ...ve-sdk-datadog/test/workerd/.editorconfig
diff --git a/...dk-datadog-workers/test/worker/.gitignore → ...serve-sdk-datadog/test/workerd/.gitignore b/...dk-datadog-workers/test/worker/.gitignore → ...serve-sdk-datadog/test/workerd/.gitignore
diff --git a/...k-datadog-workers/test/worker/.prettierrc → ...erve-sdk-datadog/test/workerd/.prettierrc b/...k-datadog-workers/test/worker/.prettierrc → ...erve-sdk-datadog/test/workerd/.prettierrc
diff --git a/...dog-workers/test/worker/package-lock.json → ...dk-datadog/test/workerd/package-lock.json b/...dog-workers/test/worker/package-lock.json → ...dk-datadog/test/workerd/package-lock.json
diff --git a/...-datadog-workers/test/worker/package.json → ...rve-sdk-datadog/test/workerd/package.json b/...-datadog-workers/test/worker/package.json → ...rve-sdk-datadog/test/workerd/package.json
@@ -10,10 +10,10 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20231218.0",
     "typescript": "^5.0.4",
-    "wrangler": "^3.0.0"
+    "wrangler": "^3.22.2"
   },
   "dependencies": {
     "@bjorn3/browser_wasi_shim": "^0.2.17",
-    "@dylibso/observe-sdk-datadog-workers": "file:../.."
+    "@dylibso/observe-sdk-datadog": "file:../.."
   }
 }
diff --git a/...datadog-workers/test/worker/src/code.wasm → ...ve-sdk-datadog/test/workerd/src/code.wasm b/...datadog-workers/test/worker/src/code.wasm → ...ve-sdk-datadog/test/workerd/src/code.wasm
diff --git a/...-datadog-workers/test/worker/src/index.ts → ...rve-sdk-datadog/test/workerd/src/index.ts b/...-datadog-workers/test/worker/src/index.ts → ...rve-sdk-datadog/test/workerd/src/index.ts
@@ -1,4 +1,4 @@
-import { DatadogAdapter } from "@dylibso/observe-sdk-datadog-workers";
+import { DatadogAdapter } from "@dylibso/observe-sdk-datadog";
 import { File, OpenFile, WASI } from "@bjorn3/browser_wasi_shim";
 import code from './code.wasm';
 

diff --git a/...datadog-workers/test/worker/tsconfig.json → ...ve-sdk-datadog/test/workerd/tsconfig.json b/...datadog-workers/test/worker/tsconfig.json → ...ve-sdk-datadog/test/workerd/tsconfig.json
diff --git a/...datadog-workers/test/worker/wrangler.toml → ...ve-sdk-datadog/test/workerd/wrangler.toml b/...datadog-workers/test/worker/wrangler.toml → ...ve-sdk-datadog/test/workerd/wrangler.toml