bare-module 3.1.1 → 3.1.3

package/CMakeLists.txt

@@ -7,7 +7,7 @@ include(bare)
 add_bare_module(bare_module)
 
 target_sources(
-  bare_module
+  ${bare_module}
   PRIVATE
     binding.c
 )

package/index.js

@@ -35,11 +35,11 @@ const Module = module.exports = exports = class Module {
   }
 
   get filename () {
-    return url.fileURLToPath(this._url)
+    return urlToPath(this._url)
   }
 
   get dirname () {
-    return path.dirname(url.fileURLToPath(this._url))
+    return urlToDirname(this._url)
   }
 
   get type () {
@@ -473,7 +473,7 @@ exports.createRequire = function createRequire (parentURL, opts = {}) {
 
     switch (resolved.protocol) {
       case 'builtin:': return resolved.pathname
-      default: return url.fileURLToPath(resolved)
+      default: return urlToPath(resolved)
     }
   }
 
@@ -544,7 +544,7 @@ Module._extensions['.cjs'] = function (module, source, referrer) {
 
     module._exports = {}
 
-    const filename = url.fileURLToPath(module._url)
+    const filename = urlToPath(module._url)
 
     binding.createFunction(module._url.href, ['require', 'module', 'exports', '__filename', '__dirname'], source, 0)(
       require,
@@ -567,7 +567,7 @@ Module._extensions['.cjs'] = function (module, source, referrer) {
 
       switch (resolved.protocol) {
         case 'builtin:': return resolved.pathname
-        default: url.fileURLToPath(resolved)
+        default: urlToPath(resolved)
       }
     }
 
@@ -686,3 +686,15 @@ Bare
 
     binding.destroy(Module._handle)
   })
+
+function urlToPath (u) {
+  return u.protocol === 'file:'
+    ? url.fileURLToPath(u)
+    : decodeURIComponent(u.pathname)
+}
+
+function urlToDirname (u) {
+  return u.protocol === 'file:'
+    ? path.dirname(url.fileURLToPath(u))
+    : decodeURIComponent((new URL('.', u)).pathname).replace(/\/$/, '')
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [
@@ -11,9 +11,7 @@
     "lib",
     "prebuilds"
   ],
-  "addon": {
-    "target": "bare_module"
-  },
+  "addon": true,
   "scripts": {
     "test": "standard && bare test.js"
   },