@sanity/util
Advanced tools
Comparing version 0.103.13 to 0.104.19
@@ -7,5 +7,5 @@ 'use strict'; | ||
var _path = require('path'); | ||
var _merge2 = require('lodash/merge'); | ||
var _path2 = _interopRequireDefault(_path); | ||
var _merge3 = _interopRequireDefault(_merge2); | ||
@@ -16,5 +16,5 @@ var _get2 = require('lodash/get'); | ||
var _merge = require('lodash/merge'); | ||
var _path = require('path'); | ||
var _merge2 = _interopRequireDefault(_merge); | ||
var _path2 = _interopRequireDefault(_path); | ||
@@ -43,3 +43,3 @@ var _safeJson = require('./safeJson'); | ||
const localConfig = rootDir && (0, _safeJson.loadJsonSync)(_path2.default.join(rootDir, 'sanity.json')); | ||
const config = (0, _reduceConfig2.default)(localConfig ? (0, _merge2.default)({}, defaults, localConfig) : defaults, process.env.NODE_ENV || 'development' // eslint-disable-line no-process-env | ||
const config = (0, _reduceConfig2.default)(localConfig ? (0, _merge3.default)({}, defaults, localConfig) : defaults, process.env.NODE_ENV || 'development' // eslint-disable-line no-process-env | ||
); | ||
@@ -46,0 +46,0 @@ |
@@ -7,4 +7,8 @@ 'use strict'; | ||
var _lodash = require('lodash'); | ||
var _mergeWith2 = require('lodash/mergeWith'); | ||
var _mergeWith3 = _interopRequireDefault(_mergeWith2); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
const sanityEnv = process.env.SANITY_ENV || 'production'; // eslint-disable-line no-process-env | ||
@@ -31,5 +35,5 @@ const apiHosts = { | ||
const envConfig = (rawConfig.env || {})[env] || {}; | ||
const config = (0, _lodash.mergeWith)({}, rawConfig, envConfig, sanityConf, merge); | ||
const config = (0, _mergeWith3.default)({}, rawConfig, envConfig, sanityConf, merge); | ||
delete config.env; | ||
return config; | ||
}; |
{ | ||
"name": "@sanity/util", | ||
"version": "0.103.13", | ||
"version": "0.104.19", | ||
"description": "Utilities shared across projects of Sanity", | ||
@@ -29,2 +29,3 @@ "main": "lib/index.js", | ||
"devDependencies": { | ||
"babel-plugin-lodash": "^3.2.11", | ||
"babel-preset-es2015-node4": "^2.1.1", | ||
@@ -34,4 +35,4 @@ "babel-preset-stage-2": "^6.22.0", | ||
"chai-as-promised": "^6.0.0", | ||
"eslint": "^3.17.0", | ||
"eslint-config-sanity": "^2.0.2", | ||
"eslint": "^3.18.0", | ||
"eslint-config-sanity": "^2.1.0", | ||
"mocha": "^3.2.0", | ||
@@ -38,0 +39,0 @@ "rimraf": "^2.6.1" |
Sorry, the diff of this file is not supported yet
10218
206
9