Skip to content

Commit

Permalink
Bump shelljs and gulp-eslint (#356)
Browse files Browse the repository at this point in the history
* Bump shelljs and gulp-eslint

Removes [shelljs](https://github.com/shelljs/shelljs). It's no longer used after updating ancestor dependency [gulp-eslint](https://github.com/adametry/gulp-eslint). These dependencies need to be updated together.


Removes `shelljs`

Updates `gulp-eslint` from 3.0.1 to 6.0.0
- [Release notes](https://github.com/adametry/gulp-eslint/releases)
- [Changelog](https://github.com/adametry/gulp-eslint/blob/master/CHANGELOG.md)
- [Commits](adametry/gulp-eslint@v3.0.1...v6.0.0)

---
updated-dependencies:
- dependency-name: shelljs
  dependency-type: indirect
- dependency-name: gulp-eslint
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: Updated dependency gulp-eslint

Removes babel dependencies

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yann イーベス Eves <hello@yanneves.com>
  • Loading branch information
dependabot[bot] and yanneves authored Oct 16, 2023
1 parent 2b54f51 commit 0953329
Show file tree
Hide file tree
Showing 8 changed files with 5,340 additions and 6,480 deletions.
3 changes: 0 additions & 3 deletions .babelrc

This file was deleted.

1 change: 0 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"parser": "babel-eslint",
"extends": "eslint:recommended",
"rules": {
"no-unused-vars": 0,
Expand Down
19 changes: 8 additions & 11 deletions _assets/scripts/lanyrd.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Released under the MIT License
* More Information: https://github.com/dharmafly/lanyrd.js
*/
(function( _lanyrd, jQuery, module, undefined ) {
(function( _lanyrd, jQuery, module ) {
"use strict";

var config, utils, lanyrd, parseUrl;
Expand All @@ -32,7 +32,7 @@
}
} else {
for ( index in items ) {
if ( items.hasOwnProperty( index ) ) {
if ( Object.prototype.hasOwnProperty.call( items, index ) ) {
item = items[ index ];
fn.call( context || item, item, index, items );
}
Expand Down Expand Up @@ -80,7 +80,7 @@
for ( ; index < count; index += 1 ) {
object = objects[ index ];
for ( property in object ) {
if ( object.hasOwnProperty( property ) ) {
if ( Object.prototype.hasOwnProperty.call( object, property ) ) {
target[ property ] = object[ property ];
}
}
Expand Down Expand Up @@ -189,7 +189,7 @@
while ( object && keys.length ) {
key = keys.shift();

if ( object.hasOwnProperty( key ) || (prototype === true && object[ key ] !== undefined) ) {
if ( Object.prototype.hasOwnProperty.call( object, key ) || (prototype === true && object[ key ] !== undefined) ) {
object = object[ key ];

if ( keys.length === 0 && object !== undefined ) {
Expand Down Expand Up @@ -614,13 +614,10 @@

// _.each
var breaker = {},
AP = Array.prototype,
OP = Object.prototype,

hasOwn = OP.hasOwnProperty,
toString = OP.toString,
forEach = AP.forEach,
slice = AP.slice;
hasOwn = Object.prototype.hasOwnProperty,
toString = Object.prototype.toString,
forEach = Array.prototype.forEach,
slice = Array.prototype.slice;

var _each = function( obj, iterator, context ) {
var key, i, l;
Expand Down
2 changes: 1 addition & 1 deletion _assets/scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if ( document.querySelectorAll ) {
function setupLanyrd( lanyrd ) {
var event, target, url, container, upcoming, eventUrlRegex;

eventUrlRegex = /^\s*https?:\/\/(?:www.)?lanyrd.com\/\d{4}\/[a-z0-9\-]+\/\s*$/;
eventUrlRegex = /^\s*https?:\/\/(?:www.)?lanyrd.com\/\d{4}\/[a-z0-9-]+\/\s*$/;
event = document.querySelector( ".event-detail" );
if ( event ) {
target = event.querySelector( ".lanyrd-link" );
Expand Down
2 changes: 0 additions & 2 deletions _tasks/assets/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const path = require('path')
const gulp = require('gulp')
const eslint = require('gulp-eslint')
const jscs = require('gulp-jscs')
const babel = require('gulp-babel')
const uglify = require('gulp-uglify')
const sourcemaps = require('gulp-sourcemaps')

Expand All @@ -27,7 +26,6 @@ function buildScripts(cb) {

gulp.src(scripts.glob)
.pipe(sourcemaps.init())
// .pipe(babel())
.pipe(uglify())
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest(path.join(dist.dir, 'js/')))
Expand Down
11 changes: 0 additions & 11 deletions _tasks/assets/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,19 @@ const path = require('path')
const gulp = require('gulp')
const sass = require('gulp-sass')(require('sass'))
const autoprefixer = require('gulp-autoprefixer')
const scsslint = require('gulp-scss-lint')
// const uncss = require('gulp-uncss')
const cssnano = require('gulp-cssnano')
const sourcemaps = require('gulp-sourcemaps')
const { styles, dist } = require('../../paths.json')

function lintStyles() {

return gulp.src(styles.glob)
.pipe(scsslint())
.pipe(scsslint.failReporter())
}

function buildStyles() {

return gulp.src(styles.glob)
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
.pipe(autoprefixer({ browsers: ['> 1%'], cascade: false }))
// .pipe(uncss({ html: [path.join(dist.dir, '**/*.html')] }))
.pipe(cssnano())
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest(path.join(dist.dir, 'css/')))
}

// module.exports = gulp.series([lintStyles, buildStyles])
module.exports = gulp.series(buildStyles)
Loading

0 comments on commit 0953329

Please sign in to comment.