Skip to content

Commit 4dbf000

Browse files
committed
Bump ember-cli to 2.13.2
1 parent 82ed216 commit 4dbf000

28 files changed

+212
-226
lines changed

.editorconfig

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,8 @@ insert_final_newline = true
1313
indent_style = space
1414
indent_size = 2
1515

16-
[*.js]
17-
indent_style = space
18-
indent_size = 2
19-
2016
[*.hbs]
2117
insert_final_newline = false
22-
indent_style = space
23-
indent_size = 2
24-
25-
[*.css]
26-
indent_style = space
27-
indent_size = 2
28-
29-
[*.html]
30-
indent_style = space
31-
indent_size = 2
3218

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

.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: 2017,
5+
sourceType: 'module'
6+
},
7+
extends: 'eslint:recommended',
8+
env: {
9+
browser: true
10+
},
11+
rules: {
12+
}
13+
};

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
44
/dist
@@ -13,5 +13,5 @@
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
16+
npm-debug.log*
1717
testem.log

.jshintrc

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

.npmignore

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
bower_components/
2-
tests/
3-
tmp/
4-
dist/
5-
1+
/bower_components
2+
/config/ember-try.js
3+
/dist
4+
/tests
5+
/tmp
6+
**/.gitkeep
67
.bowerrc
78
.editorconfig
89
.ember-cli
10+
.gitignore
11+
.eslintrc.js
12+
.watchmanconfig
913
.travis.yml
10-
.npmignore
11-
**/.gitkeep
1214
bower.json
13-
Brocfile.js
14-
testem.json
15+
ember-cli-build.js
16+
testem.js

.travis.yml

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

66
sudo: false
77

88
cache:
99
directories:
10-
- node_modules
10+
- $HOME/.npm
1111

1212
env:
13-
- EMBER_TRY_SCENARIO=default
13+
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
14+
- EMBER_TRY_SCENARIO=ember-lts-2.4
15+
- EMBER_TRY_SCENARIO=ember-lts-2.8
1416
- EMBER_TRY_SCENARIO=ember-release
1517
- EMBER_TRY_SCENARIO=ember-beta
1618
- EMBER_TRY_SCENARIO=ember-canary
19+
- EMBER_TRY_SCENARIO=ember-default
1720

1821
matrix:
1922
fast_finish: true
2023
allow_failures:
2124
- env: EMBER_TRY_SCENARIO=ember-canary
2225

2326
before_install:
24-
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
25-
- "npm config set spin false"
26-
- "npm install -g npm@^2"
27+
- npm config set spin false
28+
- npm install -g phantomjs-prebuilt
29+
- phantomjs --version
2730

2831
install:
29-
- npm install -g bower
3032
- npm install
31-
- bower install
3233

3334
script:
34-
- ember try $EMBER_TRY_SCENARIO test
35+
# Usually, it's ok to finish the test scenario without reverting
36+
# to the addon's original dependency state, skipping "cleanup".
37+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Ember-cli-adapter-pattern [![Build Status](https://travis-ci.org/tomasbasham/ember-cli-adapter-pattern.svg?branch=master)](https://travis-ci.org/tomasbasham/ember-cli-adapter-pattern)
22

3-
An [Ember CLI](http://www.ember-cli.com/) addon to standardise a common adapter pattern.
3+
An [Ember CLI](https://ember-cli.com/) addon to standardise a common adapter pattern.
44

55
The adapter pattern helps to provide a common interface from which two incompatible interface may work together. For example you may wish to include in your applications the ability to authenticate users through a variety of social platforms (i.e. Facebook and Twitter). Each platform defines its own API which to interface with it's servers. Using the adapter pattern you can separate the logic of both APIs into their own adapter objects, using a common interface to work with both.
66

@@ -138,23 +138,23 @@ Here we are passing the name of the API call as the first argument to `invoke` f
138138

139139
### Installation
140140

141-
* `git clone` this repository
141+
* `git clone <repository-url>` this repository
142+
* `cd ember-cli-adapter-pattern`
142143
* `npm install`
143-
* `bower install`
144144

145145
### Running
146146

147-
* `ember server`
148-
* Visit your app at http://localhost:4200.
147+
* `ember serve`
148+
* Visit your app at [http://localhost:4200](http://localhost:4200).
149149

150150
### Running Tests
151151

152-
* `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions)
152+
* `npm test` (Runs `ember try:each` to test your addon against multiple Ember versions)
153153
* `ember test`
154154
* `ember test --server`
155155

156156
### Building
157157

158158
* `ember build`
159159

160-
For more information on using ember-cli, visit [http://www.ember-cli.com/](http://www.ember-cli.com/).
160+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

bower.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
{
22
"name": "ember-cli-adapter-pattern",
33
"dependencies": {
4-
"ember": "1.13.11",
5-
"ember-cli-shims": "0.0.6",
6-
"ember-cli-test-loader": "0.2.1",
7-
"ember-data": "1.13.15",
8-
"ember-load-initializers": "0.1.7",
9-
"ember-qunit": "0.4.16",
10-
"ember-qunit-notifications": "0.1.0",
11-
"ember-resolver": "~0.1.20",
12-
"jquery": "1.11.3",
13-
"loader.js": "ember-cli/loader.js#3.4.0",
14-
"qunit": "~1.20.0",
154
"sinonjs": "^1.17.1"
165
}
176
}

config/ember-try.js

Lines changed: 70 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,90 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
module.exports = {
33
scenarios: [
44
{
5-
name: 'default',
6-
dependencies: { }
5+
name: 'ember-lts-2.4',
6+
bower: {
7+
dependencies: {
8+
'ember': 'components/ember#lts-2-4'
9+
},
10+
resolutions: {
11+
'ember': 'lts-2-4'
12+
}
13+
},
14+
npm: {
15+
devDependencies: {
16+
'ember-source': null
17+
}
18+
}
19+
},
20+
{
21+
name: 'ember-lts-2.8',
22+
bower: {
23+
dependencies: {
24+
'ember': 'components/ember#lts-2-8'
25+
},
26+
resolutions: {
27+
'ember': 'lts-2-8'
28+
}
29+
},
30+
npm: {
31+
devDependencies: {
32+
'ember-source': null
33+
}
34+
}
735
},
836
{
937
name: 'ember-release',
10-
dependencies: {
11-
'ember': 'components/ember#release'
38+
bower: {
39+
dependencies: {
40+
'ember': 'components/ember#release'
41+
},
42+
resolutions: {
43+
'ember': 'release'
44+
}
1245
},
13-
resolutions: {
14-
'ember': 'release'
46+
npm: {
47+
devDependencies: {
48+
'ember-source': null
49+
}
1550
}
1651
},
1752
{
1853
name: 'ember-beta',
19-
dependencies: {
20-
'ember': 'components/ember#beta'
54+
bower: {
55+
dependencies: {
56+
'ember': 'components/ember#beta'
57+
},
58+
resolutions: {
59+
'ember': 'beta'
60+
}
2161
},
22-
resolutions: {
23-
'ember': 'beta'
62+
npm: {
63+
devDependencies: {
64+
'ember-source': null
65+
}
2466
}
2567
},
2668
{
2769
name: 'ember-canary',
28-
dependencies: {
29-
'ember': 'components/ember#canary'
70+
bower: {
71+
dependencies: {
72+
'ember': 'components/ember#canary'
73+
},
74+
resolutions: {
75+
'ember': 'canary'
76+
}
3077
},
31-
resolutions: {
32-
'ember': 'canary'
78+
npm: {
79+
devDependencies: {
80+
'ember-source': null
81+
}
82+
}
83+
},
84+
{
85+
name: 'ember-default',
86+
npm: {
87+
devDependencies: {}
3388
}
3489
}
3590
]

config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
'use strict';
33

44
module.exports = function(/* environment, appConfig */) {

0 commit comments

Comments
 (0)