Skip to content

Commit 5a49a14

Browse files
authored
Merge pull request #89 from ember-cli-deploy/chore/upgrade-ember-cli
Update ember-cli and dependencies
2 parents e359304 + 442a4d2 commit 5a49a14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+5505
-458
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 & 33 deletions
This file was deleted.

.travis.yml

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

76
sudo: false
87

98
cache:
10-
directories:
11-
- $HOME/.npm
12-
- $HOME/.cache # includes bowers cache
13-
14-
matrix:
15-
fast_finish: true
9+
yarn: true
1610

1711
before_install:
18-
- npm config set spin false
19-
- npm install -g bower
20-
- bower --version
21-
- npm install phantomjs-prebuilt
22-
- node_modules/phantomjs-prebuilt/bin/phantomjs --version
12+
- curl -o- -L https://yarnpkg.com/install.sh | bash
13+
- export PATH=$HOME/.yarn/bin:$PATH
2314

2415
install:
25-
- npm install
26-
- bower install
16+
- yarn install --no-lockfile
2717

2818
script:
29-
- npm test
19+
- yarn test

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,13 @@ Replace **http://www.your-site.com** with your domain.
306306
Some more info: [Amazon CORS guide][7], [Stackoverflow][8]
307307

308308

309-
## Running Tests
309+
## Tests
310310

311-
- `npm test`
311+
* yarn test
312+
313+
## Why `ember build` and `ember test` don't work
314+
315+
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.
312316

313317
[1]: http://ember-cli-deploy.com/plugins/ "Plugin Documentation"
314318
[2]: https://github.com/ember-cli-deploy/ember-cli-deploy-build "ember-cli-deploy-build"

addon/.gitkeep

Whitespace-only changes.

app/.gitkeep

Whitespace-only changes.

bin/prepare-release

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

bower.json

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

circle.yml

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

0 commit comments

Comments
 (0)