Skip to content

Commit 276141c

Browse files
author
pipeline
committed
bug(EJ2-1948): Resolved build failures
1 parent 242de7c commit 276141c

20 files changed

+62
-521
lines changed

‎gulpfile.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gulp.task('scripts', function(done) {
1212
var ts = require('gulp-typescript');
1313
var tsProject = ts.createProject('tsconfig.json', { typescript: require('typescript') });
1414
var tsResult = gulp.src(['./src/**/*.ts', './spec/**/*.ts'], { base: '.' })
15-
.pipe(tsProject());
15+
.pipe(tsProject());
1616
tsResult.js
1717
.pipe(gulp.dest('./'))
1818
.on('end', function() {
@@ -69,7 +69,7 @@ gulp.task('test', function(done) {
6969
new karma.Server({
7070
configFile: __dirname + '/karma.conf.js',
7171
singleRun: true,
72-
browsers: ['Chrome'],
72+
browsers: ['PhantomJS'],
7373
browserNoActivityTimeout: 30000
7474
}, function(e) {
7575
done(e === 0 ? null : 'karma exited with status ' + e);
@@ -79,7 +79,7 @@ gulp.task('test', function(done) {
7979
/**
8080
* Load the samples
8181
*/
82-
gulp.task('serve', ['build'], function (done) {
82+
gulp.task('serve', ['build'], function(done) {
8383
var browserSync = require('browser-sync');
8484
var bs = browserSync.create('Essential JS 2');
8585
var options = {

‎karma.conf.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ module.exports = function (config) {
1616
'/src/': '/base/src/',
1717
'/src/common': '/base/src/common',
1818
'/node_modules/': '/base/node_modules/',
19-
'/styles/': '/base/styles/',
20-
'/showcase.html': '/base/showcase.html'
19+
'/styles/': '/base/styles/'
2120
},
2221

2322
// list of files / patterns to load in the browser
@@ -28,13 +27,10 @@ module.exports = function (config) {
2827
{ pattern: "src/common.min.js", included: true },
2928
{ pattern: "spec/**/*.spec.js", included: false },
3029
{ pattern: "node_modules/@syncfusion/ej2-base/**/*.js", included: false },
31-
{ pattern: "node_modules/bootstrap/dist/css/bootstrap.min.css", included: false },
3230
{ pattern: 'node_modules/es6-promise/dist/es6-promise.js', included: false },
33-
{ pattern: "404.html", included: false },
3431
{ pattern: "styles/index.css", included: true },
3532
{ pattern: "styles/material.css", included: false },
36-
{ pattern: "index.html", included: false },
37-
{ pattern: "showcase.html", included: false },
33+
{ pattern: "index.html", included: false }
3834
],
3935

4036

‎package.json‎

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,57 @@
11
{
2-
"name": "@syncfusion/ej2-samples",
3-
"version": "0.0.1",
4-
"description": "Samples for Syncfusion Essential JS 2",
5-
"author": "Syncfusion Inc.",
6-
"license": "SEE LICENSE IN license",
7-
"dependencies": {
8-
"@syncfusion/ej2": "*",
9-
"@syncfusion/ej2-base": "*",
10-
"@syncfusion/ej2-buttons": "*",
11-
"@syncfusion/ej2-lists": "*",
12-
"@syncfusion/ej2-grids": "*",
13-
"@syncfusion/ej2-calendars": "*",
14-
"@syncfusion/ej2-inputs": "*",
15-
"@syncfusion/ej2-popups": "*",
16-
"@syncfusion/ej2-dropdowns": "*",
17-
"@syncfusion/ej2-charts": "*",
18-
"@syncfusion/ej2-navigations": "*",
19-
"crossroads": "^0.12.2",
20-
"hasher": "^1.2.0"
21-
},
22-
"devDependencies": {
23-
"@types/chai": "^3.4.28",
24-
"@types/crossroads": "0.0.28",
25-
"@types/es6-promise": "0.0.28",
26-
"@types/hasher": "0.0.27",
27-
"@types/highlight.js": "^9.1.7",
28-
"@types/jasmine": "^2.2.29",
29-
"@types/jasmine-ajax": "^3.1.27",
30-
"@types/requirejs": "^2.1.26",
31-
"@types/signals": "0.0.16",
32-
"es6-promise": "^3.2.1",
33-
"gulp": "^3.9.1",
34-
"gulp-sass": "^3.1.0",
35-
"gulp-typescript": "^3.1.6",
36-
"requirejs": "^2.3.3",
37-
"typescript": "2.2.2",
38-
"browser-sync": "2.11.2",
39-
"jasmine-ajax": "^3.3.1",
40-
"jasmine-core": "^2.6.1",
41-
"karma": "^1.7.0",
42-
"karma-generic-preprocessor": "^1.1.0",
43-
"karma-htmlfile-reporter": "^0.3.5",
44-
"karma-jasmine": "^1.1.0",
45-
"karma-jasmine-ajax": "^0.1.13",
46-
"karma-phantomjs-launcher": "^1.0.4",
47-
"karma-requirejs": "^1.1.0",
2+
"name": "@syncfusion/ej2-samples",
3+
"version": "1.0.0",
4+
"description": "Samples for Syncfusion Essential JS 2",
5+
"author": "Syncfusion Inc.",
6+
"license": "SEE LICENSE IN license",
7+
"dependencies": {
8+
"@syncfusion/ej2": "*",
9+
"@syncfusion/ej2-base": "*",
10+
"@syncfusion/ej2-buttons": "*",
11+
"@syncfusion/ej2-lists": "*",
12+
"@syncfusion/ej2-grids": "*",
13+
"@syncfusion/ej2-calendars": "*",
14+
"@syncfusion/ej2-inputs": "*",
15+
"@syncfusion/ej2-popups": "*",
16+
"@syncfusion/ej2-charts": "*",
17+
"@syncfusion/ej2-navigations": "*",
18+
"crossroads": "^0.12.2",
19+
"hasher": "^1.2.0"
20+
},
21+
"devDependencies": {
22+
"@types/chai": "^3.4.28",
23+
"@types/crossroads": "0.0.28",
24+
"@types/es6-promise": "0.0.28",
25+
"@types/hasher": "0.0.27",
26+
"@types/highlight.js": "^9.1.7",
27+
"@types/jasmine": "^2.2.29",
28+
"@types/jasmine-ajax": "^3.1.27",
29+
"@types/requirejs": "^2.1.26",
30+
"@types/signals": "0.0.16",
31+
"es6-promise": "^3.2.1",
32+
"gulp": "^3.9.1",
33+
"gulp-sass": "^3.1.0",
34+
"gulp-typescript": "^3.1.6",
35+
"requirejs": "^2.3.3",
36+
"typescript": "2.2.2",
37+
"browser-sync": "2.11.2",
38+
"jasmine-ajax": "^3.3.1",
39+
"jasmine-core": "^2.6.1",
40+
"karma": "^0.13.2",
41+
"karma-phantomjs-launcher": "^1.0.4",
42+
"karma-generic-preprocessor": "^1.1.0",
43+
"karma-htmlfile-reporter": "^0.2.2",
44+
"karma-jasmine": "^0.3.6",
45+
"karma-jasmine-ajax": "^0.1.13",
46+
"karma-requirejs": "^0.2.6",
4847
"phantomjs-prebuilt": "^2.1.14",
49-
"run-sequence": "^1.2.2",
50-
"webpack": "2.5.1",
51-
"webpack-stream": "^3.2.0"
52-
},
53-
"scripts": {
54-
"build": "gulp build",
55-
"serve": "gulp serve",
56-
"test": "gulp test"
57-
}
48+
"run-sequence": "^1.2.2",
49+
"webpack": "2.5.1",
50+
"webpack-stream": "^3.2.0"
51+
},
52+
"scripts": {
53+
"build": "gulp build",
54+
"serve": "gulp serve",
55+
"test": "gulp test"
56+
}
5857
}

‎spec/samplebrowser.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ describe('sample browser', (): void => {
1919

2020
let samples: any = samplesList;
2121
beforeAll((done: Function) => {
22-
let ajax: Ajax = new Ajax('../../base/index.html', 'GET', true);
22+
let ajax: Ajax = new Ajax('../base/index.html', 'GET', true);
2323
ajax.send().then((value: Object): void => {
2424
document.body.innerHTML = document.body.innerHTML + value.toString();
2525
require(
26-
['../../src/common/index.min'],
26+
['../src/common/index.min'],
2727
(): void => {
2828
done();
2929
});

‎src/dropdownlist/cascading.html‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/dropdownlist/cascading.ts‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎src/dropdownlist/default.html‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/dropdownlist/default.ts‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/dropdownlist/grouping.html‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/dropdownlist/grouping.ts‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)