Skip to content

Commit

Permalink
chore: use typescript-eslint instead of deprecated tslint (#1685)
Browse files Browse the repository at this point in the history
  • Loading branch information
limonte committed Jul 21, 2019
1 parent cb3e498 commit 1563d65
Show file tree
Hide file tree
Showing 6 changed files with 972 additions and 994 deletions.
13 changes: 11 additions & 2 deletions .eslintrc.js
@@ -1,19 +1,28 @@
module.exports = {
parser: '@typescript-eslint/parser',
env: {
browser: true,
node: true,
commonjs: true,
es6: true
},
extends: 'standard',
extends: [
'standard',
'plugin:@typescript-eslint/recommended'
],
plugins: [
'import'
],
parserOptions: {
ecmaVersion: 8,
ecmaVersion: 2018,
sourceType: 'module'
},
rules: {
'@typescript-eslint/indent': ['error', 2],
'@typescript-eslint/no-use-before-define': 0,
'@typescript-eslint/no-var-requires': 0,
'@typescript-eslint/no-empty-interface': 0,
'@typescript-eslint/no-explicit-any': 0,
'comma-dangle': 0,
'complexity': ['error', { max: 10 }],
'import/extensions': ['error', 'always'],
Expand Down
17 changes: 2 additions & 15 deletions gulpfile.js
Expand Up @@ -8,8 +8,6 @@ const css2js = require('gulp-css2js')
const concat = require('gulp-concat')
const autoprefixer = require('gulp-autoprefixer')
const cleanCss = require('gulp-clean-css')
const typescript = require('gulp-typescript')
const tslint = require('gulp-tslint')
const eslint = require('gulp-eslint')
const stylelint = require('gulp-stylelint')
const babel = require('rollup-plugin-babel')
Expand All @@ -28,10 +26,9 @@ const banner = `/*!
* Released under the ${packageJson.license} License.
*/`

const allScriptFiles = ['**/*.js', '!dist/**', '!node_modules/**']
const allScriptFiles = ['**/*.js', 'sweetalert2.d.ts', '!dist/**', '!node_modules/**']
const srcScriptFiles = ['src/**/*.js']
const srcStyleFiles = ['src/**/*.scss']
const tsFiles = ['sweetalert2.d.ts']

const continueOnError = process.argv.includes('--continue-on-error')
const skipMinification = process.argv.includes('--skip-minification')
Expand Down Expand Up @@ -155,16 +152,7 @@ gulp.task('lint:styles', () => {
}))
})

gulp.task('lint:ts', () => {
return gulp.src(tsFiles)
.pipe(typescript({ lib: ['es6', 'dom'] }))
.pipe(tslint({ formatter: 'verbose' }))
.pipe(tslint.report({
emitError: !continueOnError
}))
})

gulp.task('lint', gulp.parallel('lint:scripts', 'lint:styles', 'lint:ts'))
gulp.task('lint', gulp.parallel('lint:scripts', 'lint:styles'))

// ---

Expand All @@ -176,7 +164,6 @@ gulp.task('develop', gulp.series(
gulp.watch(srcStyleFiles, gulp.parallel('build:styles'))
gulp.watch(allScriptFiles, gulp.parallel('lint:scripts'))
gulp.watch(srcStyleFiles, gulp.parallel('lint:styles'))
gulp.watch(tsFiles, gulp.parallel('lint:ts'))
},
async function sandbox () {
browserSync.init({
Expand Down
7 changes: 3 additions & 4 deletions package.json
Expand Up @@ -14,6 +14,8 @@
"@babel/preset-env": "^7.3.1",
"@sweetalert2/execute": "^1.0.0",
"@sweetalert2/stylelint-config": "^1.1.5",
"@typescript-eslint/eslint-plugin": "^1.12.0",
"@typescript-eslint/parser": "^1.12.0",
"babel-loader": "^8.0.4",
"babel-plugin-array-includes": "^2.0.3",
"browser-sync": "^2.26.3",
Expand All @@ -36,8 +38,6 @@
"gulp-rename": "^1.2.2",
"gulp-rollup": "^2.16.2",
"gulp-stylelint": "^9.0.0",
"gulp-tslint": "^8.1.2",
"gulp-typescript": "^5.0.0",
"gulp-uglify": "^3.0.0",
"jquery": "^3.3.1",
"karma": "^4.0.0",
Expand All @@ -60,8 +60,7 @@
"sass": "^1.22.1",
"sinon": "^7.2.3",
"stylelint": "^10.0.0",
"tslint": "^5.12.1",
"typescript": "^3.2.4",
"typescript": "^3.5.0",
"webpack": "^4.29.0"
},
"files": [
Expand Down

0 comments on commit 1563d65

Please sign in to comment.