Merge branch 'release-6.0.1'

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.0.1](2019-10-29)
+
+### Fixed
+
+- [3ce11f6](https://github.com/dadi/api/commit/3ce11f628772260d85f4204ca8516f5c8434e093): fix error with non-directory files in collections directory
+
 ## [6.0.0](2019-10-28)
 
 ### Added

dadi/lib/index.js

@@ -531,7 +531,14 @@ Server.prototype.scanDirectoryForCollections = function(directory, callback) {
 
   directoryFiles.forEach(item => {
     const itemPath = path.join(directory, item)
-    const subItems = fs.readdirSync(itemPath)
+
+    let subItems
+
+    try {
+      subItems = fs.readdirSync(itemPath)
+    } catch (_) {
+      return
+    }
 
     // We don't know whether `item` is a property or a version (legacy). We
     // determine that by checking whether there is a sub-directory inside it,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dadi/api",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "main": "main.js",
   "scripts": {
     "create-client": "cd ../../.. && node ./node_modules/@dadi/api/utils/create-client.js",