Skip to content

Commit be87f3b

Browse files
committed
upgrade dummmy app
1 parent dc8ad56 commit be87f3b

File tree

23 files changed

+13757
-3232
lines changed

23 files changed

+13757
-3232
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/blueprints/*/files/**/*.js

test/fixtures/my-addon/.eslintrc.js

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,47 @@ 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+
'ember-cli-build.js',
24+
'index.js',
25+
'testem.js',
26+
'blueprints/*/index.js',
27+
'config/**/*.js',
28+
'tests/dummy/config/**/*.js'
29+
],
30+
excludedFiles: [
31+
'addon/**',
32+
'addon-test-support/**',
33+
'app/**',
34+
'tests/dummy/app/**'
35+
],
36+
parserOptions: {
37+
sourceType: 'script',
38+
ecmaVersion: 2015
39+
},
40+
env: {
41+
browser: false,
42+
node: true
43+
},
44+
plugins: ['node'],
45+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
46+
// add your custom rules and overrides for node files here
47+
})
48+
}
49+
]
1350
};

test/fixtures/my-addon/.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

test/fixtures/my-addon/.travis.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,29 @@ node_js:
66
- "4"
77

88
sudo: false
9+
dist: trusty
10+
11+
addons:
12+
chrome: stable
913

1014
cache:
1115
directories:
1216
- $HOME/.npm
1317

1418
env:
15-
# we recommend new addons test the current and previous LTS
16-
# as well as latest stable release (bonus points to beta/canary)
17-
- EMBER_TRY_SCENARIO=ember-lts-2.8
18-
- EMBER_TRY_SCENARIO=ember-lts-2.12
19-
- EMBER_TRY_SCENARIO=ember-release
20-
- EMBER_TRY_SCENARIO=ember-beta
21-
- EMBER_TRY_SCENARIO=ember-canary
22-
- 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
2332

2433
matrix:
2534
fast_finish: true
@@ -30,13 +39,9 @@ before_install:
3039
- npm config set spin false
3140
- npm install -g npm@4
3241
- npm --version
33-
- npm install -g phantomjs-prebuilt
34-
- phantomjs --version
35-
36-
install:
37-
- npm install
3842

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

test/fixtures/my-addon/README.md

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,50 @@
1-
# my-addon
1+
my-addon
2+
==============================================================================
23

3-
This README outlines the details of collaborating on this Ember addon.
4+
[Short description of the addon.]
45

5-
## Installation
6+
Installation
7+
------------------------------------------------------------------------------
68

7-
* `git clone <repository-url>` this repository
9+
```
10+
ember install my-addon
11+
```
12+
13+
14+
Usage
15+
------------------------------------------------------------------------------
16+
17+
[Longer description of how to use the addon in apps.]
18+
19+
20+
Contributing
21+
------------------------------------------------------------------------------
22+
23+
### Installation
24+
25+
* `git clone <repository-url>`
826
* `cd my-addon`
927
* `npm install`
1028

11-
## Running
29+
### Linting
1230

13-
* `ember serve`
14-
* Visit your app at [http://localhost:4200](http://localhost:4200).
31+
* `npm run lint:js`
32+
* `npm run lint:js -- --fix`
1533

16-
## Running Tests
34+
### Running tests
1735

18-
* `npm test` (Runs `ember try:each` to test your addon against multiple Ember versions)
19-
* `ember test`
20-
* `ember test --server`
36+
* `ember test` Runs the test suite on the current Ember version
37+
* `ember test --server` – Runs the test suite in "watch mode"
38+
* `ember try:each` – Runs the test suite against multiple Ember versions
2139

22-
## Building
40+
### Running the dummy application
2341

24-
* `ember build`
42+
* `ember serve`
43+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2544

2645
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
46+
47+
License
48+
------------------------------------------------------------------------------
49+
50+
This project is licensed under the [MIT License](LICENSE.md).
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22
import layout from '../templates/components/my-component';
33

4-
export default Ember.Component.extend({
4+
export default Component.extend({
55
layout
66
});
Lines changed: 64 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,70 @@
1-
/* eslint-env node */
2-
module.exports = {
3-
scenarios: [
4-
{
5-
name: 'ember-lts-2.8',
6-
bower: {
7-
dependencies: {
8-
'ember': 'components/ember#lts-2-8'
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-8'
12-
}
13-
},
14-
npm: {
15-
devDependencies: {
16-
'ember-source': null
17-
}
18-
}
19-
},
20-
{
21-
name: 'ember-lts-2.12',
22-
npm: {
23-
devDependencies: {
24-
'ember-source': '~2.12.0'
25-
}
26-
}
27-
},
28-
{
29-
name: 'ember-release',
30-
bower: {
31-
dependencies: {
32-
'ember': 'components/ember#release'
21+
{
22+
name: 'ember-lts-2.16',
23+
npm: {
24+
devDependencies: {
25+
'ember-source': '~2.16.0'
26+
}
27+
}
3328
},
34-
resolutions: {
35-
'ember': 'release'
36-
}
37-
},
38-
npm: {
39-
devDependencies: {
40-
'ember-source': null
41-
}
42-
}
43-
},
44-
{
45-
name: 'ember-beta',
46-
bower: {
47-
dependencies: {
48-
'ember': 'components/ember#beta'
29+
{
30+
name: 'ember-lts-2.18',
31+
npm: {
32+
devDependencies: {
33+
'ember-source': '~2.18.0'
34+
}
35+
}
4936
},
50-
resolutions: {
51-
'ember': 'beta'
52-
}
53-
},
54-
npm: {
55-
devDependencies: {
56-
'ember-source': null
57-
}
58-
}
59-
},
60-
{
61-
name: 'ember-canary',
62-
bower: {
63-
dependencies: {
64-
'ember': 'components/ember#canary'
37+
{
38+
name: 'ember-release',
39+
npm: {
40+
devDependencies: {
41+
'ember-source': urls[0]
42+
}
43+
}
6544
},
66-
resolutions: {
67-
'ember': 'canary'
68-
}
69-
},
70-
npm: {
71-
devDependencies: {
72-
'ember-source': null
45+
{
46+
name: 'ember-beta',
47+
npm: {
48+
devDependencies: {
49+
'ember-source': urls[1]
50+
}
51+
}
52+
},
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+
}
7366
}
74-
}
75-
},
76-
{
77-
name: 'ember-default',
78-
npm: {
79-
devDependencies: {}
80-
}
81-
}
82-
]
67+
]
68+
};
69+
});
8370
};

test/fixtures/my-addon/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 */) {

test/fixtures/my-addon/ember-cli-build.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
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

test/fixtures/my-addon/index.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 = {

0 commit comments

Comments
 (0)