Skip to content

Update eslint, introduce prettier & run lint:fix #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alubbe wants to merge 2 commits into from
Closed

Update eslint, introduce prettier & run lint:fix #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f0d9b6
Update eslint and introduce prettier
alubbe Jan 17, 2019
cee23d4
Run lint:fix and replace remaining `var` by hand
alubbe Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
build
dist
out
test
spec/manual/public/
spec/manual/public/
56 changes: 28 additions & 28 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
{
"extends": "airbnb",
"parserOptions": {
"ecmaVersion": 7,
"sourceType": "script"
},
"extends": [
"airbnb",
"prettier"
],
"parser": "babel-eslint",
"env": {
"es6": true
},
"rules": {
"max-len": [1, 160, 2, {"ignoreComments": true}],
"semi": ["error", "always"],
"object-property-newline": ["off", { "allowMultiplePropertiesPerLine": true }],
"comma-dangle": ["error", {"arrays": "always-multiline", "objects": "always-multiline", "imports": "always-multiline", "exports": "always-multiline", "functions": "never"}],
"func-names": ["off", "never"],
"space-before-function-paren": ["error", "never"],
"no-trailing-spaces": ["error", { "skipBlankLines": true }],
"global-require": ["off"],
"max-len": ["error", {"code": 160, "ignoreComments": true}],
"no-mixed-operators": ["error", {"allowSamePrecedence": true}],
"linebreak-style": ["off"],
"no-use-before-define": ["error", { "variables": false, "classes": false, "functions": false }],
"no-plusplus": ["off"],
"no-underscore-dangle": ["error", { "allowAfterThis": true, "allowAfterSuper": true }],
"no-multi-assign": ["off"],
"one-var": ["off"],
"one-var-declaration-per-line": ["off"],
"vars-on-top": ["off"],

"no-var": ["off"],
"arrow-parens": ["off"],
"no-prototype-builtins": ["off"],
"no-param-reassign": ["off"],
"prefer-arrow-callback": ["off"],
"comma-dangle": ["off"],
"strict": ["off"],
"indent": ["off"],
"object-shorthand": ["off"],
"prefer-template": ["off"],
"object-curly-spacing": ["off"],
"no-unused-expressions": ["off"],
"global-require": ["off"],
"no-path-concat": ["off"],
"prefer-rest-params": ["off"]
"no-plusplus": ["off"],
"no-prototype-builtins": ["off"],
"no-trailing-spaces": ["error", { "skipBlankLines": true }],
"no-underscore-dangle": ["error", { "allowAfterThis": true, "allowAfterSuper": true }],
"no-use-before-define": ["error", { "variables": false, "classes": false, "functions": false }],
"object-property-newline": ["off", { "allowMultiplePropertiesPerLine": true }],
"prefer-destructuring": ["warn"],
"prefer-rest-params": ["off"],
"quotes": ["error", "single"],
"semi": ["error", "always"],
"space-before-function-paren": ["error", "never"],
"strict": ["off"]
}
}
}
26 changes: 0 additions & 26 deletions .jshintrc
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions .prettier
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"bracketSpacing": false,
"printWidth": 160,
"trailingComma": "all"
}
4 changes: 4 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
build
dist
out
spec/manual/public/
37 changes: 17 additions & 20 deletions gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,41 @@ module.exports = function(grunt) {
grunt.initConfig({
babel: {
options: {
sourceMap: true
sourceMap: true,
},
dist: {
files: [
{
expand: true,
src: ['./lib/**/*.js', './spec/browser/*.js'],
dest: './build/'
}
]
}
dest: './build/',
},
],
},
},
browserify: {
bundle: {
src: ['./build/lib/exceljs.browser.js'],
dest: './dist/exceljs.js',
options: {
browserifyOptions: {
standalone: 'ExcelJS'
}
}
standalone: 'ExcelJS',
},
},
},
spec: {
src: ['./build/spec/browser/exceljs.spec.js'],
dest: './build/web/exceljs.spec.js'
dest: './build/web/exceljs.spec.js',
},
},
uglify: {
options: {
banner: '/*! ExcelJS <%= grunt.template.today("dd-mm-yyyy") %> */\n'
banner: '/*! ExcelJS <%= grunt.template.today("dd-mm-yyyy") %> */\n',
},
dist: {
files: {
'./dist/exceljs.min.js': ['./dist/exceljs.js']
}
'./dist/exceljs.min.js': ['./dist/exceljs.js'],
},
},
// es3: {
// files: [
Expand All @@ -64,20 +64,17 @@ module.exports = function(grunt) {

copy: {
dist: {
files: [
{ expand: true, src: ['**'], cwd: './build/lib', dest: './dist/es5' },
{ src: './build/lib/exceljs.nodejs.js', dest: './dist/es5/index.js'},
]
}
files: [{ expand: true, src: ['**'], cwd: './build/lib', dest: './dist/es5' }, { src: './build/lib/exceljs.nodejs.js', dest: './dist/es5/index.js' }],
},
},

jasmine: {
dev: {
src: ['./dist/exceljs.js'],
options: {
specs: './build/web/exceljs.spec.js'
}
}
specs: './build/web/exceljs.spec.js',
},
},
},
});

Expand Down
2 changes: 1 addition & 1 deletion lib/config/set-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var PromishLib = require('../utils/promish');
const PromishLib = require('../utils/promish');

function setValue(key, value, overwrite) {
if (overwrite === undefined) {
Expand Down
Loading