From d35bbda1c2c5d690488d57496e1cd7e59c05d811 Mon Sep 17 00:00:00 2001 From: "Saad A. Bazaz" Date: Tue, 7 Jan 2025 17:31:38 +0500 Subject: [PATCH] fix: nuke path utils altogether --- packages/usdk/packages/upstreet-agent/package.json | 1 - .../codecs/packages/libopusjs/libopus.wasm.fs.js | 3 +-- .../packages/mpg123-decoder/src/MPEGDecoder.fs.js | 3 +-- .../upstreet-agent/packages/path-util/package.json | 4 ---- .../packages/path-util/path-util.mjs | 14 -------------- .../packages/react-agents-node/install-agent.mjs | 3 +-- .../packages/react-agents-node/node-runtime.mjs | 3 +-- .../packages/react-agents-node/watcher.mjs | 3 +-- .../packages/react-agents/util/path-util.mjs | 14 -------------- 9 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 packages/usdk/packages/upstreet-agent/packages/path-util/package.json delete mode 100644 packages/usdk/packages/upstreet-agent/packages/path-util/path-util.mjs delete mode 100644 packages/usdk/packages/upstreet-agent/packages/react-agents/util/path-util.mjs diff --git a/packages/usdk/packages/upstreet-agent/package.json b/packages/usdk/packages/upstreet-agent/package.json index 86fbef5d1..34ea84b3f 100644 --- a/packages/usdk/packages/upstreet-agent/package.json +++ b/packages/usdk/packages/upstreet-agent/package.json @@ -22,7 +22,6 @@ "memoize-one": "^6.0.0", "minimatch": "^9.0.4", "openai": "^4.56.0", - "path-util": "file:./packages/path-util", "playwright-core-lite": "file:./packages/playwright-core-lite", "queue-manager": "file:./packages/queue-manager", "react": "file:./packages/react", diff --git a/packages/usdk/packages/upstreet-agent/packages/codecs/packages/libopusjs/libopus.wasm.fs.js b/packages/usdk/packages/upstreet-agent/packages/codecs/packages/libopusjs/libopus.wasm.fs.js index 0e043f2ce..b8cdf5124 100644 --- a/packages/usdk/packages/upstreet-agent/packages/codecs/packages/libopusjs/libopus.wasm.fs.js +++ b/packages/usdk/packages/upstreet-agent/packages/codecs/packages/libopusjs/libopus.wasm.fs.js @@ -1,6 +1,5 @@ import path from 'path'; import fs from 'fs'; -import { getCurrentDirname } from 'path-util'; const loadWasm = p => { const b = fs.readFileSync(p); @@ -8,7 +7,7 @@ const loadWasm = p => { return m; }; -let dirname = getCurrentDirname(import.meta, process); +let dirname = import.meta.dirname; const wasm = loadWasm(path.join(dirname, '/libopus.wasm')); const location = new URL('http://localhost'); diff --git a/packages/usdk/packages/upstreet-agent/packages/codecs/packages/mpg123-decoder/src/MPEGDecoder.fs.js b/packages/usdk/packages/upstreet-agent/packages/codecs/packages/mpg123-decoder/src/MPEGDecoder.fs.js index b046f200a..583963263 100644 --- a/packages/usdk/packages/upstreet-agent/packages/codecs/packages/mpg123-decoder/src/MPEGDecoder.fs.js +++ b/packages/usdk/packages/upstreet-agent/packages/codecs/packages/mpg123-decoder/src/MPEGDecoder.fs.js @@ -4,7 +4,6 @@ import EmscriptenWASM from "./EmscriptenWasm.js"; import path from 'path'; import fs from 'fs'; -import { getCurrentDirname } from "path-util"; const loadWasm = p => { const b = fs.readFileSync(p); @@ -12,7 +11,7 @@ const loadWasm = p => { return m; }; -let dirname = getCurrentDirname(import.meta, process); +let dirname = import.meta.dirname; const wasmAudioDecoderCommon = loadWasm(path.join(dirname, '/wasm-audio-decoder-common.wasm')); const emscriptenWasm = loadWasm(path.join(dirname, '/emscripten-wasm.wasm')); diff --git a/packages/usdk/packages/upstreet-agent/packages/path-util/package.json b/packages/usdk/packages/upstreet-agent/packages/path-util/package.json deleted file mode 100644 index 0055c483c..000000000 --- a/packages/usdk/packages/upstreet-agent/packages/path-util/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "path-util", - "main": "path-util.mjs" -} \ No newline at end of file diff --git a/packages/usdk/packages/upstreet-agent/packages/path-util/path-util.mjs b/packages/usdk/packages/upstreet-agent/packages/path-util/path-util.mjs deleted file mode 100644 index 3b23253e0..000000000 --- a/packages/usdk/packages/upstreet-agent/packages/path-util/path-util.mjs +++ /dev/null @@ -1,14 +0,0 @@ -import path from 'path'; - -export const getCurrentDirname = (importMeta = import.meta, _process = process) => { - if (importMeta.dirname) { - return importMeta.dirname; - } else if (importMeta.url) { - return path.dirname(new URL(importMeta.url).pathname); - } else if (_process) { // In some environments, importMeta is not defined. So we revert to process. - return _process.cwd() - } else { // We default to this, and pray to God it works. - console.info("[getCurrentDirname] Defaulting to '.'.") - return "." - } -}; \ No newline at end of file diff --git a/packages/usdk/packages/upstreet-agent/packages/react-agents-node/install-agent.mjs b/packages/usdk/packages/upstreet-agent/packages/react-agents-node/install-agent.mjs index 0b4c7aefa..d0a044676 100644 --- a/packages/usdk/packages/upstreet-agent/packages/react-agents-node/install-agent.mjs +++ b/packages/usdk/packages/upstreet-agent/packages/react-agents-node/install-agent.mjs @@ -3,9 +3,8 @@ import fs from 'fs'; import { mkdirp } from 'mkdirp'; import { rimraf } from 'rimraf'; import toml from '@iarna/toml'; -import { getCurrentDirname } from '../react-agents/util/path-util.mjs'; -const dirname = getCurrentDirname(import.meta, process); +const dirname = import.meta.dirname; const copyWithStringTransform = async (src, dst, transformFn = (s) => s) => { let s = await fs.promises.readFile(src, 'utf8'); s = transformFn(s); diff --git a/packages/usdk/packages/upstreet-agent/packages/react-agents-node/node-runtime.mjs b/packages/usdk/packages/upstreet-agent/packages/react-agents-node/node-runtime.mjs index ae2f3beb8..799ba720f 100644 --- a/packages/usdk/packages/upstreet-agent/packages/react-agents-node/node-runtime.mjs +++ b/packages/usdk/packages/upstreet-agent/packages/react-agents-node/node-runtime.mjs @@ -1,12 +1,11 @@ import path from 'path'; import crossSpawn from 'cross-spawn'; import { devServerPort } from './util/ports.mjs'; -import { getCurrentDirname} from '../react-agents/util/path-util.mjs' import { installAgent } from '../react-agents-node/install-agent.mjs'; // -const localDirectory = getCurrentDirname(import.meta, process); +const localDirectory = import.meta.dirname; // diff --git a/packages/usdk/packages/upstreet-agent/packages/react-agents-node/watcher.mjs b/packages/usdk/packages/upstreet-agent/packages/react-agents-node/watcher.mjs index 5e028a72e..def9a381e 100644 --- a/packages/usdk/packages/upstreet-agent/packages/react-agents-node/watcher.mjs +++ b/packages/usdk/packages/upstreet-agent/packages/react-agents-node/watcher.mjs @@ -3,11 +3,10 @@ import crossSpawn from 'cross-spawn'; import { program } from 'commander'; import { createServer as createViteServer } from 'vite'; import { Debouncer } from 'debouncer'; -import { getCurrentDirname } from '../react-agents/util/path-util.mjs'; // -const dirname = getCurrentDirname(import.meta, process); +const dirname = import.meta.dirname; // watch SIGTERM process.on('SIGTERM', () => { diff --git a/packages/usdk/packages/upstreet-agent/packages/react-agents/util/path-util.mjs b/packages/usdk/packages/upstreet-agent/packages/react-agents/util/path-util.mjs deleted file mode 100644 index 3b23253e0..000000000 --- a/packages/usdk/packages/upstreet-agent/packages/react-agents/util/path-util.mjs +++ /dev/null @@ -1,14 +0,0 @@ -import path from 'path'; - -export const getCurrentDirname = (importMeta = import.meta, _process = process) => { - if (importMeta.dirname) { - return importMeta.dirname; - } else if (importMeta.url) { - return path.dirname(new URL(importMeta.url).pathname); - } else if (_process) { // In some environments, importMeta is not defined. So we revert to process. - return _process.cwd() - } else { // We default to this, and pray to God it works. - console.info("[getCurrentDirname] Defaulting to '.'.") - return "." - } -}; \ No newline at end of file