From df5b51413b54c711b7559b7b642ddbd1920c8b3e Mon Sep 17 00:00:00 2001 From: Mark Moffat Date: Thu, 11 Jul 2019 15:05:03 +0930 Subject: [PATCH] Fixes to glob-fs --- lib/schema.js | 4 ++-- package.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/schema.js b/lib/schema.js index 995316f..85346ba 100644 --- a/lib/schema.js +++ b/lib/schema.js @@ -3,10 +3,10 @@ const fs = require('fs'); const _ = require('lodash'); const Validator = require('jsonschema').Validator; const v = new Validator(); -const glob = require('glob-fs')(); +const glob = require('glob'); const addSchemas = () => { - const schemaFiles = glob.readdirSync('./lib/**/*.json'); + const schemaFiles = glob.sync('./lib/**/*.json'); _.forEach(schemaFiles, (file) => { const fileData = JSON.parse(fs.readFileSync(file, 'utf-8')); v.addSchema(fileData, path.basename(schemaFiles[0], '.json')); diff --git a/package.json b/package.json index e0462c7..7e3ab47 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,6 @@ "express": "^4.17.1", "express-handlebars": "^3.1.0", "express-session": "^1.16.2", - "glob": "^7.1.4", - "glob-fs": "^0.1.7", "helmet": "^3.18.0", "html-entities": "^1.2.0", "jsonschema": "^1.2.4", @@ -58,6 +56,7 @@ "eslint-plugin-node": "^9.1.0", "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^4.0.0", + "glob": "^7.1.4", "gulp": "^4.0.2", "gulp-clean-css": "^3.10.0", "gulp-minify": "^3.1.0",