Merge pull request #761 from emberjs/use-validate-peer-dependencies

Migrate to validate-peer-dependencies.

Author: scalvert

index.js

@@ -3,38 +3,9 @@
 
 const path = require('path');
 const resolvePackagePath = require('resolve-package-path');
-const semver = require('semver');
-const SilentError = require('silent-error');
 const stripIndent = require('common-tags').stripIndent;
 
-// avoid checking multiple times from the same location
-let HAS_PEER_DEPS_INSTALLED = new Map();
-function hasPeerDependenciesInstalled(parentRoot) {
-  if (HAS_PEER_DEPS_INSTALLED.has(parentRoot)) {
-    return HAS_PEER_DEPS_INSTALLED.get(parentRoot);
-  }
-
-  let peerDependencies = require('./package').peerDependencies;
-
-  for (let packageName in peerDependencies) {
-    let minimumVersion = peerDependencies[packageName].substring(1);
-
-    let packagePath = resolvePackagePath(packageName, parentRoot);
-    if (packagePath === null) {
-      HAS_PEER_DEPS_INSTALLED.set(parentRoot, false);
-      return false;
-    }
-
-    let packageVersion = require(packagePath).version;
-    if (semver.lt(packageVersion, minimumVersion)) {
-      HAS_PEER_DEPS_INSTALLED.set(parentRoot, false);
-      return false;
-    }
-  }
-
-  HAS_PEER_DEPS_INSTALLED.set(parentRoot, true);
-  return true;
-}
+const validatePeerDependencies = require('validate-peer-dependencies');
 
 module.exports = {
   name: 'ember-qunit',
@@ -48,21 +19,9 @@ module.exports = {
   included() {
     this._super.included.apply(this, arguments);
 
-    if (!hasPeerDependenciesInstalled(this.parent.root)) {
-      let peerDependencies = require('./package').peerDependencies;
-      let packages = Object.keys(peerDependencies).map(
-        (name) => `"${name}@${peerDependencies[name]}"`
-      );
-      let hasYarnLock = this.project.has('yarn.lock');
-
-      let installMessage = `${
-        hasYarnLock ? 'yarn add' : 'npm install'
-      } --dev ${packages.join(' ')}`;
-
-      throw new SilentError(
-        `ember-qunit now requires that \`qunit\` and \`@ember/test-helpers\` are \`devDependencies\` of the project. Please run:\n\t${installMessage}`
-      );
-    }
+    validatePeerDependencies(__dirname, {
+      resolvePackagePathFrom: this.parent.root,
+    });
 
     // TODO: figure out how to make this not needed, AFAICT ember-auto-import
     // does not provide any ability to import styles

package.json

@@ -37,9 +37,9 @@
     "ember-auto-import": "^1.6.0",
     "ember-cli-babel": "^7.22.1",
     "ember-cli-test-loader": "^3.0.0",
-    "resolve-package-path": "^2.0.0",
-    "semver": "^7.3.2",
-    "silent-error": "^1.1.1"
+    "resolve-package-path": "^3.1.0",
+    "silent-error": "^1.1.1",
+    "validate-peer-dependencies": "^1.0.0"
   },
   "devDependencies": {
     "@ember/test-helpers": "^2.0.0-beta.6",

yarn.lock

@@ -9852,6 +9852,14 @@ resolve-package-path@^2.0.0:
     path-root "^0.1.1"
     resolve "^1.13.1"
 
+resolve-package-path@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-3.1.0.tgz#35faaa5d54a9c7dd481eb7c4b2a44410c9c763d8"
+  integrity sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.17.0"
+
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -11434,6 +11442,14 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
+validate-peer-dependencies@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-1.0.0.tgz#d82f1c2020eef96d331723c2cef15de94063adf3"
+  integrity sha512-9T1pR9gopOuQYDMT0ApUPiRt1MOsSCJUm56mr55Hy7RDx7dyFHa6SnEXVP5wJuFyJ8pWyZoYxfFo4raEspRbUg==
+  dependencies:
+    resolve-package-path "^3.1.0"
+    semver "^7.3.2"
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"