Merge pull request #1055 from blackflux/dev

[Gally]: master <- dev

package.json

@@ -47,22 +47,22 @@
     "@babel/cli": "7.12.10",
     "@babel/core": "7.12.10",
     "@babel/register": "7.12.10",
-    "@blackflux/eslint-plugin-rules": "1.3.43",
-    "@blackflux/robo-config-plugin": "3.10.17",
+    "@blackflux/eslint-plugin-rules": "1.3.45",
+    "@blackflux/robo-config-plugin": "4.0.4",
     "babel-eslint": "10.1.0",
-    "babel-preset-latest-node": "5.2.0",
+    "babel-preset-latest-node": "5.4.0",
     "chai": "4.2.0",
     "coveralls": "3.1.0",
-    "eslint": "7.17.0",
+    "eslint": "7.18.0",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-json": "2.1.2",
     "eslint-plugin-markdown": "1.0.2",
     "eslint-plugin-mocha": "8.0.0",
-    "js-gardener": "2.0.182",
-    "node-tdd": "2.19.0",
+    "js-gardener": "2.0.184",
+    "node-tdd": "2.19.1",
     "nyc": "15.1.0",
-    "semantic-release": "17.3.1"
+    "semantic-release": "17.3.7"
   },
   "nyc": {
     "tempDir": "./coverage/.nyc_output",
@@ -107,13 +107,13 @@
     "lib"
   ],
   "dependencies": {
-    "fs-extra": "9.0.1",
+    "fs-extra": "9.1.0",
     "js-yaml": "4.0.0",
     "json-stringify-pretty-compact": "2.0.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.isequal": "4.5.0",
-    "object-align": "1.0.16",
+    "object-lib": "1.3.0",
     "xml-js": "1.6.11",
-    "yaml-boost": "1.10.3"
+    "yaml-boost": "1.10.5"
   }
 }

src/logic/smart-write.js

@@ -6,7 +6,7 @@ const cloneDeep = require('lodash.clonedeep');
 const fsExtra = require('fs-extra');
 const stringify = require('json-stringify-pretty-compact');
 const yaml = require('yaml-boost');
-const objectAlign = require('object-align');
+const { align } = require('object-lib');
 const smartRead = require('./smart-read');
 const xmlParser = require('../util/xml-parser');
 const getExt = require('../util/get-ext');
@@ -53,7 +53,7 @@ module.exports = (filepath, content, options = {}) => {
   if (!isEqual(currentContent, mergedContent)) {
     fsExtra.ensureDirSync(path.dirname(filepath));
     if (ctx.keepOrder) {
-      objectAlign(mergedContent, currentContent);
+      align(mergedContent, currentContent);
     }
     let contentString;
     switch (ctx.treatAs || ext) {