You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/02/05 21:42:25 UTC
[30/30] allura git commit: [#8035] update references to .eslintrc
files; ignore es5 libs
[#8035] update references to .eslintrc files; ignore es5 libs
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d5d1c646
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d5d1c646
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d5d1c646
Branch: refs/heads/master
Commit: d5d1c646d74eadb16cde8f3ab2019c19eb5946da
Parents: 126f606
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Feb 5 15:31:29 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Feb 5 15:41:30 2016 -0500
----------------------------------------------------------------------
.eslintignore-es5 | 10 +++++++++-
AlluraTest/alluratest/validation.py | 2 +-
package.json | 2 +-
rat-excludes.txt | 5 ++++-
4 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d5d1c646/.eslintignore-es5
----------------------------------------------------------------------
diff --git a/.eslintignore-es5 b/.eslintignore-es5
index 8dfa7af..81e6f09 100644
--- a/.eslintignore-es5
+++ b/.eslintignore-es5
@@ -1,2 +1,10 @@
Allura/allura/public/nf/js/build
-**/*es6.js
\ No newline at end of file
+**/*es6.js
+# TODO make a "lib" folder for these
+Allura/allura/public/nf/js/*.compiled.js
+Allura/allura/public/nf/js/*.min.js
+Allura/allura/public/nf/js/jquery*
+Allura/allura/public/nf/js/modernizr.js
+Allura/allura/public/nf/js/react*
+Allura/allura/public/nf/js/sylvester.js
+Allura/allura/public/nf/js/underscore-min.js
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/allura/blob/d5d1c646/AlluraTest/alluratest/validation.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/validation.py b/AlluraTest/alluratest/validation.py
index 7f080b5..b6252a2 100644
--- a/AlluraTest/alluratest/validation.py
+++ b/AlluraTest/alluratest/validation.py
@@ -186,7 +186,7 @@ def validate_js(html_or_response, within_html=False):
else:
text = html_or_response
fname = dump_to_file('eslint-', text, suffix='.html' if within_html else '.js')
- eslintrc = os.path.join(pkg_resources.get_distribution('allura').location, '../.eslintrc')
+ eslintrc = os.path.join(pkg_resources.get_distribution('allura').location, '../.eslintrc-es5')
cmd = ['npm', 'run', 'eslint', '--',
'-c', eslintrc, # since we're in a tmp dir
'--no-ignore', # tmp dirs ignored by default
http://git-wip-us.apache.org/repos/asf/allura/blob/d5d1c646/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index a0e9ec3..3f430d2 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"eslint": "eslint",
"lint-es5": "eslint -c .eslintrc-es5 --ignore-path .eslintignore-es5 Allura/allura/public/**/*.js || true",
"lint-es6": "eslint -c .eslintrc-es6 --ignore-path .eslintignore-es6 Allura/allura/public/**/*.es6.js || true",
- "lint": "npm run lint5 && npm run lint6"
+ "lint": "npm run lint-es5 && npm run lint-es6"
},
"repository": {
"type": "git",
http://git-wip-us.apache.org/repos/asf/allura/blob/d5d1c646/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 2e0d026..67df2f9 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -7,7 +7,10 @@
**/MANIFEST.in
**/nosetests.xml
**/setup.cfg
-.eslintrc
+.eslintignore-es5
+.eslintignore-es6
+.eslintrc-es5
+.eslintrc-es6
.jscsrc
.jshintrc
Allura/allura/etc/mime.types