diff --git a/.circleci/config.yml b/.circleci/config.yml index 70372f0..ecb720e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,6 +13,9 @@ jobs: - run: name: npm install command: npm install --non-interactive + - run: + name: Test + command: ember test - deploy: command: | if [ "${CIRCLE_BRANCH}" == "master" ]; then diff --git a/.editorconfig b/.editorconfig index 219985c..c35a002 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,7 +4,6 @@ root = true - [*] end_of_line = lf charset = utf-8 diff --git a/.eslintignore b/.eslintignore index 72df373..9221655 100644 --- a/.eslintignore +++ b/.eslintignore @@ -13,6 +13,7 @@ # misc /coverage/ !.* +.eslintcache # ember-try /.node_modules.ember-try/ diff --git a/.eslintrc.js b/.eslintrc.js index 28ef895..da079e3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,42 +1,53 @@ +'use strict'; + module.exports = { root: true, + parser: 'babel-eslint', parserOptions: { - ecmaVersion: 2017, - sourceType: 'module' + ecmaVersion: 2018, + sourceType: 'module', + ecmaFeatures: { + legacyDecorators: true, + }, }, - plugins: [ - 'ember' - ], + plugins: ['ember'], extends: [ 'eslint:recommended', - 'plugin:ember/recommended' + 'plugin:ember/recommended', + 'plugin:prettier/recommended', ], env: { - browser: true - }, - rules: { + browser: true, }, + rules: {}, overrides: [ // 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' + 'server/**/*.js', ], parserOptions: { sourceType: 'script', - ecmaVersion: 2015 }, env: { browser: false, - node: true - } - } - ] + node: true, + }, + plugins: ['node'], + extends: ['plugin:node/recommended'], + rules: { + // this can be removed once the following is fixed + // https://github.com/mysticatea/eslint-plugin-node/issues/77 + 'node/no-unpublished-require': 'off', + }, + }, + ], }; diff --git a/.gitignore b/.gitignore index c40a1b2..7e0f7dd 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /.env* /.pnp* /.sass-cache +/.eslintcache /connect.lock /coverage/ /libpeerconnection.log diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..9221655 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,21 @@ +# unconventional js +/blueprints/*/files/ +/vendor/ + +# compiled output +/dist/ +/tmp/ + +# dependencies +/bower_components/ +/node_modules/ + +# misc +/coverage/ +!.* +.eslintcache + +# ember-try +/.node_modules.ember-try/ +/bower.json.ember-try +/package.json.ember-try diff --git a/.prettierrc.js b/.prettierrc.js new file mode 100644 index 0000000..534e6d3 --- /dev/null +++ b/.prettierrc.js @@ -0,0 +1,5 @@ +'use strict'; + +module.exports = { + singleQuote: true, +}; diff --git a/.template-lintrc.js b/.template-lintrc.js index b45e96f..3b0b9af 100644 --- a/.template-lintrc.js +++ b/.template-lintrc.js @@ -1,5 +1,5 @@ 'use strict'; module.exports = { - extends: 'recommended' + extends: 'octane', }; diff --git a/.travis.yml b/.travis.yml index e63caa7..c8c586f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,9 @@ --- language: node_js node_js: - - "6" + - "10" -sudo: false -dist: trusty +dist: xenial addons: chrome: stable @@ -18,10 +17,22 @@ env: # See https://git.io/vdao3 for details. - JOBS=1 +branches: + only: + - master + before_install: +<<<<<<< HEAD - npm config set spin false script: - npm run lint:hbs - npm run lint:js - npm test +======= + - curl -o- -L https://yarnpkg.com/install.sh | bash + - export PATH=$HOME/.yarn/bin:$PATH + +script: + - yarn test +>>>>>>> 3e552d3... v3.9.0...v3.25.0 diff --git a/app/app.js b/app/app.js index b3b2bd6..36435ef 100644 --- a/app/app.js +++ b/app/app.js @@ -1,14 +1,12 @@ import Application from '@ember/application'; -import Resolver from './resolver'; +import Resolver from 'ember-resolver'; import loadInitializers from 'ember-load-initializers'; -import config from './config/environment'; +import config from 'cv-website/config/environment'; -const App = Application.extend({ - modulePrefix: config.modulePrefix, - podModulePrefix: config.podModulePrefix, - Resolver -}); +export default class App extends Application { + modulePrefix = config.modulePrefix; + podModulePrefix = config.podModulePrefix; + Resolver = Resolver; +} loadInitializers(App, config.modulePrefix); - -export default App; diff --git a/app/resolver.js b/app/resolver.js deleted file mode 100644 index 2fb563d..0000000 --- a/app/resolver.js +++ /dev/null @@ -1,3 +0,0 @@ -import Resolver from 'ember-resolver'; - -export default Resolver; diff --git a/app/router.js b/app/router.js index d0bb009..c380ec2 100644 --- a/app/router.js +++ b/app/router.js @@ -1,12 +1,9 @@ import EmberRouter from '@ember/routing/router'; -import config from './config/environment'; +import config from 'cv-website/config/environment'; -const Router = EmberRouter.extend({ - location: config.locationType, - rootURL: config.rootURL -}); +export default class Router extends EmberRouter { + location = config.locationType; + rootURL = config.rootURL; +} -Router.map(function() { -}); - -export default Router; +Router.map(function () {}); diff --git a/app/templates/application.hbs b/app/templates/application.hbs index b5190e4..0e36382 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,3 +1,4 @@ +<<<<<<< HEAD