Skip to content

Commit 69297db

Browse files
authored
Merge pull request #257 from josemarluedke/jl-template-lint
Add Ember Template Lint
2 parents 4caf597 + c0eb85a commit 69297db

File tree

12 files changed

+186
-40
lines changed

12 files changed

+186
-40
lines changed

.template-lintrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended',
5+
rules: {
6+
quotes: 'single'
7+
}
8+
};

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
},
1616
"scripts": {
1717
"build": "ember build",
18+
"lint:hbs": "ember-template-lint .",
1819
"lint:js": "eslint .",
1920
"start": "ember serve",
2021
"test": "ember try:each",
@@ -86,7 +87,7 @@
8687
"broccoli-asset-rev": "^3.0.0",
8788
"common-tags": "^1.8.0",
8889
"ember-classy-page-object": "^0.5.0",
89-
"ember-cli": "~3.4.0",
90+
"ember-cli": "~3.4.3",
9091
"ember-cli-addon-docs-esdoc": "^0.2.1",
9192
"ember-cli-addon-docs-yuidoc": "^0.2.1",
9293
"ember-cli-dependency-checker": "^3.0.0",
@@ -98,15 +99,15 @@
9899
"ember-cli-inject-live-reload": "^1.8.2",
99100
"ember-cli-mirage": "^0.4.9",
100101
"ember-cli-qunit": "^4.3.2",
101-
"ember-cli-shims": "^1.2.0",
102102
"ember-cli-sri": "^2.1.1",
103+
"ember-cli-template-lint": "^1.0.0-beta.2",
103104
"ember-cli-uglify": "^2.1.0",
104105
"ember-disable-prototype-extensions": "^1.1.3",
105106
"ember-export-application-global": "^2.0.0",
106107
"ember-load-initializers": "^1.1.0",
107108
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
108109
"ember-resolver": "^5.0.1",
109-
"ember-source": "~3.4.0",
110+
"ember-source": "~3.4.5",
110111
"ember-source-channel-url": "^1.1.0",
111112
"ember-test-selectors": "^1.0.0",
112113
"ember-try": "^1.0.0",

test-apps/new-addon/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"ember-cli-htmlbars-inline-precompile": "*",
3333
"ember-cli-inject-live-reload": "*",
3434
"ember-cli-qunit": "*",
35-
"ember-cli-shims": "*",
3635
"ember-cli-sri": "*",
3736
"ember-cli-uglify": "*",
3837
"ember-disable-prototype-extensions": "*",

tests/dummy/app/pods/docs/components/docs-demo/demo3/template.hbs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
{{#docs-demo as |demo|}}
33
{{#demo.example name='docs-demo-custom.md'}}
44
<pre>
5-
# Markdown
6-
- Has syntax highlighting, too
5+
# Markdown
6+
- Has syntax highlighting, too
77
</pre>
88
{{/demo.example}}
99

1010
{{demo.snippet 'docs-demo-custom-src.hbs' label='Source'}}
11-
{{demo.snippet 'docs-demo-custom.md' label='My Custom Label' language='markdown'}}
11+
{{demo.snippet
12+
'docs-demo-custom.md'
13+
label='My Custom Label'
14+
language='markdown'
15+
}}
1216
{{/docs-demo}}
1317
{{!-- END-SNIPPET --}}

tests/dummy/app/pods/docs/components/docs-hero/demo-2/template.hbs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
{{docs-hero
44
prefix='EmberData'
55
heading='Something'
6-
byline='The best addon ever. Now playing in theaters.'}}
6+
byline='The best addon ever. Now playing in theaters.'
7+
}}
78
{{/demo.example}}
89

910
{{demo.snippet 'docs-hero-2.hbs'}}

tests/dummy/app/pods/docs/components/docs-snippet/demo1/template.hbs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<div class="docs-my-8">
2-
{{#docs-snippet name="docs-snippet.hbs"}}
1+
<div class='docs-my-8'>
2+
{{#docs-snippet name='docs-snippet.hbs'}}
33
<div id='foo'>
44
{{#my-awesome-thing
55
some=true
6-
options=false}}
6+
options=false
7+
}}
78
<p>Something old, something new</p>
89
{{/my-awesome-thing}}
910
</div>

tests/dummy/app/pods/docs/components/docs-snippet/demo2/template.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="docs-my-8">
2-
{{#docs-snippet name="my-snippet-src.hbs"}}
1+
<div class='docs-my-8'>
2+
{{#docs-snippet name='my-snippet-src.hbs'}}
33
// BEGIN-SNIPPET my-snippet.js
44
App = Ember.Application.extend({
55
modulePrefix: config.modulePrefix,
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="docs-my-8">
2-
{{#docs-snippet name="my-snippet-src2.hbs"}}
1+
<div class='docs-my-8'>
2+
{{#docs-snippet name='my-snippet-src2.hbs'}}
33
{{docs-snippet name='my-snippet.js'}}
44
{{/docs-snippet}}
55
</div>

tests/dummy/app/pods/docs/components/docs-snippet/demo4/template.hbs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
<div class="docs-my-8">
2-
{{#docs-snippet name="docs-snippet-title-example.js" title="app/components/my-component.js"}}
1+
<div class='docs-my-8'>
2+
{{#docs-snippet
3+
name='docs-snippet-title-example.js'
4+
title='app/components/my-component.js'
5+
}}
36
import Component from '@ember/component';
47
export default Component.extend({
58
// ...

tests/dummy/app/pods/index/template.hbs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
<section class='docs-max-w-md docs-mx-auto docs-pb-8'>
55
{{index/index-content}}
66

7-
<div class="docs-my-16 docs-text-right">
8-
{{#link-to 'docs' class='docs-bg-grey-darkest hover:docs-bg-black docs-text-white docs-py-2 docs-px-4 docs-no-underline docs-rounded'}}
7+
<div class='docs-my-16 docs-text-right'>
8+
{{#link-to
9+
'docs'
10+
class='docs-bg-grey-darkest hover:docs-bg-black docs-text-white docs-py-2 docs-px-4 docs-no-underline docs-rounded'
11+
}}
912
Read the docs →
1013
{{/link-to}}
1114
</div>

0 commit comments

Comments
 (0)