Skip to content
This repository was archived by the owner on Apr 17, 2020. It is now read-only.

Commit 6b4ef6e

Browse files
committed
Update ember-cli to 1.13.13
1 parent f4a6eff commit 6b4ef6e

14 files changed

+70
-39
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: bower.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "ember-cli-deploy-notifications",
33
"dependencies": {
4-
"ember": "1.13.7",
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-data": "1.13.8",
8-
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
9-
"ember-qunit": "0.4.9",
10-
"ember-qunit-notifications": "0.0.7",
11-
"ember-resolver": "~0.1.18",
4+
"ember": "1.13.11",
5+
"ember-cli-shims": "0.0.6",
6+
"ember-cli-test-loader": "0.2.1",
7+
"ember-data": "1.13.15",
8+
"ember-load-initializers": "0.1.7",
9+
"ember-qunit": "0.4.16",
10+
"ember-qunit-notifications": "0.1.0",
11+
"ember-resolver": "~0.1.20",
1212
"jquery": "^1.11.3",
13-
"loader.js": "ember-cli/loader.js#3.2.1",
14-
"qunit": "~1.18.0"
13+
"loader.js": "ember-cli/loader.js#3.4.0",
14+
"qunit": "~1.20.0"
1515
}
1616
}

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818
"author": "simplabs GmbH",
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.13",
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",
26-
"ember-cli-htmlbars": "0.7.9",
27-
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
28-
"ember-cli-ic-ajax": "0.2.1",
25+
"ember-cli-dependency-checker": "^1.1.0",
26+
"ember-cli-htmlbars": "^1.0.1",
27+
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
28+
"ember-cli-ic-ajax": "0.2.4",
2929
"ember-cli-inject-live-reload": "^1.3.1",
30-
"ember-cli-qunit": "^1.0.0",
31-
"ember-cli-release": "0.2.3",
32-
"ember-cli-sri": "^1.0.3",
30+
"ember-cli-qunit": "^1.0.4",
31+
"ember-cli-release": "0.2.8",
32+
"ember-cli-sri": "^1.2.0",
3333
"ember-cli-uglify": "^1.2.0",
34-
"ember-data": "1.13.8",
35-
"ember-disable-proxy-controllers": "^1.0.0",
36-
"ember-export-application-global": "^1.0.3",
34+
"ember-data": "1.13.15",
35+
"ember-disable-proxy-controllers": "^1.0.1",
36+
"ember-export-application-global": "^1.0.4",
3737
"ember-disable-prototype-extensions": "^1.0.0",
38-
"ember-try": "0.0.6"
38+
"ember-try": "~0.0.8"
3939
},
4040
"keywords": [
4141
"ember-addon",
@@ -45,7 +45,7 @@
4545
"chai": "^3.3.0",
4646
"chai-as-promised": "^5.1.0",
4747
"core-object": "^1.1.0",
48-
"ember-cli-babel": "^5.1.3",
48+
"ember-cli-babel": "^5.1.5",
4949
"ember-cli-deploy-plugin": "0.2.0",
5050
"glob": "^5.0.15",
5151
"lodash": "^3.10.1",
@@ -56,4 +56,4 @@
5656
"ember-addon": {
5757
"configPath": "tests/dummy/config"
5858
}
59-
}
59+
}

Diff for: tests/dummy/app/app.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import Resolver from 'ember/resolver';
33
import loadInitializers from 'ember/load-initializers';
44
import config from './config/environment';
55

6-
var App;
6+
let App;
77

88
Ember.MODEL_FACTORY_INJECTIONS = true;
99

1010
App = Ember.Application.extend({
1111
modulePrefix: config.modulePrefix,
1212
podModulePrefix: config.podModulePrefix,
13-
Resolver: Resolver
13+
Resolver
1414
});
1515

1616
loadInitializers(App, config.modulePrefix);

Diff for: tests/dummy/app/router.js

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

4-
var Router = Ember.Router.extend({
4+
const Router = Ember.Router.extend({
55
location: config.locationType
66
});
77

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)