Skip to content
This repository was archived by the owner on Aug 24, 2022. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ember-template-lint/ember-cli-template-lint
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.7.2
Choose a base ref
...
head repository: ember-template-lint/ember-cli-template-lint
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 9,598 additions and 2,896 deletions.
  1. +0 −4 .bowerrc
  2. +20 −0 .eslintignore
  3. +51 −36 .eslintrc.js
  4. +16 −8 .gitignore
  5. +0 −32 .jshintrc
  6. +32 −16 .npmignore
  7. +1 −3 .template-lintrc.js
  8. +43 −14 .travis.yml
  9. +50 −0 CHANGELOG.md
  10. +1 −1 LICENSE.md
  11. +20 −15 README.md
  12. 0 app/.gitkeep
  13. +1 −2 blueprints/ember-cli-template-lint/recommended-files/.template-lintrc.js
  14. +2 −3 blueprints/ember-cli-template-lint/recommended-with-bare-strings-files/.template-lintrc.js
  15. +0 −9 bower.json
  16. +6 −4 broccoli-template-linter.js
  17. +83 −38 config/ember-try.js
  18. +0 −2 config/environment.js
  19. +3 −2 ember-cli-build.js
  20. +18 −6 index.js
  21. +3 −1 lib/commands/print-failing.js
  22. +8 −0 lib/plugins/remove-configuration-html-comments.js
  23. +39 −12 node-tests/acceptance/broccoli-test.js
  24. +21 −7 node-tests/blueprints/ember-cli-template-lint-test.js
  25. +1 −1 node-tests/fixtures/with-bare-strings/.template-lintrc.js
  26. +54 −40 package.json
  27. +24 −0 testem.js
  28. +0 −12 testem.json
  29. +8 −8 tests/acceptance/index-test.js
  30. +7 −13 tests/dummy/app/app.js
  31. +4 −4 tests/dummy/app/index.html
  32. +0 −3 tests/dummy/app/resolver.js
  33. +5 −6 tests/dummy/app/router.js
  34. +1 −1 tests/dummy/app/templates/application.hbs
  35. 0 tests/dummy/app/templates/components/.gitkeep
  36. +10 −8 tests/dummy/config/environment.js
  37. +6 −0 tests/dummy/config/optional-features.json
  38. +18 −0 tests/dummy/config/targets.js
  39. +0 −15 tests/dummy/public/crossdomain.xml
  40. 0 {addon → tests/helpers}/.gitkeep
  41. +0 −5 tests/helpers/destroy-app.js
  42. +0 −23 tests/helpers/module-for-acceptance.js
  43. +0 −11 tests/helpers/resolver.js
  44. +0 −18 tests/helpers/start-app.js
  45. +8 −9 tests/index.html
  46. +6 −4 tests/test-helper.js
  47. 0 vendor/.gitkeep
  48. +9,028 −2,500 yarn.lock
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

20 changes: 20 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
87 changes: 51 additions & 36 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,57 @@
// from ember-cli/ember-cli

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 6,
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
},
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
extends: 'eslint:recommended',

rules: {
semi: [2, 'always'],

'no-unused-expressions': [2, {
allowShortCircuit: true,
allowTernary: true
}],

'strict': [2, 'global'],

'indent': [2, 2, {
'SwitchCase': 0,
'VariableDeclarator': { 'var': 2, 'let': 2, 'const': 3 }
}],

'no-cond-assign': [2, 'except-parens'],
curly: 2,
'no-use-before-define': [2, 'nofunc'],
'no-debugger': 2,

eqeqeq: 2,
'no-eval': 2,
'linebreak-style': [2, 'unix'],
'no-caller': 2,
'no-empty': 2,
quotes: [2, 'single', 'avoid-escape'],
'no-undef': 2,
'no-unused-vars': 2,
'no-trailing-spaces': 2,
'no-eq-null': 2,
'no-console': 2
}
'ember/no-jquery': 'error'
},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js',
'lib/**/*.js'
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
parserOptions: {
sourceType: 'script'
},
env: {
browser: false,
node: true
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
}
]
};
24 changes: 16 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
32 changes: 0 additions & 32 deletions .jshintrc

This file was deleted.

48 changes: 32 additions & 16 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,33 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintignore
/.eslintrc.js
/.git/
/.gitignore
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.json
node-tests/
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/yarn.lock
/node-tests
.gitkeep

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
4 changes: 1 addition & 3 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use strict';

/* eslint-env node */

module.exports = {
extends: 'recommended',
extends: 'octane',

pending: [
'dummy/templates/components/foo-bar'
57 changes: 43 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,58 @@
---
language: node_js
node_js:
- "4"
- "6"
- "7"
- "12"

sudo: false
addons:
chrome: stable

cache:
yarn: true

matrix:
fast_finish: true
branches:
only:
- master
# automated dependency updates
- /^dependabot/
# npm version tags
- /^v\d+\.\d+\.\d+/

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
- yarn global add bower phantomjs-prebuilt
- bower --version
- phantomjs --version

install:
- yarn install --no-lockfile
- bower install
- yarn install

script:
- yarn test
- yarn run nodetest
jobs:
fail_fast: true

include:
# runs tests in chrome with current locked deps and linting

- stage: tests
name: "Tests"
script:
- yarn lint:js
- yarn test:node
- yarn test

# If that passes:
# - run tests in other node versions
# - run tests without pinned dependencies to catch issues with new versions

- stage: additional tests
name: "Node 10 Tests"
node_js: 10
script:
- yarn test:node
- name: "Node 13 Tests"
node_js: 13
script:
- yarn test:node

- name: "Floating dependencies"
install: yarn install --no-lockfile --non-interactive
script:
- yarn test:node
- yarn test
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,56 @@
Changelog
=========

## v2.0.2

- Update to ember-template-lint@2.0.1

## v2.0.1

- Allow Babel to run in parrallel

## v2.0.0

- Update blueprint to use `octane` config
- Run `npx ember-cli-update`
- Drop NodeJs 6, 8, 11

## v1.0.0

- Update dependency to support Dynamic styles. Please review [ember-template-lint's CHANGELOG.md](https://github.com/ember-template-lint/ember-template-lint/blob/master/CHANGELOG.md) for a detailed list of changs.
- Remove jshintrc file.

## v1.0.0-beta.3

- Support parallel babel configuration.
- Update ember-template-lint to 1.1.0.
- Update dependencies to latest versions.

## v1.0.0-beta.1

- Drop support for Node 4, 5, 7, and 9.
- Update ember-template-lint to 1.0.0-beta.2. Please review [ember-template-lint's CHANGELOG.md](https://github.com/ember-template-lint/ember-template-lint/blob/master/CHANGELOG.md) for a detailed list of changs.
- Update dependencies to latest versions.
- Ensure compatible with Broccoli 2.

## v0.7.6

- Update to latest version of `ember-template-lint` (see its [changelog](https://github.com/ember-template-lint/ember-template-lint/blob/master/CHANGELOG.md) for details).
- Fix blueprint to account for the `bare-string` -> `no-bare-string` deprecation.

## v0.7.5

- Fix test framework detection to allow prerelease versions.

## v0.7.4

- Fix issue with warning when no testing framework is detected.
- Update various dependencies.

## v0.7.3

- Fix another issue with new console output formatting.

## v0.7.2

- Update ember-template-lint to 0.8.1 to include a fix for console output formatting.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016
Copyright (c) 2016-2019 Robert Jackson

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:

Loading