adapt-authoring-server 2.2.4 → 2.3.0

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@v3
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        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/utils/loadRouteConfig.js

@@ -83,7 +83,8 @@ export async function loadRouteConfig (rootDir, target, options = {}) {
       return { ...d, ...rest, handlers: { ...d.handlers, ...rest.handlers } }
     })
     const remaining = customRoutes.filter(r => !r.override || !matched.has(r.route))
-    config.routes = [...mergedDefaults, ...remaining]
+    // Custom routes must come before defaults so they take priority in Express's first-match routing
+    config.routes = [...remaining, ...mergedDefaults]
   } else {
     config.routes = customRoutes
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-server",
-  "version": "2.2.4",
+  "version": "2.3.0",
   "description": "Provides an Express application routing and more",
   "homepage": "https://github.com/adapt-security/adapt-authoring-server",
   "license": "GPL-3.0",
@@ -17,37 +17,11 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@semantic-release/git": "^10.0.1",
-    "adapt-schemas": "^1.1.0",
-    "conventional-changelog-eslint": "^6.0.0",
-    "semantic-release": "^25.0.2",
+    "@adaptlearning/semantic-release-config": "^1.0.0",
+    "adapt-schemas": "^3.1.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"
-          ],
-          "message": "Chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-        }
-      ]
-    ]
+    "extends": "@adaptlearning/semantic-release-config"
   }
 }

package/tests/utils-loadRouteConfig.spec.js

@@ -34,9 +34,9 @@ describe('loadRouteConfig()', () => {
     // Build shared schema registry with the server's base schemas, mirroring how
     // adapt-authoring-jsonschema auto-discovers schema/ files from all dependencies at startup
     schemas = new Schemas()
-    await schemas.init()
-    await schemas.registerSchema(path.join(SCHEMA_DIR, 'routes.schema.json'))
-    await schemas.registerSchema(path.join(SCHEMA_DIR, 'routeitem.schema.json'))
+    schemas.init()
+    schemas.registerSchema(path.join(SCHEMA_DIR, 'routes.schema.json'))
+    schemas.registerSchema(path.join(SCHEMA_DIR, 'routeitem.schema.json'))
 
     // Mock App.instance.waitForModule so loadRouteConfig can resolve 'jsonschema'
     // without a running app instance
@@ -150,7 +150,7 @@ describe('loadRouteConfig()', () => {
         }
       }
     })
-    await schemas.registerSchema(schemaFile)
+    schemas.registerSchema(schemaFile)
     try {
       const dir = path.join(tmpDir, 'consumer-fields')
       await mkdir(dir, { recursive: true })
@@ -188,7 +188,7 @@ describe('loadRouteConfig()', () => {
         }
       }
     })
-    await schemas.registerSchema(schemaFile)
+    schemas.registerSchema(schemaFile)
     try {
       const dir = path.join(tmpDir, 'missing-route-field')
       await mkdir(dir, { recursive: true })
@@ -217,7 +217,7 @@ describe('loadRouteConfig()', () => {
         }
       }
     })
-    await schemas.registerSchema(schemaFile)
+    schemas.registerSchema(schemaFile)
     try {
       const dir = path.join(tmpDir, 'missing-schemaname')
       await mkdir(dir, { recursive: true })
@@ -270,7 +270,7 @@ describe('loadRouteConfig()', () => {
     }
 
     before(async () => {
-      await schemas.registerSchema(await writeJson(path.join(tmpDir, 'perm-routes.schema.json'), permSchema))
+      schemas.registerSchema(await writeJson(path.join(tmpDir, 'perm-routes.schema.json'), permSchema))
     })
 
     after(() => schemas.deregisterSchema('perm-routes'))
@@ -301,7 +301,7 @@ describe('loadRouteConfig()', () => {
   })
 
   describe('defaults option', () => {
-    it('should prepend default routes from template when defaults path is provided', async () => {
+    it('should place custom routes before default routes for correct Express matching', async () => {
       const dir = path.join(tmpDir, 'with-defaults')
       await mkdir(dir, { recursive: true })
       await writeJson(path.join(dir, 'routes.json'), {
@@ -318,8 +318,8 @@ describe('loadRouteConfig()', () => {
       }
       const config = await loadRouteConfig(dir, target, { defaults: defaultsPath })
       assert.equal(config.routes.length, 2)
-      assert.equal(config.routes[0].route, '/')
-      assert.equal(config.routes[1].route, '/custom')
+      assert.equal(config.routes[0].route, '/custom')
+      assert.equal(config.routes[1].route, '/')
     })
 
     it('should resolve handler strings in default routes using handlerAliases', async () => {
@@ -450,8 +450,8 @@ describe('loadRouteConfig()', () => {
       })
       const config = await loadRouteConfig(dir, { myHandler: () => {} }, { defaults: defaultsPath })
       assert.equal(config.routes.length, 2)
-      assert.equal(config.routes[0].route, '/')
-      assert.equal(config.routes[1].route, '/nomatch')
+      assert.equal(config.routes[0].route, '/nomatch')
+      assert.equal(config.routes[1].route, '/')
     })
 
     it('should strip the override flag from merged route', async () => {