Merge branch 'dillon/122-1688-po-automation-project' into vapor/development

gulpfile.js

@@ -10,6 +10,7 @@ const plugins = require('gulp-load-plugins')({
     }
 });
 const path = require('path');
+const merge = require('merge-stream');
 const gulpIf = require('gulp-if');
 
 const onError = (error) => {

package.json

@@ -62,6 +62,7 @@
         "gulp-uglify-es": "^2.0.0",
         "laravel-mix": "^6.0.49",
         "lodash": "^4.17.13",
+        "merge-stream": "^2.0.0",
         "resolve-url-loader": "^3.1.5",
         "vue-loader": "^15.11.1 ",
         "vue-template-compiler": "^2.7.14"