Merge pull request #13 from gatsbyjs/fix/windows-fixes

Fix windows paths

README.md

@@ -12,7 +12,7 @@ This is alpha software, is under active development, and is likely to be broken.
 
 ### To install built packages:
 
-1. Click on releases and choose the installer for your platform. Mac users will need to right-click (or ctrl-click) on the app when you first launch it, until we have code signing set up.
+1. Click on [releases](https://github.com/gatsbyjs/desktop/releases) and choose the installer for your platform. Mac users will need to right-click (or ctrl-click) on the app when you first launch it, until we have code signing set up. Windows users will need to agree to lots of Defender warnings.
 
 ### To install from source:
 
@@ -24,7 +24,7 @@ This is alpha software, is under active development, and is likely to be broken.
 
 Gatsby Desktop is an Electron app, which is currently just displayed in the menubar or tray. All Electron apps have two primary processes:
 
-1. "main", which is a Node.js script which handles windowing, menus and similar native bits. Think of it as the server. It opens BrowserWindows which contain:
+1. "main", which is a Node.js script which handles windowing, menus and similar native bits. Think of it as the server. It opens `BrowserWindow`s which contain:
 2. "renderer": this is the UI of the app, which is HTML + JS. In Gatsby Desktop, this is of course a local Gatsby site. Unlike a regular web app, Electron renderers can import and use built-in Node.js modules, such as `fs` and `child_process`.
 
 Gatsby Desktop can launch and run your local Gatsby sites. To do this we use another process:

package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby-desktop",
   "description": "Gatsby Desktop",
-  "version": "0.0.1-alpha.3",
+  "version": "0.0.1-alpha.4",
   "main": "lib/main.js",
   "homepage": "https://www.gatsbyjs.com/",
   "author": "<[email protected]>",

worker/launcher.ts

@@ -39,11 +39,18 @@ async function readJSON<T = unknown>(filePath: string): Promise<T> {
   })
 }
 
+// Gatsby package type is missing these
+type PackageJsonWithBin = PackageJson & { bin: { gatsby: string } }
+
+async function getPackageJson(root: string): Promise<PackageJsonWithBin> {
+  return readJSON<PackageJsonWithBin>(
+    `${root}/node_modules/gatsby/package.json`
+  )
+}
+
 async function isGatsbySite(root: string): Promise<boolean> {
   try {
-    const packageJson = await readJSON<PackageJson>(
-      `/${root}/node_modules/gatsby/package.json`
-    )
+    const packageJson = await getPackageJson(root)
     return packageJson?.name === `gatsby`
   } catch (e) {
     console.warn({ e })
@@ -95,7 +102,11 @@ async function launchSite(program: IProgram): Promise<number> {
 
   logAction({ type: `SET_PORT`, payload: port })
 
-  const cmd = path.join(program.directory, `node_modules`, `.bin`, `gatsby`)
+  const packageJson = await getPackageJson(program.directory)
+
+  const bin = packageJson?.bin?.gatsby || `dist/bin/gatsby.js`
+
+  const cmd = path.resolve(program.directory, `node_modules`, `gatsby`, bin)
 
   // Runs `gatsby develop` in the site root
   proc = fork(cmd, [`develop`, `--port=${port}`], {