Skip to content

Commit 3d10481

Browse files
committed
⬆️ 2.18...3.0
1 parent 2121578 commit 3d10481

File tree

11 files changed

+356
-271
lines changed

11 files changed

+356
-271
lines changed

.eslintrc.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,18 @@ module.exports = {
1414
// node files
1515
{
1616
files: [
17+
"ember-cli-build.js",
1718
"index.js",
1819
"testem.js",
19-
"ember-cli-build.js",
2020
"config/**/*.js",
2121
"tests/dummy/config/**/*.js",
2222
],
23+
excludedFiles: [
24+
"addon/**",
25+
"addon-test-support/**",
26+
"app/**",
27+
"tests/dummy/app/**",
28+
],
2329
excludedFiles: ["app/**", "addon/**", "tests/dummy/app/**"],
2430
parserOptions: {
2531
sourceType: "script",
@@ -38,14 +44,5 @@ module.exports = {
3844
}
3945
),
4046
},
41-
42-
// test files
43-
{
44-
files: ["tests/**/*.js"],
45-
excludedFiles: ["tests/dummy/**/*.js"],
46-
env: {
47-
embertest: true,
48-
},
49-
},
5047
],
5148
};

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ env:
2323
# as well as latest stable release (bonus points to beta/canary)
2424
- EMBER_TRY_SCENARIO=ember-lts-2.12
2525
- EMBER_TRY_SCENARIO=ember-lts-2.16
26+
- EMBER_TRY_SCENARIO=ember-lts-2.18
2627
- EMBER_TRY_SCENARIO=ember-release
2728
- EMBER_TRY_SCENARIO=ember-beta
2829
- EMBER_TRY_SCENARIO=ember-canary

README.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,37 @@ component is watching that particular view of the errors.
121121

122122
1. Do you have Ember Data in your application and are using it for your data modeling?
123123
1. Is Bootstrap 3 installed? As the addon's name states, this isn't Bootstrap 4 ready.
124+
125+
```
126+
ember install my-addon
127+
```
128+
129+
## Contributing
130+
131+
### Installation
132+
133+
- `git clone <repository-url>`
134+
- `cd my-addon`
135+
- `npm install`
136+
137+
### Linting
138+
139+
- `npm run lint:js`
140+
- `npm run lint:js -- --fix`
141+
142+
### Running tests
143+
144+
- `ember test` – Runs the test suite on the current Ember version
145+
- `ember test --server` – Runs the test suite in "watch mode"
146+
- `npm test` – Runs `ember try:each` to test your addon against multiple Ember versions
147+
148+
### Running the dummy application
149+
150+
- `ember serve`
151+
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
152+
153+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
154+
155+
## License
156+
157+
This project is licensed under the [MIT License](LICENSE.md).

config/ember-try.js

Lines changed: 62 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,70 @@
1-
module.exports = {
2-
scenarios: [
3-
{
4-
name: "ember-lts-2.12",
5-
npm: {
6-
devDependencies: {
7-
"ember-source": "~2.12.0",
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+
},
820
},
9-
},
10-
},
11-
{
12-
name: "ember-lts-2.16",
13-
npm: {
14-
devDependencies: {
15-
"ember-source": "~2.16.0",
21+
{
22+
name: "ember-lts-2.16",
23+
npm: {
24+
devDependencies: {
25+
"ember-source": "~2.16.0",
26+
},
27+
},
1628
},
17-
},
18-
},
19-
{
20-
name: "ember-release",
21-
bower: {
22-
dependencies: {
23-
ember: "components/ember#release",
29+
{
30+
name: "ember-lts-2.18",
31+
npm: {
32+
devDependencies: {
33+
"ember-source": "~2.18.0",
34+
},
35+
},
2436
},
25-
resolutions: {
26-
ember: "release",
37+
{
38+
name: "ember-release",
39+
npm: {
40+
devDependencies: {
41+
"ember-source": urls[0],
42+
},
43+
},
2744
},
28-
},
29-
npm: {
30-
devDependencies: {
31-
"ember-source": null,
45+
{
46+
name: "ember-beta",
47+
npm: {
48+
devDependencies: {
49+
"ember-source": urls[1],
50+
},
51+
},
3252
},
33-
},
34-
},
35-
{
36-
name: "ember-beta",
37-
bower: {
38-
dependencies: {
39-
ember: "components/ember#beta",
53+
{
54+
name: "ember-canary",
55+
npm: {
56+
devDependencies: {
57+
"ember-source": urls[2],
58+
},
59+
},
4060
},
41-
resolutions: {
42-
ember: "beta",
61+
{
62+
name: "ember-default",
63+
npm: {
64+
devDependencies: {},
65+
},
4366
},
44-
},
45-
npm: {
46-
devDependencies: {
47-
"ember-source": null,
48-
},
49-
},
50-
},
51-
{
52-
name: "ember-canary",
53-
bower: {
54-
dependencies: {
55-
ember: "components/ember#canary",
56-
},
57-
resolutions: {
58-
ember: "canary",
59-
},
60-
},
61-
npm: {
62-
devDependencies: {
63-
"ember-source": null,
64-
},
65-
},
66-
},
67-
{
68-
name: "ember-default",
69-
npm: {
70-
devDependencies: {},
71-
},
72-
},
73-
],
67+
],
68+
};
69+
});
7470
};

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"bootswatch": "^3.3.7",
4848
"broccoli-asset-rev": "^2.4.5",
4949
"ember-ajax": "^3.0.0",
50-
"ember-cli": "~2.18.2",
50+
"ember-cli": "~3.0.4",
5151
"ember-cli-dependency-checker": "^2.0.0",
5252
"ember-cli-deploy": "^1.0.1",
5353
"ember-cli-deploy-build": "^1.1.0",
@@ -66,12 +66,15 @@
6666
"ember-disable-prototype-extensions": "^1.1.2",
6767
"ember-export-application-global": "^2.0.0",
6868
"ember-load-initializers": "^1.0.0",
69+
"ember-maybe-import-regenerator": "^0.1.6",
6970
"ember-resolver": "^4.0.0",
7071
"ember-route-action-helper": "^2.0.6",
71-
"ember-source": "~2.18.0",
72+
"ember-source": "~3.0.0",
73+
"ember-source-channel-url": "^1.0.1",
74+
"ember-try": "^0.2.23",
7275
"ember-welcome-page": "^3.0.0",
7376
"eslint-plugin-ember": "^5.0.0",
74-
"eslint-plugin-node": "^5.2.1",
77+
"eslint-plugin-node": "^6.0.1",
7578
"font-awesome": "4.7",
7679
"loader.js": "^4.2.3",
7780
"sass": "~1.14.3"

tests/dummy/config/targets.js

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1+
'use strict';
2+
3+
const browsers = [
4+
'last 1 Chrome versions',
5+
'last 1 Firefox versions',
6+
'last 1 Safari versions'
7+
];
8+
9+
const isCI = !!process.env.CI;
10+
const isProduction = process.env.EMBER_ENV === 'production';
11+
12+
if (isCI || isProduction) {
13+
browsers.push('ie 11');
14+
}
15+
116
module.exports = {
2-
browsers: [
3-
'ie 9',
4-
'last 1 Chrome versions',
5-
'last 1 Firefox versions',
6-
'last 1 Safari versions'
7-
]
17+
browsers
818
};

tests/helpers/.gitkeep

Whitespace-only changes.

tests/helpers/destroy-app.js

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

tests/helpers/module-for-acceptance.js

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

tests/helpers/start-app.js

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

0 commit comments

Comments
 (0)