chore: other fixes from other PRs

LekoArts · LekoArts · commit 6e0da3d39278 · 2023-04-26T09:22:42.000+02:00
diff --git a/packages/runtime/src/helpers/matchers.ts b/packages/runtime/src/helpers/matchers.ts
@@ -8,7 +8,7 @@ export const stripLookahead = (regex: string) => {
   }
   try {
     // Parse the regexp into an AST
-    const re = transform(`/${regex}/`, {
+    const re = transform(new RegExp(regex), {
       Assertion(path) {
         // Remove the lookahead
         if (path.node.kind === 'Lookahead') {
diff --git a/packages/runtime/src/templates/getHandler.ts b/packages/runtime/src/templates/getHandler.ts
@@ -86,7 +86,7 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
         port,
       },
       {
-        revalidateToken: customContext.odb_refresh_hooks,
+        revalidateToken: customContext?.odb_refresh_hooks,
       },
     )
     const requestHandler = nextServer.getRequestHandler()

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export const stripLookahead = (regex: string) => {`
`8`	`8`	`}`
`9`	`9`	`try {`
`10`	`10`	`// Parse the regexp into an AST`
`11`		- const re = transform(`/${regex}/`, {
	`11`	`+ const re = transform(new RegExp(regex), {`
`12`	`12`	`Assertion(path) {`
`13`	`13`	`// Remove the lookahead`
`14`	`14`	`if (path.node.kind === 'Lookahead') {`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str`
`86`	`86`	`port,`
`87`	`87`	`},`
`88`	`88`	`{`
`89`		`- revalidateToken: customContext.odb_refresh_hooks,`
	`89`	`+ revalidateToken: customContext?.odb_refresh_hooks,`
`90`	`90`	`},`
`91`	`91`	`)`
`92`	`92`	`const requestHandler = nextServer.getRequestHandler()`