bare-module 1.14.4 → 1.14.6

package/index.js

@@ -238,12 +238,14 @@ module.exports = exports = class Module {
 
     if (this._cache[specifier]) return this._transform(this._cache[specifier], referrer, dynamic)
 
-    const bundle = this._bundleFor(path.dirname(specifier), protocol, source)
+    const bundle = this._bundleFor(path.dirname(specifier), protocol)
 
     if (bundle) {
       protocol = new Protocol({
         imports: bundle.imports,
 
+        preresolve: this._protocols['file:'].preresolve,
+
         exists (filename) {
           return bundle.exists(filename)
         },
@@ -312,6 +314,8 @@ module.exports = exports = class Module {
       protocol = new Protocol({
         imports: bundle.imports,
 
+        preresolve: this._protocols['file:'].preresolve,
+
         exists (filename) {
           return bundle.exists(filename)
         },
@@ -349,9 +353,7 @@ module.exports = exports = class Module {
       yield specifier
     }
 
-    if (/^([a-z]:)?([/\\]|\.{1,2}[/\\]?)/i.test(specifier)) {
-      if (specifier[0] === '.') specifier = path.join(dirname, specifier)
-
+    if (path.isAbsolute(specifier)) {
       yield * this._resolveFile(specifier, protocol)
       yield * this._resolveDirectory(specifier, protocol)
     }
@@ -541,6 +543,8 @@ module.exports = exports = class Module {
       protocol = new Protocol({
         imports: parent.imports,
 
+        preresolve: this._protocols['file:'].preresolve,
+
         exists (filename) {
           return parent.exists(filename)
         },
@@ -699,6 +703,8 @@ exports._extensions['.node'] = function (module, source, referrer, protocol, imp
 }
 
 exports._extensions['.bundle'] = function (module, source, referrer, protocol, imports) {
+  if (source === null) source = protocol.read(module._filename)
+
   if (typeof source === 'string') source = Buffer.from(source)
 
   const bundle = this._bundleFor(module._filename, protocol, source)
@@ -710,8 +716,13 @@ exports._extensions['.bundle'] = function (module, source, referrer, protocol, i
 }
 
 exports._protocols['file:'] = new Protocol({
-  preresolve (specifier) {
-    return path.normalize(specifier.replace(/^file:/, ''))
+  preresolve (specifier, dirname) {
+    specifier = specifier.replace(/^file:/, '')
+
+    if (specifier[0] === '.') specifier = path.join(dirname, specifier)
+    if (specifier[0] === '/' || specifier[0] === '\\') specifier = path.normalize(specifier)
+
+    return specifier
   },
 
   postresolve (specifier) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-module",
-  "version": "1.14.4",
+  "version": "1.14.6",
   "description": "Module support for JavaScript",
   "main": "index.js",
   "files": [