Skip to content
This repository was archived by the owner on Nov 23, 2024. It is now read-only.

Commit 49491a3

Browse files
BrianSippleBrianSipple
BrianSipple
authored and
BrianSipple
committed
1 parent 2b5c5c5 commit 49491a3

25 files changed

+201
-126
lines changed

‎.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ indent_style = space
1818
indent_size = 2
1919

2020
[*.hbs]
21+
insert_final_newline = false
2122
indent_style = space
2223
indent_size = 2
2324

‎.eslintrc

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
{
22
"extends": "ember",
3+
"parser": "babel-eslint",
4+
"env": {
5+
"es6": true
6+
},
37
"rules": {
4-
"prefer-arrow-callback": 0
8+
"prefer-arrow-callback": 0,
9+
"space-before-function-paren": [0, { "anonymous": "always", "named": "always" }],
10+
"object-curly-spacing": 0,
11+
"prefer-reflect": 0,
12+
"newline-after-var": 0,
13+
"arrow-spacing": 0
514
}
615
}

‎.npmignore

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
bower_components/
2-
tests/
3-
tmp/
4-
1+
/bower_components
2+
/config/ember-try.js
3+
/dist
4+
/tests
5+
/tmp
6+
**/.gitkeep
57
.bowerrc
68
.editorconfig
79
.ember-cli
10+
.gitignore
11+
.jshintrc
12+
.watchmanconfig
813
.travis.yml
9-
.npmignore
10-
**/.gitkeep
1114
bower.json
12-
Brocfile.js
15+
ember-cli-build.js
1316
testem.json

‎.travis.yml

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
---
22
language: node_js
3+
node_js:
4+
- "0.12"
35

46
sudo: false
57

68
cache:
79
directories:
810
- node_modules
911

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+
1023
before_install:
24+
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
1125
- "npm config set spin false"
1226
- "npm install -g npm@^2"
1327

@@ -17,4 +31,4 @@ install:
1731
- bower install
1832

1933
script:
20-
- 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", "dist"]
3+
}

‎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

‎bower.json

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
{
22
"name": "ember-cli-eslint",
33
"dependencies": {
4-
"jquery": "~2.1.4",
5-
"ember": "1.13.8",
6-
"ember-data": "1.0.0-beta.18",
7-
"ember-resolver": "~0.1.18",
8-
"loader.js": "3.3.0",
9-
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
10-
"ember-cli-test-loader": "0.2.0",
11-
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
12-
"ember-qunit": "0.4.9",
13-
"ember-qunit-notifications": "0.0.7",
14-
"qunit": "~1.18.0"
4+
"ember": "~2.3.1",
5+
"ember-cli-shims": "0.1.0",
6+
"ember-cli-test-loader": "0.2.2",
7+
"ember-qunit-notifications": "0.1.0"
158
}
169
}

‎config/ember-try.js

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

‎config/environment.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/*jshint node:true*/
2+
'use strict';
3+
4+
module.exports = function(/* environment, appConfig */) {
5+
return { };
6+
};

‎package.json

+28-21
Original file line numberDiff line numberDiff line change
@@ -25,41 +25,48 @@
2525
"author": "Jonathan Kingston",
2626
"license": "MIT",
2727
"devDependencies": {
28-
"broccoli-asset-rev": "~2.1.2",
29-
"ember-cli": "~1.13.8",
30-
"ember-cli-app-version": "0.5.0",
31-
"ember-cli-babel": "~5.1.3",
32-
"ember-cli-content-security-policy": "^0.4.0",
33-
"ember-cli-dependency-checker": "~1.0.1",
34-
"ember-cli-htmlbars": "~0.7.9",
35-
"ember-cli-htmlbars-inline-precompile": "~0.2.0",
36-
"ember-cli-ic-ajax": "0.1.4",
37-
"ember-cli-inject-live-reload": "~1.3.1",
38-
"ember-cli-qunit": "~1.0.0",
39-
"ember-cli-sri": "~1.0.3",
40-
"ember-cli-uglify": "~1.2.0",
41-
"ember-data": "1.0.0-beta.18",
42-
"ember-export-application-global": "~1.0.3",
43-
"ember-try": "0.0.8",
44-
"eslint-config-ember": "^0.1.1",
28+
"babel-eslint": "^5.0.0",
29+
"broccoli-asset-rev": "^2.2.0",
30+
"ember-ajax": "0.7.1",
31+
"ember-cli": "^2.3.0",
32+
"ember-cli-app-version": "^1.0.0",
33+
"ember-cli-dependency-checker": "^1.2.0",
34+
"ember-cli-htmlbars": "^1.0.1",
35+
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
36+
"ember-cli-inject-live-reload": "^1.3.1",
37+
"ember-cli-qunit": "^1.2.1",
38+
"ember-cli-release": "0.2.8",
39+
"ember-cli-sri": "^2.0.0",
40+
"ember-cli-uglify": "^1.2.0",
41+
"ember-disable-prototype-extensions": "^1.1.0",
42+
"ember-disable-proxy-controllers": "^1.0.1",
43+
"ember-export-application-global": "^1.0.4",
44+
"ember-load-initializers": "^0.5.0",
45+
"ember-resolver": "^2.0.3",
46+
"ember-try": "^0.1.2",
47+
"eslint-config-ember": "^0.2.1",
4548
"express": "^4.12.3",
4649
"js-string-escape": "^1.0.0",
47-
"phantomjs": "^1.9.16"
50+
"loader.js": "^4.0.0",
51+
"phantomjs": "^2.1.3"
4852
},
4953
"keywords": [
5054
"ember-addon",
5155
"lint",
5256
"eslint",
57+
"eslint ember",
58+
"eslint ember-cli",
5359
"ember"
5460
],
61+
"dependencies": {
62+
"broccoli-lint-eslint": "^1.1.1",
63+
"ember-cli-babel": "^5.1.5"
64+
},
5565
"main": "index.js",
5666
"ember-addon": {
5767
"configPath": "tests/dummy/config",
5868
"before": "ember-cli-qunit",
5969
"main": "index.js",
6070
"defaultBlueprint": "ember-cli-eslint"
61-
},
62-
"dependencies": {
63-
"broccoli-lint-eslint": "^1.1.1"
6471
}
6572
}

‎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/.jshintrc

-51
This file was deleted.

‎tests/dummy/.eslintrc

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"extends": "ember",
3+
"parser": "babel-eslint",
4+
"rules": {
5+
"prefer-arrow-callback": 0,
6+
"space-before-function-paren": [0, { "anonymous": "always", "named": "always" }],
7+
"object-curly-spacing": 0,
8+
"prefer-reflect": 0,
9+
"newline-after-var": 0,
10+
"arrow-spacing": 0
11+
}
12+
}

‎tests/dummy/app/app.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import Ember from 'ember';
2-
import Resolver from 'ember/resolver';
3-
import loadInitializers from 'ember/load-initializers';
2+
import Resolver from './resolver';
3+
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);

‎tests/dummy/app/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

10-
{{content-for 'head'}}
10+
{{content-for "head"}}
1111

1212
<link rel="stylesheet" href="assets/vendor.css">
1313
<link rel="stylesheet" href="assets/dummy.css">
1414

15-
{{content-for 'head-footer'}}
15+
{{content-for "head-footer"}}
1616
</head>
1717
<body>
18-
{{content-for 'body'}}
18+
{{content-for "body"}}
1919

2020
<script src="assets/vendor.js"></script>
2121
<script src="assets/dummy.js"></script>
2222

23-
{{content-for 'body-footer'}}
23+
{{content-for "body-footer"}}
2424
</body>
2525
</html>

‎tests/dummy/app/resolver.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import Resolver from 'ember-resolver';
2+
3+
export default Resolver;

‎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

‎tests/dummy/app/templates/application.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<h2 id="title">Welcome to Ember.js</h2>
1+
<h2 id="title">Welcome to Ember</h2>
22

33
{{outlet}}

‎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>

0 commit comments

Comments
 (0)