fix: handle relative paths more better

FUDCo · FUDCo · commit e979475f4b5c · 2020-08-13T12:29:07.000-07:00
diff --git a/packages/SwingSet/src/controller.js b/packages/SwingSet/src/controller.js
@@ -138,14 +138,13 @@ export function loadBasedir(basedir) {
  */
 function resolveSpecFromConfig(dirname, specPath) {
   try {
-    return require.resolve(specPath);
+    return require.resolve(specPath, { path: [dirname] });
   } catch (e) {
-    if (e.code === 'MODULE_NOT_FOUND') {
-      return path.resolve(dirname, specPath);
-    } else {
+    if (e.code !== 'MODULE_NOT_FOUND') {
       throw e;
     }
   }
+  return path.resolve(dirname, specPath);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -138,14 +138,13 @@ export function loadBasedir(basedir) {`
`138`	`138`	`*/`
`139`	`139`	`function resolveSpecFromConfig(dirname, specPath) {`
`140`	`140`	`try {`
`141`		`- return require.resolve(specPath);`
	`141`	`+ return require.resolve(specPath, { path: [dirname] });`
`142`	`142`	`} catch (e) {`
`143`		`- if (e.code === 'MODULE_NOT_FOUND') {`
`144`		`- return path.resolve(dirname, specPath);`
`145`		`- } else {`
	`143`	`+ if (e.code !== 'MODULE_NOT_FOUND') {`
`146`	`144`	`throw e;`
`147`	`145`	`}`
`148`	`146`	`}`
	`147`	`+ return path.resolve(dirname, specPath);`
`149`	`148`	`}`
`150`	`149`
`151`	`150`	`/**`