adapt-cli 3.1.3 → 3.1.5

package/lib/integration/Plugin.js

@@ -79,7 +79,7 @@ export default class Plugin {
    * @returns {boolean|null}
    */
   get isUpToDate () {
-    if (!this.hasFrameworkCompatibleVersion) return true;
+    if (!this.hasFrameworkCompatibleVersion) return true
     const canCheckSourceAgainstProject = (this.latestSourceVersion && this.projectVersion)
     if (!canCheckSourceAgainstProject) return null
     const isLatestVersion = (this.projectVersion === this.latestSourceVersion)
@@ -104,6 +104,14 @@ export default class Plugin {
     return (this._projectInfo?.version || null)
   }
 
+  /**
+   * the required framework version from the source package json
+   * @returns {string|null}
+   */
+  get frameworkVersion () {
+    return (this._sourceInfo?.framework || null)
+  }
+
   /**
    * a list of tags denoting the source versions of the plugin
    * @returns {[string]}
@@ -293,7 +301,7 @@ export default class Plugin {
 
       // check if the latest version is compatible
       const satisfiesConstraint = !this.hasValidRequestVersion || semver.satisfies(this._sourceInfo.version, this.requestedVersion, semverOptions)
-      const satisfiesFramework = semver.satisfies(framework, this._sourceInfo.framework, semverOptions)
+      const satisfiesFramework = semver.satisfies(framework, this.frameworkVersion, semverOptions)
       if (!this.latestCompatibleSourceVersion && satisfiesFramework) this.latestCompatibleSourceVersion = this.latestSourceVersion
       if (satisfiesConstraint && satisfiesFramework) {
         return this.latestSourceVersion

package/lib/integration/PluginManagement/register.js

@@ -3,6 +3,7 @@ import getBowerRegistryConfig from '../getBowerRegistryConfig.js'
 import fs from 'fs-extra'
 import path from 'path'
 import bower from 'bower'
+import fetch from 'node-fetch'
 import chalk from 'chalk'
 import inquirer from 'inquirer'
 import { readValidateJSON } from '../../util/JSONReadValidate.js'
@@ -120,11 +121,18 @@ async function exists (BOWER_REGISTRY_CONFIG, plugin) {
 }
 
 async function registerWithBowerRepo (BOWER_REGISTRY_CONFIG, plugin, repository) {
-  return new Promise((resolve, reject) => {
-    bower.commands.register(plugin.toString(), repository.url || repository, {
-      registry: BOWER_REGISTRY_CONFIG
-    })
-      .on('end', resolve)
-      .on('error', reject)
+  const data = {
+    name: plugin.toString(),
+    url: repository.url || repository
+  }
+  const response = await fetch(`${BOWER_REGISTRY_CONFIG.register}packages`, {
+    headers: {
+      'User-Agent': 'adapt-cli',
+      'Content-Type': 'application/json'
+    },
+    followRedirect: false,
+    method: 'POST',
+    body: JSON.stringify(data)
   })
+  return (response?.status === 201)
 }

package/lib/integration/PluginManagement/update.js

@@ -165,7 +165,7 @@ async function conflictResolution ({ logger, targets, isInteractive }) {
   }
   const preFilteredPlugins = targets.filter(target => !target.isLocalSource)
   const allQuestions = [
-    add(preFilteredPlugins.filter(target => !target.hasFrameworkCompatibleVersion), 'There is no compatible version of the following plugins:', checkVersion),
+    add(preFilteredPlugins.filter(target => !target.hasFrameworkCompatibleVersion && target.latestSourceVersion), 'There is no compatible version of the following plugins:', checkVersion),
     add(preFilteredPlugins.filter(target => target.hasFrameworkCompatibleVersion && !target.hasValidRequestVersion), 'The version requested is invalid, there are newer compatible versions of the following plugins:', checkVersion),
     add(preFilteredPlugins.filter(target => target.hasFrameworkCompatibleVersion && target.hasValidRequestVersion && !target.isApplyLatestCompatibleVersion), 'There are newer compatible versions of the following plugins:', checkVersion)
   ].filter(Boolean)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-cli",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "Command line tools for Adapt",
   "main": "./lib/api.js",
   "type": "module",