adapt-authoring-contentplugin 1.0.2 → 1.0.7

package/.github/workflows/new.yml

@@ -1,19 +1,15 @@
-name: Add to main project
+# Calls the org-level reusable workflow to add PRs to the TODO Board
+
+name: Add PR to Project
 
 on:
-  issues:
-    types:
-      - opened
   pull_request:
     types:
       - opened
+      - reopened
 
 jobs:
   add-to-project:
-    name: Add to main project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v0.1.0
-        with:
-          project-url: https://github.com/orgs/adapt-security/projects/5
-          github-token: ${{ secrets.PROJECTS_SECRET }}
+    uses: adapt-security/.github/.github/workflows/new.yml@main
+    secrets:
+      PROJECTS_SECRET: ${{ secrets.PROJECTS_SECRET }}

package/.github/workflows/releases.yml

@@ -3,10 +3,16 @@ on:
   push:
     branches:
       - master
+
 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@v3
@@ -16,10 +22,11 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 'lts/*'
+      - name: Update npm
+        run: npm install -g npm@latest
       - name: Install dependencies
         run: npm ci
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.AAT_NPM_TOKEN }}
-        run: npx semantic-release
+        run: npx semantic-release

package/lib/ContentPluginModule.js

@@ -149,7 +149,11 @@ class ContentPluginModule extends AbstractApiModule {
     const missing = await this.getMissingPlugins()
     if (missing.length) { // note we're using CLI directly, as plugins already exist in the DB
       this.log('debug', 'MISSING', missing)
-      await this.framework.runCliCommand('installPlugins', { plugins: missing })
+      try {
+        await this.framework.runCliCommand('installPlugins', { plugins: missing })
+      } catch (e) {
+        this.log('error', 'MISSING_INSTALL', e)
+      }
     }
     const results = await Promise.allSettled([
       this.syncPluginData(),
@@ -190,13 +194,16 @@ class ContentPluginModule extends AbstractApiModule {
 
   /**
    * Loads and processes all installed content plugin schemas
-   * @param {Array} pluginInfo Plugin info data
+   * @param {Array|Object} pluginInfo Plugin info data
    * @return {Promise}
    */
   async processPluginSchemas (pluginInfo) {
     if (!pluginInfo) {
       pluginInfo = await this.framework.runCliCommand('getPluginUpdateInfos')
     }
+    if (!Array.isArray(pluginInfo)) {
+      pluginInfo = [pluginInfo]
+    }
     const jsonschema = await this.app.waitForModule('jsonschema')
     return Promise.all(pluginInfo.map(async plugin => {
       const name = plugin.name
@@ -319,7 +326,7 @@ class ContentPluginModule extends AbstractApiModule {
       throw this.app.errors.CONTENTPLUGIN_ATTR_MISSING
         .setData({ name })
     }
-    await this.processPluginSchemas([data])
+    await this.processPluginSchemas(data)
     return info
   }
 

package/package.json

@@ -1,25 +1,49 @@
 {
   "name": "adapt-authoring-contentplugin",
-  "version": "1.0.2",
+  "version": "1.0.7",
   "description": "Module for managing framework plugins",
   "homepage": "https://github.com/adapt-security/adapt-authoring-contentplugin",
+  "repository": "github:adapt-security/adapt-authoring-contentplugin",
   "main": "index.js",
   "type": "module",
   "dependencies": {
-    "adapt-cli": "github:adaptlearning/adapt-cli#v3.3.3",
-    "glob": "^11.0.0",
+    "adapt-cli": "^3.3.3",
+    "glob": "^13.0.0",
     "semver": "^7.6.0"
   },
+  "peerDependencies": {
+    "adapt-authoring-adaptframework": "^1.9.3",
+    "adapt-authoring-content": "^1.2.3",
+    "adapt-authoring-core": "^1.7.0",
+    "adapt-authoring-jsonschema": "^1.2.0",
+    "adapt-authoring-middleware": "^1.0.2",
+    "adapt-authoring-mongodb": "^1.1.3"
+  },
+  "peerDependenciesMeta": {
+    "adapt-authoring-adaptframework": {
+      "optional": true
+    },
+    "adapt-authoring-content": {
+      "optional": true
+    },
+    "adapt-authoring-core": {
+      "optional": true
+    },
+    "adapt-authoring-jsonschema": {
+      "optional": true
+    },
+    "adapt-authoring-middleware": {
+      "optional": true
+    },
+    "adapt-authoring-mongodb": {
+      "optional": true
+    }
+  },
   "devDependencies": {
-    "standard": "^17.1.0",
-    "@semantic-release/commit-analyzer": "^9.0.2",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^8.0.5",
-    "@semantic-release/npm": "^9.0.1",
-    "@semantic-release/release-notes-generator": "^10.0.3",
-    "conventional-changelog-eslint": "^3.0.9",
-    "semantic-release": "^21.0.1",
-    "semantic-release-replace-plugin": "^1.2.7"
+    "conventional-changelog-eslint": "^6.0.0",
+    "semantic-release": "^25.0.2",
+    "standard": "^17.1.0"
   },
   "release": {
     "plugins": [

package/.github/workflows/labelled_prs.yml

@@ -1,16 +0,0 @@
-name: Add labelled PRs to project
-
-on:
-  pull_request:
-    types: [ labeled ]
-
-jobs:
-  add-to-project:
-    if: ${{ github.event.label.name == 'dependencies' }}
-    name: Add to main project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v0.1.0
-        with:
-          project-url: https://github.com/orgs/adapt-security/projects/5
-          github-token: ${{ secrets.PROJECTS_SECRET }}