Skip to content

Commit

Permalink
πŸ‘” install eslint; run eslint . --fix
Browse files Browse the repository at this point in the history
πŸ‘” fix lints
  • Loading branch information
desandro committed Dec 6, 2020
1 parent 7270f45 commit 4fa704a
Show file tree
Hide file tree
Showing 27 changed files with 405 additions and 383 deletions.
20 changes: 20 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* eslint-env node */

module.exports = {
plugins: [ 'metafizzy' ],
extends: 'plugin:metafizzy/browser',
env: {
browser: true,
commonjs: true,
},
parserOptions: {
ecmaVersion: 2018,
},
globals: {
InfiniteScroll: 'readonly',
QUnit: 'readonly',
define: 'readonly',
},
rules: {
},
};
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14
73 changes: 36 additions & 37 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
/*jshint node: true, strict: false */
/* eslint-env node */

var fs = require('fs');
var gulp = require('gulp');
var rename = require('gulp-rename');
var replace = require('gulp-replace');
let fs = require('fs');
let gulp = require('gulp');
let rename = require('gulp-rename');
let replace = require('gulp-replace');

// ----- hint ----- //

var jshint = require('gulp-jshint');
let jshint = require('gulp-jshint');

gulp.task( 'hint-js', function() {
return gulp.src('js/**/*.js')
.pipe( jshint() )
.pipe( jshint.reporter('default') );
});
} );

gulp.task( 'hint-test', function() {
return gulp.src('test/unit/*.js')
.pipe( jshint() )
.pipe( jshint.reporter('default') );
});
} );

gulp.task( 'hint-task', function() {
return gulp.src('gulpfile.js')
.pipe( jshint() )
.pipe( jshint.reporter('default') );
});
} );

var jsonlint = require('gulp-json-lint');
let jsonlint = require('gulp-json-lint');

gulp.task( 'jsonlint', function() {
return gulp.src( '*.json' )
return gulp.src('*.json')
.pipe( jsonlint() )
.pipe( jsonlint.report('verbose') );
});
} );

gulp.task( 'hint', [ 'hint-js', 'hint-test', 'hint-task', 'jsonlint' ]);
gulp.task( 'hint', [ 'hint-js', 'hint-test', 'hint-task', 'jsonlint' ] );

// -------------------------- RequireJS makes pkgd -------------------------- //

var gutil = require('gulp-util');
var chalk = require('chalk');
var rjsOptimize = require('gulp-requirejs-optimize');
let gutil = require('gulp-util');
let chalk = require('chalk');
let rjsOptimize = require('gulp-requirejs-optimize');

// regex for banner comment
var reBannerComment = new RegExp('^\\s*(?:\\/\\*[\\s\\S]*?\\*\\/)\\s*');
let reBannerComment = new RegExp('^\\s*(?:\\/\\*[\\s\\S]*?\\*\\/)\\s*');

function getBanner() {
var src = fs.readFileSync( 'js/index.js', 'utf8' );
var matches = src.match( reBannerComment );
var banner = matches[0].replace( 'Infinite Scroll', 'Infinite Scroll PACKAGED' );
let src = fs.readFileSync( 'js/index.js', 'utf8' );
let matches = src.match( reBannerComment );
let banner = matches[0].replace( 'Infinite Scroll', 'Infinite Scroll PACKAGED' );
return banner;
}

Expand All @@ -58,8 +58,8 @@ function addBanner( str ) {
}

gulp.task( 'requirejs', function() {
var banner = getBanner();
var definitionRE = /define\(\s*'infinite-scroll\/js\/index'(.|\n)+\],\s*factory/;
let banner = getBanner();
let definitionRE = /define\(\s*'infinite-scroll\/js\/index'(.|\n)+\],\s*factory/;
// HACK src is not needed
// should refactor rjsOptimize to produce src
return gulp.src('js/index.js')
Expand All @@ -69,52 +69,51 @@ gulp.task( 'requirejs', function() {
include: [
'jquery-bridget/jquery-bridget',
'infinite-scroll/js/index',
'imagesloaded/imagesloaded'
'imagesloaded/imagesloaded',
],
paths: {
'infinite-scroll': '../',
jquery: 'empty:'
}
jquery: 'empty:',
},
}) )
// munge AMD definition
.pipe( replace( definitionRE, function( definition ) {
// remove named module
return definition.replace( "'infinite-scroll/js/index',", '' )
// use explicit file paths, './history' -> 'infinite-scroll/js/history'
.replace( /'.\//g, "'infinite-scroll/js/" );
}) )
} ) )
// add banner
.pipe( addBanner( banner ) )
.pipe( rename('infinite-scroll.pkgd.js') )
.pipe( gulp.dest('dist') );
});

} );

// ----- uglify ----- //

var uglify = require('gulp-uglify');
let uglify = require('gulp-uglify');

gulp.task( 'uglify', [ 'requirejs' ], function() {
var banner = getBanner();
let banner = getBanner();
gulp.src('dist/infinite-scroll.pkgd.js')
.pipe( uglify() )
// add banner
.pipe( addBanner( banner ) )
.pipe( rename('infinite-scroll.pkgd.min.js') )
.pipe( gulp.dest('dist') );
});
} );

// ----- version ----- //

// set version in source files

var minimist = require('minimist');
let minimist = require('minimist');

// use gulp version -t 1.2.3
gulp.task( 'version', function() {
var args = minimist( process.argv.slice(3) );
var version = args.t;
if ( !version || !/\d\.\d\.\d/.test( version ) ) {
let args = minimist( process.argv.slice( 3 ) );
let version = args.t;
if ( !version || !( /\d\.\d\.\d/ ).test( version ) ) {
gutil.log( 'invalid version: ' + chalk.red( version ) );
return;
}
Expand All @@ -127,11 +126,11 @@ gulp.task( 'version', function() {
gulp.src('package.json')
.pipe( replace( /"version": "\d\.\d+\.\d+"/, '"version": "' + version + '"' ) )
.pipe( gulp.dest('.') );
});
} );

// ----- default ----- //

gulp.task( 'default', [
'hint',
'uglify',
]);
] );
20 changes: 9 additions & 11 deletions js/button.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
// button
( function( window, factory ) {
// universal module definition
/* globals define, module, require */
if ( typeof define == 'function' && define.amd ) {
// AMD
define( [
'./core',
'fizzy-ui-utils/utils',
], function( InfiniteScroll, utils ) {
return factory( window, InfiniteScroll, utils );
});
} );
} else if ( typeof module == 'object' && module.exports ) {
// CommonJS
module.exports = factory(
window,
require('./core'),
require('fizzy-ui-utils')
window,
require('./core'),
require('fizzy-ui-utils'),
);
} else {
// browser global
factory(
window,
window.InfiniteScroll,
window.fizzyUIUtils
window,
window.InfiniteScroll,
window.fizzyUIUtils,
);
}

Expand All @@ -31,10 +30,9 @@
// InfiniteScroll.defaults.button = null;

InfiniteScroll.create.button = function() {
var buttonElem = utils.getQueryElement( this.options.button );
let buttonElem = utils.getQueryElement( this.options.button );
if ( buttonElem ) {
this.button = new InfiniteScrollButton( buttonElem, this );
return;
}
};

Expand Down Expand Up @@ -85,4 +83,4 @@ InfiniteScroll.Button = InfiniteScrollButton;

return InfiniteScroll;

}));
} ) );
Loading

0 comments on commit 4fa704a

Please sign in to comment.