Merge pull request #89 from strongloop/fix/version-error-message
Fix "incompatible loopback version" check & msg
This commit is contained in:
commit
146a3183eb
|
@ -4,6 +4,7 @@ var semver = require('semver');
|
||||||
var debug = require('debug')('loopback:boot:executor');
|
var debug = require('debug')('loopback:boot:executor');
|
||||||
var async = require('async');
|
var async = require('async');
|
||||||
var path = require('path');
|
var path = require('path');
|
||||||
|
var format = require('util').format;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute bootstrap instructions gathered by `boot.compile`.
|
* Execute bootstrap instructions gathered by `boot.compile`.
|
||||||
|
@ -73,12 +74,17 @@ function assertLoopBackVersion(app) {
|
||||||
var RANGE = '1.x || 2.x';
|
var RANGE = '1.x || 2.x';
|
||||||
|
|
||||||
var loopback = app.loopback;
|
var loopback = app.loopback;
|
||||||
if (!semver.satisfies(loopback.version || '1.0.0', RANGE)) {
|
// remove any pre-release tag from the version string,
|
||||||
throw new Error(
|
// because semver has special treatment of pre-release versions,
|
||||||
|
// while loopback-boot treats pre-releases the same way as regular versions
|
||||||
|
var version = (loopback.version || '1.0.0').replace(/-.*$/, '');
|
||||||
|
if (!semver.satisfies(version, RANGE)) {
|
||||||
|
var msg = format(
|
||||||
'The `app` is powered by an incompatible loopback version %s. ' +
|
'The `app` is powered by an incompatible loopback version %s. ' +
|
||||||
'Supported versions: %s',
|
'Supported versions: %s',
|
||||||
loopback.version || '(unknown)',
|
loopback.version || '(unknown)',
|
||||||
RANGE);
|
RANGE);
|
||||||
|
throw new Error(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue