Skip to content

Commit 3f3fee4

Browse files
authored
feat(lint): fix global-require eslint rule
1 parent 42e4040 commit 3f3fee4

File tree

17 files changed

+77
-67
lines changed

17 files changed

+77
-67
lines changed

.eslint/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
const eqeqeqRule = require('./eqeqeq-rule');
2+
const noExtraParensRule = require('./no-extra-parens-rule');
3+
14
module.exports = {
25
rules: {
3-
eqeqeq: require('./eqeqeq-rule'),
4-
'no-extra-parens': require('./no-extra-parens-rule'),
6+
eqeqeq: eqeqeqRule,
7+
'no-extra-parens': noExtraParensRule,
58
},
69
configs: {
710
recommended: {

.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ module.exports = {
113113

114114
// TODO rules with a lot of errors to be fixed manually, fix in a separate PR
115115
eqeqeq: 'off', // about 20 errors to be fixed manually
116-
'global-require': 'off', // about 30 errors to be fixed manually
117116
'no-shadow': 'off', // about 220 errors to be fixed manually
118117
'prefer-arrow-callback': 'off', // about 350 errors (all autofixable)
119118
},

gulpfile.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ const
66
gulp = require('gulp'),
77

88
// read user config to know what task to load
9-
config = require('./tasks/config/user')
9+
config = require('./tasks/config/user'),
10+
11+
admin = require('./tasks/collections/admin'),
12+
rtl = require('./tasks/collections/rtl')
1013
;
1114

1215
/*******************************
@@ -30,10 +33,10 @@ require('./tasks/collections/docs')(gulp);
3033
--------------- */
3134

3235
if (config.rtl) {
33-
require('./tasks/collections/rtl')(gulp);
36+
rtl(gulp);
3437
}
3538

3639
/* Admin Tasks */
3740
if (config.admin) {
38-
require('./tasks/collections/admin')(gulp);
41+
admin(gulp);
3942
}

tasks/admin/components/init.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ const
2424
mkdirp = require('mkdirp'),
2525

2626
// admin files
27-
github = require('../../config/admin/github'),
2827
release = require('../../config/admin/release'),
2928
project = require('../../config/project/release'),
3029

@@ -38,6 +37,8 @@ const
3837
;
3938

4039
module.exports = function (callback) {
40+
const github = require('../../config/admin/github'); // eslint-disable-line global-require
41+
4142
let
4243
index = -1,
4344
total = release.components.length,

tasks/admin/components/update.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const
2222
git = require('gulp-git'),
2323

2424
// admin files
25-
github = require('../../config/admin/github'),
2625
release = require('../../config/admin/release'),
2726
project = require('../../config/project/release'),
2827

@@ -36,6 +35,8 @@ const
3635
;
3736

3837
module.exports = function (callback) {
38+
const github = require('../../config/admin/github'); // eslint-disable-line global-require
39+
3940
let
4041
index = -1,
4142
total = release.components.length,
@@ -73,7 +74,7 @@ module.exports = function (callback) {
7374
: '',
7475

7576
componentPackage = fs.existsSync(outputDirectory + 'package.json')
76-
? require(outputDirectory + 'package.json') // eslint-disable-line import/no-dynamic-require
77+
? require(outputDirectory + 'package.json') // eslint-disable-line global-require, import/no-dynamic-require
7778
: false,
7879

7980
isNewVersion = version && componentPackage.version !== version,

tasks/admin/distributions/init.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ const
2424
mkdirp = require('mkdirp'),
2525

2626
// admin files
27-
github = require('../../config/admin/github'),
2827
release = require('../../config/admin/release'),
2928
project = require('../../config/project/release'),
3029

@@ -38,6 +37,8 @@ const
3837
;
3938

4039
module.exports = function (callback) {
40+
const github = require('../../config/admin/github'); // eslint-disable-line global-require
41+
4142
let
4243
index = -1,
4344
total = release.distributions.length,

tasks/admin/distributions/update.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const
2222
git = require('gulp-git'),
2323

2424
// admin files
25-
github = require('../../config/admin/github'),
2625
release = require('../../config/admin/release'),
2726
project = require('../../config/project/release'),
2827

@@ -36,6 +35,8 @@ const
3635
;
3736

3837
module.exports = function (callback) {
38+
const github = require('../../config/admin/github'); // eslint-disable-line global-require
39+
3940
let
4041
index = -1,
4142
total = release.distributions.length,
@@ -69,7 +70,7 @@ module.exports = function (callback) {
6970
: '',
7071

7172
distributionPackage = fs.existsSync(outputDirectory + 'package.json')
72-
? require(outputDirectory + 'package.json') // eslint-disable-line import/no-dynamic-require
73+
? require(outputDirectory + 'package.json') // eslint-disable-line global-require, import/no-dynamic-require
7374
: false,
7475

7576
isNewVersion = version && distributionPackage.version !== version,

tasks/collections/admin.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22
* Admin Task Collection
33
*******************************/
44

5+
const
6+
// less/css distributions
7+
initComponents = require('../admin/components/init'),
8+
createComponents = require('../admin/components/create'),
9+
updateComponents = require('../admin/components/update'),
10+
11+
// single component releases
12+
initDistributions = require('../admin/distributions/init'),
13+
createDistributions = require('../admin/distributions/create'),
14+
updateDistributions = require('../admin/distributions/update'),
15+
16+
release = require('../admin/release'),
17+
publish = require('../admin/publish'),
18+
register = require('../admin/register')
19+
;
20+
521
/*
622
This are tasks to be run by project maintainers
723
- Creating Component Repos
@@ -14,22 +30,6 @@
1430
*******************************/
1531

1632
module.exports = function (gulp) {
17-
const
18-
// less/css distributions
19-
initComponents = require('../admin/components/init'),
20-
createComponents = require('../admin/components/create'),
21-
updateComponents = require('../admin/components/update'),
22-
23-
// single component releases
24-
initDistributions = require('../admin/distributions/init'),
25-
createDistributions = require('../admin/distributions/create'),
26-
updateDistributions = require('../admin/distributions/update'),
27-
28-
release = require('../admin/release'),
29-
publish = require('../admin/publish'),
30-
register = require('../admin/register')
31-
;
32-
3333
/* Release */
3434
gulp.task('init distributions', initDistributions);
3535
gulp.task('init distributions').description = 'Grabs each component from GitHub';

tasks/collections/build.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
* Define Build Sub-Tasks
33
*******************************/
44

5-
module.exports = function (gulp) {
6-
// build sub-tasks
7-
const
8-
watch = require('../watch'),
5+
const watch = require('../watch'),
96

10-
build = require('../build'),
11-
buildJS = require('../build/javascript'),
12-
buildCSS = require('../build/css'),
13-
buildAssets = require('../build/assets')
14-
;
7+
// build sub-tasks
8+
build = require('../build'),
9+
buildJS = require('../build/javascript'),
10+
buildCSS = require('../build/css'),
11+
buildAssets = require('../build/assets')
12+
;
1513

14+
module.exports = function (gulp) {
1615
gulp.task('watch', watch);
1716
gulp.task('watch').description = 'Watch for site/theme changes';
1817

tasks/collections/docs.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
* Define Docs Sub-Tasks
33
*******************************/
44

5+
// docs tasks
6+
const buildDocs = require('../docs/build'),
7+
serveDocs = require('../docs/serve')
8+
;
9+
510
/*
611
Lets you serve files to a local documentation instance
712
https://github.com/fomantic/Fomantic-UI-Docs/
813
*/
914
module.exports = function (gulp) {
10-
let
11-
// docs tasks
12-
serveDocs = require('../docs/serve'),
13-
buildDocs = require('../docs/build')
14-
;
15-
1615
gulp.task('serve-docs', serveDocs);
1716
gulp.task('serve-docs').description = 'Serve file changes to SUI Docs';
1817

0 commit comments

Comments
 (0)