From 5011ae418e21be4e9f1608ffcd276d963b1a9a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kwa=C5=9Bniak?= Date: Sun, 4 Feb 2018 22:02:02 +0100 Subject: [PATCH 1/4] Ember 2.18.2 --- .eslintrc.js | 43 +++++- .npmignore | 8 +- .travis.yml | 3 +- LICENSE.md | 2 +- config/ember-try.js | 17 +-- config/environment.js | 1 - config/targets.js | 9 -- ember-cli-build.js | 1 - index.js | 1 - package-lock.json | 230 ++++++++++++++++++----------- package.json | 6 +- testem.js | 1 - tests/.eslintrc.js | 5 - tests/dummy/config/environment.js | 1 - tests/dummy/config/targets.js | 1 - tests/dummy/public/crossdomain.xml | 15 -- tests/helpers/resolver.js | 11 -- tests/helpers/start-app.js | 1 + tests/test-helper.js | 11 +- 19 files changed, 212 insertions(+), 155 deletions(-) delete mode 100644 config/targets.js delete mode 100644 tests/.eslintrc.js delete mode 100644 tests/dummy/public/crossdomain.xml delete mode 100644 tests/helpers/resolver.js diff --git a/.eslintrc.js b/.eslintrc.js index 02f0374..020a422 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -4,6 +4,9 @@ module.exports = { ecmaVersion: 2017, sourceType: 'module' }, + plugins: [ + 'ember' + ], extends: [ 'eslint:recommended', 'plugin:ember/recommended' @@ -14,5 +17,43 @@ module.exports = { rules: { 'ember/use-ember-get-and-set': 0, 'ember/named-functions-in-promises': 0 - } + }, + overrides: [ + // node files + { + files: [ + 'index.js', + 'testem.js', + 'ember-cli-build.js', + 'config/**/*.js', + 'tests/dummy/config/**/*.js' + ], + excludedFiles: [ + 'app/**', + 'addon/**', + 'tests/dummy/app/**' + ], + parserOptions: { + sourceType: 'script', + ecmaVersion: 2015 + }, + 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 + }) + }, + + // test files + { + files: ['tests/**/*.js'], + excludedFiles: ['tests/dummy/**/*.js'], + env: { + embertest: true + } + } + ] }; diff --git a/.npmignore b/.npmignore index 889b2bf..7bf769e 100644 --- a/.npmignore +++ b/.npmignore @@ -7,10 +7,16 @@ .bowerrc .editorconfig .ember-cli -.gitignore .eslintrc.js +.gitignore .watchmanconfig .travis.yml bower.json ember-cli-build.js testem.js +.DS_Store + +# ember-try +.node_modules.ember-try/ +bower.json.ember-try +package.json.ember-try diff --git a/.travis.yml b/.travis.yml index ac366b8..5b24d5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ env: matrix: # we recommend new addons test the current and previous LTS # as well as latest stable release (bonus points to beta/canary) - - EMBER_TRY_SCENARIO=ember-lts-2.8 - EMBER_TRY_SCENARIO=ember-lts-2.12 + - EMBER_TRY_SCENARIO=ember-lts-2.16 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary @@ -40,6 +40,7 @@ before_install: - npm --version script: + - npm run lint:js # Usually, it's ok to finish the test scenario without reverting # to the addon's original dependency state, skipping "cleanup". - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup diff --git a/LICENSE.md b/LICENSE.md index 0d5e3ef..198f6da 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 +Copyright (c) 2018 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: diff --git a/config/ember-try.js b/config/ember-try.js index 21f6079..1c31c54 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -1,27 +1,18 @@ -/* eslint-env node */ module.exports = { scenarios: [ { - name: 'ember-lts-2.8', - bower: { - dependencies: { - 'ember': 'components/ember#lts-2-8' - }, - resolutions: { - 'ember': 'lts-2-8' - } - }, + name: 'ember-lts-2.12', npm: { devDependencies: { - 'ember-source': null + 'ember-source': '~2.12.0' } } }, { - name: 'ember-lts-2.12', + name: 'ember-lts-2.16', npm: { devDependencies: { - 'ember-source': '~2.12.0' + 'ember-source': '~2.16.0' } } }, diff --git a/config/environment.js b/config/environment.js index 81af59f..872bf0e 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,4 +1,3 @@ -/* eslint-env node */ 'use strict'; function codeVersion() { diff --git a/config/targets.js b/config/targets.js deleted file mode 100644 index df7664c..0000000 --- a/config/targets.js +++ /dev/null @@ -1,9 +0,0 @@ -/* eslint-env node */ -module.exports = { - browsers: [ - 'ie 9', - 'last 1 Chrome versions', - 'last 1 Firefox versions', - 'last 1 Safari versions' - ] -}; diff --git a/ember-cli-build.js b/ember-cli-build.js index 4fc1798..43463e4 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,4 +1,3 @@ -/* eslint-env node */ 'use strict'; const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); diff --git a/index.js b/index.js index dcfb7c3..71d1f6d 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,3 @@ -/* eslint-env node */ 'use strict'; const path = require('path'); diff --git a/package-lock.json b/package-lock.json index a065591..fdc6c21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ember-rollbar-client", - "version": "0.5.1", + "version": "0.5.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3725,9 +3725,9 @@ } }, "ember-cli": { - "version": "2.16.2", - "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-2.16.2.tgz", - "integrity": "sha1-U7kiBzqObzQlWm4NyxeUqRuj4bc=", + "version": "2.18.2", + "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-2.18.2.tgz", + "integrity": "sha1-uxUxOhUTmoUkiobSA2Q/kYukD1c=", "dev": true, "requires": { "amd-name-resolver": "1.0.0", @@ -3759,7 +3759,7 @@ "diff": "3.4.0", "ember-cli-broccoli-sane-watcher": "2.0.4", "ember-cli-is-package-missing": "1.0.0", - "ember-cli-legacy-blueprints": "0.1.5", + "ember-cli-legacy-blueprints": "0.2.1", "ember-cli-lodash-subset": "2.0.1", "ember-cli-normalize-entity-name": "1.0.0", "ember-cli-preprocess-registry": "3.1.1", @@ -3795,19 +3795,19 @@ "morgan": "1.9.0", "node-modules-path": "1.0.1", "nopt": "3.0.6", - "npm-package-arg": "4.2.1", + "npm-package-arg": "6.0.0", "portfinder": "1.0.13", "promise-map-series": "0.2.3", "quick-temp": "0.1.8", "resolve": "1.5.0", - "rsvp": "3.6.2", - "sane": "1.7.0", + "rsvp": "4.8.1", + "sane": "2.3.0", "semver": "5.5.0", "silent-error": "1.1.0", "sort-package-json": "1.7.1", "symlink-or-copy": "1.1.8", "temp": "0.8.3", - "testem": "1.18.4", + "testem": "2.0.0", "tiny-lr": "1.1.0", "tree-sync": "1.2.2", "uuid": "3.0.1", @@ -3869,6 +3869,12 @@ "path-is-absolute": "1.0.1" } }, + "rsvp": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.1.tgz", + "integrity": "sha512-c9tShmZbQ5nLVVVl3Fuhk1NExJlXfAMIEz7a8GC570X8XhNQNZPFAdjOeMmJEN3SLYOOb2OprS576P/QO4QouA==", + "dev": true + }, "supports-color": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", @@ -3934,6 +3940,29 @@ "heimdalljs-logger": "0.1.9", "rsvp": "3.6.2", "sane": "1.7.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "sane": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/sane/-/sane-1.7.0.tgz", + "integrity": "sha1-s1ebzLRclM8gNVzIESSZDf00bjA=", + "dev": true, + "requires": { + "anymatch": "1.3.2", + "exec-sh": "0.2.1", + "fb-watchman": "2.0.0", + "minimatch": "3.0.4", + "minimist": "1.2.0", + "walker": "1.0.7", + "watch": "0.10.0" + } + } } }, "ember-cli-build-config-editor": { @@ -4550,43 +4579,48 @@ "dev": true }, "ember-cli-legacy-blueprints": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/ember-cli-legacy-blueprints/-/ember-cli-legacy-blueprints-0.1.5.tgz", - "integrity": "sha1-k8FcokLsUQfWKor37DD2rFOPOtk=", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ember-cli-legacy-blueprints/-/ember-cli-legacy-blueprints-0.2.1.tgz", + "integrity": "sha1-SA83y4Px7aLUa7x9B8WeoujOm4Q=", "dev": true, "requires": { - "chalk": "1.1.3", + "chalk": "2.3.0", "ember-cli-get-component-path-option": "1.0.0", "ember-cli-get-dependency-depth": "1.0.0", "ember-cli-is-package-missing": "1.0.0", - "ember-cli-lodash-subset": "1.0.12", + "ember-cli-lodash-subset": "2.0.1", "ember-cli-normalize-entity-name": "1.0.0", "ember-cli-path-utils": "1.0.0", "ember-cli-string-utils": "1.1.0", "ember-cli-test-info": "1.0.0", "ember-cli-valid-component-name": "1.0.0", - "ember-cli-version-checker": "1.3.1", + "ember-cli-version-checker": "2.1.0", "ember-router-generator": "1.2.3", "exists-sync": "0.0.3", - "fs-extra": "0.24.0", + "fs-extra": "4.0.3", "inflection": "1.12.0", - "rsvp": "3.6.2", + "rsvp": "4.8.1", "silent-error": "1.1.0" }, "dependencies": { - "ember-cli-lodash-subset": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz", - "integrity": "sha1-ry5366XcsNd/MwjTpv19NFD25Tc=", - "dev": true + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } }, - "ember-cli-version-checker": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz", - "integrity": "sha1-C8LRNMgwFC2mS/lieg7e0QthrnI=", + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "dev": true, "requires": { - "semver": "5.5.0" + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" } }, "exists-sync": { @@ -4595,16 +4629,19 @@ "integrity": "sha1-uRAAC+27ETs3i4L19adjgQdiLc8=", "dev": true }, - "fs-extra": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz", - "integrity": "sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=", + "rsvp": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.1.tgz", + "integrity": "sha512-c9tShmZbQ5nLVVVl3Fuhk1NExJlXfAMIEz7a8GC570X8XhNQNZPFAdjOeMmJEN3SLYOOb2OprS576P/QO4QouA==", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "path-is-absolute": "1.0.1", - "rimraf": "2.6.2" + "has-flag": "2.0.0" } } } @@ -5947,12 +5984,12 @@ } }, "ember-source": { - "version": "2.16.2", - "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-2.16.2.tgz", - "integrity": "sha1-68Kc423sPsyA9rGwIhjWPKUEEIg=", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-2.18.0.tgz", + "integrity": "sha1-9hzycB2KqUpq3ubUex1ac6TO9fY=", "dev": true, "requires": { - "broccoli-funnel": "1.2.0", + "broccoli-funnel": "2.0.1", "broccoli-merge-trees": "2.0.0", "ember-cli-get-component-path-option": "1.0.0", "ember-cli-is-package-missing": "1.0.0", @@ -5961,36 +5998,13 @@ "ember-cli-string-utils": "1.1.0", "ember-cli-test-info": "1.0.0", "ember-cli-valid-component-name": "1.0.0", - "ember-cli-version-checker": "1.3.1", + "ember-cli-version-checker": "2.1.0", "ember-router-generator": "1.2.3", - "fs-extra": "4.0.3", "inflection": "1.12.0", "jquery": "3.3.1", "resolve": "1.5.0" }, "dependencies": { - "broccoli-funnel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz", - "integrity": "sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=", - "dev": true, - "requires": { - "array-equal": "1.0.0", - "blank-object": "1.0.2", - "broccoli-plugin": "1.3.0", - "debug": "2.6.9", - "exists-sync": "0.0.4", - "fast-ordered-set": "1.0.3", - "fs-tree-diff": "0.5.7", - "heimdalljs": "0.2.5", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "path-posix": "1.0.0", - "rimraf": "2.6.2", - "symlink-or-copy": "1.1.8", - "walk-sync": "0.3.2" - } - }, "broccoli-merge-trees": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz", @@ -6000,15 +6014,6 @@ "broccoli-plugin": "1.3.0", "merge-trees": "1.0.1" } - }, - "ember-cli-version-checker": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz", - "integrity": "sha1-C8LRNMgwFC2mS/lieg7e0QthrnI=", - "dev": true, - "requires": { - "semver": "5.5.0" - } } } }, @@ -6489,6 +6494,26 @@ } } }, + "eslint-plugin-node": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-5.2.1.tgz", + "integrity": "sha512-xhPXrh0Vl/b7870uEbaumb2Q+LxaEcOQ3kS1jtIXanBAwpMre1l5q/l2l/hESYJGEFKuI78bp6Uw50hlpr7B+g==", + "dev": true, + "requires": { + "ignore": "3.3.7", + "minimatch": "3.0.4", + "resolve": "1.5.0", + "semver": "5.3.0" + }, + "dependencies": { + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true + } + } + }, "eslint-scope": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", @@ -9788,6 +9813,12 @@ "lodash._slice": "2.3.0" } }, + "lodash.castarray": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz", + "integrity": "sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=", + "dev": true + }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -13172,13 +13203,15 @@ } }, "npm-package-arg": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz", - "integrity": "sha1-WTMD/eqF98Qid18X+et2cPaA4+w=", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz", + "integrity": "sha512-hwC7g81KLgRmchv9ol6f3Fx4Yyc9ARX5X5niDHVILgpuvf08JRIgOZcEfpFXli3BgESoTrkauqorXm6UbvSgSg==", "dev": true, "requires": { "hosted-git-info": "2.5.0", - "semver": "5.5.0" + "osenv": "0.1.4", + "semver": "5.5.0", + "validate-npm-package-name": "3.0.0" } }, "npm-run-path": { @@ -14928,18 +14961,19 @@ "dev": true }, "sane": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/sane/-/sane-1.7.0.tgz", - "integrity": "sha1-s1ebzLRclM8gNVzIESSZDf00bjA=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/sane/-/sane-2.3.0.tgz", + "integrity": "sha512-6GB9zPCsqJqQPAGcvEkUPijM1ZUFI+A/DrscL++dXO3Ltt5q5mPDayGxZtr3cBRkrbb4akbwszVVkTIFefEkcg==", "dev": true, "requires": { "anymatch": "1.3.2", "exec-sh": "0.2.1", "fb-watchman": "2.0.0", + "fsevents": "1.1.3", "minimatch": "3.0.4", "minimist": "1.2.0", "walker": "1.0.7", - "watch": "0.10.0" + "watch": "0.18.0" }, "dependencies": { "minimist": { @@ -14947,6 +14981,16 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true + }, + "watch": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz", + "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=", + "dev": true, + "requires": { + "exec-sh": "0.2.1", + "minimist": "1.2.0" + } } } }, @@ -16120,9 +16164,9 @@ } }, "testem": { - "version": "1.18.4", - "resolved": "https://registry.npmjs.org/testem/-/testem-1.18.4.tgz", - "integrity": "sha1-5F/tkivsL1SmFsQ/EZIlmKyX60E=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/testem/-/testem-2.0.0.tgz", + "integrity": "sha1-sFyWIAx6yYuumY1xyUwMU0WQfRM=", "dev": true, "requires": { "backbone": "1.3.3", @@ -16130,13 +16174,14 @@ "charm": "1.0.2", "commander": "2.8.1", "consolidate": "0.14.5", - "cross-spawn": "5.1.0", + "execa": "0.9.0", "express": "4.16.2", "fireworm": "0.7.1", "glob": "7.1.2", "http-proxy": "1.16.2", "js-yaml": "3.10.0", "lodash.assignin": "4.2.0", + "lodash.castarray": "4.4.0", "lodash.clonedeep": "4.5.0", "lodash.find": "4.6.0", "lodash.uniqby": "4.7.0", @@ -16151,6 +16196,23 @@ "styled_string": "0.0.1", "tap-parser": "5.4.0", "xmldom": "0.1.27" + }, + "dependencies": { + "execa": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.9.0.tgz", + "integrity": "sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA==", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + } } }, "text-table": { diff --git a/package.json b/package.json index a69cf24..6cd0e83 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "scripts": { "build": "ember build", "start": "ember server", + "lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests", "test": "ember try:each" }, "dependencies": { @@ -32,7 +33,7 @@ "broccoli-asset-rev": "2.6.0", "ember-ajax": "3.0.0", "ember-bootstrap": "1.0.0-rc.4", - "ember-cli": "~2.16.2", + "ember-cli": "~2.18.2", "ember-cli-dependency-checker": "2.1.0", "ember-cli-eslint": "4.2.2", "ember-cli-favicon": "1.0.0-beta.4", @@ -52,8 +53,9 @@ "ember-load-initializers": "1.0.0", "ember-resolver": "4.5.0", "ember-scroll-to": "0.6.4", - "ember-source": "~2.16.2", + "ember-source": "~2.18.0", "eslint-plugin-ember": "5.0.1", + "eslint-plugin-node": "^5.2.1", "loader.js": "4.6.0" }, "engines": { diff --git a/testem.js b/testem.js index c5f94d5..d1755a4 100644 --- a/testem.js +++ b/testem.js @@ -1,4 +1,3 @@ -/* eslint-env node */ module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js deleted file mode 100644 index fbf2555..0000000 --- a/tests/.eslintrc.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - env: { - embertest: true - } -}; diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index e968bc1..9143e78 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -1,4 +1,3 @@ -/* eslint-env node */ 'use strict'; module.exports = function(environment) { diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js index df7664c..082e68b 100644 --- a/tests/dummy/config/targets.js +++ b/tests/dummy/config/targets.js @@ -1,4 +1,3 @@ -/* eslint-env node */ module.exports = { browsers: [ 'ie 9', diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml deleted file mode 100644 index 0c16a7a..0000000 --- a/tests/dummy/public/crossdomain.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js deleted file mode 100644 index b208d38..0000000 --- a/tests/helpers/resolver.js +++ /dev/null @@ -1,11 +0,0 @@ -import Resolver from '../../resolver'; -import config from '../../config/environment'; - -const resolver = Resolver.create(); - -resolver.namespace = { - modulePrefix: config.modulePrefix, - podModulePrefix: config.podModulePrefix -}; - -export default resolver; diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index 681aa01..99d35dc 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -5,6 +5,7 @@ import { run } from '@ember/runloop'; export default function startApp(attrs) { let attributes = merge({}, config.APP); + attributes.autoboot = true; attributes = merge(attributes, attrs); // use defaults, but you can override; return run(() => { diff --git a/tests/test-helper.js b/tests/test-helper.js index 7270b8a..0382a84 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,9 +1,8 @@ -import resolver from './helpers/resolver'; -import { - setResolver -} from 'ember-qunit'; +import Application from '../app'; +import config from '../config/environment'; +import { setApplication } from '@ember/test-helpers'; +import { start } from 'ember-qunit'; -import { start } from 'ember-cli-qunit'; +setApplication(Application.create(config.APP)); -setResolver(resolver); start(); From 5790c23f47995ca6eeef2b5d5f9bafed3b772263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kwa=C5=9Bniak?= Date: Sun, 4 Feb 2018 22:09:42 +0100 Subject: [PATCH 2/4] Fix code --- addon/instance-initializers/rollbar.js | 5 +---- config/release.js | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/addon/instance-initializers/rollbar.js b/addon/instance-initializers/rollbar.js index c05a658..83b6f93 100644 --- a/addon/instance-initializers/rollbar.js +++ b/addon/instance-initializers/rollbar.js @@ -18,7 +18,4 @@ export function initialize(appInstance) { }; } -export default { - name: 'rollbar', - initialize -}; +export default { initialize }; diff --git a/config/release.js b/config/release.js index d73111a..0971c26 100644 --- a/config/release.js +++ b/config/release.js @@ -1,17 +1,17 @@ -/* eslint-env node */ +'use strict'; + const fs = require('fs'); -const RSVP = require('rsvp'); const path = require('path'); -const { exec } = require('child_process'); +const exec = require('child_process').exec; function generateChangelog(project, version) { let content = `future-release=${version}\n`; let generatorPath = path.join(project.root, '.github_changelog_generator'); - return new RSVP.Promise(function(resolve, reject) { + return new Promise(function(resolve, reject) { fs.writeFile(generatorPath, content, (err) => err ? reject(err) : resolve()); }).then(() => { - return new RSVP.Promise(function(resolve, reject) { + return new Promise(function(resolve, reject) { exec('github_changelog_generator', (err) => err ? reject(err) : resolve()); }); }) @@ -20,7 +20,7 @@ function generateChangelog(project, version) { function generateWebsite(version) { let command = `ember github-pages:commit --message "${version}" && git push origin gh-pages:gh-pages`; - return new RSVP.Promise(function(resolve, reject) { + return new Promise(function(resolve, reject) { exec(command, (err) => err ? reject(err) : resolve()); }); } From 6fde35597f2157351e9291effc40ff2ae237cc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kwa=C5=9Bniak?= Date: Sun, 4 Feb 2018 22:24:52 +0100 Subject: [PATCH 3/4] Upgrades packages --- package-lock.json | 817 ++++++++++++---------------------------------- package.json | 18 +- 2 files changed, 225 insertions(+), 610 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdc6c21..bc7245e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -145,14 +145,14 @@ } }, "@ember-decorators/argument": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@ember-decorators/argument/-/argument-0.7.2.tgz", - "integrity": "sha512-QwZXHdEO4sNvJAPySBqmkdTpc1XBnMR8rwkEUSr399b2MUhJuN3njSsVWAmiieeqZJW4RT/GAQlcS99UkLThPQ==", + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/@ember-decorators/argument/-/argument-0.8.9.tgz", + "integrity": "sha512-fxZqBmsHeO61cA1KbwYmzsZgZBhs3xEnlxc4fPcRhEaNLe31b82us2q7PUTBEAWx7UBl71bxEXWx/nSvx7+uag==", "dev": true, "requires": { "babel-plugin-filter-imports": "1.1.1", "broccoli-funnel": "2.0.1", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-version-checker": "2.1.0", "ember-compatibility-helpers": "0.1.3", "ember-get-config": "0.2.4" @@ -166,7 +166,7 @@ "requires": { "babel-plugin-transform-class-properties": "6.24.1", "babel-plugin-transform-decorators-legacy": "1.3.4", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-version-checker": "2.1.0" } }, @@ -176,7 +176,7 @@ "integrity": "sha512-KtjPFMtLBLYV4pEweKuJiILXBA1cxxKkqZCy1OfhiEucWbpuOJc3tAYuwvn4wg2zubnhZ7I9HkW9byKpi9KihA==", "dev": true, "requires": { - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-compatibility-helpers": "0.1.3" } }, @@ -187,7 +187,7 @@ "dev": true, "requires": { "broccoli-funnel": "2.0.1", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-htmlbars-inline-precompile": "1.0.2" } }, @@ -3639,7 +3639,7 @@ "integrity": "sha1-jyHp2gwdQzz4eaqFX85GTVF+mrU=", "dev": true, "requires": { - "ember-cli-babel": "6.10.0" + "ember-cli-babel": "6.11.0" } }, "ember-assign-polyfill": { @@ -3648,14 +3648,14 @@ "integrity": "sha512-r6a0GlVjvMM6J8MP+kmywt9/gu7srN5Ufv1C4187zPyWKQnum9r2JEXtS06t8bvqa1JVlMRKJfu4dxOuelmr5g==", "dev": true, "requires": { - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-version-checker": "2.1.0" } }, "ember-bootstrap": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/ember-bootstrap/-/ember-bootstrap-1.0.0-rc.4.tgz", - "integrity": "sha512-QcWZylTor4OeS0VJjDXHXO5oE/kj0356GRuP410YfzK2z2YeC2txE/UWQEVnZyEqYKNeojrWr/diA7aA7R6ebg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/ember-bootstrap/-/ember-bootstrap-1.2.0.tgz", + "integrity": "sha512-bnGN5bmUnmSdIaDmpdEX2Xtibb5Fx3PTw/ifSjpOlhWefilNgTSj2ruDA1jqI9G5EOzjuALzg6FVUi3koYfUuQ==", "dev": true, "requires": { "broccoli-debug": "0.6.4", @@ -3664,15 +3664,18 @@ "broccoli-stew": "1.5.0", "chalk": "2.3.0", "ember-assign-polyfill": "2.2.0", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-build-config-editor": "0.5.0", "ember-cli-htmlbars": "2.0.3", "ember-cli-version-checker": "2.1.0", - "ember-popper": "0.7.3", + "ember-concurrency": "0.8.14", + "ember-in-element-polyfill": "0.1.2", + "ember-maybe-in-element": "0.1.3", + "ember-popper": "0.8.2", "ember-runtime-enumerable-includes-polyfill": "2.1.0", - "ember-wormhole": "0.5.4", "findup-sync": "1.0.0", "fs-extra": "4.0.3", + "resolve": "1.5.0", "rsvp": "4.8.1", "silent-error": "1.1.0" }, @@ -3887,9 +3890,9 @@ } }, "ember-cli-babel": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.10.0.tgz", - "integrity": "sha512-MbgXmePweFzjkpN0l2eYFIU6XKfEKCaAx4Xk9wdL3vsPAvAm4N0DXnz4pOQ3OLezhl0bJJvutD3uLQ7Eo3sSTA==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.11.0.tgz", + "integrity": "sha512-lHQyl30lbAsMmMq2it1GO85HKrqr2gMpK5CFxmOgTJ3moBqOGMKsdV3Z0qXWpgh8Asy7pB9AACMShdgfQvSGPg==", "requires": { "amd-name-resolver": "0.0.7", "babel-plugin-debug-macros": "0.1.11", @@ -3987,9 +3990,9 @@ } }, "ember-cli-eslint": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/ember-cli-eslint/-/ember-cli-eslint-4.2.2.tgz", - "integrity": "sha512-kVL2Hs7oItg2GHfWhN/AfLzx+DToXWrRzdSth10oONTlKgRCYu/5QPR3x6XuQuSlOSYBqLGOud/1tmD2u0nEmQ==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/ember-cli-eslint/-/ember-cli-eslint-4.2.3.tgz", + "integrity": "sha512-1fqRz9QVLTT790Zr07aDFmAprZ1vVsaBGJOGQgDEFmBpogq8BeaQopaxogWFp748hol8nGC4QP5tbzhVD6KQHw==", "dev": true, "requires": { "broccoli-lint-eslint": "4.2.1", @@ -4281,263 +4284,20 @@ "dev": true }, "ember-cli-github-pages": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ember-cli-github-pages/-/ember-cli-github-pages-0.1.2.tgz", - "integrity": "sha1-g7EdMHhYWVWCumHpBgIgmjfVs0g=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ember-cli-github-pages/-/ember-cli-github-pages-0.2.0.tgz", + "integrity": "sha512-jUDv1i3P9IvBeAAiNns9Yc4EkS0nkfbuedl9e8GRYVh7WOi5eR0SDi/7cYHXT5UnGkAe+eTBjjZkDKthL/DLPQ==", "dev": true, "requires": { - "ember-cli-babel": "5.2.4", - "ember-cli-version-checker": "1.3.1", - "rsvp": "3.6.2" + "ember-cli-version-checker": "2.1.0", + "rsvp": "4.8.1" }, "dependencies": { - "babel-core": { - "version": "5.8.38", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz", - "integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=", - "dev": true, - "requires": { - "babel-plugin-constant-folding": "1.0.1", - "babel-plugin-dead-code-elimination": "1.0.2", - "babel-plugin-eval": "1.0.1", - "babel-plugin-inline-environment-variables": "1.0.1", - "babel-plugin-jscript": "1.0.4", - "babel-plugin-member-expression-literals": "1.0.1", - "babel-plugin-property-literals": "1.0.1", - "babel-plugin-proto-to-assign": "1.0.4", - "babel-plugin-react-constant-elements": "1.0.3", - "babel-plugin-react-display-name": "1.0.3", - "babel-plugin-remove-console": "1.0.1", - "babel-plugin-remove-debugger": "1.0.1", - "babel-plugin-runtime": "1.0.7", - "babel-plugin-undeclared-variables-check": "1.0.2", - "babel-plugin-undefined-to-void": "1.1.6", - "babylon": "5.8.38", - "bluebird": "2.11.0", - "chalk": "1.1.3", - "convert-source-map": "1.5.1", - "core-js": "1.2.7", - "debug": "2.6.9", - "detect-indent": "3.0.1", - "esutils": "2.0.2", - "fs-readdir-recursive": "0.1.2", - "globals": "6.4.1", - "home-or-tmp": "1.0.0", - "is-integer": "1.0.7", - "js-tokens": "1.0.1", - "json5": "0.4.0", - "lodash": "3.10.1", - "minimatch": "2.0.10", - "output-file-sync": "1.1.2", - "path-exists": "1.0.0", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "regenerator": "0.8.40", - "regexpu": "1.3.0", - "repeating": "1.1.3", - "resolve": "1.5.0", - "shebang-regex": "1.0.0", - "slash": "1.0.0", - "source-map": "0.5.7", - "source-map-support": "0.2.10", - "to-fast-properties": "1.0.3", - "trim-right": "1.0.1", - "try-resolve": "1.0.1" - } - }, - "babylon": { - "version": "5.8.38", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz", - "integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=", - "dev": true - }, - "bluebird": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", - "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=", - "dev": true - }, - "broccoli-babel-transpiler": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.3.tgz", - "integrity": "sha512-MnNWRoijJ+/yfaxNQ7zyd74i+Z1AQxZTDrkc9/eeSOVfcsUPVbItyvrhHAY8BVG9VCHCqBVLW9lDNj2dg/pRDg==", - "dev": true, - "requires": { - "babel-core": "5.8.38", - "broccoli-funnel": "1.2.0", - "broccoli-merge-trees": "1.2.4", - "broccoli-persistent-filter": "1.4.3", - "clone": "0.2.0", - "hash-for-dep": "1.2.3", - "heimdalljs-logger": "0.1.9", - "json-stable-stringify": "1.0.1", - "rsvp": "3.6.2", - "workerpool": "2.3.0" - }, - "dependencies": { - "clone": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", - "dev": true - } - } - }, - "broccoli-funnel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz", - "integrity": "sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=", - "dev": true, - "requires": { - "array-equal": "1.0.0", - "blank-object": "1.0.2", - "broccoli-plugin": "1.3.0", - "debug": "2.6.9", - "exists-sync": "0.0.4", - "fast-ordered-set": "1.0.3", - "fs-tree-diff": "0.5.7", - "heimdalljs": "0.2.5", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "path-posix": "1.0.0", - "rimraf": "2.6.2", - "symlink-or-copy": "1.1.8", - "walk-sync": "0.3.2" - }, - "dependencies": { - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - } - } - } - }, - "core-js": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=", - "dev": true - }, - "detect-indent": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz", - "integrity": "sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=", - "dev": true, - "requires": { - "get-stdin": "4.0.1", - "minimist": "1.2.0", - "repeating": "1.1.3" - } - }, - "ember-cli-babel": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz", - "integrity": "sha1-XOT0awjtb20h6Hhhn7aJcZ1ujhM=", - "dev": true, - "requires": { - "broccoli-babel-transpiler": "5.7.3", - "broccoli-funnel": "1.2.0", - "clone": "2.1.1", - "ember-cli-version-checker": "1.3.1", - "resolve": "1.5.0" - } - }, - "ember-cli-version-checker": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz", - "integrity": "sha1-C8LRNMgwFC2mS/lieg7e0QthrnI=", - "dev": true, - "requires": { - "semver": "5.5.0" - } - }, - "globals": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz", - "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=", - "dev": true - }, - "home-or-tmp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz", - "integrity": "sha1-S58eQIAMPlDGwn94FnavzOcfOYU=", - "dev": true, - "requires": { - "os-tmpdir": "1.0.2", - "user-home": "1.1.1" - } - }, - "js-tokens": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz", - "integrity": "sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=", - "dev": true - }, - "json5": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz", - "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=", - "dev": true - }, - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", - "dev": true - }, - "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "path-exists": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz", - "integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=", + "rsvp": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.1.tgz", + "integrity": "sha512-c9tShmZbQ5nLVVVl3Fuhk1NExJlXfAMIEz7a8GC570X8XhNQNZPFAdjOeMmJEN3SLYOOb2OprS576P/QO4QouA==", "dev": true - }, - "repeating": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz", - "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=", - "dev": true, - "requires": { - "is-finite": "1.0.2" - } - }, - "source-map-support": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz", - "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=", - "dev": true, - "requires": { - "source-map": "0.1.32" - }, - "dependencies": { - "source-map": { - "version": "0.1.32", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz", - "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - } - } } } }, @@ -4733,191 +4493,87 @@ "debug": "2.6.9", "exists-sync": "0.0.4", "fast-ordered-set": "1.0.3", - "fs-tree-diff": "0.5.7", - "heimdalljs": "0.2.5", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "path-posix": "1.0.0", - "rimraf": "2.6.2", - "symlink-or-copy": "1.1.8", - "walk-sync": "0.3.2" - }, - "dependencies": { - "exists-sync": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/exists-sync/-/exists-sync-0.0.4.tgz", - "integrity": "sha1-l0TCxCjMA7AQYNtFTUsS8O88iHk=", - "dev": true - } - } - }, - "ember-cli-lodash-subset": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz", - "integrity": "sha1-ry5366XcsNd/MwjTpv19NFD25Tc=", - "dev": true - }, - "exists-sync": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/exists-sync/-/exists-sync-0.0.3.tgz", - "integrity": "sha1-uRAAC+27ETs3i4L19adjgQdiLc8=", - "dev": true - } - } - }, - "ember-cli-qunit": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ember-cli-qunit/-/ember-cli-qunit-4.1.1.tgz", - "integrity": "sha1-MHoVfp82oNMmIa4kfv+4kf+VH8c=", - "dev": true, - "requires": { - "ember-cli-babel": "6.10.0", - "ember-qunit": "3.3.0" - } - }, - "ember-cli-release": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/ember-cli-release/-/ember-cli-release-1.0.0-beta.2.tgz", - "integrity": "sha1-y3LTQSk+lKGovPS3P3pjlvW34MU=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "git-tools": "0.1.4", - "make-array": "0.1.2", - "merge": "1.2.0", - "moment-timezone": "0.3.1", - "nopt": "3.0.6", - "npm": "3.5.4", - "require-dir": "0.3.2", - "rsvp": "3.6.2", - "semver": "4.3.6", - "silent-error": "1.1.0" - }, - "dependencies": { - "semver": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", - "dev": true - } - } - }, - "ember-cli-sass": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/ember-cli-sass/-/ember-cli-sass-7.1.1.tgz", - "integrity": "sha512-8CgQB41fWEranryo9zjwBjo5Orxdatz5cJAnM/wc9bRwJV8nQR++usSn0wzuagmP8U33Jiy6MbW+e2esIxMO2w==", - "dev": true, - "requires": { - "broccoli-funnel": "1.2.0", - "broccoli-merge-trees": "1.2.4", - "broccoli-sass-source-maps": "2.2.0", - "ember-cli-babel": "5.2.4", - "ember-cli-version-checker": "1.3.1" - }, - "dependencies": { - "babel-core": { - "version": "5.8.38", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz", - "integrity": "sha1-H8ruedfmG3ULALjlT238nQr4ZVg=", - "dev": true, - "requires": { - "babel-plugin-constant-folding": "1.0.1", - "babel-plugin-dead-code-elimination": "1.0.2", - "babel-plugin-eval": "1.0.1", - "babel-plugin-inline-environment-variables": "1.0.1", - "babel-plugin-jscript": "1.0.4", - "babel-plugin-member-expression-literals": "1.0.1", - "babel-plugin-property-literals": "1.0.1", - "babel-plugin-proto-to-assign": "1.0.4", - "babel-plugin-react-constant-elements": "1.0.3", - "babel-plugin-react-display-name": "1.0.3", - "babel-plugin-remove-console": "1.0.1", - "babel-plugin-remove-debugger": "1.0.1", - "babel-plugin-runtime": "1.0.7", - "babel-plugin-undeclared-variables-check": "1.0.2", - "babel-plugin-undefined-to-void": "1.1.6", - "babylon": "5.8.38", - "bluebird": "2.11.0", - "chalk": "1.1.3", - "convert-source-map": "1.5.1", - "core-js": "1.2.7", - "debug": "2.6.9", - "detect-indent": "3.0.1", - "esutils": "2.0.2", - "fs-readdir-recursive": "0.1.2", - "globals": "6.4.1", - "home-or-tmp": "1.0.0", - "is-integer": "1.0.7", - "js-tokens": "1.0.1", - "json5": "0.4.0", - "lodash": "3.10.1", - "minimatch": "2.0.10", - "output-file-sync": "1.1.2", - "path-exists": "1.0.0", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "regenerator": "0.8.40", - "regexpu": "1.3.0", - "repeating": "1.1.3", - "resolve": "1.5.0", - "shebang-regex": "1.0.0", - "slash": "1.0.0", - "source-map": "0.5.7", - "source-map-support": "0.2.10", - "to-fast-properties": "1.0.3", - "trim-right": "1.0.1", - "try-resolve": "1.0.1" - }, - "dependencies": { - "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - } - } - } - }, - "babylon": { - "version": "5.8.38", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz", - "integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=", - "dev": true - }, - "bluebird": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", - "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=", - "dev": true - }, - "broccoli-babel-transpiler": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.3.tgz", - "integrity": "sha512-MnNWRoijJ+/yfaxNQ7zyd74i+Z1AQxZTDrkc9/eeSOVfcsUPVbItyvrhHAY8BVG9VCHCqBVLW9lDNj2dg/pRDg==", - "dev": true, - "requires": { - "babel-core": "5.8.38", - "broccoli-funnel": "1.2.0", - "broccoli-merge-trees": "1.2.4", - "broccoli-persistent-filter": "1.4.3", - "clone": "0.2.0", - "hash-for-dep": "1.2.3", - "heimdalljs-logger": "0.1.9", - "json-stable-stringify": "1.0.1", - "rsvp": "3.6.2", - "workerpool": "2.3.0" + "fs-tree-diff": "0.5.7", + "heimdalljs": "0.2.5", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "path-posix": "1.0.0", + "rimraf": "2.6.2", + "symlink-or-copy": "1.1.8", + "walk-sync": "0.3.2" }, "dependencies": { - "clone": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "exists-sync": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/exists-sync/-/exists-sync-0.0.4.tgz", + "integrity": "sha1-l0TCxCjMA7AQYNtFTUsS8O88iHk=", "dev": true } } }, + "ember-cli-lodash-subset": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz", + "integrity": "sha1-ry5366XcsNd/MwjTpv19NFD25Tc=", + "dev": true + }, + "exists-sync": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/exists-sync/-/exists-sync-0.0.3.tgz", + "integrity": "sha1-uRAAC+27ETs3i4L19adjgQdiLc8=", + "dev": true + } + } + }, + "ember-cli-qunit": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ember-cli-qunit/-/ember-cli-qunit-4.3.0.tgz", + "integrity": "sha512-ClGZldPjHYIftEB80MPvdRdXhAo5QiJHzpO6nTsXC640hFoEtkvyRloKvHSnhR4UH31btMnA29ALAjpoRlufwA==", + "dev": true, + "requires": { + "ember-cli-babel": "6.11.0", + "ember-qunit": "3.3.0" + } + }, + "ember-cli-release": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/ember-cli-release/-/ember-cli-release-1.0.0-beta.2.tgz", + "integrity": "sha1-y3LTQSk+lKGovPS3P3pjlvW34MU=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "git-tools": "0.1.4", + "make-array": "0.1.2", + "merge": "1.2.0", + "moment-timezone": "0.3.1", + "nopt": "3.0.6", + "npm": "3.5.4", + "require-dir": "0.3.2", + "rsvp": "3.6.2", + "semver": "4.3.6", + "silent-error": "1.1.0" + }, + "dependencies": { + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", + "dev": true + } + } + }, + "ember-cli-sass": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/ember-cli-sass/-/ember-cli-sass-7.1.3.tgz", + "integrity": "sha512-2TbhlJxxdH7KxlHU9CykHR+me16x7HvT9DBgejIFTZtpnETXaqG762sx+8zfe3WBdkBw7S/z37w1+6mfz7+Ajg==", + "dev": true, + "requires": { + "broccoli-funnel": "1.2.0", + "broccoli-merge-trees": "1.2.4", + "broccoli-sass-source-maps": "2.2.0", + "ember-cli-version-checker": "1.3.1" + }, + "dependencies": { "broccoli-funnel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz", @@ -4940,36 +4596,6 @@ "walk-sync": "0.3.2" } }, - "core-js": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=", - "dev": true - }, - "detect-indent": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz", - "integrity": "sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=", - "dev": true, - "requires": { - "get-stdin": "4.0.1", - "minimist": "1.2.0", - "repeating": "1.1.3" - } - }, - "ember-cli-babel": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz", - "integrity": "sha1-XOT0awjtb20h6Hhhn7aJcZ1ujhM=", - "dev": true, - "requires": { - "broccoli-babel-transpiler": "5.7.3", - "broccoli-funnel": "1.2.0", - "clone": "2.1.1", - "ember-cli-version-checker": "1.3.1", - "resolve": "1.5.0" - } - }, "ember-cli-version-checker": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz", @@ -4978,81 +4604,6 @@ "requires": { "semver": "5.5.0" } - }, - "globals": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz", - "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=", - "dev": true - }, - "home-or-tmp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz", - "integrity": "sha1-S58eQIAMPlDGwn94FnavzOcfOYU=", - "dev": true, - "requires": { - "os-tmpdir": "1.0.2", - "user-home": "1.1.1" - } - }, - "js-tokens": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz", - "integrity": "sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=", - "dev": true - }, - "json5": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz", - "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=", - "dev": true - }, - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", - "dev": true - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "path-exists": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz", - "integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=", - "dev": true - }, - "repeating": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz", - "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=", - "dev": true, - "requires": { - "is-finite": "1.0.2" - } - }, - "source-map-support": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz", - "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=", - "dev": true, - "requires": { - "source-map": "0.1.32" - }, - "dependencies": { - "source-map": { - "version": "0.1.32", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz", - "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - } - } } } }, @@ -5111,7 +4662,7 @@ "integrity": "sha512-mlSXX9SciIRwGkFTX6XGyJYp4ry6oCFZRxh5jJ7VH8UXLTNx2ZACtDTwaWtNhYrWXgKyiDUvmD8enD56aePWRA==", "dev": true, "requires": { - "ember-cli-babel": "6.10.0" + "ember-cli-babel": "6.11.0" } }, "ember-cli-uglify": { @@ -5153,6 +4704,17 @@ "semver": "5.5.0" } }, + "ember-concurrency": { + "version": "0.8.14", + "resolved": "https://registry.npmjs.org/ember-concurrency/-/ember-concurrency-0.8.14.tgz", + "integrity": "sha1-QBcTPl+7nQiAgu9qtbkYOe0zEHs=", + "dev": true, + "requires": { + "babel-core": "6.26.0", + "ember-cli-babel": "6.11.0", + "ember-maybe-import-regenerator": "0.1.6" + } + }, "ember-decorators": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/ember-decorators/-/ember-decorators-1.3.4.tgz", @@ -5161,7 +4723,7 @@ "requires": { "@ember-decorators/babel-transforms": "0.1.1", "@ember-decorators/utils": "0.2.0", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-compatibility-helpers": "0.1.3", "ember-macro-helpers": "0.17.0" } @@ -5178,7 +4740,7 @@ "integrity": "sha1-jW12GayKGj+MQwA1Sesh6+1oW9I=", "dev": true, "requires": { - "ember-cli-babel": "6.10.0" + "ember-cli-babel": "6.11.0" } }, "ember-font-awesome": { @@ -5464,7 +5026,30 @@ "dev": true, "requires": { "broccoli-file-creator": "1.1.1", - "ember-cli-babel": "6.10.0" + "ember-cli-babel": "6.11.0" + } + }, + "ember-in-element-polyfill": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ember-in-element-polyfill/-/ember-in-element-polyfill-0.1.2.tgz", + "integrity": "sha1-anNCOGng8zDECkjXWnHRw2Fhy9Y=", + "dev": true, + "requires": { + "debug": "3.1.0", + "ember-cli-babel": "6.11.0", + "ember-cli-version-checker": "2.1.0", + "ember-wormhole": "0.5.4" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } } }, "ember-legacy-class-transform": { @@ -5474,7 +5059,7 @@ "dev": true, "requires": { "babel-plugin-ember-legacy-class-constructor": "0.1.4", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-version-checker": "2.1.0" } }, @@ -5484,26 +5069,62 @@ "integrity": "sha1-SRnq8G9t/sp+E0Yz2MBabJkh5uc=", "dev": true, "requires": { - "ember-cli-babel": "6.10.0" + "ember-cli-babel": "6.11.0" } }, "ember-lodash": { - "version": "4.17.6", - "resolved": "https://registry.npmjs.org/ember-lodash/-/ember-lodash-4.17.6.tgz", - "integrity": "sha1-mDt6WNqO9/ytUOgsd6owEZUChEU=", + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/ember-lodash/-/ember-lodash-4.18.0.tgz", + "integrity": "sha1-Rd5wDWpPaPHNYoiNkLUKpkd7moM=", "requires": { "broccoli-debug": "0.6.4", - "broccoli-funnel": "1.2.0", + "broccoli-funnel": "2.0.1", "broccoli-merge-trees": "2.0.0", "broccoli-string-replace": "0.1.2", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "lodash-es": "4.17.5" }, + "dependencies": { + "broccoli-merge-trees": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz", + "integrity": "sha1-EK6kbdXOvMi499WlTwqEpPC7kLk=", + "requires": { + "broccoli-plugin": "1.3.0", + "merge-trees": "1.0.1" + } + } + } + }, + "ember-macro-helpers": { + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/ember-macro-helpers/-/ember-macro-helpers-0.17.0.tgz", + "integrity": "sha1-XmSkn0duOMGRav91+UlFVTPNGr4=", + "dev": true, + "requires": { + "ember-cli-babel": "6.11.0", + "ember-cli-string-utils": "1.1.0", + "ember-cli-test-info": "1.0.0", + "ember-weakmap": "3.1.1" + } + }, + "ember-maybe-import-regenerator": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz", + "integrity": "sha1-NdQYKK+m1qWbwNo85H80xXPXdso=", + "dev": true, + "requires": { + "broccoli-funnel": "1.2.0", + "broccoli-merge-trees": "1.2.4", + "ember-cli-babel": "6.11.0", + "regenerator-runtime": "0.9.6" + }, "dependencies": { "broccoli-funnel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz", "integrity": "sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=", + "dev": true, "requires": { "array-equal": "1.0.0", "blank-object": "1.0.2", @@ -5521,40 +5142,34 @@ "walk-sync": "0.3.2" } }, - "broccoli-merge-trees": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz", - "integrity": "sha1-EK6kbdXOvMi499WlTwqEpPC7kLk=", - "requires": { - "broccoli-plugin": "1.3.0", - "merge-trees": "1.0.1" - } + "regenerator-runtime": { + "version": "0.9.6", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz", + "integrity": "sha1-0z65XQ0gAaS+OWWXB8UbDLcc4Ck=", + "dev": true } } }, - "ember-macro-helpers": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/ember-macro-helpers/-/ember-macro-helpers-0.17.0.tgz", - "integrity": "sha1-XmSkn0duOMGRav91+UlFVTPNGr4=", + "ember-maybe-in-element": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/ember-maybe-in-element/-/ember-maybe-in-element-0.1.3.tgz", + "integrity": "sha512-cAiG6N9HwvoPsMIePgwECilPrKRrIdfKqx9g8qWHKPS4vwrgS2PTeLmOcJvVYbBTXkHaFZmecDRpf6xAj6zk7A==", "dev": true, "requires": { - "ember-cli-babel": "6.10.0", - "ember-cli-string-utils": "1.1.0", - "ember-cli-test-info": "1.0.0", - "ember-weakmap": "3.1.1" + "ember-cli-babel": "6.11.0" } }, "ember-popper": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/ember-popper/-/ember-popper-0.7.3.tgz", - "integrity": "sha512-vQP7dy5mP7dMx7Ady4AMPsX5m2TMNoy7UlkwGJ4rNOpXBfAHynClLsYndE/8gR/Xp/R/WUm+a8sGXCvbBeYo1w==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/ember-popper/-/ember-popper-0.8.2.tgz", + "integrity": "sha512-10jCGmnZmMysZmoWybp7kxHY/1Tro2IzCjDWio+d1k+JqaEtqSFw/Zm4eU+YcdN8GHgbywwKT2jDWQs573IWqw==", "dev": true, "requires": { - "@ember-decorators/argument": "0.7.2", + "@ember-decorators/argument": "0.8.9", "babel-eslint": "8.2.1", "babel6-plugin-strip-class-callcheck": "6.0.0", "broccoli-funnel": "2.0.1", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-htmlbars": "2.0.3", "ember-cli-node-assets": "0.2.2", "ember-cli-version-checker": "2.1.0", @@ -5576,7 +5191,7 @@ "broccoli-funnel": "2.0.1", "broccoli-merge-trees": "2.0.0", "common-tags": "1.7.2", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-test-loader": "2.2.0", "qunit": "2.5.0" }, @@ -5599,7 +5214,7 @@ "integrity": "sha1-oioC0jjDdEmSMcA6ucW5iHxyqFM=", "dev": true, "requires": { - "ember-cli-babel": "6.10.0" + "ember-cli-babel": "6.11.0" } }, "ember-resolver": { @@ -5612,7 +5227,7 @@ "babel-plugin-debug-macros": "0.1.11", "broccoli-funnel": "1.2.0", "broccoli-merge-trees": "2.0.0", - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-version-checker": "2.1.0", "resolve": "1.5.0" }, @@ -5697,7 +5312,7 @@ "integrity": "sha512-au18iI8VbEDYn3jLFZzETnKN5ciPgCUxMRucEP3jkq7qZ6sE0FVKpWMPY/h9tTND3VOBJt6fgPpEBJoJVCUudg==", "dev": true, "requires": { - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-version-checker": "2.1.0" } }, @@ -6078,7 +5693,7 @@ "requires": { "browserslist": "2.11.3", "debug": "3.1.0", - "ember-cli-babel": "6.10.0" + "ember-cli-babel": "6.11.0" }, "dependencies": { "debug": { @@ -6098,7 +5713,7 @@ "integrity": "sha1-lo6A8JNJT0rtJm51CvpjkZxhOD0=", "dev": true, "requires": { - "ember-cli-babel": "6.10.0", + "ember-cli-babel": "6.11.0", "ember-cli-htmlbars": "2.0.3" } }, @@ -6476,9 +6091,9 @@ } }, "eslint-plugin-ember": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-ember/-/eslint-plugin-ember-5.0.1.tgz", - "integrity": "sha512-5lKrwcxl2cS7jjOmUy0jo49DU9hLbZM9HlKXW0BmAauCJnI3t1roYEIOthwTK4stcuTPv4iYoqbewGZ4FojpXg==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-ember/-/eslint-plugin-ember-5.0.3.tgz", + "integrity": "sha512-wPq2N96YQR2/Ob2LfuLQV8BEotHXxiFcuBiHikN8P+2VGzxBeuydafXy/pExuTsU2RHfPiSgyBHavKGy1DYdrQ==", "dev": true, "requires": { "ember-rfc176-data": "0.2.7", @@ -8264,9 +7879,9 @@ "integrity": "sha1-KgcoIyVKr2L88HZgB9e2ZRvUGUM=" }, "git-repo-version": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/git-repo-version/-/git-repo-version-1.0.0.tgz", - "integrity": "sha512-/u4D5oAhBM9dheHy2Vg4p8EjJXqI/hqcpTYQ6L37lfDt1hvTBCpR1OXaDprMbJfmQ0EezFZgE7ZORE4pChVjkw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/git-repo-version/-/git-repo-version-1.0.2.tgz", + "integrity": "sha512-OPtwtHx9E8/rTMcWT+BU6GNj6Kq/O40bHJZaZAGy+pN2RXGmeKcfr0ix4M+SQuFY8vl5L/wfPSGOAtvUT/e3Qg==", "requires": { "git-repo-info": "1.4.1" } diff --git a/package.json b/package.json index 6cd0e83..0a73ef0 100644 --- a/package.json +++ b/package.json @@ -23,27 +23,27 @@ }, "dependencies": { "broccoli-funnel": "2.0.1", - "ember-cli-babel": "6.10.0", - "ember-lodash": "4.17.6", - "git-repo-version": "1.0.0", + "ember-cli-babel": "6.11.0", + "ember-lodash": "4.18.0", + "git-repo-version": "1.0.2", "rollbar": "~2.3.1" }, "devDependencies": { "bootstrap-sass": "3.3.7", "broccoli-asset-rev": "2.6.0", "ember-ajax": "3.0.0", - "ember-bootstrap": "1.0.0-rc.4", + "ember-bootstrap": "1.2.0", "ember-cli": "~2.18.2", "ember-cli-dependency-checker": "2.1.0", - "ember-cli-eslint": "4.2.2", + "ember-cli-eslint": "4.2.3", "ember-cli-favicon": "1.0.0-beta.4", - "ember-cli-github-pages": "0.1.2", + "ember-cli-github-pages": "0.2.0", "ember-cli-htmlbars": "2.0.3", "ember-cli-htmlbars-inline-precompile": "1.0.2", "ember-cli-inject-live-reload": "1.7.0", - "ember-cli-qunit": "4.1.1", + "ember-cli-qunit": "4.3.0", "ember-cli-release": "1.0.0-beta.2", - "ember-cli-sass": "7.1.1", + "ember-cli-sass": "7.1.3", "ember-cli-shims": "1.2.0", "ember-cli-sri": "2.1.1", "ember-cli-uglify": "2.0.0", @@ -54,7 +54,7 @@ "ember-resolver": "4.5.0", "ember-scroll-to": "0.6.4", "ember-source": "~2.18.0", - "eslint-plugin-ember": "5.0.1", + "eslint-plugin-ember": "5.0.3", "eslint-plugin-node": "^5.2.1", "loader.js": "4.6.0" }, From 2eabe7018bf7fe55d532ae7b894b154ab2a930c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kwa=C5=9Bniak?= Date: Sat, 10 Feb 2018 10:51:49 +0100 Subject: [PATCH 4/4] Fix tests --- .../instance-initializers/rollbar-test.js | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/tests/unit/instance-initializers/rollbar-test.js b/tests/unit/instance-initializers/rollbar-test.js index cac00ac..53d44e3 100644 --- a/tests/unit/instance-initializers/rollbar-test.js +++ b/tests/unit/instance-initializers/rollbar-test.js @@ -1,15 +1,16 @@ import Ember from 'ember'; -import EmberObject from '@ember/object'; -import Application from '@ember/application'; -import { run } from '@ember/runloop'; -import { initialize } from 'dummy/instance-initializers/rollbar'; import { module, test } from 'qunit'; +import { run } from '@ember/runloop'; +import { getApplication } from '@ember/test-helpers/application'; import destroyApp from '../../helpers/destroy-app'; +import Service from '@ember/service'; +import { initialize } from 'ember-rollbar-client/instance-initializers/rollbar'; + const onError = Ember.onerror; function createRollbarMock(assert, options = {}) { - return EmberObject.extend({ + return Service.extend({ enabled: true, error(error) { @@ -22,7 +23,7 @@ function createRollbarMock(assert, options = {}) { module('Unit | Instance Initializer | rollbar', { beforeEach() { run(() => { - this.application = Application.create(); + this.application = getApplication() this.appInstance = this.application.buildInstance(); }); }, @@ -31,11 +32,13 @@ module('Unit | Instance Initializer | rollbar', { Ember.onerror = onError; run(this.appInstance, 'destroy'); destroyApp(this.application); - }, + } }); test('register error handler for Ember errors', function(assert) { assert.expect(3); + + Ember.onerror = onError; let error = new Error('foo'); this.appInstance.register('service:rollbar', createRollbarMock(assert)); @@ -57,15 +60,19 @@ test('error handler does not override previous hook', function(assert) { assert.throws(() => Ember.onerror(error), error); }); -test('error handler does not fire error if disabled', function(assert) { - assert.expect(2); +test('error handler reacts on enabled state', function(assert) { + assert.expect(7); let error = new Error('foo'); - this.appInstance.register('service:rollbar', createRollbarMock(assert, { enabled: false })); + this.appInstance.register('service:rollbar', createRollbarMock(assert)); - Ember.onerror = function() { - assert.ok(true); - }; + initialize(this.appInstance); + assert.throws(() => Ember.onerror(error), error); + + this.appInstance.lookup('service:rollbar').set('enabled', false); + initialize(this.appInstance); + assert.throws(() => Ember.onerror(error), error); + this.appInstance.lookup('service:rollbar').set('enabled', true); initialize(this.appInstance); assert.throws(() => Ember.onerror(error), error); })