diff --git a/.circleci/config.yml b/.circleci/config.yml index cb9c942f..76912ea0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: ~/emberobserver/client docker: - - image: circleci/node:12-browsers + - image: circleci/node:14-browsers steps: - checkout - restore_cache: diff --git a/.eslintignore b/.eslintignore index d90e43b5..bef62d8c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -13,6 +13,7 @@ # misc /coverage/ !.* +.*/ .eslintcache # ember-try diff --git a/.eslintrc.js b/.eslintrc.js index 82bdb99e..d1ad77a9 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -41,15 +41,15 @@ module.exports = { // node files { files: [ - '.eslintrc.js', - '.prettierrc.js', - '.template-lintrc.js', - 'ember-cli-build.js', - 'testem.js', - 'blueprints/*/index.js', - 'config/**/*.js', - 'lib/*/index.js', - 'server/**/*.js', + './.eslintrc.js', + './.prettierrc.js', + './.template-lintrc.js', + './ember-cli-build.js', + './testem.js', + './blueprints/*/index.js', + './config/**/*.js', + './lib/*/index.js', + './server/**/*.js', ], parserOptions: { sourceType: 'script', @@ -66,5 +66,10 @@ module.exports = { 'node/no-unpublished-require': 'off', }, }, + { + // Test files: + files: ['tests/**/*-test.{js,ts}'], + extends: ['plugin:qunit/recommended'], + }, ], }; diff --git a/.template-lintrc.js b/.template-lintrc.js index 65818135..56c93d99 100644 --- a/.template-lintrc.js +++ b/.template-lintrc.js @@ -2,7 +2,7 @@ module.exports = { pending: [], - extends: 'octane', + extends: 'recommended', rules: { 'eol-last': 'always', 'inline-link-to': true, @@ -14,6 +14,7 @@ module.exports = { 'no-outlet-outside-routes': true, 'no-trailing-spaces': true, 'no-partial': true, + 'require-input-label': false, quotes: false, 'table-groups': false, }, diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d27b4022..00000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -language: node_js -node_js: - - "10" - -dist: xenial - -addons: - chrome: stable - -cache: - directories: - - $HOME/.npm - -env: - global: - # See https://git.io/vdao3 for details. - - JOBS=1 - -branches: - only: - - master - -before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash - - export PATH=$HOME/.yarn/bin:$PATH - -script: - - - - yarn test diff --git a/README.md b/README.md index b8dab021..d5388214 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,8 @@ Make use of the many generators for code, try `ember help generate` for more det ### Linting -* `npm run lint:hbs` -* `npm run lint:js` -* `npm run lint:js -- --fix` +* `yarn lint` +* `yarn lint:fix` ### Building diff --git a/app/components/admin-addon.hbs b/app/components/admin-addon.hbs index 45a7fd2a..89398572 100644 --- a/app/components/admin-addon.hbs +++ b/app/components/admin-addon.hbs @@ -71,12 +71,12 @@
- +
-