Skip to content

Commit 0ffc977

Browse files
authored
Merge pull request #25 from ember-cli-deploy/chore/update-ember-cli
Update ember-cli and dependencies
2 parents b9b7f6b + 449fc73 commit 0ffc977

22 files changed

+5255
-203
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 6,
5+
sourceType: 'module'
6+
},
7+
extends: 'eslint:recommended',
8+
env: {
9+
browser: true
10+
},
11+
rules: {
12+
}
13+
};

.jshintrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
---
22
language: node_js
33
node_js:
4-
- "0.12"
4+
- "6"
55

66
sudo: false
77

88
cache:
9-
directories:
10-
- node_modules
9+
yarn: true
1110

1211
before_install:
13-
- "npm config set spin false"
14-
- "npm install -g npm@^2"
12+
- curl -o- -L https://yarnpkg.com/install.sh | bash
13+
- export PATH=$HOME/.yarn/bin:$PATH
1514

1615
install:
17-
- npm install -g bower
18-
- npm install
19-
- bower install
16+
- yarn install --no-lockfile
2017

2118
script:
22-
- npm test
19+
- yarn test

Brocfile.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ The following properties are expected to be present on the deployment `context`
103103

104104
## Running Tests
105105

106-
- `npm test`
106+
* `yarn test`
107+
108+
## Why `ember build` and `ember test` don't work
109+
110+
Since this is a node-only ember-cli addon, this package does not include many files and dependencies which are part of ember-cli's typical `ember build` and `ember test` processes.
107111

108112
[1]: http://ember-cli-deploy.github.io/ember-cli-deploy/plugins/ "Plugin Documentation"
109113
[2]: https://github.com/zapnito/ember-cli-deploy-build "ember-cli-deploy-build"

addon/.gitkeep

Whitespace-only changes.

app/.gitkeep

Whitespace-only changes.

bower.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

circle.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
machine:
22
node:
3-
version: 0.12.0
3+
version: 4
4+
environment:
5+
PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
46

57
dependencies:
6-
pre:
7-
- npm install -g bower
88
override:
9-
- npm i
10-
- bower i
9+
- yarn
10+
cache_directories:
11+
- ~/.cache/yarn
12+
13+
test:
14+
override:
15+
- yarn test

0 commit comments

Comments
 (0)