Skip to content

Commit b01888a

Browse files
ajithrajithr
authored
Merge pull request #23 from jesusarockias/master
gulp version updating
2 parents e8388c2 + 8c317ac commit b01888a

File tree

132 files changed

+407
-7342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+407
-7342
lines changed

‎config.json

Lines changed: 3 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,4 @@
1-
{
2-
"styleDependency": [
3-
"ej2"
4-
],
5-
"ts": [
6-
"./src/**/*.tsx",
7-
"./src/**/*.ts",
8-
"!./node_modules/**/*.ts",
9-
"!./node_modules/**/*.tsx"
10-
],
11-
"platform": "react",
12-
"customNames": [
13-
"config",
14-
"toolbar",
15-
"ajax",
16-
"popup",
17-
"textboxes",
18-
"uploader",
19-
"preload",
20-
"api",
21-
"maskedtextbox",
22-
"numerictextbox",
23-
null,
24-
"dialog",
25-
"blog",
26-
"draggable",
27-
"inline",
28-
"heatmap",
29-
"json",
30-
"tooltip",
31-
"swipeable",
32-
"treeview",
33-
"datasource",
34-
"timeline",
35-
"bpmn",
36-
"fishbone",
37-
"venn",
38-
"gauge",
39-
"sparkline",
40-
"treemap",
41-
"drilldown",
42-
"custom",
43-
"code",
44-
"embedly",
45-
"image",
46-
"bollinger",
47-
"hilo",
48-
"100",
49-
"doughnut",
50-
"apis",
51-
"tooltip-customization",
52-
"html-content",
53-
"ajaxcontent",
54-
"smartposition",
55-
"tooltip-sample",
56-
"tooltip-menu",
57-
"virtualization",
58-
"newsData",
59-
"rtl",
60-
"callhistory",
61-
"groupTemplate",
62-
"listview",
63-
"customization",
64-
"africa",
65-
"continent",
66-
"asia",
67-
"australia",
68-
"california",
69-
"countriesdata",
70-
"europe",
71-
"germany",
72-
"india",
73-
"population",
74-
"north",
75-
"america",
76-
"oceania",
77-
"okalahoma",
78-
"sydney",
79-
"texas",
80-
"uno",
81-
"courtries",
82-
"usa",
83-
"seatSelection",
84-
"datepicker",
85-
"daterangepicker",
86-
"datetimepicker",
87-
"timepicker",
88-
"smithchart",
89-
"pareto",
90-
"html",
91-
"inplace-editor",
92-
"dropdowns",
93-
"inplace",
94-
"pdf",
95-
"aspnet",
96-
"aspnetmvc",
97-
"javascript",
98-
"listData",
99-
"olap",
100-
"kanban",
101-
"islamic",
102-
"calendar",
103-
"daterange",
104-
"monthpicker",
105-
"dayspan",
106-
"monthrangepicker",
107-
"multiline",
108-
"swimlane-template",
109-
"swimlane",
110-
"wip-validation",
111-
"wip",
112-
"validation",
113-
"csvData",
114-
"progressbar",
115-
null
116-
]
1+
{
2+
"styleDependency":["ej2"],
3+
"ts": ["./src/**/*.tsx","./src/**/*.ts", "!./node_modules/**/*.ts","!./node_modules/**/*.tsx"]
1174
}

‎gulpfile.js

Lines changed: 40 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var glob = require('glob');
88
var fs = require('fs');
99
var configRegex = /\[(.*)\]/;
1010
var shelljs = require('shelljs');
11-
var runSequence = require('run-sequence');
11+
var runSequence = require('gulp4-run-sequence');
1212

1313
function extend(copied, first, second, deep) {
1414
var result = copied || {};
@@ -49,7 +49,7 @@ function isObject(obj) {
4949
return value === undefined || value === null;
5050
}
5151

52-
gulp.task('scripts', function (done) {
52+
gulp.task('scripts', gulp.series(function (done) {
5353
var ts = require('gulp-typescript');
5454
var tsProject = ts.createProject('tsconfig.json', { typescript: require('typescript') });
5555

@@ -59,8 +59,8 @@ gulp.task('scripts', function (done) {
5959
.on('end', function () {
6060
done();
6161
});
62-
});
63-
gulp.task('create-locale', function () {
62+
}));
63+
gulp.task('create-locale', gulp.series(function (done) {
6464
var localeJson = glob.sync('./src/**/locale.json', { silent: true });
6565
if(localeJson.length) {
6666
// baseUtil;
@@ -73,21 +73,27 @@ gulp.task('create-locale', function () {
7373
} else {
7474
fs.writeFileSync('./src/common/locale-string.ts', 'export let Locale: Object={};');
7575
}
76-
})
76+
done();
77+
}));
7778

78-
gulp.task('serve', function () {
79+
gulp.task('serve', gulp.series(function () {
7980
shelljs.exec('node --max-old-space-size=8192 node_modules/gulp/bin/gulp serve-max', { silent: false });
80-
});
81+
}));
8182

8283
/**
8384
* Compile styles
8485
*/
85-
gulp.task('styles', function () {
86-
gulp.src('./node_modules/@syncfusion/ej2/*.css')
87-
.pipe(gulp.dest('./styles/'));
88-
});
86+
gulp.task('styles', gulp.series(function () {
87+
var sass = require('gulp-sass');
88+
return gulp.src(['./**/*.scss', '!./node_modules/**/*.scss'], { base: './' })
89+
.pipe(sass({
90+
outputStyle: 'expanded',
91+
includePaths: './node_modules/@syncfusion/'
92+
}))
93+
.pipe(gulp.dest('.'));
94+
}));
8995

90-
gulp.task('generate-router', function (done) {
96+
gulp.task('generate-router', gulp.series(function (done) {
9197
var imports = '';
9298
var compRoutes = '';
9399
var allconfig = '';
@@ -170,24 +176,26 @@ gulp.task('generate-router', function (done) {
170176
fs.writeFileSync('./src/common/all-routes.tsx',allroutes);
171177
fs.writeFileSync('./src/common/search-index.json', JSON.stringify(instance.toJSON()));
172178
done();
173-
});
174-
gulp.task('build', function (done) {
175-
if( shelljs.exec('node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js react-build').code!==0){
179+
}));
180+
gulp.task('build', gulp.series(function (done) {
181+
// var sValue = shelljs.exec('node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js react-build', { silent: true });
182+
if( shelljs.exec('node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js react-build').code !==0){
176183
process.exit(1);
177184
}
178-
});
185+
done();
186+
}));
179187

180-
gulp.task('react-build', function (done) {
181-
runSequence('create-locale','generate-router','styles','scripts','bundle','plnkr-json', done);
182-
});
188+
gulp.task('react-build', gulp.series(function (done) {
189+
runSequence('create-locale','generate-router','styles','scripts','bundle','plnkr-json','cssfile', done);
190+
}));
183191

184-
gulp.task('bundle', function () {
192+
gulp.task('bundle', gulp.series(function () {
185193
return gulp.src("./src/common/index.js")
186194
.pipe(gulpWebpack(webpackConfig,webpack))
187195
.pipe(gulp.dest('dist/'));
188-
});
196+
}));
189197

190-
gulp.task('plnkr-json', function() {
198+
gulp.task('plnkr-json', gulp.series(function(done) {
191199
var files = glob.sync('./src/**/*.tsx', { silent: true, ignore: [
192200
'./src/common/**/*.tsx', './src/**/*-routes.tsx', './src/**/config.tsx'] });
193201
var sys = fs.readFileSync('./src/common/plnk-template/systemjs.config.js','utf8');
@@ -323,7 +331,8 @@ gulp.task('plnkr-json', function() {
323331
}
324332

325333
}
326-
});
334+
done();
335+
}));
327336
function getStringWithOutDescription(code, descRegex) {
328337
var lines = code.split('\n');
329338
var desStartLine = null;
@@ -351,7 +360,7 @@ function getStringWithOutDescription(code, descRegex) {
351360
}
352361
return lines.join('\n');
353362
}
354-
gulp.task('serve-max', ['react-build'], function (done) {
363+
gulp.task('serve-max', gulp.series('react-build', function (done) {
355364
var browserSync = require('browser-sync');
356365
var bs = browserSync.create('Essential JS 2 react');
357366
var options = {
@@ -361,5 +370,11 @@ gulp.task('serve-max', ['react-build'], function (done) {
361370
ui: false
362371
};
363372
bs.init(options, done);
364-
});
373+
}));
374+
375+
gulp.task('cssfile', gulp.series(function (done) {
376+
gulp.src('./node_modules/@syncfusion/ej2/*.css')
377+
.pipe(gulp.dest('./styles/'));
378+
done();
379+
}));
365380

‎index.html

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,11 @@
1717
<link rel="manifest" href="./manifest.webmanifest">
1818
<link href="src/common/lib/content/roboto.css" rel="stylesheet">
1919
<link href="src/common/lib/content/bootstrap.min.css" rel="stylesheet" />
20-
<link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet"></link>
2120
<link rel="shortcut icon" href="favicon.ico" />
2221
<style id="themelink"></style>
2322
<link rel="stylesheet" type="text/css" href="./styles/index.css" />
2423
<link rel="stylesheet" type="text/css" href="./src/common/lib/highlightjs/styles/default.css" />
2524
<link href="src/common/lib/content/codemirror.css" rel="stylesheet"></link>
26-
<script>
27-
var orgin = location.origin;
28-
var baseref = location.href.split('#')[0].replace(orgin, '');
29-
if (baseref.charAt(baseref.length - 1) !== '/') {
30-
baseref += '/';
31-
}
32-
document.write('<base href="' + baseref + '">');
33-
</script>
3425
<script type="text/javascript">
3526
if (/MSIE \d|Trident.*rv:/.test(navigator.userAgent)) {
3627
document.write('<script src="src/common/lib/content/bluebird.min.js"><\/script>');
@@ -127,14 +118,9 @@
127118
<div class='sb-header-item sb-table-cell sb-download-wrapper'>
128119
<a href='https://www.syncfusion.com/downloads/react' target="_blank">
129120
<button id='download-now' class='sb-download-btn'>
130-
<span class='sb-download-text'>FREE TRIAL</span>
131-
</button>
132-
</a>
133-
<a href='https://www.npmjs.com/search?q=ej2-react' target="_blank">
134-
<button class='sb-npm-btn'>
135-
<img class="npm-svg" src="styles/images/NPM.svg" alt="npm icon"></span><span class="doc-npm-link">Install NPM</span>
121+
<span class='sb-download-text'>Download Now</span>
136122
</button>
137-
</a>
123+
</a>
138124
</div>
139125
</div>
140126

@@ -283,38 +269,6 @@ <h1 class='sb-sample-text'></h1>
283269
<div id='tab-component'></div>
284270
<div class='description-section sb-rightpane-padding'>
285271
</div>
286-
<div class="ad-wrapper">
287-
<div id='ad-image' class="ad-img">
288-
<div class="row">
289-
<div class="col-sm-12">
290-
<div class="col-sm-12">
291-
<div id="ad-banner-head" class="ad-header">Transform your React web apps today with Syncfusion React components</div>
292-
</div>
293-
<div class="col-sm-12 cnt-area">
294-
<div class="ad-cnt-area">
295-
<div class="ad-cnt-pt">
296-
<div class="ad-cnt-icon click-icon sb-icons sb-icon-icon-selection"></div>
297-
<div class="cnt-text">65+ high-performance and responsive UI components</div>
298-
</div>
299-
<div class="ad-cnt-pt">
300-
<div class="ad-cnt-icon click-icon sb-icons sb-icon-icon-selection"></div>
301-
<div class="cnt-text">Dedicated support</div>
302-
</div>
303-
<div class="ad-cnt-pt">
304-
<div class="ad-cnt-icon click-icon sb-icons sb-icon-icon-selection"></div>
305-
<div class="cnt-text">Hassle-free licensing</div>
306-
</div>
307-
</div>
308-
<a style="color:#ffff;text-decoration:none;"
309-
href="https://www.syncfusion.com/downloads/react">
310-
<div class="free-trial">TRY IT FOR FREE</div>
311-
</a>
312-
</div>
313-
</div>
314-
315-
</div>
316-
</div>
317-
</div>
318272
<div class="sb-footer">
319273
<div class="sb-footer-left">
320274
<div class="sb-footer-links">
@@ -378,7 +332,6 @@ <h1 class='sb-sample-text'></h1>
378332
<div class='sb-api-content'>${description}</div>
379333
</div>
380334
</script>
381-
<script src="./dist/0.bundle.js"></script>
382335
<script src="./dist/bundle.js"></script>
383336

384337
</body>

0 commit comments

Comments
 (0)