From 110b6a37c0b37485318d32080503968a9d8acb15 Mon Sep 17 00:00:00 2001 From: Max Minkoff Date: Sat, 24 Jun 2017 13:07:49 -0400 Subject: [PATCH] upgraded ember to v2.13.2 --- .bowerrc | 4 ---- .eslintrc.js | 13 +++++++++++++ .npmignore | 2 +- .travis.yml | 7 ++----- README.md | 8 ++++---- bower.json | 4 ---- config/ember-try.js | 2 +- config/environment.js | 2 +- ember-cli-build.js | 5 ++--- index.js | 2 +- package.json | 34 +++++++++++++++------------------- testem.js | 3 +-- tests/.eslintrc.js | 5 +++++ tests/dummy/config/targets.js | 10 ++++++++++ tests/helpers/start-app.js | 9 +++------ tests/test-helper.js | 2 ++ 16 files changed, 61 insertions(+), 51 deletions(-) delete mode 100644 .bowerrc create mode 100644 .eslintrc.js delete mode 100644 bower.json create mode 100644 tests/.eslintrc.js create mode 100644 tests/dummy/config/targets.js diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 959e169..0000000 --- a/.bowerrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "directory": "bower_components", - "analytics": false -} diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..2873e2f --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,13 @@ +module.exports = { + root: true, + parserOptions: { + ecmaVersion: 2017, + sourceType: 'module' + }, + extends: 'eslint:recommended', + env: { + browser: true + }, + rules: { + } +}; diff --git a/.npmignore b/.npmignore index fa8b147..889b2bf 100644 --- a/.npmignore +++ b/.npmignore @@ -8,7 +8,7 @@ .editorconfig .ember-cli .gitignore -.jshintrc +.eslintrc.js .watchmanconfig .travis.yml bower.json diff --git a/.travis.yml b/.travis.yml index 7afaaf7..72f90c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,13 @@ --- language: node_js node_js: - - "4" + - "6" sudo: false cache: directories: - $HOME/.npm - - $HOME/.cache # includes bowers cache env: # we recommend testing LTS's and latest stable release (bonus points to beta/canary) @@ -26,13 +25,11 @@ matrix: before_install: - npm config set spin false - - npm install -g bower phantomjs-prebuilt - - bower --version + - npm install -g phantomjs-prebuilt - phantomjs --version install: - npm install - - bower install script: # Usually, it's ok to finish the test scenario without reverting diff --git a/README.md b/README.md index 8fac827..4baa04c 100644 --- a/README.md +++ b/README.md @@ -55,12 +55,12 @@ export default Ember.Component.extend({ ## Running -* `ember server` -* Visit your app at http://localhost:4200. +* `ember serve` +* Visit your app at [http://localhost:4200](http://localhost:4200). ## Running Tests -* `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions) +* `npm test` (Runs `ember try:each` to test your addon against multiple Ember versions) * `ember test` * `ember test --server` @@ -68,4 +68,4 @@ export default Ember.Component.extend({ * `ember build` -For more information on using ember-cli, visit [http://ember-cli.com/](http://ember-cli.com/). +For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/). diff --git a/bower.json b/bower.json deleted file mode 100644 index 419f7ee..0000000 --- a/bower.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "ember-filestack", - "dependencies": {} -} diff --git a/config/ember-try.js b/config/ember-try.js index b1813d0..a070124 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -1,4 +1,4 @@ -/*jshint node:true*/ +/* eslint-env node */ module.exports = { scenarios: [ { diff --git a/config/environment.js b/config/environment.js index 28a787b..012a412 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,4 +1,4 @@ -/*jshint node:true*/ +/* eslint-env node */ 'use strict'; module.exports = function(/* environment, appConfig */) { diff --git a/ember-cli-build.js b/ember-cli-build.js index 4ac3913..5e6f037 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,6 +1,5 @@ -/*jshint node:true*/ -/* global require, module */ -var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); +/* eslint-env node */ +const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function(defaults) { var app = new EmberAddon(defaults, { diff --git a/index.js b/index.js index 664b26c..5fac419 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -/* jshint node: true */ +/* eslint-env node */ 'use strict'; var path = require('path'); var mergeTrees = require('broccoli-merge-trees'); diff --git a/package.json b/package.json index 5f4ee40..264777f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-filestack", - "version": "0.0.3", + "version": "0.0.4", "description": "Ember Addon for https://filestack.com support", "keywords": [ "ember-addon" @@ -20,36 +20,32 @@ "dependencies": { "broccoli-funnel": "^1.2.0", "broccoli-merge-trees": "^2.0.0", - "ember-cli-babel": "^5.1.7", "ember-cli-htmlbars": "^1.1.1", - "filestack-js": "^0.6.0" + "filestack-js": "^0.6.0", + "ember-cli-babel": "^6.0.0" }, "devDependencies": { "broccoli-asset-rev": "^2.4.5", - "ember-ajax": "^2.4.1", "ember-browserify": "1.1.13", - "ember-cli": "2.11.1", - "ember-cli-app-version": "^2.0.0", + "ember-ajax": "^3.0.0", + "ember-cli": "2.13.2", "ember-cli-dependency-checker": "^1.3.0", - "ember-cli-htmlbars-inline-precompile": "^0.3.6", + "ember-cli-eslint": "^3.0.0", + "ember-cli-htmlbars-inline-precompile": "^0.4.0", "ember-cli-inject-live-reload": "^1.4.1", - "ember-cli-jshint": "^2.0.1", - "ember-cli-qunit": "^3.0.1", - "ember-cli-release": "^0.2.9", - "ember-cli-shims": "^1.0.2", + "ember-cli-qunit": "^4.0.0", + "ember-cli-shims": "^1.1.0", "ember-cli-sri": "^2.1.0", - "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.11.0", "ember-disable-prototype-extensions": "^1.1.0", - "ember-export-application-global": "^1.0.5", - "ember-load-initializers": "^0.6.0", - "ember-resolver": "^2.0.3", - "ember-source": "~2.11.0", - "loader.js": "^4.0.10" + "ember-export-application-global": "^2.0.0", + "ember-load-initializers": "^1.0.0", + "ember-resolver": "^4.0.0", + "ember-source": "~2.13.0", + "loader.js": "^4.2.3" }, "engines": { - "node": ">= 0.12.0" + "node": ">= 4" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/testem.js b/testem.js index 26044b2..b234048 100644 --- a/testem.js +++ b/testem.js @@ -1,6 +1,5 @@ -/*jshint node:true*/ +/* eslint-env node */ module.exports = { - "framework": "qunit", "test_page": "tests/index.html?hidepassed", "disable_watching": true, "launch_in_ci": [ diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js new file mode 100644 index 0000000..fbf2555 --- /dev/null +++ b/tests/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + embertest: true + } +}; diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js new file mode 100644 index 0000000..2bebfac --- /dev/null +++ b/tests/dummy/config/targets.js @@ -0,0 +1,10 @@ +/* eslint-env node */ + +module.exports = { + browsers: [ + 'ie 9', + 'last 1 Chrome versions', + 'last 1 Firefox versions', + 'last 1 Safari versions' + ] +}; diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index e098f1d..9a605eb 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -3,16 +3,13 @@ import Application from '../../app'; import config from '../../config/environment'; export default function startApp(attrs) { - let application; - let attributes = Ember.merge({}, config.APP); attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; - Ember.run(() => { - application = Application.create(attributes); + return Ember.run(() => { + let application = Application.create(attributes); application.setupForTesting(); application.injectTestHelpers(); + return application; }); - - return application; } diff --git a/tests/test-helper.js b/tests/test-helper.js index e6cfb70..f219659 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -2,5 +2,7 @@ import resolver from './helpers/resolver'; import { setResolver } from 'ember-qunit'; +import { start } from 'ember-cli-qunit'; setResolver(resolver); +start();