File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -13,22 +13,8 @@ insert_final_newline = true
1313indent_style = space
1414indent_size = 2
1515
16- [* .js ]
17- indent_style = space
18- indent_size = 2
19-
2016[* .hbs ]
2117insert_final_newline = false
22- indent_style = space
23- indent_size = 2
24-
25- [* .css ]
26- indent_style = space
27- indent_size = 2
28-
29- [* .html ]
30- indent_style = space
31- indent_size = 2
3218
3319[* .{diff,md} ]
3420trim_trailing_whitespace = false
Original file line number Diff line number Diff line change 11module . exports = {
22 root : true ,
33 parserOptions : {
4- ecmaVersion : 6 ,
4+ ecmaVersion : 2017 ,
55 sourceType : 'module'
66 } ,
7- extends : 'eslint:recommended' ,
7+ plugins : [
8+ 'ember'
9+ ] ,
10+ extends : [
11+ 'eslint:recommended' ,
12+ 'plugin:ember/recommended'
13+ ] ,
814 env : {
9- node : true
15+ browser : true
1016 } ,
1117 rules : {
12- }
18+ } ,
19+ overrides : [
20+ // node files
21+ {
22+ files : [
23+ 'index.js' ,
24+ 'testem.js' ,
25+ 'ember-cli-build.js' ,
26+ 'config/**/*.js' ,
27+ 'tests/dummy/config/**/*.js'
28+ ] ,
29+ excludedFiles : [
30+ 'app/**' ,
31+ 'addon/**'
32+ ] ,
33+ parserOptions : {
34+ sourceType : 'script' ,
35+ ecmaVersion : 2015
36+ } ,
37+ env : {
38+ browser : false ,
39+ node : true
40+ } ,
41+ plugins : [ 'node' ] ,
42+ rules : Object . assign ( { } , require ( 'eslint-plugin-node' ) . configs . recommended . rules , {
43+ // add your custom rules and overrides for node files here
44+ } )
45+ } ,
46+
47+ // test files
48+ {
49+ files : [ 'tests/**/*.js' ] ,
50+ excludedFiles : [ 'tests/dummy/**/*.js' ] ,
51+ env : {
52+ embertest : true
53+ }
54+ }
55+ ]
1356} ;
Original file line number Diff line number Diff line change 1- # See http ://help.github.com/ignore-files/ for more about ignoring files.
1+ # See https ://help.github.com/ignore-files/ for more about ignoring files.
22
33# compiled output
44/dist
1313/connect.lock
1414/coverage /*
1515/libpeerconnection.log
16- npm-debug.log
16+ npm-debug.log *
17+ yarn-error.log
1718testem.log
19+
20+ # ember-try
21+ .node_modules.ember-try /
22+ bower.json.ember-try
23+ package.json.ember-try
Original file line number Diff line number Diff line change 1- bower_components /
2- tests /
3- tmp /
4- dist /
5-
1+ /bower_components
2+ /config /ember-try.js
3+ /dist
4+ /tests
5+ /tmp
6+ ** /.gitkeep
67.bowerrc
78.editorconfig
89.ember-cli
10+ .eslintrc.js
11+ .gitignore
12+ .watchmanconfig
913.travis.yml
10- .npmignore
11- ** /.gitkeep
1214bower.json
13- Brocfile.js
14- testem.json
15+ ember-cli-build.js
16+ testem.js
17+
18+ # ember-try
19+ .node_modules.ember-try /
20+ bower.json.ember-try
21+ package.json.ember-try
Original file line number Diff line number Diff line change 55 "scripts" : {},
66 "repository" : " https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack" ,
77 "engines" : {
8- "node" : " >= 4 "
8+ "node" : " ^4.5 || 6.* || >= 7.* "
99 },
1010 "author" : " Luke Melia and ember-cli-deploy team" ,
1111 "license" : " MIT" ,
1212 "devDependencies" : {
13- "ember-cli" : " ^2.12 .0" ,
13+ "ember-cli" : " ^2.18 .0" ,
1414 "ember-cli-release" : " 1.0.0-beta.2" ,
1515 "eslint" : " ^3.18.0"
1616 },
2020 ],
2121 "dependencies" : {
2222 "ember-cli-deploy-build" : " ^1.1.0" ,
23- "ember-cli-deploy-display-revisions" : " 1.0.0" ,
24- "ember-cli-deploy-gzip" : " 1.0.0" ,
25- "ember-cli-deploy-manifest" : " 1.0.0" ,
23+ "ember-cli-deploy-display-revisions" : " ^ 1.0.0" ,
24+ "ember-cli-deploy-gzip" : " ^ 1.0.0" ,
25+ "ember-cli-deploy-manifest" : " ^ 1.0.0" ,
2626 "ember-cli-deploy-redis" : " ^1.0.2" ,
27- "ember-cli-deploy-revision-data" : " 1.0.0" ,
27+ "ember-cli-deploy-revision-data" : " ^ 1.0.0" ,
2828 "ember-cli-deploy-s3" : " ^1.1.0"
2929 },
3030 "ember-addon" : {
You can’t perform that action at this time.
0 commit comments