Skip to content

Commit bc80241

Browse files
jrjohnsonlukemelia
authored andcommitted
(chore) update ember CLI (#54)
Update ember-cli and related dependencies
1 parent d2d268e commit bc80241

32 files changed

+3542
-2098
lines changed

.bowerrc

-4
This file was deleted.

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/blueprints/*/files/**/*.js

.eslintrc.js

+40-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,53 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 6,
4+
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
'browser': true
1016
},
1117
globals: {
1218
'Tether': false
1319
},
1420
rules: {
15-
}
21+
},
22+
overrides: [
23+
// node files
24+
{
25+
files: [
26+
'ember-cli-build.js',
27+
'index.js',
28+
'testem.js',
29+
'blueprints/*/index.js',
30+
'config/**/*.js',
31+
'tests/dummy/config/**/*.js'
32+
],
33+
excludedFiles: [
34+
'addon/**',
35+
'addon-test-support/**',
36+
'app/**',
37+
'tests/dummy/app/**'
38+
],
39+
parserOptions: {
40+
sourceType: 'script',
41+
ecmaVersion: 2015
42+
},
43+
env: {
44+
browser: false,
45+
node: true
46+
},
47+
plugins: ['node'],
48+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
49+
// add your custom rules and overrides for node files here
50+
})
51+
}
52+
]
1653
};

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414
/coverage/*
1515
/libpeerconnection.log
1616
npm-debug.log*
17+
yarn-error.log
1718
testem.log
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

.npmignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@
77
.bowerrc
88
.editorconfig
99
.ember-cli
10-
.gitignore
1110
.eslintrc.js
11+
.gitignore
1212
.watchmanconfig
1313
.travis.yml
1414
bower.json
1515
ember-cli-build.js
1616
testem.js
17+
18+
# ember-try
19+
.node_modules.ember-try/
20+
bower.json.ember-try
21+
package.json.ember-try

.travis.yml

+27-13
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,48 @@
11
---
22
language: node_js
33
node_js:
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
46
- "4"
57

8+
sudo: false
69
dist: trusty
7-
sudo: required
810

911
addons:
10-
apt:
11-
sources:
12-
- google-chrome
13-
packages:
14-
- google-chrome-stable
12+
chrome: stable
1513

1614
cache:
1715
yarn: true
1816

17+
env:
18+
global:
19+
# See https://git.io/vdao3 for details.
20+
- JOBS=1
21+
matrix:
22+
# we recommend new addons test the current and previous LTS
23+
# as well as latest stable release (bonus points to beta/canary)
24+
- EMBER_TRY_SCENARIO=ember-lts-2.12
25+
- EMBER_TRY_SCENARIO=ember-lts-2.16
26+
- EMBER_TRY_SCENARIO=ember-lts-2.18
27+
- EMBER_TRY_SCENARIO=ember-release
28+
- EMBER_TRY_SCENARIO=ember-beta
29+
- EMBER_TRY_SCENARIO=ember-canary
30+
- EMBER_TRY_SCENARIO=ember-default
31+
32+
matrix:
33+
fast_finish: true
34+
allow_failures:
35+
- env: EMBER_TRY_SCENARIO=ember-canary
36+
1937
before_install:
20-
- "export DISPLAY=:99.0"
21-
- "sh -e /etc/init.d/xvfb start"
22-
- sleep 3
2338
- curl -o- -L https://yarnpkg.com/install.sh | bash
2439
- export PATH=$HOME/.yarn/bin:$PATH
25-
- yarn global add bower
2640

2741
install:
28-
- yarn install --no-lockfile
29-
- bower install
42+
- yarn install --no-lockfile --non-interactive
3043

3144
script:
45+
- yarn lint:js
3246
# Usually, it's ok to finish the test scenario without reverting
3347
# to the addon's original dependency state, skipping "cleanup".
34-
- ember try:each --skip-cleanup
48+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016
3+
Copyright (c) 2018
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

README.md

+17-9
Original file line numberDiff line numberDiff line change
@@ -80,27 +80,35 @@ ENV['ember-tether'] = {
8080

8181
It is also possible to pass a `bodyElement` to a particular ember-tether component declaration.
8282

83-
## Development Setup
83+
## Contributing
8484

8585
### Installation
8686

87-
* `git clone` this repository
88-
* `yarn install`
87+
* `git clone <repository-url>`
88+
* `cd my-addon`
89+
* `npm install`
90+
`
8991

90-
### Running Tests
92+
### Linting
9193

92-
* `ember test`
93-
* `ember test --serve`
94+
* `npm run lint:js`
95+
* `npm run lint:js -- --fix`
96+
97+
### Running tests
98+
99+
* `ember test` – Runs the test suite on the current Ember version
100+
* `ember test --server` – Runs the test suite in "watch mode"
101+
* `ember try:each` – Runs the test suite against multiple Ember versions
94102

95103
This addon uses ember-try to test against multiple versions of Ember:
96104

97105
* `ember try:each`
98106
* `ember try:one ember-release --- ember test --serve`
99107

100-
### Running the dummy app
108+
### Running the dummy application
101109

102-
* `ember server`
103-
* Visit your app at http://localhost:4200.
110+
* `ember serve`
111+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
104112

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

addon/components/ember-tether.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
import Ember from 'ember';
2-
3-
const { observer, get, getOwner, run, computed, isNone, Component } = Ember;
1+
import { getOwner } from '@ember/application';
2+
import { run } from '@ember/runloop';
3+
import { computed, get, observer } from '@ember/object';
4+
import { isNone } from '@ember/utils';
5+
import Component from '@ember/component';
46

57
export default Component.extend({
68
classNames: ['ember-tether'],

bower.json

-4
This file was deleted.

config/ember-try.js

+64-84
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,71 @@
1-
/* eslint-env node */
2-
module.exports = {
3-
scenarios: [
4-
{
5-
name: 'ember-lts-2.4',
6-
bower: {
7-
dependencies: {
8-
'ember': 'components/ember#lts-2-4'
1+
'use strict';
2+
3+
const getChannelURL = require('ember-source-channel-url');
4+
5+
module.exports = function() {
6+
return Promise.all([
7+
getChannelURL('release'),
8+
getChannelURL('beta'),
9+
getChannelURL('canary')
10+
]).then((urls) => {
11+
return {
12+
useYarn: true,
13+
scenarios: [
14+
{
15+
name: 'ember-lts-2.12',
16+
npm: {
17+
devDependencies: {
18+
'ember-source': '~2.12.0'
19+
}
20+
}
921
},
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'
22+
{
23+
name: 'ember-lts-2.16',
24+
npm: {
25+
devDependencies: {
26+
'ember-source': '~2.16.0'
27+
}
28+
}
2529
},
26-
resolutions: {
27-
'ember': 'lts-2-8'
28-
}
29-
},
30-
npm: {
31-
devDependencies: {
32-
'ember-source': null
33-
}
34-
}
35-
},
36-
{
37-
name: 'ember-release',
38-
bower: {
39-
dependencies: {
40-
'ember': 'components/ember#release'
30+
{
31+
name: 'ember-lts-2.18',
32+
npm: {
33+
devDependencies: {
34+
'ember-source': '~2.18.0'
35+
}
36+
}
4137
},
42-
resolutions: {
43-
'ember': 'release'
44-
}
45-
},
46-
npm: {
47-
devDependencies: {
48-
'ember-source': null
49-
}
50-
}
51-
},
52-
{
53-
name: 'ember-beta',
54-
bower: {
55-
dependencies: {
56-
'ember': 'components/ember#beta'
38+
{
39+
name: 'ember-release',
40+
npm: {
41+
devDependencies: {
42+
'ember-source': urls[0]
43+
}
44+
}
5745
},
58-
resolutions: {
59-
'ember': 'beta'
60-
}
61-
},
62-
npm: {
63-
devDependencies: {
64-
'ember-source': null
65-
}
66-
}
67-
},
68-
{
69-
name: 'ember-canary',
70-
bower: {
71-
dependencies: {
72-
'ember': 'components/ember#canary'
46+
{
47+
name: 'ember-beta',
48+
npm: {
49+
devDependencies: {
50+
'ember-source': urls[1]
51+
}
52+
}
7353
},
74-
resolutions: {
75-
'ember': 'canary'
76-
}
77-
},
78-
npm: {
79-
devDependencies: {
80-
'ember-source': null
54+
{
55+
name: 'ember-canary',
56+
npm: {
57+
devDependencies: {
58+
'ember-source': urls[2]
59+
}
60+
}
61+
},
62+
{
63+
name: 'ember-default',
64+
npm: {
65+
devDependencies: {}
66+
}
8167
}
82-
}
83-
},
84-
{
85-
name: 'ember-default',
86-
npm: {
87-
devDependencies: {}
88-
}
89-
}
90-
]
68+
]
69+
};
70+
});
9171
};

config/environment.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

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

ember-cli-build.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
/* eslint-env node */
1+
'use strict';
2+
23
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
34

45
module.exports = function(defaults) {
5-
var app = new EmberAddon(defaults, {
6+
let app = new EmberAddon(defaults, {
67
// Add options here
78
});
89

0 commit comments

Comments
 (0)