Merge pull request #926 from mountaindude/925

925
ptarmiganlabs · Oct 21, 2024 · 6cde315 · 6cde315
2 parents 6ab7e9a + dbaece8
commit 6cde315
Show file tree

Hide file tree

Showing 10 changed files with 1,061 additions and 231 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -100,7 +100,7 @@ jobs:
       - name: Build binaries
         run: |
           pwd
-          ./node_modules/.bin/esbuild src/bundle.js --bundle --external:axios --external:xdg-open --external:enigma.js --outfile=build.cjs --format=cjs --platform=node --target=node18 --minify
+          ./node_modules/.bin/esbuild src/bundle.js --bundle --external:axios --external:xdg-open --external:enigma.js --outfile=build.cjs --format=cjs --platform=node --target=node18 --minify --inject:./src/lib/import-meta-url.js --define:import.meta.url=import_meta_url
           pkg --output "./${DIST_FILE_NAME}" -t node18-macos-x64 ./build.cjs --config package.json --options no-deprecation --compress GZip
 
           chmod +x "${DIST_FILE_NAME}"
@@ -214,7 +214,7 @@ jobs:
 
       - name: Build binaries
         run: |
-          ./node_modules/.bin/esbuild src/bundle.js --bundle --external:axios --external:xdg-open --external:enigma.js --outfile=build.cjs --format=cjs --platform=node --target=node18 --minify
+          ./node_modules/.bin/esbuild src/bundle.js --bundle --external:axios --external:xdg-open --external:enigma.js --outfile=build.cjs --format=cjs --platform=node --target=node18 --minify --inject:./src/lib/import-meta-url.js --define:import.meta.url=import_meta_url
           pkg --output "./${env:DIST_FILE_NAME}.exe" -t node18-win-x64 ./build.cjs --config package.json --options no-deprecation --compress GZip
 
           # # Extract signing certificate to files on disk
@@ -329,7 +329,7 @@ jobs:
 
       - name: Build binaries
         run: |
-          ./node_modules/.bin/esbuild src/bundle.js --bundle --external:axios --external:xdg-open --external:enigma.js --outfile=build.cjs --format=cjs --platform=node --target=node18 --minify
+          ./node_modules/.bin/esbuild src/bundle.js --bundle --external:axios --external:xdg-open --external:enigma.js --outfile=build.cjs --format=cjs --platform=node --target=node18 --minify --inject:./src/lib/import-meta-url.js --define:import.meta.url=import_meta_url
           pkg --output "./${DIST_FILE_NAME}" -t node18-linux-x64 ./build.cjs --config package.json --options no-deprecation --compress GZip
 
           chmod +x ${DIST_FILE_NAME}

diff --git a/.gitignore b/.gitignore
@@ -54,3 +54,4 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+build.cjs
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
             "request": "launch",
             "name": "Launch Program",
             "program": "${workspaceFolder}/src/butler-sos.js",
-            "runtimeVersion": "20",
+            "runtimeVersion": "18",
             "cwd": "${workspaceFolder}/src",
             "env": {
                 "NODE_CONFIG_DIR": "${workspaceFolder}/src/config",