adapt-authoring-adaptframework 2.5.2 → 2.5.4

package/.github/workflows/releases.yml

@@ -1,32 +1,16 @@
 name: Release
+
 on:
   push:
     branches:
       - master
 
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  id-token: write
+
 jobs:
   release:
-    name: Release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write # to be able to publish a GitHub release
-      issues: write # to be able to comment on released issues
-      pull-requests: write # to be able to comment on released pull requests
-      id-token: write # to enable use of OIDC for trusted publishing and npm provenance
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@master
-        with:
-          node-version: 'lts/*'
-      - name: Update npm
-        run: npm install -g npm@latest
-      - name: Install dependencies
-        run: npm install
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npx semantic-release
+    uses: adaptlearning/semantic-release-config/.github/workflows/release.yml@master

package/lib/AdaptFrameworkImport.js

@@ -881,7 +881,7 @@ class AdaptFrameworkImport {
     // Uninstall newly installed plugins
     if (this.contentplugin) {
       tasks.push(...Object.values(this.newContentPlugins).map(p =>
-        this.contentplugin.uninstallPlugin(p._id)
+        this.contentplugin.delete({ _id: p._id })
           .catch(e => log('warn', `failed to uninstall plugin '${p.name}'`, e))
       ))
     }

package/lib/AdaptFrameworkModule.js

@@ -161,7 +161,10 @@ class AdaptFrameworkModule extends AbstractModule {
       if (version) {
         this.checkVersionCompatibility(version)
       }
-      await this.runCliCommand('installFramework', { version: version ?? this.targetVersionRange })
+      if (!version && this.targetVersionRange) {
+        version = await this.getLatestVersion()
+      }
+      await this.runCliCommand('installFramework', { version })
     } catch (e) {
       this.log('error', `failed to install framework, ${e.message}`)
       throw e.statusCode ? e : this.app.errors.FW_INSTALL_FAILED.setData({ reason: e.message })
@@ -176,7 +179,7 @@ class AdaptFrameworkModule extends AbstractModule {
    */
   async getLatestVersion () {
     try {
-      return semver.clean(await this.runCliCommand('getLatestFrameworkVersion', { version: this.targetVersionRange }))
+      return semver.clean(await this.runCliCommand('getLatestFrameworkVersion', { versionLimit: this.targetVersionRange }))
     } catch (e) {
       this.log('error', `failed to retrieve framework update data, ${e.message}`)
       throw this.app.errors.FW_LATEST_VERSION_FAILED.setData({ reason: e.message })
@@ -210,7 +213,10 @@ class AdaptFrameworkModule extends AbstractModule {
       if (version) {
         this.checkVersionCompatibility(version)
       }
-      await this.runCliCommand('updateFramework', { version: version ?? this.targetVersionRange })
+      if (!version && this.targetVersionRange) {
+        version = await this.getLatestVersion()
+      }
+      await this.runCliCommand('updateFramework', { version })
       this._version = await this.runCliCommand('getCurrentFrameworkVersion')
     } catch (e) {
       this.log('error', `failed to update framework, ${e.message}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-adaptframework",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "Adapt framework integration for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-adaptframework",
   "license": "GPL-3.0",
@@ -14,11 +14,11 @@
     "adapt-authoring-content": "^2.0.0",
     "adapt-authoring-contentplugin": "^1.0.3",
     "adapt-authoring-core": "^2.0.0",
-    "adapt-authoring-courseassets": "^1.0.3",
     "adapt-authoring-coursetheme": "^1.0.2",
     "adapt-authoring-mongodb": "^3.0.0",
     "adapt-authoring-spoortracking": "^1.0.2",
     "adapt-cli": "^3.3.3",
+    "adapt-migrations": "^1.4.0",
     "adapt-octopus": "^0.1.2",
     "bytes": "^3.1.2",
     "fs-extra": "11.3.3",
@@ -37,35 +37,10 @@
     "adapt-authoring-tags": "^1.0.1"
   },
   "devDependencies": {
-    "@semantic-release/git": "^10.0.1",
-    "conventional-changelog-eslint": "^6.0.0",
-    "semantic-release": "^25.0.2",
+    "@adaptlearning/semantic-release-config": "^1.0.0",
     "standard": "^17.1.0"
   },
   "release": {
-    "plugins": [
-      [
-        "@semantic-release/commit-analyzer",
-        {
-          "preset": "eslint"
-        }
-      ],
-      [
-        "@semantic-release/release-notes-generator",
-        {
-          "preset": "eslint"
-        }
-      ],
-      "@semantic-release/npm",
-      "@semantic-release/github",
-      [
-        "@semantic-release/git",
-        {
-          "assets": [
-            "package.json"
-          ]
-        }
-      ]
-    ]
+    "extends": "@adaptlearning/semantic-release-config"
   }
 }

package/tests/AdaptFrameworkImport.spec.js

@@ -416,7 +416,7 @@ describe('AdaptFrameworkImport', () => {
       const uninstalled = []
       const ctx = makeRollbackCtx({
         contentplugin: {
-          uninstallPlugin: async (id) => uninstalled.push(id)
+          delete: async ({ _id }) => uninstalled.push(_id)
         },
         newContentPlugins: {
           'adapt-contrib-text': { _id: 'p1', name: 'adapt-contrib-text' },
@@ -515,9 +515,9 @@ describe('AdaptFrameworkImport', () => {
       const uninstalled = []
       const ctx = makeRollbackCtx({
         contentplugin: {
-          uninstallPlugin: async (id) => {
-            if (id === 'p1') throw new Error('uninstall failed')
-            uninstalled.push(id)
+          delete: async ({ _id }) => {
+            if (_id === 'p1') throw new Error('uninstall failed')
+            uninstalled.push(_id)
           }
         },
         newContentPlugins: {