refactor

Mqxx · Mqxx · commit 308899cc2eb0 · 2024-11-05T16:27:02.000+01:00
diff --git a/config/build/index.ts b/config/build/index.ts
@@ -51,7 +51,7 @@ const filesConfig : esbuild.BuildOptions = {
   tsconfig: './deno.json',
   outdir: './dist',
   outbase: './src/client',
-  entryNames: '[dir]/bundle.min',
+  entryNames: '[dir]/bundle',
   entryPoints: [
     './src/client/app/**/index.tsx',
     './src/client/app/**/index.scss',
diff --git a/src/client/app/index.html b/src/client/app/index.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Home</title>
-    <link rel="shortcut icon" href="/assets/favicon.svg" type="image/x-icon" />
-    <link rel="stylesheet" href="/bundle.min.css" />
+    <link rel="shortcut icon" href="./assets/favicon.svg" type="image/x-icon" />
+    <link rel="stylesheet" href="/bundle.css" />
   </head>
   <body>
     <h1 class="title">Home</h1>
diff --git a/src/server/index.ts b/src/server/index.ts
@@ -15,20 +15,22 @@ const routes: Route[] = [
     )
   },
   {
-    pattern: new URLPattern({ pathname: '/:path*/assets/:dynamicAsset*' }),
+    pattern: new URLPattern({ pathname: '/:asset' }),
     handler: (request, _info, parameters) => {
-      const {path, dynamicAsset} = parameters?.pathname.groups ?? {};
+      const {asset} = parameters?.pathname.groups ?? {};
       return pageHandler(
         request,
         appDirectory,
-        path,
-        '/assets/' + dynamicAsset
+        '',
+        asset
       );
     }
   },
   {
-    pattern: new URLPattern({ pathname: '/:path(.*)' }),
-    handler: (request) => {
+    pattern: new URLPattern({ pathname: '/:page([^\.]*)' }),
+    handler: (request, _info, parameters) => {
+      console.log('page', parameters?.pathname.groups.page);
+      
       return pageHandler(request, appDirectory, '')
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -15,20 +15,22 @@ const routes: Route[] = [`
`15`	`15`	`)`
`16`	`16`	`},`
`17`	`17`	`{`
`18`		`- pattern: new URLPattern({ pathname: '/:path/assets/:dynamicAsset' }),`
	`18`	`+ pattern: new URLPattern({ pathname: '/:asset' }),`
`19`	`19`	`handler: (request, _info, parameters) => {`
`20`		`- const {path, dynamicAsset} = parameters?.pathname.groups ?? {};`
	`20`	`+ const {asset} = parameters?.pathname.groups ?? {};`
`21`	`21`	`return pageHandler(`
`22`	`22`	`request,`
`23`	`23`	`appDirectory,`
`24`		`- path,`
`25`		`- '/assets/' + dynamicAsset`
	`24`	`+ '',`
	`25`	`+ asset`
`26`	`26`	`);`
`27`	`27`	`}`
`28`	`28`	`},`
`29`	`29`	`{`
`30`		`- pattern: new URLPattern({ pathname: '/:path(.*)' }),`
`31`		`- handler: (request) => {`
	`30`	`+ pattern: new URLPattern({ pathname: '/:page([^\.]*)' }),`
	`31`	`+ handler: (request, _info, parameters) => {`
	`32`	`+ console.log('page', parameters?.pathname.groups.page);`
	`33`	`+`
`32`	`34`	`return pageHandler(request, appDirectory, '')`
`33`	`35`	`}`
`34`	`36`	`}`