Skip to content

Commit a2ea661

Browse files
authored
Merge pull request #79 from wwwednesday/master
Eslint update + some fixes
2 parents 1473d09 + c4b23f3 commit a2ea661

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

generators/app/templates/eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/js/lib

generators/app/templates/eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"extends": ["airbnb-base", "prettier"],
1212
"rules": {
1313
"dollar-sign/dollar-sign": [2, "ignoreProperties"],
14-
"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }]
14+
"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
15+
"no-unused-vars": 1
1516
}
1617
}

generators/app/templates/gulp/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import util from 'gulp-util';
22

3-
const production = util.env.production || util.env.prod || false;
3+
const production = util.env.production || util.env.prod || util.env._.indexOf('build') !== -1 || false;
44
const destPath = 'build';
55

66
const config = {

generators/app/templates/package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"gulp-git": "^2.9.0",
4747
"lost": "^8.3.1",
4848
"postcss-csso": "^3.0.0",
49-
"babel-eslint": "^7.2.3",
5049
"gulp-postcss": "^8.0.0",<% if (css === 'postcss') { %>
5150
"gulp-sass-to-postcss-mixins": "0.0.3",
5251
"postcss": "^8.0.0",
@@ -82,10 +81,8 @@
8281
"gulp-cheerio": "^0.6.3",
8382
"gulp-changed": "^3.2.0",
8483
"gulp-svgstore": "^7.0.1",
85-
"through2": "^3.0.1",
86-
"gulp-consolidate": "^0.2.0",<% } %><% if (svgo) { %>
84+
"through2": "^3.0.1",<% } %><% if (svgo) { %>
8785
"gulp-svgmin": "^1.2.0",<% } %><% if (templates) { %>
88-
"gulp-changed": "^1.3.0",
8986
"gulp-front-matter": "^1.3.0",
9087
"gulp-prettify": "^0.5.0",<% } %><% if (templates === 'nunjucks') { %>
9188
"gulp-nunjucks-render": "^2.2.2",<% } %><% if (templates === 'swig') { %>
@@ -98,7 +95,6 @@
9895
"webpack-cli": "^3.3.0",
9996
"glslify-loader": "^2.0.0",
10097
"raw-loader": "^1.0.0",
101-
"babel-runtime": "^5.0.0",
10298
"require-yaml": "^0.0.1",
10399
"lodash": "^4.17.11"
104100
}

generators/app/templates/webpack.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const webpack = require('webpack');
22
const path = require('path');
3-
const util = require('gulp-util');
43
const config = require('./gulp/config');
54
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
65

generators/app/writing.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ module.exports = function () {
2424
this.fs.copy(this.templatePath('gitignore'), '.gitignore');
2525
this.fs.copy(this.templatePath('editorconfig'), '.editorconfig');
2626
this.fs.copy(this.templatePath('eslintrc'), '.eslintrc');
27+
this.fs.copy(this.templatePath('eslintignore'), '.eslintignore');
2728
this.fs.copy(this.templatePath('htmlhintrc'), '.htmlhintrc');
2829
this.fs.copy(this.templatePath('sass-lint.yml'), '.sass-lint.yml');
2930
this.fs.copy(this.templatePath('stylelintrc'), '.stylelintrc');

0 commit comments

Comments
 (0)