Skip to content

Commit 4a87d0e

Browse files
authored
Merge pull request #72 from ember-cli-deploy/chore/ember-cli-upgrade
Upgrade ember-cli & embrace being a node-only ember-cli addon
2 parents 30a249c + 2f9207c commit 4a87d0e

Some content is hidden

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

49 files changed

+5359
-517
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+
node: true
10+
},
11+
rules: {
12+
}
13+
};

.jshintignore

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

.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

.watchmanconfig

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

addon/.gitkeep

Whitespace-only changes.

app/.gitkeep

Whitespace-only changes.

appveyor.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,27 @@ init:
77
# Test against these versions of Node.js.
88
environment:
99
matrix:
10-
- nodejs_version: "0.12"
11-
- nodejs_version: "4.2"
12-
- nodejs_version: "5.0"
10+
- nodejs_version: "4.5"
11+
- nodejs_version: "6.10"
12+
13+
cache:
14+
- "%LOCALAPPDATA%\\Yarn"
1315

1416
# Install scripts. (runs after repo cloning)
1517
install:
1618
# Get the latest stable version of Node.js or io.js
1719
- ps: Install-Product node $env:nodejs_version
1820
# install modules
1921
- md C:\nc
20-
- npm config set cache C:\n
21-
- npm install -g bower
22-
- npm install
23-
- bower install
22+
- yarn install
2423

2524
# Post-install test scripts.
2625
test_script:
2726
# Output useful info for debugging.
2827
- node --version
29-
- npm --version
28+
- yarn --version
3029
# run tests
31-
- npm test
30+
- yarn test
3231

3332
# Don't actually build.
3433
build: off

bin/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
var EOL = require('os').EOL;
1515
var multiline = require('multiline');
16-
var Promise = require('ember-cli/lib/ext/promise');
16+
var RSVP = require('rsvp');
1717
var GitHubApi = require('github');
1818

1919
var github = new GitHubApi({version: '3.0.0'});
20-
var compareCommits = Promise.denodeify(github.repos.compareCommits);
20+
var compareCommits = RSVP.denodeify(github.repos.compareCommits);
2121
var currentVersion = 'v' + require('../package').version;
2222

2323
var user = 'ember-cli-deploy';

0 commit comments

Comments
 (0)