Skip to content

Commit 0bda1b6

Browse files
xomaczarxomaczar
committed
upgraded to ember-cli@0.2.7
1 parent 5576cc3 commit 0bda1b6

11 files changed

+58
-40
lines changed

‎.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
bower_components/
22
tests/
33
tmp/
4+
dist/
45

56
.bowerrc
67
.editorconfig

‎.travis.yml

+13-1
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

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

‎Brocfile.js

+8-13
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,14 @@
33

44
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
55

6-
var app = new EmberAddon();
6+
/*
7+
This Brocfile specifes the options for the dummy test app of this
8+
addon, located in `/tests/dummy`
9+
10+
This Brocfile does *not* influence how the addon or the app using it
11+
behave. You most likely want to be modifying `./index.js` or app's Brocfile
12+
*/
713

8-
// Use `app.import` to add additional libraries to the generated
9-
// output files.
10-
//
11-
// If you need to use different assets in different
12-
// environments, specify an object as the first parameter. That
13-
// object's keys should be the environment name and the values
14-
// should be the asset to use in that environment.
15-
//
16-
// If the library that you are including contains AMD or ES6
17-
// modules that you would like to import into your application
18-
// please specify an object with the list of modules as keys
19-
// along with the exports of each module as its value.
14+
var app = new EmberAddon();
2015

2116
module.exports = app.toTree();

‎bower.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "ember-cli-styles-reloader",
33
"dependencies": {
4-
"ember": "1.11.1",
4+
"ember": "1.12.0",
55
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
66
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
7-
"ember-data": "1.0.0-beta.16.1",
7+
"ember-data": "1.0.0-beta.18",
88
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
9-
"ember-qunit": "0.3.1",
9+
"ember-qunit": "0.3.3",
1010
"ember-qunit-notifications": "0.0.7",
1111
"ember-resolver": "~0.1.15",
1212
"jquery": "^1.11.1",

‎package.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"scripts": {
1010
"start": "ember server",
1111
"build": "ember build",
12-
"test": "ember test"
12+
"test": "ember try:testall"
1313
},
1414
"repository": "https://github.com/xomaczar/ember-cli-styles-reloader",
1515
"engines": {
@@ -18,19 +18,17 @@
1818
"author": "Andrey Khomenko",
1919
"license": "MIT",
2020
"devDependencies": {
21-
"broccoli-asset-rev": "^2.0.0",
22-
"ember-cli": "^0.2.3",
23-
"ember-cli-app-version": "0.3.1",
24-
"ember-cli-babel": "^4.0.0",
25-
"ember-cli-content-security-policy": "0.3.0",
26-
"ember-cli-dependency-checker": "0.0.8",
27-
"ember-cli-htmlbars": "0.7.4",
21+
"broccoli-asset-rev": "^2.0.2",
22+
"ember-cli": "0.2.7",
23+
"ember-cli-app-version": "0.3.3",
24+
"ember-cli-content-security-policy": "0.4.0",
25+
"ember-cli-dependency-checker": "^1.0.0",
26+
"ember-cli-htmlbars": "0.7.6",
2827
"ember-cli-ic-ajax": "0.1.1",
2928
"ember-cli-inject-live-reload": "^1.3.0",
30-
"ember-cli-qunit": "0.3.9",
31-
"ember-cli-uglify": "1.0.1",
32-
"ember-data": "1.0.0-beta.15",
33-
"ember-export-application-global": "^1.0.2"
29+
"ember-cli-qunit": "0.3.13",
30+
"ember-cli-uglify": "^1.0.1",
31+
"ember-try": "0.0.6"
3432
},
3533
"keywords": [
3634
"ember-addon",
@@ -46,6 +44,9 @@
4644
"less",
4745
"styl"
4846
],
47+
"dependencies": {
48+
"ember-cli-babel": "^5.0.0"
49+
},
4950
"ember-addon": {
5051
"configPath": "tests/dummy/config"
5152
}

‎testem.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"framework": "qunit",
33
"test_page": "tests/index.html?hidepassed",
4+
"disable_watching": true,
45
"launch_in_ci": [
56
"PhantomJS"
67
],

‎tests/dummy/app/app.js

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

6+
var App;
7+
68
Ember.MODEL_FACTORY_INJECTIONS = true;
79

8-
var App = Ember.Application.extend({
10+
App = Ember.Application.extend({
911
modulePrefix: config.modulePrefix,
1012
podModulePrefix: config.podModulePrefix,
1113
Resolver: Resolver

‎tests/dummy/app/router.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ var Router = Ember.Router.extend({
55
location: config.locationType
66
});
77

8-
export default Router.map(function() {
8+
Router.map(function() {
99
});
10+
11+
export default Router;

‎tests/dummy/public/crossdomain.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
33
<cross-domain-policy>
4-
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
4+
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
55

6-
<!-- Most restrictive policy: -->
7-
<site-control permitted-cross-domain-policies="none"/>
6+
<!-- Most restrictive policy: -->
7+
<site-control permitted-cross-domain-policies="none"/>
88

9-
<!-- Least restrictive policy: -->
10-
<!--
11-
<site-control permitted-cross-domain-policies="all"/>
12-
<allow-access-from domain="*" to-ports="*" secure="false"/>
13-
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
14-
-->
9+
<!-- Least restrictive policy: -->
10+
<!--
11+
<site-control permitted-cross-domain-policies="all"/>
12+
<allow-access-from domain="*" to-ports="*" secure="false"/>
13+
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
14+
-->
1515
</cross-domain-policy>

‎tests/dummy/public/robots.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# http://www.robotstxt.org
22
User-agent: *
3+
Disallow:

0 commit comments

Comments
 (0)