Skip to content

Commit 7689415

Browse files
committed
update ember-cli
1 parent 0d17afb commit 7689415

14 files changed

+71
-36
lines changed

Diff for: .npmignore

-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ dist/
1010
.npmignore
1111
**/.gitkeep
1212
bower.json
13-
ember-cli-build.js
1413
Brocfile.js
1514
testem.json

Diff for: .watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp"]
2+
"ignore_dirs": ["tmp", "dist"]
33
}

Diff for: 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) 2015
3+
Copyright (c) 2016
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

Diff for: README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Animations are completely based on CSS classes. As long as you have a CSS class
3737
}
3838
```
3939

40-
There are two ways of defining transitions,
40+
There are two ways of defining transitions,
4141
And if you use the `{{transition-group}}` component you can then do something like this ( there is also a mixin you can use for custom components):
4242

4343
```handlebars
@@ -97,6 +97,7 @@ Note: **IE9** does not support CSS3 transitions / animations. They must live wit
9797

9898
## Running Tests
9999

100+
* `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions)
100101
* `ember test`
101102
* `ember test --server`
102103

Diff for: bower.json

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
{
22
"name": "ember-css-transitions",
33
"dependencies": {
4-
"ember": "1.13.8",
5-
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
6-
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
7-
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
8-
"ember-qunit": "0.4.9",
9-
"ember-qunit-notifications": "0.0.7",
10-
"ember-resolver": "~0.1.18",
11-
"jquery": "^1.11.3",
12-
"loader.js": "ember-cli/loader.js#3.2.1",
13-
"qunit": "~1.18.0"
4+
"ember": "1.13.11",
5+
"ember-cli-shims": "0.0.6",
6+
"ember-cli-test-loader": "0.2.1",
7+
"ember-load-initializers": "0.1.7",
8+
"ember-qunit": "0.4.16",
9+
"ember-qunit-notifications": "0.1.0",
10+
"ember-resolver": "~0.1.20",
11+
"jquery": "1.11.3",
12+
"loader.js": "ember-cli/loader.js#3.4.0",
13+
"qunit": "~1.20.0"
1414
},
1515
"devDependencies": {
1616
"bootstrap": "~3.3.5"
17+
},
18+
"resolutions": {
19+
"qunit-notifications": "~0.1.0"
1720
}
1821
}

Diff for: config/ember-try.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*jshint node:true*/
12
module.exports = {
23
scenarios: [
34
{

Diff for: config/environment.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*jshint node:true*/
12
'use strict';
23

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

Diff for: ember-cli-build.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
/*jshint node:true*/
12
/* global require, module */
2-
var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
3+
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
34

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

Diff for: package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,31 @@
1818
"author": "Petter Kjelkenes <[email protected]>",
1919
"license": "MIT",
2020
"devDependencies": {
21-
"broccoli-asset-rev": "^2.1.2",
22-
"ember-cli": "1.13.8",
23-
"ember-cli-app-version": "0.5.0",
21+
"broccoli-asset-rev": "^2.2.0",
22+
"ember-cli": "1.13.14",
23+
"ember-cli-app-version": "^1.0.0",
2424
"ember-cli-content-security-policy": "0.4.0",
25-
"ember-cli-dependency-checker": "^1.0.1",
25+
"ember-cli-dependency-checker": "^1.1.0",
2626
"ember-cli-github-pages": "0.0.6",
27-
"ember-cli-htmlbars": "0.7.9",
28-
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
29-
"ember-cli-ic-ajax": "0.2.1",
27+
"ember-cli-htmlbars": "^1.0.1",
28+
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
29+
"ember-cli-ic-ajax": "0.2.4",
3030
"ember-cli-inject-live-reload": "^1.3.1",
31-
"ember-cli-qunit": "^1.0.0",
32-
"ember-cli-release": "0.2.3",
33-
"ember-cli-sri": "^1.0.3",
31+
"ember-cli-qunit": "^1.0.4",
32+
"ember-cli-release": "0.2.8",
33+
"ember-cli-sri": "^1.2.0",
3434
"ember-cli-uglify": "^1.2.0",
35+
"ember-disable-proxy-controllers": "^1.0.1",
36+
"ember-export-application-global": "^1.0.4",
3537
"ember-disable-prototype-extensions": "^1.0.0",
36-
"ember-disable-proxy-controllers": "^1.0.0",
37-
"ember-export-application-global": "^1.0.3",
38-
"ember-try": "0.0.6"
38+
"ember-try": "~0.0.8"
3939
},
4040
"keywords": [
4141
"ember-addon",
4242
"animation"
4343
],
4444
"dependencies": {
45-
"ember-cli-babel": "^5.1.3"
45+
"ember-cli-babel": "^5.1.5"
4646
},
4747
"ember-addon": {
4848
"configPath": "tests/dummy/config",

Diff for: tests/helpers/destroy-app.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Ember from 'ember';
2+
3+
export default function destroyApp(application) {
4+
Ember.run(application, 'destroy');
5+
}

Diff for: tests/helpers/module-for-acceptance.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { module } from 'qunit';
2+
import startApp from '../helpers/start-app';
3+
import destroyApp from '../helpers/destroy-app';
4+
5+
export default function(name, options = {}) {
6+
module(name, {
7+
beforeEach() {
8+
this.application = startApp();
9+
10+
if (options.beforeEach) {
11+
options.beforeEach.apply(this, arguments);
12+
}
13+
},
14+
15+
afterEach() {
16+
destroyApp(this.application);
17+
18+
if (options.afterEach) {
19+
options.afterEach.apply(this, arguments);
20+
}
21+
}
22+
});
23+
}

Diff for: tests/helpers/resolver.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Resolver from 'ember/resolver';
22
import config from '../../config/environment';
33

4-
var resolver = Resolver.create();
4+
const resolver = Resolver.create();
55

66
resolver.namespace = {
77
modulePrefix: config.modulePrefix,

Diff for: tests/helpers/start-app.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import Application from '../../app';
33
import config from '../../config/environment';
44

55
export default function startApp(attrs) {
6-
var application;
6+
let application;
77

8-
var attributes = Ember.merge({}, config.APP);
8+
let attributes = Ember.merge({}, config.APP);
99
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
1010

11-
Ember.run(function() {
11+
Ember.run(() => {
1212
application = Application.create(attributes);
1313
application.setupForTesting();
1414
application.injectTestHelpers();

Diff for: tests/index.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
{{content-for 'test-head-footer'}}
1919
</head>
2020
<body>
21-
2221
{{content-for 'body'}}
2322
{{content-for 'test-body'}}
23+
2424
<script src="assets/vendor.js"></script>
2525
<script src="assets/test-support.js"></script>
2626
<script src="assets/dummy.js"></script>
27-
<script src="testem.js"></script>
27+
<script src="testem.js" integrity=""></script>
28+
<script src="assets/tests.js"></script>
2829
<script src="assets/test-loader.js"></script>
2930

3031
{{content-for 'body-footer'}}

0 commit comments

Comments
 (0)