From edf3893475ec3713b05a1881f01efdee80d455b0 Mon Sep 17 00:00:00 2001
From: jon-a-nygaard <jon.arild@highsoft.com>
Date: Mon, 19 Feb 2018 10:32:26 +0100
Subject: [PATCH] Fixed #7186, added new build script to dist task. Build and
 includes es-modules in distribution.

---
 gulpfile.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 0b54283b36f..30ec2f892a9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -406,7 +406,9 @@ const compile = (files, sourceFolder) => {
 const compileScripts = () => {
     const sourceFolder = './code/';
     const files = getFilesInFolder(sourceFolder, true, '')
-      .filter(path => path.endsWith('.src.js'));
+        // Compile all files ending with .src.js.
+        // Do not compile files in ./es-modules or ./js/es-modules.
+      .filter(path => (path.endsWith('.src.js') && !path.includes('es-modules')));
     return compile(files, sourceFolder);
 };
 
@@ -1367,7 +1369,7 @@ gulp.task('dist', () => {
     return Promise.resolve()
         .then(gulpify('cleanCode', cleanCode))
         .then(gulpify('styles', styles))
-        .then(gulpify('scripts', scripts))
+        .then(gulpify('scripts', getBuildScripts({}).fnFirstBuild))
         .then(gulpify('lint', lint))
         .then(gulpify('compile', compileScripts))
         .then(gulpify('cleanDist', cleanDist))