Skip to content

Commit c66dce0

Browse files
authored
Update ember cli 2.18.2 (#6)
* Update ember-cli 2.18.2 * Update clock service * Update test * Upadte clock service * Remove bower.json * Update ember-cli 2.18.2
1 parent f3ddf79 commit c66dce0

26 files changed

+14428
-2582
lines changed

.eslintrc.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 2017,
5+
sourceType: 'module'
6+
},
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
14+
env: {
15+
browser: true
16+
},
17+
rules: {
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'index.js',
24+
'testem.js',
25+
'ember-cli-build.js',
26+
'config/**/*.js',
27+
'tests/dummy/config/**/*.js'
28+
],
29+
excludedFiles: [
30+
'app/**',
31+
'addon/**',
32+
'tests/dummy/app/**'
33+
],
34+
parserOptions: {
35+
sourceType: 'script',
36+
ecmaVersion: 2015
37+
},
38+
env: {
39+
browser: false,
40+
node: true
41+
},
42+
plugins: ['node'],
43+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
44+
// add your custom rules and overrides for node files here
45+
})
46+
},
47+
48+
// test files
49+
{
50+
files: ['tests/**/*.js'],
51+
excludedFiles: ['tests/dummy/**/*.js'],
52+
env: {
53+
embertest: true
54+
}
55+
}
56+
]
57+
};

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,10 @@
1414
/coverage/*
1515
/libpeerconnection.log
1616
npm-debug.log*
17+
yarn-error.log
1718
testem.log
18-
/docs
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

.npmignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@
77
.bowerrc
88
.editorconfig
99
.ember-cli
10+
.eslintrc.js
1011
.gitignore
11-
.jshintrc
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

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,47 @@
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

68
sudo: false
9+
dist: trusty
10+
11+
addons:
12+
chrome: stable
713

814
cache:
9-
directories:
10-
- $HOME/.npm
11-
- $HOME/.cache # includes bowers cache
15+
yarn: true
1216

1317
env:
14-
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
15-
- EMBER_TRY_SCENARIO=ember-lts-2.4
16-
- EMBER_TRY_SCENARIO=ember-lts-2.8
17-
- EMBER_TRY_SCENARIO=ember-release
18-
- EMBER_TRY_SCENARIO=ember-beta
19-
- EMBER_TRY_SCENARIO=ember-canary
20-
- EMBER_TRY_SCENARIO=ember-default
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-release
27+
- EMBER_TRY_SCENARIO=ember-beta
28+
- EMBER_TRY_SCENARIO=ember-canary
29+
- EMBER_TRY_SCENARIO=ember-default
2130

2231
matrix:
2332
fast_finish: true
2433
allow_failures:
2534
- env: EMBER_TRY_SCENARIO=ember-canary
2635

2736
before_install:
28-
- npm config set spin false
29-
- npm install -g bower phantomjs-prebuilt
30-
- bower --version
31-
- phantomjs --version
37+
- curl -o- -L https://yarnpkg.com/install.sh | bash
38+
- export PATH=$HOME/.yarn/bin:$PATH
3239

3340
install:
34-
- npm install
35-
- bower install
41+
- yarn install --no-lockfile --non-interactive
3642

3743
script:
44+
- yarn lint:js
3845
# Usually, it's ok to finish the test scenario without reverting
3946
# to the addon's original dependency state, skipping "cleanup".
40-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
47+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

addon/services/clock.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/**
22
@module ember-clock
33
*/
4-
import Ember from 'ember';
4+
import { bool } from '@ember/object/computed';
55

6-
const { computed: { bool } , run, Service } = Ember;
6+
import { run } from '@ember/runloop';
7+
import Service from '@ember/service';
78

89
/**
910
## ClockService
@@ -119,8 +120,8 @@ export default Service.extend({
119120
@private
120121
*/
121122
tick() {
122-
this.setTime();
123-
this.set('nextTick', run.later(this, this.tick, 1000));
123+
this.setTime();
124+
this.set('nextTick', run.later(this, this.tick, 1000));
124125
},
125126

126127
/**

bower.json

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

config/ember-try.js

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,19 @@
1-
/*jshint node:true*/
21
module.exports = {
2+
useYarn: true,
33
scenarios: [
44
{
5-
name: 'ember-1.13',
6-
bower: {
7-
dependencies: {
8-
'ember': '~1.13.0'
9-
},
10-
resolutions: {
11-
'ember': '~1.13.0'
12-
}
13-
}
14-
},
15-
{
16-
name: 'ember-lts-2.4',
17-
bower: {
18-
dependencies: {
19-
'ember': 'components/ember#lts-2-4'
20-
},
21-
resolutions: {
22-
'ember': 'lts-2-4'
23-
}
24-
},
5+
name: 'ember-lts-2.12',
256
npm: {
267
devDependencies: {
27-
'ember-source': null
8+
'ember-source': '~2.12.0'
289
}
2910
}
3011
},
3112
{
32-
name: 'ember-lts-2.8',
33-
bower: {
34-
dependencies: {
35-
'ember': 'components/ember#lts-2-8'
36-
},
37-
resolutions: {
38-
'ember': 'lts-2-8'
39-
}
40-
},
13+
name: 'ember-lts-2.16',
4114
npm: {
4215
devDependencies: {
43-
'ember-source': null
16+
'ember-source': '~2.16.0'
4417
}
4518
}
4619
},

config/environment.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/*jshint node:true*/
21
'use strict';
32

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

ember-cli-build.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/*jshint node:true*/
2-
/* global require, module */
3-
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
1+
'use strict';
2+
3+
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function(defaults) {
6-
var app = new EmberAddon(defaults, {
6+
let app = new EmberAddon(defaults, {
77
// Add options here
88
});
99

index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* jshint node: true */
21
'use strict';
32

43
module.exports = {

0 commit comments

Comments
 (0)