adapt-authoring-tags 1.0.0 → 1.0.2

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/.github/workflows/standardjs.yml

@@ -0,0 +1,13 @@
+name: Standard.js formatting check
+on: push
+jobs:
+  default:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@master
+        with:
+          node-version: 'lts/*'
+          cache: 'npm'
+      - run: npm ci
+      - run: npx standard

package/lib/TagsModule.js

@@ -81,22 +81,27 @@ class TagsModule extends AbstractApiModule {
     if (!mod.schemaName) {
       return this.log('warn', 'cannot register module, module doesn\'t define a schemaName')
     }
-    await this.registerSchemas()
-   
+    await this.registerSchema(mod)
+
     this.log('debug', `registered ${mod.name} for use with tags`)
     this.modules.push(mod)
   }
 
-   /**
+  /**
+   * Register single module schema
+   */
+  async registerSchema (mod) {
+    try {
+      const jsonschema = await this.app.waitForModule('jsonschema')
+      jsonschema.extendSchema(mod.schemaName, this.schemaExtensionName)
+    } catch (e) {}
+  }
+
+  /**
    * Registers module schemas
    */
   async registerSchemas () {
-    const jsonschema = await this.app.waitForModule('jsonschema')
-    this.modules.forEach(mod => {
-      try {
-        jsonschema.extendSchema(mod.schemaName, this.schemaExtensionName)
-      } catch(e) {}
-    })
+    this.modules.forEach(mod => this.registerSchema(mod))
   }
 
   /**
@@ -128,15 +133,15 @@ class TagsModule extends AbstractApiModule {
       await Promise.all(this.modules.map(async m => {
         try {
           await m.updateMany({ tags: sourceId }, { $push: { tags: destId } }, { rawUpdate: true })
-          if(req.apiData.query.deleteSourceTag !== 'true') await m.updateMany({ tags: sourceId }, { $pull: { tags: sourceId } }, { rawUpdate: true })
+          if (req.apiData.query.deleteSourceTag !== 'true') await m.updateMany({ tags: sourceId }, { $pull: { tags: sourceId } }, { rawUpdate: true })
         } catch (e) {
           this.log('warn', `Failed to transfer tag, ${e}`)
         }
       }))
-      if(req.apiData.query.deleteSourceTag === 'true') {
+      if (req.apiData.query.deleteSourceTag === 'true') {
         await this.delete({ _id: sourceId })
       }
-    } catch(e) {
+    } catch (e) {
       next(e)
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-tags",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Module for managing tags",
   "homepage": "https://github.com/adapt-security/adapt-authoring-tags",
   "license": "GPL-3.0",
@@ -13,16 +13,10 @@
     "adapt-authoring-mongodb": "github:adapt-security/adapt-authoring-mongodb"
   },
   "devDependencies": {
-    "eslint": "^9.12.0",
-    "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": [
@@ -40,15 +34,7 @@
       ],
       "@semantic-release/npm",
       "@semantic-release/github",
-      [
-        "@semantic-release/git",
-        {
-          "assets": [
-            "package.json"
-          ],
-          "message": "Chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-        }
-      ]
+      "@semantic-release/git"
     ]
   }
 }

package/.eslintignore

@@ -1 +0,0 @@
-node_modules

package/.eslintrc

@@ -1,14 +0,0 @@
-{
-  "env": {
-      "browser": false,
-      "node": true,
-      "commonjs": false,
-      "es2020": true
-  },
-  "extends": [
-      "standard"
-  ],
-  "parserOptions": {
-      "ecmaVersion": 2020
-  }
-}

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 }}