it would be infuriating if this worked

Osmose · Sep 22, 2024 · b4d51ec · b4d51ec
1 parent 4480e72
commit b4d51ec
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build-binary.yml b/.github/workflows/build-binary.yml
@@ -164,25 +164,25 @@ jobs:
         with:
           name: ${{ matrix.artifact-name }}
 
-      - name: Copy Phantomake binary to tauri binaries dir (Unix)
+      - name: Copy Phantomake binary to tauri bin dir (Unix)
         if: matrix.platform == 'ubuntu-latest'
         run: |
-          mv phantomake ./packages/gui/src-tauri/binaries/phantomake-$(rustc -Vv | grep host | cut -f2 -d' ')
+          mv phantomake ./packages/gui/src-tauri/bin/phantomake-$(rustc -Vv | grep host | cut -f2 -d' ')
 
-      - name: Copy Phantomake binary to tauri binaries dir (MacOS)
+      - name: Copy Phantomake binary to tauri bin dir (MacOS)
         if: matrix.platform == 'macos-latest'
         run: |
-          mv phantomake ./packages/gui/src-tauri/binaries/phantomake-universal-apple-darwin
-          cd ./packages/gui/src-tauri/binaries
+          mv phantomake ./packages/gui/src-tauri/bin/phantomake-universal-apple-darwin
+          cd ./packages/gui/src-tauri/bin
           ln -s phantomake-universal-apple-darwin phantomake-aarch64-apple-darwin
           ln -s phantomake-universal-apple-darwin phantomake-x86_64-apple-darwin
           pwd
           ls -l .
 
-      - name: Copy Phantomake binary to tauri binaries dir (Windows)
+      - name: Copy Phantomake binary to tauri bin dir (Windows)
         if: matrix.platform == 'windows-latest'
         run: |
-          Move-Item -Path phantomake.exe -Destination .\packages\gui\src-tauri\binaries\phantomake-$(rustc -Vv | Select-String "host:" | ForEach-Object {$_.Line.split(" ")[1]}).exe
+          Move-Item -Path phantomake.exe -Destination .\packages\gui\src-tauri\bin\phantomake-$(rustc -Vv | Select-String "host:" | ForEach-Object {$_.Line.split(" ")[1]}).exe
 
       - uses: tauri-apps/tauri-action@v0
         env:

diff --git a/packages/gui/src-tauri/binaries/.gitignore → packages/gui/src-tauri/bin/.gitignore b/packages/gui/src-tauri/binaries/.gitignore → packages/gui/src-tauri/bin/.gitignore
diff --git a/packages/gui/src-tauri/tauri.conf.json b/packages/gui/src-tauri/tauri.conf.json
@@ -25,7 +25,7 @@
         "sidecar": true,
         "open": true,
         "scope": [
-          {"name": "binaries/phantomake", "sidecar": true, "args": true}
+          {"name": "bin/phantomake", "sidecar": true, "args": true}
         ]
       }
     },
@@ -37,7 +37,7 @@
         "depends": []
       },
       "externalBin": [
-        "binaries/phantomake"
+        "bin/phantomake"
       ],
       "icon": [
         "icons/32x32.png",

diff --git a/packages/gui/src/components/DirectoryForm.tsx b/packages/gui/src/components/DirectoryForm.tsx
@@ -138,7 +138,7 @@ export default function DirectoryForm() {
       return;
     }
 
-    const command = Command.sidecar('binaries/phantomake', ['build', projectDirectory!, outputDirectory]);
+    const command = Command.sidecar('bin/phantomake', ['build', projectDirectory!, outputDirectory]);
     setBuilding(true);
     setBuildResult(null);
     const output = await command.execute();

diff --git a/packages/gui/src/store.tsx b/packages/gui/src/store.tsx
@@ -48,7 +48,7 @@ export const useMainStore = create<MainStoreState>()(
         const { projectDirectory, watchProcess } = get();
         if (watchProcess || !projectDirectory) return;
 
-        const command = Command.sidecar('binaries/phantomake', ['watch', projectDirectory]);
+        const command = Command.sidecar('bin/phantomake', ['watch', projectDirectory]);
         command.stdout.on('data', (line) =>
           set((state) => {
             return { watchLogs: [...state.watchLogs, { index: logIndex++, text: line }].slice(-1000) };

diff --git a/packages/phantomake/package.json b/packages/phantomake/package.json
@@ -1,7 +1,7 @@
 {
   "name": "phantomake",
   "description": "A file-focused static site generator",
-  "version": "0.4.27",
+  "version": "0.4.28",
   "license": "ISC",
   "module": "src/index.ts",
   "bin": "./src/cli.ts",