From 7875d9d0c937875b80ec16740fdf74f672c3f7f4 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Fri, 1 Nov 2019 22:26:58 +0000 Subject: [PATCH] v3.0.2: fix the wrapped find callback --- manager.js | 3 ++- package-lock.json | 28 +++++++++++++++++++++++++++- package.json | 2 +- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/manager.js b/manager.js index 1dc38be..77f66be 100644 --- a/manager.js +++ b/manager.js @@ -112,7 +112,8 @@ Manage.create = function(CONF) { // between the managed state and the overlay, and choose // what was found. var theirs = await CONF.find(args); - return _mergeFind(ours, theirs); + var config = await Manage._getLatest(manage, CONF); + return _mergeFind(config, ours, theirs); }; function _find(args) { diff --git a/package-lock.json b/package-lock.json index 68710af..a8ee0ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "greenlock-manager-fs", - "version": "0.7.0", + "version": "3.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -9,6 +9,32 @@ "resolved": "https://registry.npmjs.org/@root/mkdirp/-/mkdirp-1.0.0.tgz", "integrity": "sha512-hxGAYUx5029VggfG+U9naAhQkoMSXtOeXtbql97m3Hi6/sQSRL/4khKZPyOF6w11glyCOU38WCNLu9nUcSjOfA==" }, + "@root/request": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@root/request/-/request-1.4.2.tgz", + "integrity": "sha512-J8FM4+SJuc7WRC+Jz17m+VT2lgI7HtatHhxN1F2ck5aIKUAxJEaR4u/gLBsgT60mVHevKCjKN0O8115UtJjwLw==", + "dev": true + }, + "greenlock-manager-fs": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/greenlock-manager-fs/-/greenlock-manager-fs-3.0.1.tgz", + "integrity": "sha512-vZfGFq1TTKxaAqdGDUwNservrNzXx0xCwT/ovG/N378GrhS+U5S8B8LUlNtQU7Fdw6RToMiBcm22OOxSrvZ2zw==", + "dev": true, + "requires": { + "@root/mkdirp": "^1.0.0", + "safe-replace": "^1.1.0" + } + }, + "greenlock-manager-test": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/greenlock-manager-test/-/greenlock-manager-test-3.0.0.tgz", + "integrity": "sha512-grqpUcxT7v5KzJ04r8wJWXjSVm7us1z/2QluCJRl9BZUM4CXzQuP1C0d2wdsV4NHwziEGJpA+4mFsntuh3f1YA==", + "dev": true, + "requires": { + "@root/request": "^1.4.1", + "greenlock-manager-fs": "^3.0.0" + } + }, "safe-replace": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-replace/-/safe-replace-1.1.0.tgz", diff --git a/package.json b/package.json index 524c400..46e7166 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "greenlock-manager-fs", - "version": "3.0.1", + "version": "3.0.2", "description": "A simple file-based management strategy for Greenlock", "main": "manager.js", "scripts": {