diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..d9807d3 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,16 @@ +# unconventional js +/blueprints/*/files/ +/vendor/ + +# compiled output +/dist/ +/tmp/ + +# dependencies +/bower_components/ + +# misc +/coverage/ + +# ember-try +/.node_modules.ember-try/ diff --git a/.eslintrc.js b/.eslintrc.js index 466bbee..b956de0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -23,6 +23,7 @@ module.exports = { 'ember-cli-build.js', 'index.js', 'testem.js', + 'blueprints/*/index.js', 'config/**/*.js', 'tests/dummy/config/**/*.js' ], diff --git a/.gitignore b/.gitignore index 8fa39a6..29c9bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,23 @@ # 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 /.sass-cache /connect.lock -/coverage/* +/coverage/ /libpeerconnection.log -npm-debug.log* -yarn-error.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 +/.node_modules.ember-try/ +/bower.json.ember-try +/package.json.ember-try diff --git a/.npmignore b/.npmignore index 135c7b1..f4a79da 100644 --- a/.npmignore +++ b/.npmignore @@ -14,6 +14,7 @@ bower.json ember-cli-build.js testem.js +yarn.lock # ember-try .node_modules.ember-try/ diff --git a/.travis.yml b/.travis.yml index c9db7e0..c9e48c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: node_js node_js: # we recommend testing addons with the same minimum supported node version as Ember CLI # so that your addon works for all apps - - "4" + - "6" sudo: false dist: trusty diff --git a/package.json b/package.json index ddeabc2..891f91b 100644 --- a/package.json +++ b/package.json @@ -5,19 +5,19 @@ "keywords": [ "ember-addon" ], + "repository": { + "type": "git", + "url": "git+https://github.com/lblod/ember-rdfa-editor-plugin-generator.git" + }, "license": "MIT", "author": "redpencil.io", "directories": { "doc": "doc", "test": "tests" }, - "repository": { - "type": "git", - "url": "git+https://github.com/lblod/ember-rdfa-editor-plugin-generator.git" - }, "scripts": { "build": "ember build", - "lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests", + "lint:js": "eslint .", "start": "ember serve", "test": "ember test", "test:all": "ember try:each" @@ -26,15 +26,15 @@ "ember-cli-babel": "^6.6.0" }, "devDependencies": { - "broccoli-asset-rev": "^2.4.5", + "broccoli-asset-rev": "^2.7.0", "ember-ajax": "^3.0.0", - "ember-cli": "~3.1.2", + "ember-cli": "~3.3.0", "ember-cli-dependency-checker": "^2.0.0", "ember-cli-eslint": "^4.2.1", "ember-cli-htmlbars": "^2.0.1", "ember-cli-htmlbars-inline-precompile": "^1.0.0", "ember-cli-inject-live-reload": "^1.4.1", - "ember-cli-qunit": "^4.1.1", + "ember-cli-qunit": "^4.3.2", "ember-cli-release": "^1.0.0-beta.2", "ember-cli-shims": "^1.2.0", "ember-cli-sri": "^2.1.0", @@ -42,18 +42,19 @@ "ember-cli-update": "^0.21.3", "ember-disable-prototype-extensions": "^1.1.2", "ember-export-application-global": "^2.0.0", - "ember-load-initializers": "^1.0.0", + "ember-load-initializers": "^1.1.0", "ember-maybe-import-regenerator": "^0.1.6", "ember-resolver": "^4.0.0", - "ember-source": "~3.1.0", + "ember-source": "~3.3.0", "ember-source-channel-url": "^1.0.1", "ember-try": "^0.2.23", "eslint-plugin-ember": "^5.0.0", "eslint-plugin-node": "^6.0.1", - "loader.js": "^4.2.3" + "loader.js": "^4.2.3", + "qunit-dom": "^0.6.2" }, "engines": { - "node": "^4.5 || 6.* || >= 7.*" + "node": "6.* || 8.* || >= 10.*" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/testem.js b/testem.js index d1755a4..726d187 100644 --- a/testem.js +++ b/testem.js @@ -9,13 +9,14 @@ module.exports = { ], browser_args: { Chrome: { - mode: 'ci', - args: [ + ci: [ // --no-sandbox is needed when running Chrome inside a container - process.env.TRAVIS ? '--no-sandbox' : null, - - '--disable-gpu', + process.env.CI ? '--no-sandbox' : null, '--headless', + '--disable-gpu', + '--disable-dev-shm-usage', + '--disable-software-rasterizer', + '--mute-audio', '--remote-debugging-port=0', '--window-size=1440,900' ].filter(Boolean)