Skip to content

Commit 478d51f

Browse files
committed
Set indentation level to 2 and undid the removal of LICENSE file
1 parent 0abbb04 commit 478d51f

35 files changed

+1340
-2037
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ charset = utf-8
1111
trim_trailing_whitespace = true
1212
insert_final_newline = true
1313
indent_style = space
14-
indent_size = 4
14+
indent_size = 2
1515

1616
[*.hbs]
1717
insert_final_newline = false

.ember-cli

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
2+
/**
3+
Ember CLI sends analytics information by default. The data is completely
4+
anonymous, but there are times when you might want to disable this behavior.
55

6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false
6+
Setting `disableAnalytics` to true will prevent any data from being sent.
7+
*/
8+
"disableAnalytics": false
99
}

.eslintrc.js

Lines changed: 51 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -1,155 +1,54 @@
11
module.exports = {
2-
root: true,
3-
parser: 'babel-eslint',
4-
parserOptions: {
5-
ecmaVersion: 2018,
6-
sourceType: 'module',
7-
ecmaFeatures: {
8-
legacyDecorators: true
9-
}
10-
},
11-
plugins: [
12-
'ember'
13-
],
14-
extends: [
15-
'eslint:recommended',
16-
'plugin:ember/recommended'
17-
],
18-
env: {
19-
browser: true
20-
},
21-
rules: {
22-
'ember/no-jquery': 'error',
2+
root: true,
3+
parser: 'babel-eslint',
4+
parserOptions: {
5+
ecmaVersion: 2018,
6+
sourceType: 'module',
7+
ecmaFeatures: {
8+
legacyDecorators: true
9+
}
10+
},
11+
plugins: [
12+
'ember'
13+
],
14+
extends: [
15+
'eslint:recommended',
16+
'plugin:ember/recommended'
17+
],
18+
env: {
19+
browser: true
20+
},
21+
rules: {
22+
'ember/no-jquery': 'error'
23+
},
24+
overrides: [
25+
// node files
26+
{
27+
files: [
28+
'.eslintrc.js',
29+
'.template-lintrc.js',
30+
'ember-cli-build.js',
31+
'testem.js',
32+
'blueprints/*/index.js',
33+
'config/**/*.js',
34+
'lib/*/index.js',
35+
'server/**/*.js'
36+
],
37+
parserOptions: {
38+
sourceType: 'script'
39+
},
40+
env: {
41+
browser: false,
42+
node: true
43+
},
44+
plugins: ['node'],
45+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
46+
// add your custom rules and overrides for node files here
2347

24-
// AirBnB style
25-
'array-bracket-spacing': [
26-
'error',
27-
'never',
28-
{
29-
'arraysInArrays': false,
30-
'objectsInArrays': false
31-
}
32-
],
33-
'arrow-spacing': [
34-
'error',
35-
{
36-
'before': true,
37-
'after': true
38-
}
39-
],
40-
'brace-style': [
41-
'error',
42-
'1tbs',
43-
{
44-
'allowSingleLine': true
45-
}
46-
],
47-
'comma-spacing': [
48-
'error', {
49-
'before': false,
50-
'after': true
51-
}
52-
],
53-
'indent': [
54-
'error',
55-
4,
56-
{
57-
'SwitchCase': 1
58-
}
59-
],
60-
'key-spacing': [
61-
'error',
62-
{
63-
'beforeColon': false,
64-
'afterColon': true
65-
}
66-
],
67-
'keyword-spacing': [
68-
'error',
69-
{
70-
'before': true,
71-
'after': true
72-
}
73-
],
74-
'max-len': [
75-
'error',
76-
{
77-
code: 160,
78-
comments: 160,
79-
ignoreUrls: true,
80-
ignoreTemplateLiterals: true,
81-
ignoreRegExpLiterals: true
82-
}
83-
],
84-
'no-mixed-spaces-and-tabs': ['error'],
85-
'no-multi-spaces': [
86-
'error', {
87-
'exceptions': {
88-
'Property': true
89-
}
90-
}
91-
],
92-
'no-tabs': ['error'],
93-
'no-trailing-spaces': ['error'],
94-
'no-var': ['error'],
95-
'object-curly-spacing': [
96-
'error',
97-
'always'
98-
],
99-
'one-var': [
100-
'error',
101-
'never'
102-
],
103-
'quotes': [
104-
'error',
105-
'single',
106-
{
107-
'allowTemplateLiterals': true
108-
}
109-
],
110-
'require-yield': 0,
111-
'semi': [
112-
'error',
113-
'always'
114-
],
115-
'space-before-blocks': [
116-
'error',
117-
'always'
118-
],
119-
'space-before-function-paren': [
120-
'error',
121-
'never'
122-
],
123-
'space-infix-ops': ['error']
124-
},
125-
overrides: [
126-
// node files
127-
{
128-
files: [
129-
'.eslintrc.js',
130-
'.template-lintrc.js',
131-
'ember-cli-build.js',
132-
'testem.js',
133-
'blueprints/*/index.js',
134-
'config/**/*.js',
135-
'lib/*/index.js',
136-
'server/**/*.js'
137-
],
138-
parserOptions: {
139-
sourceType: 'script'
140-
},
141-
env: {
142-
browser: false,
143-
node: true
144-
},
145-
plugins: ['node'],
146-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
147-
// add your custom rules and overrides for node files here
148-
149-
// this can be removed once the following is fixed
150-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
151-
'node/no-unpublished-require': 'off'
152-
})
153-
}
154-
]
48+
// this can be removed once the following is fixed
49+
// https://github.com/mysticatea/eslint-plugin-node/issues/77
50+
'node/no-unpublished-require': 'off'
51+
})
52+
}
53+
]
15554
};

.template-lintrc.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
5-
rules: {
6-
'block-indentation': 4
7-
}
4+
extends: 'octane'
85
};

.travis.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
---
22
language: node_js
33
node_js:
4-
- "8"
4+
- "8"
55

66
sudo: false
77
dist: trusty
88

99
addons:
10-
chrome: stable
10+
chrome: stable
1111

1212
cache:
13-
directories:
14-
- $HOME/.npm
13+
directories:
14+
- $HOME/.npm
1515

1616
env:
17-
global:
18-
# See https://git.io/vdao3 for details.
19-
- JOBS=1
17+
global:
18+
# See https://git.io/vdao3 for details.
19+
- JOBS=1
2020

2121
branches:
22-
only:
23-
- master
22+
only:
23+
- master
2424

2525
script:
26-
- npm run lint:hbs
27-
- npm run lint:js
28-
- npm test
26+
- npm run lint:hbs
27+
- npm run lint:js
28+
- npm test

.watchmanconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["tmp", "dist"]
33
}

CONTRIBUTING.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,29 @@ Contributions are welcome!
77
Advanced strategies should be PR'ed directly to the [Ember.js Guides](https://github.com/ember-learn/guides-source/pulls), since a goal of this project is to be short and sweet.
88

99

10+
## Running Locally
11+
12+
This is an Ember app, so the usual steps follow:
13+
14+
1. Clone this repo.
15+
```bash
16+
git clone [email protected]:ember-learn/ember-octane-vs-classic-cheat-sheet.git
17+
```
18+
1. Change directory.
19+
```bash
20+
cd ember-octane-vs-classic-cheat-sheet
21+
```
22+
1. Install packages.
23+
```bash
24+
npm install
25+
```
26+
1. Run the app.
27+
```bash
28+
ember serve
29+
```
30+
1. Visit your app at [http://localhost:4200](http://localhost:4200).
31+
32+
1033
## Deploying
1134

1235
This site is deployed to [GitHub Pages](https://pages.github.com/) automatically from the `master` branch.

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2019 Jennifer Weber
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,6 @@ Check out [the deployed app](https://ember-learn.github.io/ember-octane-vs-class
55
You can see side-by-side examples of [Ember Octane](https://emberjs.com/editions/octane) and Ember Classic.
66

77

8-
## Running Locally
9-
10-
This is an Ember app, so the usual steps follow:
11-
12-
1. Clone this repo.
13-
```bash
14-
git clone [email protected]:ember-learn/ember-octane-vs-classic-cheat-sheet.git
15-
```
16-
1. Change directory.
17-
```bash
18-
cd ember-octane-vs-classic-cheat-sheet
19-
```
20-
1. Install packages.
21-
```bash
22-
npm install
23-
```
24-
1. Run the app.
25-
```bash
26-
ember serve
27-
```
28-
1. Visit your app at [http://localhost:4200](http://localhost:4200).
29-
30-
318
## How to Contribute
329

3310
Contributions are welcome! Please read [CONTRIBUTING.md](CONTRIBUTING.md) for more information.

app/app.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

66
export default class App extends Application {
7-
modulePrefix = config.modulePrefix;
8-
podModulePrefix = config.podModulePrefix;
9-
Resolver = Resolver;
7+
modulePrefix = config.modulePrefix;
8+
podModulePrefix = config.podModulePrefix;
9+
Resolver = Resolver;
1010
}
1111

1212
loadInitializers(App, config.modulePrefix);

0 commit comments

Comments
 (0)