Merge pull request #28 from thedadams/no-dirname-builtin

thedadams · web-flow · commit cc56263ff4bf · 2024-05-06T21:48:27.000-04:00
fix: remove reference to __dirname
diff --git a/babel.test.cjs b/babel.test.cjs
@@ -0,0 +1,18 @@
+module.exports = {
+    "presets": [
+        "@babel/preset-typescript",
+        [
+            "@babel/preset-env",
+            {
+                "useBuiltIns": "entry",
+                "corejs": 3,
+                "targets": {
+                    "node": "current"
+                }
+            }
+        ]
+    ],
+    "plugins": [
+        "babel-plugin-transform-import-meta"
+    ]
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,19 +32,23 @@
     "sse.js": "^2.4.1"
   },
   "dependencies": {
+    "@babel/template": "^7.24.0",
+    "@babel/types": "^7.24.5",
     "adm-zip": "^0.5.10",
     "node-downloader-helper": "^2.1.9",
     "tar": "^6.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.24.5",
     "@babel/preset-env": "^7.24.5",
+    "@babel/preset-typescript": "^7.24.1",
     "@rollup/plugin-typescript": "^11.1.6",
     "@swc/cli": "^0.3.9",
     "@swc/core": "^1.4.2",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.8",
     "babel-loader": "^9.1.3",
+    "babel-plugin-transform-import-meta": "^2.2.1",
     "copyfiles": "^2.4.1",
     "jest": "^29.7.0",
     "npm-run-all": "^4.1.5",
@@ -58,7 +62,13 @@
   },
   "jest": {
     "transform": {
-      "^.+\\.ts?$": "ts-jest"
+      "^.+\\.ts?$": [
+        "ts-jest",
+        {
+          "babelConfig": "babel.test.cjs",
+          "useESM": true
+        }
+      ]
     },
     "testEnvironment": "node",
     "testRegex": "/tests/.*\\.(test|spec)?\\.(ts|tsx)$",
diff --git a/src/gptscript.ts b/src/gptscript.ts
@@ -773,7 +773,8 @@ async function getCmdPath(): Promise<string> {
 	}
 
 	const path = await import("path")
-	return path.join(__dirname, "..", "bin", "gptscript")
+	const url = await import("url")
+	return path.join(path.dirname(url.fileURLToPath(import.meta.url)), "..", "bin", "gptscript")
 }
 
 export function listTools(gptscriptURL?: string): Promise<string> {

Original file line number	Diff line number	Diff line change
`@@ -773,7 +773,8 @@ async function getCmdPath(): Promise<string> {`
`773`	`773`	`}`
`774`	`774`
`775`	`775`	`const path = await import("path")`
`776`		`- return path.join(__dirname, "..", "bin", "gptscript")`
	`776`	`+ const url = await import("url")`
	`777`	`+ return path.join(path.dirname(url.fileURLToPath(import.meta.url)), "..", "bin", "gptscript")`
`777`	`778`	`}`
`778`	`779`
`779`	`780`	`export function listTools(gptscriptURL?: string): Promise<string> {`