From 8d6bc9aa2fdbc2eb38ab59e9f1ea1e17b2479377 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Tue, 14 Nov 2017 02:46:23 -0500 Subject: [PATCH] updating ember-cli-version-checker Updating this everywhere is a prerequisite for getting ember-cli to work with yarn workspaces. (cherry picked from commit 5c091344a40c1ecc5ebdf7451e7d917af480971b) --- blueprints/test-framework-detector.js | 2 +- package.json | 2 +- yarn.lock | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/blueprints/test-framework-detector.js b/blueprints/test-framework-detector.js index 2f8a2d988f8..356ac462991 100644 --- a/blueprints/test-framework-detector.js +++ b/blueprints/test-framework-detector.js @@ -14,7 +14,7 @@ module.exports = function(blueprint) { if ('ember-cli-qunit' in dependencies) { type = 'qunit'; } else if ('ember-cli-mocha' in dependencies) { - var checker = new VersionChecker({ project: this.project }); + var checker = new VersionChecker({ root: this.project.root }); if (fs.existsSync(this.path + '/mocha-0.12-files') && checker.for('ember-cli-mocha', 'npm').satisfies('>=0.12.0')) { type = 'mocha-0.12'; } else { diff --git a/package.json b/package.json index 6afb0a7ad41..14e75bd862e 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "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.1", "inflection": "^1.12.0", diff --git a/yarn.lock b/yarn.lock index 6c5a082741f..cc52c3986ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2208,12 +2208,19 @@ ember-cli-valid-component-name@^1.0.0: dependencies: silent-error "^1.0.0" -ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.3.1: +ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72" dependencies: semver "^5.3.0" +ember-cli-version-checker@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.0.tgz#fc79a56032f3717cf844ada7cbdec1a06fedb604" + dependencies: + resolve "^1.3.3" + semver "^5.3.0" + ember-cli-yuidoc@^0.8.8: version "0.8.8" resolved "https://registry.yarnpkg.com/ember-cli-yuidoc/-/ember-cli-yuidoc-0.8.8.tgz#3858baaf85388a976024f9de40f1075fea58f606"