hubot 11.0.0 → 11.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hubot",
-  "version": "11.0.0",
+  "version": "11.0.2",
   "author": "hubot",
   "keywords": [
     "github",

package/src/Robot.mjs

@@ -329,20 +329,22 @@ class Robot {
   }
 
   async loadmjs (filePath) {
-    const script = await import(pathToFileURL(filePath))
+    const forImport = this.prepareForImport(filePath)
+    const script = await import(forImport)
     if (typeof script?.default === 'function') {
       script.default(this)
     } else {
-      this.logger.warning(`Expected ${filePath} to assign a function to export default, got ${typeof script}`)
+      this.logger.warning(`Expected ${filePath} (after preparing for import ${forImport}) to assign a function to export default, got ${typeof script}`)
     }
   }
 
   async loadjs (filePath) {
-    const script = (await import(filePath)).default
+    const forImport = this.prepareForImport(filePath)
+    const script = (await import(forImport)).default
     if (typeof script === 'function') {
       script(this)
     } else {
-      this.logger.warning(`Expected ${filePath} to assign a function to module.exports, got ${typeof script}`)
+      this.logger.warning(`Expected ${filePath} (after preparing for import ${forImport}) to assign a function to module.exports, got ${typeof script}`)
     }
   }
 
@@ -489,25 +491,16 @@ class Robot {
       return
     }
     this.logger.debug(`Loading adapter ${adapterPath ?? 'from npmjs:'} ${this.adapterName}`)
-    const ext = path.extname(adapterPath ?? '') ?? '.mjs'
+    const ext = path.extname(adapterPath ?? '')
     try {
       if (Array.from(HUBOT_DEFAULT_ADAPTERS).indexOf(this.adapterName) > -1) {
         this.adapter = await this.requireAdapterFrom(path.resolve(path.join(__dirname, 'adapters', `${this.adapterName}.mjs`)))
       } else if (['.js', '.cjs'].includes(ext)) {
         this.adapter = await this.requireAdapterFrom(path.resolve(adapterPath))
       } else if (['.mjs'].includes(ext)) {
-        this.adapter = await this.importAdapterFrom(pathToFileURL(path.resolve(adapterPath)).href)
+        this.adapter = await this.importAdapterFrom(path.resolve(adapterPath))
       } else {
-        const adapterPathInCurrentWorkingDirectory = this.adapterName
-        try {
-          this.adapter = await this.requireAdapterFrom(adapterPathInCurrentWorkingDirectory)
-        } catch (err) {
-          if (err.name === 'SyntaxError') {
-            this.adapter = await this.importAdapterFrom(adapterPathInCurrentWorkingDirectory)
-          } else {
-            throw err
-          }
-        }
+        this.adapter = await this.importFromRepo(this.adapterName)
       }
     } catch (error) {
       this.logger.error(`Cannot load adapter ${adapterPath ?? '[no path set]'} ${this.adapterName} - ${error}`)
@@ -520,6 +513,11 @@ class Robot {
   }
 
   async importAdapterFrom (adapterPath) {
+    const forImport = this.prepareForImport(adapterPath)
+    return await (await import(forImport)).default.use(this)
+  }
+
+  async importFromRepo (adapterPath) {
     return await (await import(adapterPath)).default.use(this)
   }
 
@@ -670,6 +668,10 @@ class Robot {
     this.events.removeAllListeners()
   }
 
+  prepareForImport (filePath) {
+    return pathToFileURL(filePath)
+  }
+
   // Public: The version of Hubot from npm
   //
   // Returns a String of the version number.