🎉 feat: merge main

Author: SaltyAom

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.5.0 -14 May 2023
+Improvement:
+- Add support for Elysia 0.5.0-beta.2
+
 # 0.3.0 - 17 Mar 2023
 Improvement:
 - Add support for Elysia 0.3.0

bun.lockb

@@ -2,10 +2,11 @@ import { Elysia } from 'elysia'
 import cors from '../src/index'
 
 const app = new Elysia()
-    .use(
-        cors({
-            origin: /\*.saltyaom.com$/
-        })
-    )
-    .get('/', () => 'Hi')
+    .use(cors({
+        maxAge: 5
+    }))
+    .get('/', () => ({
+        hello: 'world'
+    }))
+    .post('/', () => 'Hi')
     .listen(8080)

example/index.ts

@@ -1,6 +1,6 @@
 {
   "name": "@elysiajs/cors",
-  "version": "0.3.0",
+  "version": "0.5.0-rc.0",
   "description": "Plugin for Elysia that for Cross Origin Requests (CORs)",
   "author": {
     "name": "saltyAom",
@@ -34,12 +34,12 @@
   "devDependencies": {
     "@types/node": "^18.11.7",
     "bun-types": "^0.5.7",
-    "elysia": "^0.3.0",
+    "elysia": "0.5.0-beta.2",
     "eslint": "^8.26.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.9.4"
   },
   "peerDependencies": {
-    "elysia": ">= 0.3.0"
+    "elysia": ">= 0.5.0-beta.2"
   }
 }

package.json

@@ -275,24 +275,24 @@ export const cors =
                 })
             })
 
-        return app.onRequest((context) => {
-            handleOrigin(context.set, context.request)
-            handleMethod(context.set)
+        return app.onRequest(({ set, request }) => {
+            handleOrigin(set, request)
+            handleMethod(set)
 
             if (allowedHeaders.length)
-                context.set.headers['Access-Control-Allow-Headers'] =
+                set.headers['Access-Control-Allow-Headers'] =
                     typeof allowedHeaders === 'string'
                         ? allowedHeaders
                         : allowedHeaders.join(', ')
 
             if (exposedHeaders.length)
-                context.set.headers['Access-Control-Exposed-Headers'] =
+                set.headers['Access-Control-Exposed-Headers'] =
                     typeof exposedHeaders === 'string'
                         ? exposedHeaders
                         : exposedHeaders.join(', ')
 
             if (credentials)
-                context.set.headers['Access-Control-Allow-Credentials'] = 'true'
+                set.headers['Access-Control-Allow-Credentials'] = 'true'
         })
     }
 

src/index.ts

@@ -2,11 +2,7 @@ import { Elysia } from 'elysia'
 import { cors } from '../src'
 
 import { describe, expect, it } from 'bun:test'
-
-const req = (path: string, headers?: Record<string, string>) =>
-    new Request(path, {
-        headers
-    })
+import { req } from './utils'
 
 describe('Allowed Headers', () => {
     it('Accept single header', async () => {

test/allow-headers.test.ts

@@ -2,11 +2,7 @@ import { Elysia } from 'elysia'
 import { cors } from '../src'
 
 import { describe, expect, it } from 'bun:test'
-
-const req = (path: string, headers?: Record<string, string>) =>
-    new Request(path, {
-        headers
-    })
+import { req } from './utils'
 
 describe('Credentials', () => {
     it('Allow credential', async () => {

test/credentials.test.ts

@@ -2,11 +2,7 @@ import { Elysia } from 'elysia'
 import { cors } from '../src'
 
 import { describe, expect, it } from 'bun:test'
-
-const req = (path: string, headers?: Record<string, string>) =>
-    new Request(path, {
-        headers
-    })
+import { req } from './utils'
 
 describe('Exposed Headers', () => {
     it('Expose single header', async () => {

test/exposed-header.test.ts

@@ -2,8 +2,7 @@ import { Elysia } from 'elysia'
 import { cors } from '../src'
 
 import { describe, expect, it } from 'bun:test'
-
-const req = (path: string) => new Request(path)
+import { req } from './utils'
 
 describe('CORS', () => {
     it('Accept all CORS by default', async () => {

test/index.test.ts

@@ -2,12 +2,7 @@ import { Elysia } from 'elysia'
 import { cors } from '../src'
 
 import { describe, expect, it } from 'bun:test'
-
-const req = (path: string, headers?: Record<string, string>) =>
-    new Request(`http://localhost${path}`, {
-        method: 'OPTIONS',
-        headers
-    })
+import { preflight, req } from './utils'
 
 describe('Max Age', () => {
     it('Set maxage', async () => {
@@ -17,7 +12,7 @@ describe('Max Age', () => {
             })
         )
 
-        const res = await app.handle(req('/'))
+        const res = await app.handle(preflight('/'))
         expect(res.headers.get('Access-Control-Max-Age')).toBe('5')
     })
 
@@ -28,7 +23,7 @@ describe('Max Age', () => {
             })
         )
 
-        const res = await app.handle(req('/'))
+        const res = await app.handle(preflight('/'))
         expect(res.headers.get('Access-Control-Max-Age')).toBe(null)
     })
 })