Merge branch 'master' into feature/ingest

package.json

@@ -67,7 +67,7 @@
   "dependencies": {
     "@bigfunger/decompress-zip": "0.2.0-stripfix2",
     "@bigfunger/jsondiffpatch": "0.1.38-webpack",
-    "@elastic/datemath": "2.2.0",
+    "@elastic/datemath": "2.3.0",
     "@spalger/angular-bootstrap": "0.12.1",
     "@spalger/filesaver": "1.1.2",
     "@spalger/leaflet-draw": "0.2.3",

tasks/build/archives.js

@@ -4,6 +4,7 @@ module.exports = function createPackages(grunt) {
   let { execFile } = require('child_process');
   let { all, fromNode } = require('bluebird');
 
+  const targetDir = config.get('target');
   let buildPath = resolve(config.get('root'), 'build');
   let exec = async (cmd, args) => {
     grunt.log.writeln(` > ${cmd} ${args.join(' ')}`);
@@ -29,7 +30,7 @@ module.exports = function createPackages(grunt) {
       grunt.config.get('platforms')
       .map(async platform => {
 
-        grunt.file.mkdir('target');
+        grunt.file.mkdir(targetDir);
         await archives(platform);
       })
     )

tasks/build/os_packages.js

@@ -12,6 +12,8 @@ export default (grunt) => {
   const fpm = args => exec('fpm', args);
 
   grunt.registerTask('_build:osPackages', function () {
+    grunt.file.mkdir(targetDir);
+
     config.get('platforms')
     .filter(({ name }) => /linux-x(86|64)$/.test(name))
     .map(({ name, buildDir }) => {