Skip to content

Commit

Permalink
updating ember-cli-version-checker
Browse files Browse the repository at this point in the history
Updating this everywhere is a prerequisite for getting ember-cli to work with yarn workspaces.

(cherry picked from commit 5c09134)
  • Loading branch information
ef4 authored and rwjblue committed Nov 29, 2017
1 parent c641380 commit 8d6bc9a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion blueprints/test-framework-detector.js
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -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",
Expand Down
9 changes: 8 additions & 1 deletion yarn.lock
Expand Up @@ -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"
Expand Down

0 comments on commit 8d6bc9a

Please sign in to comment.