adapt-cli 3.0.0 → 3.0.2

package/README.md

@@ -262,5 +262,5 @@ See [Developing plug-ins](https://github.com/adaptlearning/adapt_framework/wiki/
 <div float align=right><a href="#top">Back to Top</a></div>
 
 ----------------------------
-<a href="https://community.adaptlearning.org/" target="_blank"><img src="https://github.com/adaptlearning/documentation/blob/master/04_wiki_assets/plug-ins/images/adapt-logo-mrgn-lft.jpg" alt="adapt learning logo" align="right"></a>
+**Version number:**  3.0.2  <a href="https://community.adaptlearning.org/" target="_blank"><img src="https://github.com/adaptlearning/documentation/blob/master/04_wiki_assets/plug-ins/images/adapt-logo-mrgn-lft.jpg" alt="adapt learning logo" align="right"></a>
 **Author / maintainer:** Adapt Core Team with [contributors](https://github.com/adaptlearning/adapt-contrib-hotgraphic/graphs/contributors)

package/lib/integration/AdaptFramework/build.js

@@ -28,9 +28,12 @@ export default async function adaptBuild ({
     ].filter(Boolean).join(' ');
     exec(cmd, { cwd }, (error, stdout, stderr) => {
       if(error || stderr) {
+        const matches = stdout.match(/>> Error:\s(.+)\s/);
         const e = new Error('grunt tasks failed')
         e.cmd = cmd;
-        e.raw = stdout.match(/>> Error:\s(.+)\s/)[1]
+        e.raw = matches?.[1] ?? stdout;
+        e.source = error;
+        e.stderr = stderr;
         return reject(e)
       }
       resolve()

package/lib/integration/Plugin.js

@@ -79,6 +79,7 @@ export default class Plugin {
    * @returns {boolean|null}
    */
   get isUpToDate () {
+    if (!this.hasFrameworkCompatibleVersion) return true;
     const canCheckSourceAgainstProject = (this.latestSourceVersion && this.projectVersion)
     if (!canCheckSourceAgainstProject) return null
     const isLatestVersion = (this.projectVersion === this.latestSourceVersion)

package/lib/integration/PluginManagement/install.js

@@ -129,7 +129,9 @@ async function conflictResolution ({ logger, targets, isInteractive, dev }) {
       canApplyRequested && { name: `requested version [${target.matchedVersion}]`, value: 'r' },
       target.hasFrameworkCompatibleVersion
         ? { name: `latest compatible version [${target.latestCompatibleSourceVersion}]`, value: 'l' }
-        : { name: `latest version [${target.latestSourceVersion}]`, value: 'l' },
+        : target.latestSourceVersion
+          ? { name: `latest version [${target.latestSourceVersion}]`, value: 'l' }
+          : { name: `master [master]`, value: 'm' },
       { name: 'skip', value: 's' }
     ].filter(Boolean)
     const result = await createPromptTask({ message: chalk.reset(target.packageName), choices, type: 'list', default: 's' })

package/lib/integration/Target.js

@@ -132,7 +132,7 @@ export default class Target extends Plugin {
   }
 
   markMasterForInstallation () {
-    this.versionToApply = '*'
+    this.versionToApply = 'master'
   }
 
   markRequestedForInstallation () {
@@ -226,6 +226,9 @@ export default class Target extends Plugin {
           reject(err)
         })
     })
+    const bowerJSON = await fs.readJSON(path.join(pluginPath, 'bower.json'))
+    bowerJSON.version = bowerJSON.version ?? this.versionToApply;
+    await fs.writeJSON(path.join(pluginPath, '.bower.json'), bowerJSON, { spaces: 2, replacer: null })
     this._projectInfo = null
     await this.fetchProjectInfo()
   }

package/package.json

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