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/01/18 20:35:08 UTC
[1/2] allura git commit: [#8039] install eslint and deps locally;
run local command via npm since that uses node_modules/.bin/
automatically
Repository: allura
Updated Branches:
refs/heads/db/8039 db13668d5 -> 2fed403c3
[#8039] install eslint and deps locally; run local command via npm since that uses node_modules/.bin/ automatically
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/de05217e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/de05217e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/de05217e
Branch: refs/heads/db/8039
Commit: de05217ed7d322e8dd4d4ea9ea2914e65d57ad43
Parents: db13668
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Jan 18 14:31:44 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Jan 18 14:31:44 2016 -0500
----------------------------------------------------------------------
Allura/docs/getting_started/installation.rst | 2 +-
AlluraTest/alluratest/validation.py | 2 +-
Dockerfile | 2 +-
package.json | 9 ++++++---
4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/de05217e/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index f552e37..360fff1 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -191,7 +191,7 @@ For non-Ubuntu installations see https://nodejs.org/en/download/package-manager/
(env-allura)~$ curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash -
(env-allura)~$ sudo apt-get install nodejs
(env-allura)~$ cd ~/src/allura
- (env-allura)~$ sudo npm install -g broccoli-cli eslint eslint-plugin-html
+ (env-allura)~$ sudo npm install -g broccoli-cli
(env-allura)~$ npm install
(env-allura)~$ npm run build
http://git-wip-us.apache.org/repos/asf/allura/blob/de05217e/AlluraTest/alluratest/validation.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/validation.py b/AlluraTest/alluratest/validation.py
index 95479bd..7f080b5 100644
--- a/AlluraTest/alluratest/validation.py
+++ b/AlluraTest/alluratest/validation.py
@@ -187,7 +187,7 @@ def validate_js(html_or_response, within_html=False):
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')
- cmd = ['eslint',
+ 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/de05217e/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 6c6c036..54a1b3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ RUN curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash -
apt-get install --yes nodejs
# only do the global installation here. All local packages are installed in init-docker-dev.sh, since they need the shared mount
-RUN npm install -g broccoli-cli eslint eslint-plugin-html
+RUN npm install -g broccoli-cli
# Snapshot generation for SVN (and maybe other SCMs) might fail without this
RUN locale-gen en_US.UTF-8
http://git-wip-us.apache.org/repos/asf/allura/blob/de05217e/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 15bb35b..4635705 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build": "rm -rf Allura/allura/public/nf/js/build/; broccoli build Allura/allura/public/nf/js/build/",
- "watch": "broccoli-timepiece Allura/allura/public/nf/js/build/"
+ "watch": "broccoli-timepiece Allura/allura/public/nf/js/build/",
+ "eslint": "eslint"
},
"repository": {
"type": "git",
@@ -14,7 +15,6 @@
},
"author": "Apache Allura team",
"license": "Apache-2.0",
-
"//": "When broccoli-babel-transpiler moves to babel 6, we'll need to add babel-plugin-transform-class-properties to our deps",
"devDependencies": {
"broccoli": "^0.16.8",
@@ -22,6 +22,9 @@
"broccoli-funnel": "^0.2.8",
"broccoli-merge-trees": "^0.2.3",
"broccoli-sourcemap-concat": "^2.0.1",
- "broccoli-uglify-js": "^0.1.3"
+ "broccoli-uglify-js": "^0.1.3",
+ "eslint": "^1.10.3",
+ "eslint-plugin-html": "^1.2.0",
+ "esprima-fb": "^15001.1001.0-dev-harmony-fb"
}
}
[2/2] allura git commit: [#8039] can do the same thing for broccoli,
since we already use "npm run build" instead of invoking it directly
Posted by br...@apache.org.
[#8039] can do the same thing for broccoli, since we already use "npm run build" instead of invoking it directly
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2fed403c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2fed403c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2fed403c
Branch: refs/heads/db/8039
Commit: 2fed403c3773f3dec899ee7da32319af10f6b202
Parents: de05217
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Jan 18 14:34:56 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Jan 18 14:34:56 2016 -0500
----------------------------------------------------------------------
Allura/docs/getting_started/installation.rst | 1 -
Dockerfile | 3 ---
package.json | 1 +
3 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2fed403c/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index 360fff1..4f957e6 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -191,7 +191,6 @@ For non-Ubuntu installations see https://nodejs.org/en/download/package-manager/
(env-allura)~$ curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash -
(env-allura)~$ sudo apt-get install nodejs
(env-allura)~$ cd ~/src/allura
- (env-allura)~$ sudo npm install -g broccoli-cli
(env-allura)~$ npm install
(env-allura)~$ npm run build
http://git-wip-us.apache.org/repos/asf/allura/blob/2fed403c/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 54a1b3a..2ea2e18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,9 +35,6 @@ RUN apt-get update && apt-get install -y \
RUN curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash - && \
apt-get install --yes nodejs
-# only do the global installation here. All local packages are installed in init-docker-dev.sh, since they need the shared mount
-RUN npm install -g broccoli-cli
-
# Snapshot generation for SVN (and maybe other SCMs) might fail without this
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
http://git-wip-us.apache.org/repos/asf/allura/blob/2fed403c/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 4635705..94702bb 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
"devDependencies": {
"broccoli": "^0.16.8",
"broccoli-babel-transpiler": "^5.4.5",
+ "broccoli-cli": "^1.0.0",
"broccoli-funnel": "^0.2.8",
"broccoli-merge-trees": "^0.2.3",
"broccoli-sourcemap-concat": "^2.0.1",