Skip to content

Commit acf1f70

Browse files
alexblomalexblom
authored
Merge pull request #11 from jacobq/update-ecli-to-v3.0
ember-cli-update (--to 3.0.0)
2 parents db33d90 + 725b02e commit acf1f70

23 files changed

+217
-233
lines changed

‎.eslintrc.js‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,45 @@ module.exports = {
44
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
rules: {
12-
}
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+
]
1348
};

‎.gitignore‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
/connect.lock
1515
/coverage/*
1616
/libpeerconnection.log
17-
npm-debug.log
17+
npm-debug.log*
18+
yarn-error.log
1819
testem.log
1920
.idea
2021

21-
22-
# compiled output
23-
/dist
24-
/tmp
22+
# ember-try
23+
.node_modules.ember-try/
24+
bower.json.ember-try
25+
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-
.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‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,34 @@
11
---
22
language: node_js
33
node_js:
4-
- "6"
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
6+
- "4"
57

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

814
cache:
915
directories:
1016
- $HOME/.npm
1117

1218
env:
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
16-
- EMBER_TRY_SCENARIO=ember-release
17-
- EMBER_TRY_SCENARIO=ember-beta
18-
- EMBER_TRY_SCENARIO=ember-canary
19-
- EMBER_TRY_SCENARIO=ember-default
19+
global:
20+
# See https://git.io/vdao3 for details.
21+
- JOBS=1
22+
matrix:
23+
# we recommend new addons test the current and previous LTS
24+
# as well as latest stable release (bonus points to beta/canary)
25+
- EMBER_TRY_SCENARIO=ember-lts-2.12
26+
- EMBER_TRY_SCENARIO=ember-lts-2.16
27+
- EMBER_TRY_SCENARIO=ember-lts-2.18
28+
- EMBER_TRY_SCENARIO=ember-release
29+
- EMBER_TRY_SCENARIO=ember-beta
30+
- EMBER_TRY_SCENARIO=ember-canary
31+
- EMBER_TRY_SCENARIO=ember-default
2032

2133
matrix:
2234
fast_finish: true
@@ -25,13 +37,11 @@ matrix:
2537

2638
before_install:
2739
- npm config set spin false
28-
- npm install -g phantomjs-prebuilt
29-
- phantomjs --version
30-
31-
install:
32-
- npm install
40+
- npm install -g npm@4
41+
- npm --version
3342

3443
script:
44+
- npm run lint:js
3545
# Usually, it's ok to finish the test scenario without reverting
3646
# to the addon's original dependency state, skipping "cleanup".
37-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
47+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

‎README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Ember-cli-testdouble
22

3-
Shim for testdouble / ember-cli"
3+
Shim for testdouble / ember-cli
44

55
## Usage
66

@@ -13,3 +13,8 @@ Then import as follows:
1313
```
1414
import td from 'testdouble';
1515
```
16+
17+
License
18+
------------------------------------------------------------------------------
19+
20+
This project is licensed under the [MIT License](LICENSE.md).

‎config/ember-try.js‎

Lines changed: 63 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,70 @@
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+
scenarios: [
13+
{
14+
name: 'ember-lts-2.12',
15+
npm: {
16+
devDependencies: {
17+
'ember-source': '~2.12.0'
18+
}
19+
}
920
},
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'
21+
{
22+
name: 'ember-lts-2.16',
23+
npm: {
24+
devDependencies: {
25+
'ember-source': '~2.16.0'
26+
}
27+
}
2528
},
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'
29+
{
30+
name: 'ember-lts-2.18',
31+
npm: {
32+
devDependencies: {
33+
'ember-source': '~2.18.0'
34+
}
35+
}
4136
},
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'
37+
{
38+
name: 'ember-release',
39+
npm: {
40+
devDependencies: {
41+
'ember-source': urls[0]
42+
}
43+
}
5744
},
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'
45+
{
46+
name: 'ember-beta',
47+
npm: {
48+
devDependencies: {
49+
'ember-source': urls[1]
50+
}
51+
}
7352
},
74-
resolutions: {
75-
'ember': 'canary'
76-
}
77-
},
78-
npm: {
79-
devDependencies: {
80-
'ember-source': null
53+
{
54+
name: 'ember-canary',
55+
npm: {
56+
devDependencies: {
57+
'ember-source': urls[2]
58+
}
59+
}
60+
},
61+
{
62+
name: 'ember-default',
63+
npm: {
64+
devDependencies: {}
65+
}
8166
}
82-
}
83-
},
84-
{
85-
name: 'ember-default',
86-
npm: {
87-
devDependencies: {}
88-
}
89-
}
90-
]
67+
]
68+
};
69+
});
9170
};

‎config/environment.js‎

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 3 additions & 2 deletions
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

‎package.json‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
],
1414
"scripts": {
1515
"build": "ember build",
16-
"start": "ember server",
16+
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
17+
"start": "ember serve",
1718
"test": "ember try:each"
1819
},
1920
"license": "MIT",
@@ -27,30 +28,35 @@
2728
"dependencies": {
2829
"broccoli-funnel": "^1.2.0",
2930
"broccoli-merge-trees": "^2.0.0",
30-
"ember-cli-babel": "^6.0.0",
31+
"ember-cli-babel": "^6.6.0",
3132
"testdouble": "^2.1.2"
3233
},
3334
"devDependencies": {
3435
"broccoli-asset-rev": "^2.4.5",
35-
"ember-cli": "2.13.1",
36-
"ember-cli-dependency-checker": "^1.3.0",
37-
"ember-cli-eslint": "^3.0.0",
38-
"ember-cli-htmlbars": "^1.1.1",
39-
"ember-cli-htmlbars-inline-precompile": "^0.4.0",
36+
"ember-cli": "~3.0.0",
37+
"ember-cli-dependency-checker": "^2.0.0",
38+
"ember-cli-eslint": "^4.2.1",
39+
"ember-cli-htmlbars": "^2.0.1",
40+
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
4041
"ember-cli-inject-live-reload": "^1.4.1",
41-
"ember-cli-qunit": "^4.0.0",
42-
"ember-cli-shims": "^1.1.0",
42+
"ember-cli-qunit": "^4.1.1",
43+
"ember-cli-shims": "^1.2.0",
4344
"ember-cli-sri": "^2.1.0",
44-
"ember-cli-uglify": "^1.2.0",
45-
"ember-disable-prototype-extensions": "^1.1.0",
45+
"ember-cli-uglify": "^2.0.0",
46+
"ember-disable-prototype-extensions": "^1.1.2",
4647
"ember-export-application-global": "^2.0.0",
4748
"ember-load-initializers": "^1.0.0",
49+
"ember-maybe-import-regenerator": "^0.1.6",
4850
"ember-resolver": "^4.0.0",
49-
"ember-source": "~2.13.0",
51+
"ember-source": "~3.0.0",
52+
"ember-source-channel-url": "^1.0.1",
53+
"ember-try": "^0.2.23",
54+
"eslint-plugin-ember": "^5.0.0",
55+
"eslint-plugin-node": "^5.2.1",
5056
"loader.js": "^4.2.3"
5157
},
5258
"engines": {
53-
"node": ">= 4"
59+
"node": "^4.5 || 6.* || >= 7.*"
5460
},
5561
"ember-addon": {
5662
"configPath": "tests/dummy/config"

0 commit comments

Comments
 (0)