resolving conflict

Author: [email protected]

README.md

@@ -49,7 +49,7 @@ npm install
 To compile the source files, use the below command
 
 ```bash
-npm run build
+gulp build
 ```
 
 ### Serving deployed build
@@ -69,17 +69,17 @@ https://cli.vuejs.org/guide/deployment.html
             <a href="src/grid">DataGrid</a>
         </td>
         <td>
-            <a href="src/tree-grid">Tree Grid</a>
+            <a href="src/pivot-view">Pivot Table</a>
         </td>
         <td>
-            <a href="src/pivot-view">Pivot Table (Updated)</a>
+            <a href="src/tree-grid">Tree Grid</a>
         </td>
     </tr>
     <tr>
         <td>
-            <a href="src/spreadsheet">Spreadsheet (Preview)</a>
+            <a href="src/spreadsheet">Spredsheet</a>
         </td>
-        <td></td> 
+        <td></td>
         <td></td>
     </tr>
     <tr>
@@ -89,53 +89,55 @@ https://cli.vuejs.org/guide/deployment.html
     </tr>
     <tr>
         <td>
-            <a href="src/chart">Charts (Updated)</a>
+            <a href="src/chart">Charts</a>
         </td>
         <td>
-            <a href="src/diagram">Diagram</a>
+            <a href="src/stock-chart">Stock Chart</a>
         </td>
         <td>
-            <a href="src/stock-chart">Stock Chart</a>
+            <a href="src/circular-gauge">Circular Gauge</a>
         </td>
     </tr>
     <tr>
         <td>
-            <a href="src/maps">Maps</a>
+            <a href="src/diagram">Diagram</a>
         </td>
         <td>
-            <a href="src/treemap">TreeMap</a>
+            <a href="src/heatmap-chart">HeatMap Chart</a>
+        </td>
+         <td>
+            <a href="src/linear-gauge">Linear Gauge</a>
         </td>
-        <td>
-            <a href="src/heatmap">Heatmap chart</a>
-        </td>     
     </tr>
     <tr>
         <td>
-            <a href="src/circular-gauge">Circular Gauge</a>
+            <a href="src/maps">Maps</a>
         </td>
-        <td>
-            <a href="src/linear-gauge">Linear Gauge</a>
+       <td>
+            <a href="src/range-navigator">Range Selector</a>
         </td>
         <td>
-            <a href="src/range-navigator">Range Selector</a>
-        </td>        
+            <a href="src/smith-chart">Smith Chart</a>
+        </td>
     </tr>
     <tr>
         <td>
-            <a href="src/sparkline">Sparkline Charts</a>
+            <a href="src/barcode">Barcode Generator</a>
         </td>
-         <td>
-            <a href="src/smith-chart">Smith Chart</a>
+        <td>
+            <a href="src/sparkline">Sparkline Charts</a>
         </td>
         <td>
-            <a href="src/barcode">Barcode</a>
+            <a href="src/treemap">TreeMap</a>
         </td>
     </tr>
     <tr>
         <td>
-            <a href="src/bullet-chart">Bullet Chart (Preview)</a>
+            <a href="src/bullet-chart">Bullet Chart</a>
+        </td>
+        <td>
+            <a href="src/kanban">Kanban (preview)</a>
         </td>
-        <td></td>
         <td></td>
     </tr>
     <tr>
@@ -145,21 +147,14 @@ https://cli.vuejs.org/guide/deployment.html
     </tr>
     <tr>
         <td>
-            <a href="src/rich-text-editor">Rich Text Editor (Updated)</a>
+            <a href="src/rte">Rich Text Editor</a>
         </td>
         <td>
-            <a href="src/document-editor">DocumentEditor (Updated)</a>
+            <a href="src/document-editor">Word Processor</a>
         </td>
         <td>
-            <a href="src/chips">Chips</a>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <a href="src/inplace-editor">InplaceEditor</a>
+            <a href="src/inplace-editor">In-place Editor</a>
         </td>
-        <td></td>
-        <td></td>
     </tr>
     <tr>
         <td colspan="3" rowspan="1">
@@ -171,26 +166,26 @@ https://cli.vuejs.org/guide/deployment.html
             <a href="src/schedule">Scheduler</a>
         </td>
         <td>
-            <a href="src/gantt">Gantt (Updated)</a>
+            <a href="src/calendar">Calendar</a>
         </td>
         <td>
-            <a href="src/calendar">Calendar</a>
+            <a href="src/datepicker">DatePicker</a>
         </td>
     </tr>
     <tr>
-       <td>
-            <a href="src/datepicker">DatePicker</a>
+        <td>
+            <a href="src/daterangepicker">Date Range Picker</a>
         </td>
         <td>
-            <a href="src/daterangepicker">DateRangePicker</a>
+            <a href="src/datetimepicker">DateTime Picker</a>
         </td>
         <td>
-            <a href="src/datetimepicker">DateTimePicker</a>
+            <a href="src/timepicker">Time Picker</a>
         </td>
     </tr>
     <tr>
         <td>
-            <a href="src/timepicker">TimePicker</a>
+            <a href="src/gantt">Gantt Chart</a>
         </td>
         <td></td>
         <td></td>
@@ -202,34 +197,25 @@ https://cli.vuejs.org/guide/deployment.html
     </tr>
     <tr>
         <td>
-            <a href="src/button/default.vue">Button</a>
+            <a href="src/button">Button</a>
         </td>
         <td>
             <a href="src/button/button-group.vue">Button Group</a>
         </td>
         <td>
-            <a href="src/button/checkbox.vue">Checkbox</a>
+            <a href="src/button/dropdown-button.vue">Dropdown Menu</a>
         </td>
     </tr>
     <tr>
         <td>
-            <a href="src/button/radio-button.vue">Radio Button</a>
-        </td>
-        <td>
-            <a href="src/button/dropdown-button.vue">Dropdown Menu</a>
+            <a href="src/button/progress-button.vue">Progress Button</a>
         </td>
         <td>
             <a href="src/button/split-button.vue">Split Button</a>
         </td>
-    </tr>
-    <tr>
         <td>
-            <a href="src/button/switch.vue">Switch</a>
+             <a href="src/button/chips">Chips</a>
         </td>
-        <td>
-            <a href="src/button/progress-button.vue">Progress Button</a>
-        </td>
-        <td></td>
     </tr>
     <tr>
         <td colspan="3" rowspan="1">
@@ -248,13 +234,15 @@ https://cli.vuejs.org/guide/deployment.html
         </td>
     </tr>
     <tr>
+        <td>
+            <a href="src/drop-down-tree">Dropdown Tree</a>
+        </td>
         <td>
             <a href="src/multi-select">MultiSelect Dropdown</a>
         </td>
         <td>
             <a href="src/list-box">List Box</a>
         </td>
-        <td></td>
     </tr>
     <tr>
         <td colspan="3" rowspan="1">
@@ -269,40 +257,26 @@ https://cli.vuejs.org/guide/deployment.html
             <a href="src/context-menu">Context Menu</a>
         </td>
         <td>
-            <a href="src/file-manager">File Manager (Updated)</a>
+            <a href="src/menu">Menu Bar</a>
         </td>
     </tr>
     <tr>
-        <td>
-            <a href="src/menu">Menu Bar</a>
-        </td>
         <td>
             <a href="src/sidebar">Sidebar</a>
         </td>
         <td>
             <a href="src/tab">Tabs</a>
         </td>
-    </tr>
-    <tr>
         <td>
             <a href="src/toolbar">Toolbar</a>
         </td>
-        <td>
-            <a href="src/treeview">TreeView</a>
-        </td>
-        <td></td>
-    </tr>
-        <tr>
-        <td colspan="3" rowspan="1">
-            <b>NOTIFICATIONS<b>
-        </td>
     </tr>
     <tr>
         <td>
-            <a href="src/badge">Badge</a>
+            <a href="src/treeview">TreeView</a>
         </td>
         <td>
-            <a href="src/toast">Toast</a>
+            <a href="src/file-manager">File Manager</a>
         </td>
         <td></td>
     </tr>
@@ -323,15 +297,26 @@ https://cli.vuejs.org/guide/deployment.html
         </td>
     </tr>
     <tr>
+        <td>
+            <a href="src/button/radio-button.vue">Radio Button</a>
+        </td>
+        <td>
+            <a href="src/button/check-box.vue">Checkbox</a>
+        </td>
         <td>
             <a href="src/color-picker">Color Picker</a>
         </td>
+    </tr>
+    <tr>
         <td>
             <a href="src/uploader">File Upload</a>
         </td>
         <td>
             <a href="src/slider">Range Slider</a>
         </td>
+        <td>
+            <a href="src/button/switch.vue">Toggle Switch Button</a>
+        </td>
     </tr>
     <tr>
         <td colspan="3" rowspan="1">
@@ -346,47 +331,63 @@ https://cli.vuejs.org/guide/deployment.html
             <a href="src/card">Card</a>
         </td>
         <td>
-            <a href="src/dashboard-layout">Dashboard Layout</a>
+            <a href="src/dialog">Dialog</a>
         </td>
     </tr>
     <tr>
-        <td>
-            <a href="src/dialog">Dialog (Updated)</a>
-        </td>
         <td>
             <a href="src/listview">ListView</a>
         </td>
         <td>
             <a href="src/tooltip">Tooltip</a>
         </td>
+        <td>
+            <a href="src/splitter">Splitter</a>           
+        </td>
     </tr>
     <tr>
         <td>
-            <a href="src/splitter">Splitter</a>
+            <a href="src/dashboard-layout">Dashboard Layout</a>
         </td>
         <td></td>
         <td></td>
     </tr>
     <tr>
         <td colspan="3" rowspan="1">
-            <b>FORMS<b>
+            <b>NOTIFICATIONS<b>
         </td>
     </tr>
     <tr>
         <td>
-            <a href="src/query-builder">Query Builder</a>
+            <a href="src/badge">Badge</a>
+        </td>
+        <td>
+            <a href="src/toast">Toast</a>
+        </td>
+        <td>
+            <a href="src/progress-bar">Progress Bar</a>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="3" rowspan="1">
+            <b>VIEWER<b>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <a href="src/pdfviewer">PDF Viewer</a>
         </td>
         <td></td>
         <td></td>
     </tr>
     <tr>
         <td colspan="3" rowspan="1">
-            <b>VIEWER<b>
+            <b>FORMS<b>
         </td>
     </tr>
     <tr>
         <td>
-            <a href="src/pdfviewer">PDF Viewer (Updated)</a>
+            <a href="src/query-builder">Query Builder</a>
         </td>
         <td></td>
         <td></td>

build/samples.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var gulp = global.gulp = global.gulp || require('gulp');
-var config = { publishSamples: ["./**/*", "!./node_modules/**", "!./node_modules/", "!./samples-repo/**", "!./samples-repo/", "!./spec/**", "!./spec/", "!./test-report/**", "!./test-report/", "!Jenkinsfile", "!./production/**", "!./production/", "!./.gitignore", "!./!(system.config).{js,json}", "!./gulpfile.js", "!./tempFile", "!./**/*.{d.ts,md,markdown,txt,xml,scss,cmd,docx,tar,gz,zip,tgz,log}"] };
+var config = { publishSamples: ["./dist/**/*"] };
 var gzip = require('gulp-gzip');
 var shelljs = require('shelljs');
 var cdn = require('./cdn.js');

gulpfile.js

@@ -187,8 +187,16 @@ gulp.task('copy-source', function () {
     }
   }); 
 
+gulp.task('src-ship', function (done) {
+    var indexFile = fs.readFileSync('./dist/index.html','utf8');
+    indexFile = indexFile.replace(/\"\/app.js\"/g, `"./app.js"`);
+    fs.writeFileSync('./dist/index.html', indexFile, 'utf8');
+    shelljs.cp('-rf', ['./public', './**.config.js', './**.json', './src', './samples', './manifest.Webmanifest', './**.xml'], './dist/');
+    done();
+});
+
 gulp.task('build', function(done) {
-    shelljs.exec('gulp combine-samplelist && gulp generate-routes && gulp copy && gulp copy-source && npm run build', done)
+    shelljs.exec('gulp combine-samplelist && gulp generate-routes && gulp copy && gulp copy-source && npm run build && gulp src-ship', done)
 });
 
 gulp.task('serve',['build'], function(done) {

manifest.Webmanifest

@@ -27,4 +27,3 @@
         "id": "com.Syncfusion.ej2"
     }]
   }
-