test relative paths

manuel-serrano · Apr 24, 2024 · e1118d2 · e1118d2
1 parent 7ce284f
commit e1118d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/hiphop-loader.mjs b/lib/hiphop-loader.mjs
@@ -3,7 +3,7 @@
 /*    -------------------------------------------------------------    */
 /*    Author      :  Manuel Serrano                                    */
 /*    Creation    :  Fri Nov 17 08:15:59 2023                          */
-/*    Last change :  Wed Apr 24 14:25:54 2024 (serrano)                */
+/*    Last change :  Wed Apr 24 14:35:54 2024 (serrano)                */
 /*    Copyright   :  2023-24 Manuel Serrano                            */
 /*    -------------------------------------------------------------    */
 /*    HipHop loader/resolver loaders.                                  */
@@ -41,13 +41,14 @@ export async function resolve(url, context, nextResolve) {
    } else if (url === "@hop/hiphop" && process.env.HIPHOP_RESOLVE) {
       return {
 	 shortCircuit: true,
-	 url: "file://" + normalize(process.cwd() + "/" + process.env.HIPHOP_RESOLVE)
+	 url: "file://" + normalize(process.cwd() + "/"
+	    + process.env.HIPHOP_RESOLVE + "/lib/hiphop.js")
       }
-   } else if (url.match("@hop/hiphop/") && process.env.HIPHOP_RESOLVE) {
+   } else if (url.match("@hop/hiphop/modules") && process.env.HIPHOP_RESOLVE) {
       return {
 	 shortCircuit: true,
 	 url: "file://" + normalize(process.cwd() + "/" +
-	    url.replace("@hop/hiphop/", process.env.HIPHOP_RESOLVE + "/"))
+	    url.replace("@hop/hiphop/", process.env.HIPHOP_RESOLVE + "/modules/"))
       }
    }
 

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
       "mocha": "^10.2.0"
    },
    "scripts": {
-     "test": "HIPHOP_RESOLVE=\"./lib/hiphop.js\" NODE_OPTIONS=\"--enable-source-maps --no-warnings --loader ./lib/hiphop-loader.mjs\" mocha --exit test/**/*.test.js",
+     "test": "HIPHOP_RESOLVE=\".\" NODE_OPTIONS=\"--enable-source-maps --no-warnings --loader ./lib/hiphop-loader.mjs\" mocha --exit test/**/*.test.js",
      "prepare": "node etc/configure.js package.json lib/config.js.in lib/config.js && node etc/buildmodules.js"
    }
 }