[MediaWiki-commits] [Gerrit] mediawiki...WikiLexicalData[master]: build: Always exclude node_modules

2017-10-31 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386936 )

Change subject: build: Always exclude node_modules
..


build: Always exclude node_modules

Prefer grunt config over ignore file

Change-Id: If878b11a6194fc8e82137bc4dac3e9bd09aafc49
---
M .gitignore
D .jshintignore
M Gruntfile.js
M composer.json
4 files changed, 8 insertions(+), 7 deletions(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/.gitignore b/.gitignore
index e62fc28..9dfe80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 node_modules/
 vendor/
+composer.lock
 
 .svn
 *~
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3e772dc..000
--- a/.jshintignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules
-vendor
-
-# upstream libs
-resources/wforms.js
diff --git a/Gruntfile.js b/Gruntfile.js
index 18fa3a2..1425729 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,7 +10,12 @@
omegawiki: 'i18n/omegawiki/'
},
jshint: {
-   all: '.'
+   all: [
+   '*.js',
+   '!node_modules/**',
+   '!vendor/**',
+   '!resources/wforms.js' // # upstream lib
+   ]
},
jsonlint: {
all: [
diff --git a/composer.json b/composer.json
index 686b65b..aebd773 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor"
+   "parallel-lint . --exclude vendor --exclude 
node_modules"
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/386936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If878b11a6194fc8e82137bc4dac3e9bd09aafc49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikiLexicalData[master]: build: Always exclude node_modules

2017-10-27 Thread Umherirrender (Code Review) 
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386936 )

Change subject: build: Always exclude node_modules
..

build: Always exclude node_modules

Prefer grunt config over ignore file

Change-Id: If878b11a6194fc8e82137bc4dac3e9bd09aafc49
---
M .gitignore
D .jshintignore
M Gruntfile.js
M composer.json
4 files changed, 8 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData 
refs/changes/36/386936/1

diff --git a/.gitignore b/.gitignore
index e62fc28..9dfe80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 node_modules/
 vendor/
+composer.lock
 
 .svn
 *~
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3e772dc..000
--- a/.jshintignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules
-vendor
-
-# upstream libs
-resources/wforms.js
diff --git a/Gruntfile.js b/Gruntfile.js
index 18fa3a2..1425729 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,7 +10,12 @@
omegawiki: 'i18n/omegawiki/'
},
jshint: {
-   all: '.'
+   all: [
+   '*.js',
+   '!node_modules/**',
+   '!vendor/**',
+   '!resources/wforms.js' // # upstream lib
+   ]
},
jsonlint: {
all: [
diff --git a/composer.json b/composer.json
index 686b65b..aebd773 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor"
+   "parallel-lint . --exclude vendor --exclude 
node_modules"
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/386936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If878b11a6194fc8e82137bc4dac3e9bd09aafc49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits