Skip to content

Commit

Permalink
Use nvmrc, update travis config, add editorconfig, update gitignore, …
Browse files Browse the repository at this point in the history
…revert Dockerfile default CMD, add engines/engineStrict to package.json, update README
  • Loading branch information
binoculars authored and icereval committed Jan 25, 2017
1 parent 31dafc9 commit b6cf323
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 20 deletions.
14 changes: 4 additions & 10 deletions .editorconfig
Expand Up @@ -19,16 +19,10 @@ indent_size = 4

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 4

[*.css]
indent_style = space
indent_size = 4

[*.html]
indent_style = space
indent_size = 4

[*.{diff,md}]
trim_trailing_whitespace = false

[{package.json,.travis.yml}]
indent_style = space
indent_size = 2
2 changes: 0 additions & 2 deletions .gitignore
Expand Up @@ -18,5 +18,3 @@ testem.log

# idea
.idea

.editorconfig
1 change: 1 addition & 0 deletions .nvmrc
@@ -0,0 +1 @@
lts/boron
2 changes: 0 additions & 2 deletions .travis.yml
@@ -1,6 +1,4 @@
---
language: node_js
node_js: lts/boron

sudo: false
dist: trusty
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -57,4 +57,4 @@ ARG BACKEND=local
ENV BACKEND ${BACKEND}
RUN ./node_modules/ember-cli/bin/ember build --env ${APP_ENV}

CMD ["./node_modules/ember-cli/bin/ember", "serve"]
CMD ["node"]
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -12,7 +12,7 @@ This guide will help you get started if you're interested.
You will need the following things properly installed on your computer.

* [Git](http://git-scm.com/)
* [Node.js](http://nodejs.org/) (with NPM)
* [Node.js](http://nodejs.org/) (preferably via [nvm](https://github.com/creationix/nvm#install-script))
* [Yarn](https://yarnpkg.com/)
* [Bower](http://bower.io/)
* [Ember CLI](http://ember-cli.com/)
Expand All @@ -21,7 +21,7 @@ You will need the following things properly installed on your computer.
## Installation

* `git clone` this repository
* `yarn`
* `yarn install --pure-lockfile`
* `bower install`

## Running / Development
Expand Down
7 changes: 4 additions & 3 deletions package.json
@@ -1,23 +1,24 @@
{
"name": "preprint-service",
"version": "0.103.0",
"description": "Small description for preprint-service goes here",
"description": "Center for Open Science Preprint Service",
"private": true,
"directories": {
"test": "tests"
},
"scripts": {
"build": "ember build",
"start": "ember server",
"test": "npm run check-style && ember test",
"test": "yarn run check-style && ember test",
"check-style": "./node_modules/jscs/bin/jscs ."
},
"repository": {
"type": "git",
"url": "git+https://github.com/CenterForOpenScience/ember-preprints.git"
},
"engineStrict": true,
"engines": {
"node": ">= 0.10.0"
"node": ">=6"
},
"author": "",
"license": "Apache-2.0",
Expand Down

0 comments on commit b6cf323

Please sign in to comment.