Skip to content

Commit f2e6553

Browse files
committed
Upgrade ember-cli to 1.13.15
1 parent 41c7bbe commit f2e6553

File tree

10 files changed

+105
-51
lines changed

10 files changed

+105
-51
lines changed

.travis.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,19 @@ cache:
99
directories:
1010
- node_modules
1111

12+
env:
13+
- EMBER_TRY_SCENARIO=default
14+
- EMBER_TRY_SCENARIO=ember-release
15+
- EMBER_TRY_SCENARIO=ember-beta
16+
- EMBER_TRY_SCENARIO=ember-canary
17+
18+
matrix:
19+
fast_finish: true
20+
allow_failures:
21+
- env: EMBER_TRY_SCENARIO=ember-canary
22+
1223
before_install:
24+
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
1325
- "npm config set spin false"
1426
- "npm install -g npm@^2"
1527

@@ -19,4 +31,4 @@ install:
1931
- bower install
2032

2133
script:
22-
- npm test
34+
- ember try $EMBER_TRY_SCENARIO test

.watchmanconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"ignore_dirs": ["tmp", "dist"]
3+
}

Brocfile.js

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

LICENSE.md

Lines changed: 1 addition & 1 deletion
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) 2015-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

bower.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "ember-cli-deploy-azure-blob",
33
"dependencies": {
4-
"ember": "1.11.1",
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.0.0-beta.16.1",
8-
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
9-
"ember-qunit": "0.3.1",
10-
"ember-qunit-notifications": "0.0.7",
11-
"ember-resolver": "~0.1.15",
12-
"jquery": "^1.11.1",
13-
"loader.js": "ember-cli/loader.js#3.2.0",
14-
"qunit": "~1.17.1"
4+
"ember": "1.13.1",
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",
12+
"jquery": "1.11.3",
13+
"loader.js": "ember-cli/loader.js#3.4.0",
14+
"qunit": "~1.20.0"
1515
}
16-
}
16+
}

config/ember-try.js

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*jshint node:true*/
2+
module.exports = {
3+
scenarios: [
4+
{
5+
name: 'default',
6+
dependencies: { }
7+
},
8+
{
9+
name: 'ember-release',
10+
dependencies: {
11+
'ember': 'components/ember#release'
12+
},
13+
resolutions: {
14+
'ember': 'release'
15+
}
16+
},
17+
{
18+
name: 'ember-beta',
19+
dependencies: {
20+
'ember': 'components/ember#beta'
21+
},
22+
resolutions: {
23+
'ember': 'beta'
24+
}
25+
},
26+
{
27+
name: 'ember-canary',
28+
dependencies: {
29+
'ember': 'components/ember#canary'
30+
},
31+
resolutions: {
32+
'ember': 'canary'
33+
}
34+
}
35+
]
36+
};

config/environment.js

Lines changed: 1 addition & 0 deletions
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 */) {

ember-cli-build.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*jshint node:true*/
2+
/* global require, module */
3+
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
4+
5+
module.exports = function(defaults) {
6+
var app = new EmberAddon(defaults, {
7+
// Add options here
8+
});
9+
10+
/*
11+
This build file specifes the options for the dummy test app of this
12+
addon, located in `/tests/dummy`
13+
This build file does *not* influence how the addon or the app using it
14+
behave. You most likely want to be modifying `./index.js` or app's build file
15+
*/
16+
17+
return app.toTree();
18+
};

package.json

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"test": "tests"
88
},
99
"scripts": {
10-
"start": "ember server",
1110
"build": "ember build",
11+
"start": "ember server",
1212
"test": "ember try:testall"
1313
},
1414
"repository": "https://github.com/duizendnegen/ember-cli-deploy-azure-blob",
@@ -18,28 +18,32 @@
1818
"author": "Pepijn Schoen",
1919
"license": "MIT",
2020
"devDependencies": {
21-
"broccoli-asset-rev": "^2.0.2",
22-
"ember-cli": "0.2.3",
23-
"ember-cli-app-version": "0.3.3",
21+
"broccoli-asset-rev": "^2.2.0",
22+
"ember-cli": "1.13.15",
23+
"ember-cli-app-version": "^1.0.0",
2424
"ember-cli-content-security-policy": "0.4.0",
25-
"ember-cli-dependency-checker": "0.0.8",
26-
"ember-cli-htmlbars": "0.7.4",
27-
"ember-cli-ic-ajax": "0.1.1",
28-
"ember-cli-inject-live-reload": "^1.3.0",
29-
"ember-cli-qunit": "0.3.10",
30-
"ember-cli-uglify": "1.0.1",
31-
"ember-data": "1.0.0-beta.16.1",
32-
"ember-export-application-global": "^1.0.2",
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",
29+
"ember-cli-inject-live-reload": "^1.3.1",
30+
"ember-cli-qunit": "^1.0.4",
31+
"ember-cli-release": "0.2.8",
32+
"ember-cli-sri": "^1.2.0",
33+
"ember-cli-uglify": "^1.2.0",
34+
"ember-data": "1.13.15",
35+
"ember-disable-proxy-controllers": "^1.0.1",
36+
"ember-export-application-global": "^1.0.4",
3337
"ember-disable-prototype-extensions": "^1.0.0",
34-
"ember-try": "0.0.4"
38+
"ember-try": "~0.0.8"
3539
},
3640
"keywords": [
3741
"ember-addon",
3842
"ember-cli-deploy-plugin"
3943
],
4044
"dependencies": {
4145
"azure-storage": "^0.4.2",
42-
"ember-cli-babel": "^5.0.0",
46+
"ember-cli-babel": "^5.1.5",
4347
"ember-cli-deploy-plugin": "^0.2.0",
4448
"mime": "^1.2.11",
4549
"walk": "^2.3.9"

tests/.jshintrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"node": false,
2727
"browser": false,
2828
"boss": true,
29-
"curly": false,
29+
"curly": true,
3030
"debug": false,
3131
"devel": false,
3232
"eqeqeq": true,
@@ -47,5 +47,6 @@
4747
"strict": false,
4848
"white": false,
4949
"eqnull": true,
50-
"esnext": true
50+
"esnext": true,
51+
"unused": true
5152
}

0 commit comments

Comments
 (0)