Skip to content

Commit

Permalink
Merge pull request #340 from edx/alisan/remove-edx-icons-js
Browse files Browse the repository at this point in the history
Add ESlint and remove edx-icons afontgarde and modernizer files TNL-4902
  • Loading branch information
alisan617 committed Jul 11, 2016
2 parents 3754652 + 7a62539 commit 24334cf
Show file tree
Hide file tree
Showing 120 changed files with 244 additions and 3,605 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_preview_site
_site
node_modules
3 changes: 3 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "eslint-config-edx"
}
5 changes: 5 additions & 0 deletions gulp/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"no-console": "off"
}
}
3 changes: 3 additions & 0 deletions gulp/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ module.exports = {
demo_src: demoSrc + '/static/js',
demo_src_files: demoSrc + '/static/js/**/*.js'
},
exampleHtmlFiles: {
pldoc_src_files: pldocSrc + '/_includes/examples/*.html'
},
lib: {
// third party libraries
src: './node_modules'
Expand Down
2 changes: 1 addition & 1 deletion gulp/tasks/demo_scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var gulp = require('gulp'),
config = require('../config').scripts,
uglify = require('gulp-uglify');

gulp.task('demo-scripts', ['scripts-lint'], function() {
gulp.task('demo-scripts', ['lint'], function() {
return gulp.src([
// setup script sequence
config.demo_src + '/pattern-library.js'
Expand Down
2 changes: 1 addition & 1 deletion gulp/tasks/pldoc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var gulp = require('gulp'),
ghPages = require('gulp-gh-pages'),
runSequence = require('run-sequence');

gulp.task('pldoc-scripts', ['scripts-lint'], function() {
gulp.task('pldoc-scripts', ['lint'], function() {
return gulp.src([configScripts.pldoc_src + '/**.js'])
.pipe(uglify())
.pipe(browserSync.reload({stream: true}))
Expand Down
30 changes: 19 additions & 11 deletions gulp/tasks/scripts-lint.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
'use strict';
(function() {
'use strict';

var gulp = require('gulp'),
config = require('../config').scripts,
handleErrors = require('../util/handleErrors'),
merge = require('merge-stream');
var gulp = require('gulp'),
eslint = require('gulp-eslint'),
config = require('../config').scripts,
htmlFiles = require('../config').exampleHtmlFiles,
handleErrors = require('../util/handleErrors'),
merge = require('merge-stream');

gulp.task('scripts-lint', function() {
gulp.task('lint', function() {

var scripts = gulp.src(config.src_files),
pldocScripts = gulp.src(config.pldoc_src_files);
var scripts = gulp.src(config.src_files),
pldocScripts = gulp.src(config.pldoc_src_files),
pldocHtmlFiles = gulp.src(htmlFiles.pldoc_src_files);

return merge(scripts, pldocScripts)
.on('error', handleErrors);
});
return merge(scripts, pldocScripts, pldocHtmlFiles)
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failAfterError());
});

}());
2 changes: 1 addition & 1 deletion gulp/tasks/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var gulp = require('gulp'),
config = require('../config'),
uglify = require('gulp-uglify');

gulp.task('scripts', ['scripts-lint'], function() {
gulp.task('scripts', ['lint'], function() {
return gulp.src([
// setup script sequence
config.scripts.src + '/select-replace.js',
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@
"css-loader": "~0.23.1",
"del": "*",
"edx-ui-toolkit": "~1.4.1",
"eslint": "~2.13.1",
"eslint-config-edx": "~1.2.0",
"extract-text-webpack-plugin": "~1.0.1",
"file-loader": "0.8.5",
"font-awesome-loader": "0.0.1",
"gulp": "*",
"gulp-changed": "*",
"gulp-concat": "*",
"gulp-eslint": "^2.0.0",
"gulp-filesize": "*",
"gulp-filter": "*",
"gulp-gh-pages": "~0.5.4",
Expand All @@ -69,6 +72,7 @@
"scripts": {
"production": "gulp build-production",
"gulp": "gulp",
"development": "gulp build-development"
"development": "gulp build-development",
"lint": "gulp lint"
}
}
Binary file removed pattern-library/fonts/edx-icons/edx-icons.ttf
Binary file not shown.
Binary file removed pattern-library/fonts/edx-icons/edx-icons.woff
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/angle-up.svg

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/arrow-up.svg

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/book.svg

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/bullhorn.svg

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/calendar.svg

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/camera.svg

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/caret-up.svg

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/check.svg

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/circle.svg

This file was deleted.

1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/clock.svg

This file was deleted.

This file was deleted.

Diff not rendered.
1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/close.svg
Diff not rendered.
Diff not rendered.
1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/cog.svg
Diff not rendered.
1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/comment.svg
Diff not rendered.
1 change: 0 additions & 1 deletion pattern-library/fonts/edx-icons/fallback-img/comments.svg
Diff not rendered.
Loading

0 comments on commit 24334cf

Please sign in to comment.