Mass merging vnext to prod

browser/public/index.html

@@ -111,6 +111,7 @@
            <a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/chart-dashboard">─<span>Chart Dashboard</span></a> 
            <a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/financial-dashboard">─<span>Financial Dashboard</span></a> 
            <a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/gauge-dashboard">─<span>Gauge Dashboard</span></a> 
+           <a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/local-data-source-dashboard">─<span>Local Data Source Dashboard</span></a> 
            <a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/map-dashboard">─<span>Map Dashboard</span></a> 
            <a class="nav-link" href="#" data-nav="/samples/charts/dashboard-tile/pie-dashboard">─<span>Pie Dashboard</span></a> 
        </div>

browser/tasks/Transformer.ts

@@ -1031,10 +1031,10 @@ class CodeViewer {
         // jsonContent = jsonContent.replace(/\/\//g, "/");
 
         this.hasRelativeAssetsUrls = false;
-        this.path = filePath;
-        this.content = jsonContent;
         this.isMain = isMain;
         this.fileExtension = fileExtension;
         this.fileHeader = fileHeader;
+        this.path = filePath;
+        this.content = jsonContent;
     }
 }

browser/tasks/gulp-samples.js

@@ -46,6 +46,7 @@ var sampleSources = [
     // igConfig.SamplesCopyPath + '/charts/data-chart/chart-performance/package.json',
     // igConfig.SamplesCopyPath + '/charts/financial-chart/high-frequency/package.json',
     // igConfig.SamplesCopyPath + '/charts/financial-chart/high-volume/package.json',
+    // igConfig.SamplesCopyPath + '/charts/data-chart/data-annotation-multiple-with-stocks/package.json',
 
     // including all samples for all components:
     igConfig.SamplesCopyPath + '/**/package.json',
@@ -728,6 +729,7 @@ function updateCodeViewer(cb) {
 
         var content = "{\r\n \"sampleFiles\":\r\n";
         var contentItems = [];
+        var dataFiles = [];
 
         var tsItem = new CodeViewer(sample.SampleFilePath, sample.SampleFileSourceCode, "ts", "ts", true);
 
@@ -739,19 +741,40 @@ function updateCodeViewer(cb) {
                 var cssItem = new CodeViewer(file, cssContent, "css", "css", true);
                 contentItems.push(cssItem);
             }
+            else if (file.indexOf(".html") > 0) {
+                var tsContent = fs.readFileSync(file, "utf8");
+                var tsItem = new CodeViewer(file, tsContent, "html", "html", true);
+                contentItems.push(tsItem);
+            }
             else if (file.indexOf(".ts") > 0 && file.indexOf(sample.SampleFileName) == -1) {
 
-                var isIndex = file.indexOf("index.ts") > 0;
                 var tsContent = fs.readFileSync(file, "utf8");
                 var tsItem = new CodeViewer(file, tsContent, "ts", "ts", true);
-                tsItem.fileHeader = isIndex ? "ts" : "DATA";
-                contentItems.push(tsItem);
+
+                if (file.indexOf("index.ts") > 0) {
+                    tsItem.fileHeader = "ts";
+                    contentItems.push(tsItem);
+                } else {
+                    tsItem.fileHeader = "DATA";
+                    dataFiles.push(tsItem); 
+                }
             }
-            else if (file.indexOf(".html") > 0) {
-                var tsContent = fs.readFileSync(file, "utf8");
-                var tsItem = new CodeViewer(file, tsContent, "html", "html", true);
-                contentItems.push(tsItem);
+        }
+
+        if (dataFiles.length === 1) {
+            contentItems.push(dataFiles[0]);
+        } else if (dataFiles.length > 1) {
+            // combining multiple data files into one data source
+            var dataPath = dataFiles[0].path;
+            var dataFolder = dataPath.substring(0, dataPath.lastIndexOf("/"));
+            var dataContent = "// NOTE this file contains multiple data sources:";
+            for (let i = 0; i < dataFiles.length; i++) {
+                const data = dataFiles[i];
+                dataContent += "\r\n\r\n" + "// Data Source #" + (i+1) + "\r\n";
+                dataContent += data.content + "\r\n";
             }
+            var dataItem = new CodeViewer(dataFolder + "/DataSources.ts", dataContent, "ts", "DATA", true);
+            contentItems.push(dataItem);
         }
 
         content += JSON.stringify(contentItems, null, ' ');
@@ -976,21 +999,21 @@ function updateIG(cb) {
     // { version: "3.2.12",  name:               "igniteui-webcomponents-core" },   // PUBLIC NPM
     let packageUpgrades = [
         // these IG packages are often updated:
-        { version: "6.0.0", name: "igniteui-webcomponents-core" },
-        { version: "6.0.0", name: "igniteui-webcomponents-charts" },
-        { version: "6.0.0", name: "igniteui-webcomponents-excel" },
-        { version: "6.0.0", name: "igniteui-webcomponents-gauges" },
-        { version: "6.0.0", name: "igniteui-webcomponents-data-grids" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-core" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-charts" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-excel" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-gauges" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-data-grids" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-inputs" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-layouts" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-maps" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-spreadsheet-chart-adapter" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-spreadsheet" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-datasources" },
+        { version: "6.0.1-beta.1", name: "igniteui-webcomponents-dashboards" },
+        // these IG packages are sometimes updated:        
         { version: "6.0.3", name: "igniteui-webcomponents-grids" },
-        { version: "6.0.0", name: "igniteui-webcomponents-inputs" },
-        { version: "6.0.0", name: "igniteui-webcomponents-layouts" },
-        { version: "6.0.0", name: "igniteui-webcomponents-maps" },
-        { version: "6.0.0", name: "igniteui-webcomponents-spreadsheet-chart-adapter" },
-        { version: "6.0.0", name: "igniteui-webcomponents-spreadsheet" },
-        { version: "6.0.0", name: "igniteui-webcomponents-datasources" },
-        { version: "6.0.0", name: "igniteui-webcomponents-dashboards" },
-        // these IG packages are sometimes updated:
-        { version: "6.0.0" , name: "igniteui-webcomponents" },
+        { version: "6.1.2" , name: "igniteui-webcomponents" },
         { version: "1.16.0", name: "igniteui-dockmanager" },
         // other packages:
         { version: "^5.96.1", name: "webpack" },