@tangelo/tangelo-configuration-toolkit 1.11.1 → 1.12.0

package/src/modules/build/oxygen.js

@@ -1,160 +1,166 @@
-const fs      = require('fs-extra');
-const globby  = require('globby');
-const path    = require('path');
-const SaxonJS = require('saxon-js');
-
-const spConfigPath  = path.join(_paths.repo, _paths.tdi, 'tct/build/oxygen/stylesheetPaths.json');
-const sefFilePath   = path.join(_paths.repo, _paths.tdi, 'tct/build/oxygen/createProjectFile.sef.json');
-const cmscustomPath = 'config/cmscustom/';
-const siteStylesheetsPath = 'config/txp/site-stylesheets/';
-
-const masterFiles = new Set;
-const transformationScenarios = [];
-  
-const createProjectFile = (config) => {
-  _info('Initializing xpr file(s):');
-  const xprFiles = globby.sync(`*.xpr`);
-
-  // Copy xpr file from TDI if it does not exists yet;
-  if (xprFiles[0]) _write(`Found: ${xprFiles.join(', ')}`);
-  else {
-    const customers = new Set;
-    _repoconfig.forEach(p => customers.add(p.customer_name));
-    xprFiles.push([...customers].join(' - ') + '.xpr');
-    fs.copySync(path.join(_paths.repo,'tangelo-default-implementation/src/[customer].xpr'), path.join(_paths.repo, xprFiles[0]));
-    _write(`Created: '${xprFiles[0]}'`);
-  }
-
-  // Search for transformationScenarios/masterfiles based on TDI submodule oxygenProjectFile config
-  _info('\nSearching for transformationScenarios/masterfiles');
-  config.oxygenProjectFile.forEach(
-    pf => {
-      // Collect transformation scenarios and add them to the transformationScenarios array; add individual stylesheets to the masterFiles set.
-      if      (pf.transformation) getTransformations(pf.transformation);
-      // Add files to the masterfiles set.
-      else if (pf.masterfile)     getMasterfiles(pf.masterfile);
-    }
-  );
-  
-  // update all .xpr files with collected transformation scenarios and masterfiles.
-  transformXprFile(xprFiles);
-};
-
-const getTransformations = (config) => {
-  _repoconfig.forEach(rc => {
-    // get pathname of customer/project
-    const [customerPath, projectPath] = config.location == 'database' ? rc.path_dbconfig : rc.path_cmscustom;
-
-    // set pathname of customer/project in location glob-expression 
-    const location = path.join(
-    _paths.repo,
-    config.files.replace(/\[customer\]/, customerPath).replace(/\[project\]/, projectPath)
-      );
-
-    globby
-    .sync(`${location}`)
-    .forEach(f => {
-      // extract baseStrings from file
-      const baseStrings = fs.readFileSync(f).toString().match(RegExp(config.extracts.base, 'gm'));
-
-      if (baseStrings) {
-        baseStrings.forEach(s => {
-          // extract type, name, files info from baseString
-          const type = config.extracts.type ? s.match(RegExp(config.extracts.type))[1] : config.values.type;
-          const name = config.extracts.name ? s.match(RegExp(config.extracts.name))[1] : config.values.name;
-          const files = s.match(RegExp(config.extracts.files))[1];
-          
-          // Add transformation scenario to the transformationScenario array
-          transformationScenarios.push({
-            name: `${type}: ${name} (${rc.customer_name}, ${rc.project_name})`, // note that in createProjectFile.xsl a regex is added that matches scenarios based on this name. This to preserve manually added scenarios.
-            transformationScenario: files,
-            location: config.location == 'txp' ? siteStylesheetsPath : cmscustomPath
-          });
-          
-          // Add each non-tdi stylesheet in transformation scenario to the masterFiles set
-          files.split(',').forEach(f => {
-            const filePath = `${config.location == 'txp' ? siteStylesheetsPath : cmscustomPath}${f}`;
-            if (!f.startsWith('tdi')) masterFiles.add(filePath);
-          });
-        });
-      } else {
-        _write(`No transformation scenarios found in ${f} for '${config.extracts.base}'`);
-      }
-    });
-  });
-
-};
-
-
-const getMasterfiles = (config) => {
-  globby
-  .sync(`${path.join(_paths.repo, config.files)}`)
-  .forEach(cf => {
-    // Check if masterfile should be extracted from file
-    if (config.extracts) {
-      // extract baseStrings from file
-      const baseStrings = fs.readFileSync(cf).toString().match(RegExp(config.extracts.base,'gm'));
-
-      if (baseStrings) {
-        baseStrings.forEach(s => {
-          // extract (comma-separated) list of masterfiles
-          const filesString = s.match(RegExp(config.extracts.files))[1];
-          if (!filesString) _error(`No masterfiles found in '${baseString}' for '${config.extracts.files}'`);
-
-          // Add each non-tdi masterfile to the masterFiles set
-          filesString.split(',').forEach(f => {
-            if (!f.startsWith('tdi')){
-              const filePath = `${config.location == 'txp' ? siteStylesheetsPath : cmscustomPath}${f}`;
-              masterFiles.add(filePath);
-            }
-          });
-        });
-      } else {
-        _write(`No masterfiles found in ${cf} for '${config.extracts.base}'`);
-      };
-    } else { // Add synced file to masterfiles; strip path from c:/... hence it starts with config/cmscustom or config/txp/site-stylesheets
-      const filePath = config.location == 'txp' ? `${siteStylesheetsPath}${cf.split(siteStylesheetsPath)[1]}` : `${cmscustomPath}${cf.split(cmscustomPath)[1]}`;
-      masterFiles.add(filePath);
-    }
-  });
-
-};
-
-const transformXprFile = (xprFiles) => {
-  _info('\nUpdating xpr file(s):');
-  // create with: xslt3 -t -xsl:createProjectFile.xsl -export:createProjectFile.sef.json v -nogo'
-
-  xprFiles
-  .forEach(xprFile => {
-    // Transform xpr; add masterfiles and transformationScenarios as parameters of the stylesheet
-    _write(`${xprFile}\n`);
-    SaxonJS.transform({
-      stylesheetText: fs.readFileSync(sefFilePath),
-      stylesheetBaseURI: "createProjectFile.sef.json",
-      sourceFileName: path.join(_paths.repo, xprFile),
-      destination: "serialized",
-      stylesheetParams: {
-        "masterfiles": [...masterFiles],
-        "Q{}transformationScenarios": transformationScenarios
-      }
-    }, "async")
-    .then(output => {
-      // Write result of transformation to xpr file
-      fs.writeFileSync(path.join(_paths.repo, xprFile), output.principalResult);
-    })
-    .catch(e => _warn(`Failed to update: ${xprFile}\n ${e}`));
-  });
-};
-
-
-module.exports = function oxygen () {
-  // _info(`Set projects transformation scenarios and masterfiles in oXygen project file...`);
-  // _info(`- Will try to preserve manually added entries in the transformation scenarios and masterfiles`);
-  // _info(`- Will remove non existing masterfiles or masterfiles that start with a '_'\n`);
-
-  if (!fs.existsSync(spConfigPath) || !fs.existsSync(sefFilePath)) {
-    _error(`Cannot find required files in TDI submodule. Try updating TDI submodule.`);
-  }
-
-  createProjectFile(require(spConfigPath));
+const fs      = require('fs-extra');
+const globby  = require('globby');
+const path    = require('path');
+const SaxonJS = require('saxon-js');
+
+const spConfigPath  = path.join(_paths.repo, _paths.tdi, 'tct/build/oxygen/stylesheetPaths.json');
+const sefFilePath   = path.join(_paths.repo, _paths.tdi, 'tct/build/oxygen/createProjectFile.sef.json');
+const cmscustomPath = 'config/cmscustom/';
+const siteStylesheetsPath = 'config/txp/site-stylesheets/';
+
+const masterFiles = new Set;
+const transformationScenarios = [];
+
+const createProjectFile = (config) => {
+  _info('Initializing xpr file(s):');
+  const xprFiles = globby.sync(`*.xpr`);
+
+  // Copy xpr file from TDI if it does not exists yet;
+  if (xprFiles[0]) _write(`Found: ${xprFiles.join(', ')}`);
+  else {
+    const customers = new Set;
+    _repoconfig.forEach(p => customers.add(p.customer_name));
+    xprFiles.push([...customers].join(' - ') + '.xpr');
+    fs.copySync(path.join(_paths.repo, 'tangelo-default-implementation/src/[customer].xpr'), path.join(_paths.repo, xprFiles[0]));
+    _write(`Created: '${xprFiles[0]}'`);
+  }
+
+  // Search for transformationScenarios/masterfiles based on TDI submodule oxygenProjectFile config
+  _info('\nSearching for transformationScenarios/masterfiles');
+  config.oxygenProjectFile.forEach(
+    pf => {
+      // Collect transformation scenarios and add them to the transformationScenarios array; add individual stylesheets to the masterFiles set.
+      if      (pf.transformation) getTransformations(pf.transformation);
+      // Add files to the masterfiles set.
+      else if (pf.masterfile)     getMasterfiles(pf.masterfile);
+    }
+  );
+
+  // update all .xpr files with collected transformation scenarios and masterfiles.
+  transformXprFile(xprFiles);
+};
+
+const getTransformations = (config) => {
+  _repoconfig.forEach(rc => {
+    // get pathname of customer/project
+    const [customerPath, projectPath] = config.location == 'database' ? rc.path_dbconfig : rc.path_cmscustom;
+
+    // set pathname of customer/project in location glob-expression
+    const location = path.join(
+      _paths.repo,
+      config.files.replace(/\[customer\]/, customerPath).replace(/\[project\]/, projectPath)
+    );
+
+    globby
+      .sync(`${location}`)
+      .forEach(f => {
+      // extract baseStrings from file
+        const fileString = fs.readFileSync(f).toString();
+        const baseStrings = fileString.match(RegExp(config.extracts.base, 'gm'));
+        
+        if (fileString.replace(/\s|^prompt\s.*$/gm,'')!=='') {
+          if (baseStrings) {
+            baseStrings.forEach(s => {
+            // extract type, name, files info from baseString
+              const type = config.extracts.type ? s.match(RegExp(config.extracts.type))[1] : config.values.type;
+              const name = config.extracts.name ? s.match(RegExp(config.extracts.name))[1] : config.values.name;
+              const files = s.match(RegExp(config.extracts.files))[1];
+
+              // Add transformation scenario to the transformationScenario array
+              transformationScenarios.push({
+                name: `${type}: ${name} (${rc.customer_name}, ${rc.project_name})`, // note that in createProjectFile.xsl a regex is added that matches scenarios based on this name. This to preserve manually added scenarios.
+                transformationScenario: files,
+                location: config.location == 'txp' ? siteStylesheetsPath : cmscustomPath
+              });
+
+              // Add each non-tdi stylesheet in transformation scenario to the masterFiles set
+              files.split(',').forEach(f => {
+                const filePath = `${config.location == 'txp' ? siteStylesheetsPath : cmscustomPath}${f}`;
+                if (!f.startsWith('tdi')) masterFiles.add(filePath);
+              });
+            });
+          } else {
+            _write(`No transformation scenarios found in ${f} for '${config.extracts.base}'`);
+          }
+        }
+      });
+  });
+
+};
+
+
+const getMasterfiles = (config) => {
+  globby
+    .sync(`${path.join(_paths.repo, config.files)}`)
+    .forEach(cf => {
+    // Check if masterfile should be extracted from file
+      const fileString = fs.readFileSync(cf).toString();
+      if (fileString.replace(/\s|^prompt\s.*$/gm,'')!=='') {
+        if (config.extracts) {
+        // extract baseStrings from file
+          const baseStrings = fileString.match(RegExp(config.extracts.base, 'gm'));
+
+          if (baseStrings) {
+            baseStrings.forEach(s => {
+            // extract (comma-separated) list of masterfiles
+              const filesString = s.match(RegExp(config.extracts.files))[1];
+              if (!filesString) _error(`No masterfiles found in '${s}' for '${config.extracts.files}'`);
+
+              // Add each non-tdi masterfile to the masterFiles set
+              filesString.split(',').forEach(f => {
+                if (!f.startsWith('tdi')){
+                  const filePath = `${config.location == 'txp' ? siteStylesheetsPath : cmscustomPath}${f}`;
+                  masterFiles.add(filePath);
+                }
+              });
+            });
+          } else {
+            _write(`No masterfiles found in ${cf} for '${config.extracts.base}'`);
+          }
+        } else { // Add synced file to masterfiles; strip path from c:/... hence it starts with config/cmscustom or config/txp/site-stylesheets
+          const filePath = config.location == 'txp' ? `${siteStylesheetsPath}${cf.split(siteStylesheetsPath)[1]}` : `${cmscustomPath}${cf.split(cmscustomPath)[1]}`;
+          masterFiles.add(filePath);
+        }
+      }
+    });
+
+};
+
+const transformXprFile = (xprFiles) => {
+  _info('\nUpdating xpr file(s):');
+  // create with: xslt3 -t -xsl:createProjectFile.xsl -export:createProjectFile.sef.json v -nogo'
+
+  xprFiles
+    .forEach(xprFile => {
+    // Transform xpr; add masterfiles and transformationScenarios as parameters of the stylesheet
+      _write(`${xprFile}\n`);
+      SaxonJS.transform({
+        stylesheetText: fs.readFileSync(sefFilePath),
+        stylesheetBaseURI: 'createProjectFile.sef.json',
+        sourceFileName: path.join(_paths.repo, xprFile),
+        destination: 'serialized',
+        stylesheetParams: {
+          'masterfiles': [...masterFiles],
+          'Q{}transformationScenarios': transformationScenarios
+        }
+      }, 'async')
+        .then(output => {
+          // Write result of transformation to xpr file
+          fs.writeFileSync(path.join(_paths.repo, xprFile), output.principalResult);
+        })
+        .catch(e => _warn(`Failed to update: ${xprFile}\n ${e}`));
+    });
+};
+
+
+module.exports = function oxygen () {
+  // _info(`Set projects transformation scenarios and masterfiles in oXygen project file...`);
+  // _info(`- Will try to preserve manually added entries in the transformation scenarios and masterfiles`);
+  // _info(`- Will remove non existing masterfiles or masterfiles that start with a '_'\n`);
+
+  if (!fs.existsSync(spConfigPath) || !fs.existsSync(sefFilePath)) {
+    _error(`Cannot find required files in TDI submodule. Try updating TDI submodule.`);
+  }
+
+  createProjectFile(require(spConfigPath));
 };

package/src/modules/deploy/config.js

@@ -1,4 +1,4 @@
-const fs        = require('fs-extra')
+const fs        = require('fs-extra');
 const objMerge  = require('object-assign-deep');
 const path      = require('path');
 
@@ -81,11 +81,11 @@ module.exports = {
 
     this.giPatterns = !fs.existsSync('.gitignore') ? [] :
       fs.readFileSync('.gitignore').toString()
-      .trim()
-      .replace(/^#.+/gm, '') // remove comments
-      .split(/\s+/) // split on lines
-      .filter(p => !p.match(/^database\/|\/tdi|\/fonto/)) // filter paths that should be copied
-      .map(p => '!' + (p.match(/^config/) ? p : '**/' + p.split('**/').pop()) + (p.match(/\/$/) ? '**' : '')) // negate expressions, remove base dir, suffix folders with **
+        .trim()
+        .replace(/^#.+/gm, '') // remove comments
+        .split(/\s+/) // split on lines
+        .filter(p => !p.match(/^database\/|\/tdi|\/fonto/)) // filter paths that should be copied
+        .map(p => '!' + (p.match(/^config/) ? p : '**/' + p.split('**/').pop()) + (p.match(/\/$/) ? '**' : '')) // negate expressions, remove base dir, suffix folders with **
     ;
 
     let transferPattern = path.join(_paths.apply, filter).toFws();
@@ -110,11 +110,11 @@ module.exports = {
     if (this.deliveryPack && transferPattern.includes(_paths.tdi)) this.transferPatterns.push(`${_paths.tdi}/src/database/create*.sql`); // create(_exists).sql is called by tdi install
 
     // add time parameters to all xopus requests to overcome cache
-    const ts = new Date().toISOString().replace(/-|:/g, '').substring(0,15);
+    const ts = new Date().toISOString().replace(/-|:/g, '').substring(0, 15);
     this.replaceStrings = [
-      [/((xsd|xsl|src|iconsrc)="[^"?]+)"/g ,`$1?_=${ts}"`, '**/xopus/xml/*'],
-      [/(schemaLocation="[^"?]+)"/g ,`$1?_=${ts}"`, '**/xopus/xsd/*'],
-      [/(href="[^"?]+.xsl)"/g ,`$1?_=${ts}"`, '**/xopus/xsl/*']
+      [/((xsd|xsl|src|iconsrc)="[^"?]+)"/g, `$1?_=${ts}"`, '**/xopus/xml/*'],
+      [/(schemaLocation="[^"?]+)"/g, `$1?_=${ts}"`, '**/xopus/xsd/*'],
+      [/(href="[^"?]+.xsl)"/g, `$1?_=${ts}"`, '**/xopus/xsl/*']
     ];
     // depending on env, enable debug mode and change track functionality
     if (this.envDev) {
@@ -129,14 +129,14 @@ module.exports = {
     }
     else this.replaceStrings.push(['debugMode>true', 'debugMode>false', '**/xopus/xml/*']);
 
-    _info(`Branch: ${_git.commitLocal.branch}`);
+    _info(`Branch: ${_git.commitLocal().branch}`);
     _info(`Source: ${path.join(process.cwd(), transferPattern)}`);
     _info(`Server: ${ftpConfig.host ? `${ftpConfig.host}:${ftpConfig.port}` : 'local'}`);
     _info(`Target: ${this.getRemotePath(transferPattern)}`);
     _write();
 
-    if (_git.commitLocal.date < _git.commitRemote.date) {
-      _warn(`You're not deploying from the most recent git commit!\n`)
+    if (_git.commitLocal().date < _git.commitRemote().date) {
+      _warn(`You're not deploying from the most recent git commit!\n`);
     }
   }
 

package/src/modules/deploy/execute.js

@@ -25,8 +25,8 @@ const s = require('./srcset');
 
 const remote = {
   queue: [],
-  add(cmd,msg) {
-    if (!this.queue.find(e => e[0]==cmd)) this.queue.push([cmd,msg]);
+  add(cmd, msg) {
+    if (!this.queue.find(e => e[0]==cmd)) this.queue.push([cmd, msg]);
     return this;
   },
   do(sshI) {
@@ -38,25 +38,25 @@ const remote = {
     }
 
     // execute each command from the queue in batches
-    this.queue.filter((e,i) => i < executing).forEach(()=>{
+    this.queue.filter((e, i) => i < executing).forEach(()=>{
       const command = this.queue.shift();
 
       sshI.execCommand(command[0])
-      .then(result => {
-        if (result.stderr) _warn(result.stderr);
-        else if (command[1] === '') _write(result.stdout);
-        else _info(command[1] || command[0], true);
-
-        executing--;
-        if (executing==0) this.do(sshI);
-      })
-      .catch(err => {
-        _warn(`Server aborted connection. Retrying.`);
-        this.queue.unshift(command);
-
-        executing--;
-        if (executing==0) this.do(sshI);
-      });
+        .then(result => {
+          if (result.stderr) _warn(result.stderr);
+          else if (command[1] === '') _write(result.stdout);
+          else _info(command[1] || command[0], true);
+
+          executing--;
+          if (executing==0) this.do(sshI);
+        })
+        .catch(err => {
+          _warn(`Server aborted connection. Retrying.`);
+          this.queue.unshift(command);
+
+          executing--;
+          if (executing==0) this.do(sshI);
+        });
     });
   },
   process() {
@@ -64,14 +64,14 @@ const remote = {
 
     const sshI = new NodeSSH();
     sshI.connect(c.server.ftpConfig) // set up connection once
-    .then(() => {
-      this.do(sshI);
-    })
-    .catch(err => {
-      if (err.code=='ECONNRESET' || err.code=='ECONNABORTED') _warn(`Server aborted connection. Retrying.`);
-      else _warn(err);
-      this.process(); // retry set up connection
-    });
+      .then(() => {
+        this.do(sshI);
+      })
+      .catch(err => {
+        if (err.code=='ECONNRESET' || err.code=='ECONNABORTED') _warn(`Server aborted connection. Retrying.`);
+        else _warn(err);
+        this.process(); // retry set up connection
+      });
   }
 };
 
@@ -81,7 +81,7 @@ const createDeliveryPack = () => { // create install scripts if necessary, zip o
   const dbiPs1 = [];
 
   globby.sync('**/database/**/*install.sql', {cwd: c.server.remotedir}).forEach(p => { // add install-script calls and make sure tdi comes first
-    const [dir, file] = p.match(/(.+)\/([^\/]+)$/).slice(1);
+    const [dir, file] = p.match(/(.+)\/([^/]+)$/).slice(1);
     if (/config.*\/..._install/.test(p))  dbiSql.push(`@${p}`);
     else if (dir.endsWith('tdi'))         dbiPs1.unshift(`cd $cwd/${dir}`, `sqlplus /nolog "@${file}"`);
     else                                  dbiPs1.push(`cd $cwd/${dir}`, `sqlplus /nolog "@${file}"`);
@@ -133,12 +133,12 @@ const transfer = (paths, lrServer) => {
     const prPath = 'config\\'+file.relative.replace(/fonto.+$/, '');
     if (fontoPaths.outdated.includes(prPath)) return false;
     if (fontoPaths.uptodate.includes(prPath)) return true;
-    if (file.relative.match(/fonto[\\\/]dist/)) {
+    if (file.relative.match(/fonto[\\/]dist/)) {
       const paths = `${prPath}\\fonto ${prPath}\\schema ${_paths.tdi}`; // only check paths containing fonto sources
-      const lastFontoCommit = execGitCommand(`log -1 --format=%ae;%cd --date=iso-strict origin/${_git.commitLocal.branch} ${paths}`, _paths.repo, ['author', 'date']);
+      const lastFontoCommit = execGitCommand(`log -1 --format=%ae;%cd --date=iso-strict origin/${_git.commitLocal().branch} ${paths}`, _paths.repo, ['author', 'date']);
       if (
-        lastFontoCommit.author != _git.user &&
-        (lastFontoCommit.date > _git.commitLocal.date || lastFontoCommit.date > fs.statSync(file.relative).mtime)
+        lastFontoCommit.author != _git.user() &&
+        (lastFontoCommit.date > _git.commitLocal().date || lastFontoCommit.date > fs.statSync(file.relative).mtime)
       ) {
         fontoPaths.outdated.push(prPath);
         return false;
@@ -153,50 +153,50 @@ const transfer = (paths, lrServer) => {
 
   _info('Start transferring', true);
 
-  gulp.src(srcset, { base: '.', follow: true, allowEmpty: true })
-  .pipe(g_plumber()) // catch errors in plugins so watch doesnt break
-  .pipe(removeOutdatedFontoBuild)
-  .pipe(xpsF)
-  .pipe(g_resolveIncl())
-  .pipe(xpsF.restore)
-  .pipe(jsF)
-  .pipe(g_sourcemaps.init())
-  .pipe(g_babel({presets: [[babel_pe, {modules: false}]], comments: false, minified: true})) // function must be executed here, otherwise second execution during watch fails
-  .pipe(g_sourcemaps.write('.'))
-  .pipe(jsF.restore)
-  .pipe(sassF)
-  .pipe(g_sourcemaps.init())
-  .pipe(g_sass().on('error', g_sass.logError))
-  .pipe(g_sourcemaps.write('.'))
-  .pipe(sassF.restore)
-  .pipe(shF)
-  .pipe(g_eol('\n'))
-  .pipe(shF.restore)
-  .pipe(g_plumber.stop())
-  .pipe(g_replace(c.replaceStrings))
-  .pipe(through2.obj((file, enc, cb) => {
-    file.originalRelativePath = file.relative; // original path needed for sftp.fastPut
-    file.path = file.path.replace(/(fonto).(?:dev|dist|packages.sx-shell-.+src)(.+)/, '$1$2'); // change destination path for fonto build files
-    if (!file.relative.endsWith('.map')) files.push(file.relative); // collect all file paths in array for livereload
-    cb(null, file);
-  }))
-  .pipe(g_print.default())
-  .pipe(c.localTransfer ? gulp.dest(c.server.remotedir) : g_sftp(c.server.ftpConfig, c.server.remotedir))
-  .on('end', () => {
-    _info('Finished transferring\n', true);
-    if (fontoPaths.outdated[0]) _warn(`Fonto build files in the following folders were outdated and therefore skipped:\n  ${fontoPaths.outdated.map(v => v.slice(0, -1)).join('\n  ')}`);
-
-    remote.process();
-
-    if (lrServer) { // reload specific resources if files are all image or css, else reload page
-      const reloadPage = !files.every(f => /.(css|jpe?g|png|gif)$/i.test(f));
-      lrServer.changed({params: {files: reloadPage ? ['page'] : files}});
-      _info(`${reloadPage ? 'Page' : 'Resources'} reloaded\n`);
-    }
+  gulp.src(srcset, {base: '.', follow: true, allowEmpty: true})
+    .pipe(g_plumber()) // catch errors in plugins so watch doesnt break
+    .pipe(removeOutdatedFontoBuild)
+    .pipe(xpsF)
+    .pipe(g_resolveIncl())
+    .pipe(xpsF.restore)
+    .pipe(jsF)
+    .pipe(g_sourcemaps.init())
+    .pipe(g_babel({presets: [[babel_pe, {modules: false}]], comments: false, minified: true})) // function must be executed here, otherwise second execution during watch fails
+    .pipe(g_sourcemaps.write('.'))
+    .pipe(jsF.restore)
+    .pipe(sassF)
+    .pipe(g_sourcemaps.init())
+    .pipe(g_sass().on('error', g_sass.logError))
+    .pipe(g_sourcemaps.write('.'))
+    .pipe(sassF.restore)
+    .pipe(shF)
+    .pipe(g_eol('\n'))
+    .pipe(shF.restore)
+    .pipe(g_plumber.stop())
+    .pipe(g_replace(c.replaceStrings))
+    .pipe(through2.obj((file, enc, cb) => {
+      file.originalRelativePath = file.relative; // original path needed for sftp.fastPut
+      file.path = file.path.replace(/(fonto).(?:dev|dist|packages.sx-shell-.+src)(.+)/, '$1$2'); // change destination path for fonto build files
+      if (!file.relative.endsWith('.map')) files.push(file.relative); // collect all file paths in array for livereload
+      cb(null, file);
+    }))
+    .pipe(g_print.default())
+    .pipe(c.localTransfer ? gulp.dest(c.server.remotedir) : g_sftp(c.server.ftpConfig, c.server.remotedir))
+    .on('end', () => {
+      _info('Finished transferring\n', true);
+      if (fontoPaths.outdated[0]) _warn(`Fonto build files in the following folders were outdated and therefore skipped:\n  ${fontoPaths.outdated.map(v => v.slice(0, -1)).join('\n  ')}`);
+
+      remote.process();
+
+      if (lrServer) { // reload specific resources if files are all image or css, else reload page
+        const reloadPage = !files.every(f => /.(css|jpe?g|png|gif)$/i.test(f));
+        lrServer.changed({params: {files: reloadPage ? ['page'] : files}});
+        _info(`${reloadPage ? 'Page' : 'Resources'} reloaded\n`);
+      }
 
-    if (c.deliveryPack) createDeliveryPack();
-  });
-}
+      if (c.deliveryPack) createDeliveryPack();
+    });
+};
 
 
 module.exports = {remote, transfer};