pear-electron 1.4.2 → 1.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-electron",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Pear User-Interface Library for Electron",
   "main": "index.js",
   "bin": "bin.js",
@@ -19,7 +19,7 @@
   ],
   "pear": {
     "name": "pear-electron",
-    "bootstrap": "pear://0.2621.yceb7sjhgfzsnza7oc38hy3oxu9dhnywi3mzxdm9ubc48kjnxqgo",
+    "bootstrap": "pear://0.2623.yceb7sjhgfzsnza7oc38hy3oxu9dhnywi3mzxdm9ubc48kjnxqgo",
     "stage": {
       "skipWarmup": "true",
       "only": [

package/runtime.js

@@ -99,9 +99,9 @@ class PearElectron {
 
     const cwd = os.cwd()
     let dir = cwd
-    let base = null
     if (key === null) {
-      base = project(pathname, pathname, cwd)
+      const initial = normalize(pathname)
+      const base = project(initial, initial)
       dir = base.dir
       if (dir.length > 1 && dir.endsWith('/')) dir = dir.slice(0, -1)
       if (isPath) {
@@ -172,22 +172,24 @@ class PearElectron {
   }
 }
 
-function project (dir, origin, cwd) {
+function project (dir, initial) {
   try {
     if (JSON.parse(fs.readFileSync(path.join(dir, 'package.json'))).pear) {
-      return { dir, origin, entrypoint: isWindows ? path.normalize(origin.slice(1)).slice(dir.length) : origin.slice(dir.length) }
+      return { dir, entrypoint: initial.slice(dir.length) }
     }
   } catch (err) {
     if (err.code !== 'ENOENT' && err.code !== 'EISDIR' && err.code !== 'ENOTDIR') throw err
   }
   const parent = path.dirname(dir)
   if (parent === dir) {
-    const normalizedOrigin = !isWindows ? origin : path.normalize(origin.slice(1))
-    const cwdIsOrigin = path.relative(cwd, normalizedOrigin).length === 0
-    const condition = cwdIsOrigin ? `at "${cwd}"` : normalizedOrigin.includes(cwd) ? `from "${normalizedOrigin}" up to "${cwd}"` : `at "${normalizedOrigin}"`
-    throw ERR_INVALID_PROJECT_DIR(`A valid package.json file with pear field must exist ${condition}`)
+    throw ERR_INVALID_PROJECT_DIR(`A valid package.json file with pear field must exist (checked from "${initial}" to "${dir}")`)
   }
-  return project(parent, origin, cwd)
+  return project(parent, initial)
+}
+
+function normalize (pathname) {
+  if (isWindows) return path.normalize(pathname.slice(1))
+  return pathname
 }
 
 module.exports = PearElectron