Merge branch 'main' of https://github.com/vercel-community/rust

ecklf · ecklf · commit 25e5c3450810 · 2023-08-25T11:03:49.000+02:00
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Community-maintained package to support using [Rust](https://www.rust-lang.org/)
 {
   "functions": {
     "api/**/*.rs": {
-      "runtime": "vercel-rust@4.0.5"
+      "runtime": "vercel-rust@4.0.6"
     }
   }
 }
@@ -174,7 +174,7 @@ pub async fn handler(req: Request) -> Result<Response<Body>, Error> {}
 {
   "functions": {
     "api/main.rs": {
-      "runtime": "vercel-rust@4.0.5"
+      "runtime": "vercel-rust@4.0.6"
     }
   }
 }
diff --git a/examples/cron/vercel.json b/examples/cron/vercel.json
@@ -2,7 +2,7 @@
   "outputDirectory": "public",
   "functions": {
     "api/**/*.rs": {
-      "runtime": "vercel-rust@4.0.5"
+      "runtime": "vercel-rust@4.0.6"
     }
   },
   "crons": [
diff --git a/examples/nextjs/vercel.json b/examples/nextjs/vercel.json
@@ -1,7 +1,7 @@
 {
   "functions": {
     "api/**/*.rs": {
-      "runtime": "vercel-rust@4.0.5"
+      "runtime": "vercel-rust@4.0.6"
     }
   }
 }
diff --git a/examples/route-merge/vercel.json b/examples/route-merge/vercel.json
@@ -1,7 +1,7 @@
 {
   "functions": {
     "api/main.rs": {
-      "runtime": "vercel-rust@4.0.5"
+      "runtime": "vercel-rust@4.0.6"
     }
   }
 }
diff --git a/examples/simple/vercel.json b/examples/simple/vercel.json
@@ -2,7 +2,7 @@
   "outputDirectory": "public",
   "functions": {
     "api/**/*.rs": {
-      "runtime": "vercel-rust@4.0.5"
+      "runtime": "vercel-rust@4.0.6"
     }
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vercel-rust",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "description": "Rust runtime for Vercel Functions.",
   "homepage": "https://github.com/vercel-community/rust",
   "repository": {
diff --git a/src/lib/routes.test.ts b/src/lib/routes.test.ts
@@ -1,6 +1,25 @@
 import { generateRoutes } from './routes';
 
 describe('generateRoutes', () => {
+  it('should filter out entry point route', () => {
+    const staticRoutes = ['api/main.rs', 'api/foo.rs', 'api/bar/baz.rs'];
+
+    expect(generateRoutes(staticRoutes)).toMatchInlineSnapshot(`
+      [
+        {
+          "dest": "/api/bar/baz",
+          "path": "api/bar/baz",
+          "src": "/api/bar/baz",
+        },
+        {
+          "dest": "/api/foo",
+          "path": "api/foo",
+          "src": "/api/foo",
+        },
+      ]
+    `);
+  });
+
   it('should generate static routes', () => {
     const staticRoutes = ['api/foo.rs', 'api/bar/baz.rs'];
 
diff --git a/src/lib/routes.ts b/src/lib/routes.ts
@@ -79,9 +79,11 @@ export function parseRoute(filepath: string): ParsedRoute {
 }
 
 export function generateRoutes(files: string[]): Route[] {
-  const routes = files.map((file) => {
-    return parseRoute(file);
-  });
+  const routes = files
+    .map((file) => {
+      return parseRoute(file);
+    })
+    .filter((r) => r.src !== '/api/main');
 
   const orderedRoutes = orderBy(
     routes,

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ Community-maintained package to support using [Rust](https://www.rust-lang.org/)`
`28`	`28`	`{`
`29`	`29`	`"functions": {`
`30`	`30`	`"api/*/.rs": {`
`31`		`- "runtime": "vercel-rust@4.0.5"`
	`31`	`+ "runtime": "vercel-rust@4.0.6"`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -174,7 +174,7 @@ pub async fn handler(req: Request) -> Result<Response<Body>, Error> {}`
`174`	`174`	`{`
`175`	`175`	`"functions": {`
`176`	`176`	`"api/main.rs": {`
`177`		`- "runtime": "vercel-rust@4.0.5"`
	`177`	`+ "runtime": "vercel-rust@4.0.6"`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"outputDirectory": "public",`
`3`	`3`	`"functions": {`
`4`	`4`	`"api/*/.rs": {`
`5`		`- "runtime": "vercel-rust@4.0.5"`
	`5`	`+ "runtime": "vercel-rust@4.0.6"`
`6`	`6`	`}`
`7`	`7`	`},`
`8`	`8`	`"crons": [`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"functions": {`
`3`	`3`	`"api/*/.rs": {`
`4`		`- "runtime": "vercel-rust@4.0.5"`
	`4`	`+ "runtime": "vercel-rust@4.0.6"`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vercel-rust",`
`3`		`- "version": "4.0.5",`
	`3`	`+ "version": "4.0.6",`
`4`	`4`	`"description": "Rust runtime for Vercel Functions.",`
`5`	`5`	`"homepage": "https://github.com/vercel-community/rust",`
`6`	`6`	`"repository": {`