chore: bump examples deps & fix inproper priority of template engine opts in @th/app

v1rtl · v1rtl · commit e8ff0e6a5a6d · 2023-03-13T21:12:03.000+02:00
diff --git a/examples/ejs/package.json b/examples/ejs/package.json
@@ -4,7 +4,7 @@
   "type": "module",
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "ejs": "^3.1.6"
+    "ejs": "^3.1.8"
   },
   "scripts": {
     "start": "node index.js"
diff --git a/examples/eta/package.json b/examples/eta/package.json
@@ -3,12 +3,12 @@
   "private": true,
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "eta": "^1.12.3"
+    "eta": "^2.0.1"
   },
   "scripts": {
-    "start": "esmo index.ts"
+    "start": "esno index.ts"
   },
   "devDependencies": {
-    "esmo": "^0.12.1"
+    "esno": "^0.16.3"
   }
 }
diff --git a/examples/file-upload/package.json b/examples/file-upload/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "formidable": "3"
+    "formidable": "^3.2.5"
   },
   "type": "module",
   "scripts": {
diff --git a/examples/graphql/package.json b/examples/graphql/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
     "express-graphql": "^0.12.0",
-    "graphql": "^16.0.1"
+    "graphql": "^16.6.0"
   },
   "scripts": {
     "start": "node index.js"
diff --git a/examples/http2/index.js b/examples/http2/index.js
@@ -12,6 +12,5 @@ const options = {
 app.get('/', (req, res) => void res.send(`Hello from HTTP ${req.httpVersion} server!`))
 
 createSecureServer(options, (req, res) => {
-  // @ts-ignore
   app.attach(req, res)
 }).listen(3000)
diff --git a/examples/hyperapp-ssr/package.json b/examples/hyperapp-ssr/package.json
@@ -4,8 +4,8 @@
   "type": "module",
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "hyperapp": "^2.0.19",
-    "hyperapp-render": "^4.0.0"
+    "hyperapp": "^2.0.22",
+    "hyperapp-render": "^4.0.1"
   },
   "scripts": {
     "start": "node index.js"
diff --git a/examples/jwt/package.json b/examples/jwt/package.json
@@ -3,10 +3,10 @@
   "private": true,
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "@tinyhttp/jwt": "*",
-    "@types/jsonwebtoken": "^8.5.6",
-    "jsonwebtoken": "^8.5.1",
-    "milliparsec": "^2.2.0"
+    "@tinyhttp/jwt": "^1.3.1",
+    "@types/jsonwebtoken": "^9.0.1",
+    "jsonwebtoken": "^9.0.0",
+    "milliparsec": "^2.2.2"
   },
   "type": "module",
   "scripts": {
diff --git a/examples/lowdb/index.js b/examples/lowdb/index.js
@@ -1,6 +1,7 @@
 import { App } from '@tinyhttp/app'
 import { urlencoded } from 'milliparsec'
-import { Low, JSONFile } from 'lowdb'
+import { Low } from 'lowdb'
+import { JSONFile } from 'lowdb/node'
 
 const app = new App()
 const adapter = new JSONFile('db.json')
diff --git a/examples/lowdb/package.json b/examples/lowdb/package.json
@@ -3,8 +3,8 @@
   "type": "module",
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "lowdb": "^3.0.0",
-    "milliparsec": "^2.2.0"
+    "lowdb": "^5.1.0",
+    "milliparsec": "^2.2.2"
   },
   "scripts": {
     "start": "node index.js"
diff --git a/examples/neo4j/package.json b/examples/neo4j/package.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "neo4j-driver": "^4.4.1"
+    "neo4j-driver": "^5.6.0"
   },
   "type": "module"
 }
diff --git a/examples/prisma/package.json b/examples/prisma/package.json
@@ -3,14 +3,15 @@
   "name": "tinyhttp-prisma",
   "type": "module",
   "scripts": {
-    "start": "node index.js"
+    "start": "node index.js",
+    "postinstall": "prisma generate"
   },
   "dependencies": {
-    "@prisma/client": "3.5.0",
+    "@prisma/client": "4.11.0",
     "@tinyhttp/app": "workspace:*",
-    "milliparsec": "^2.2.0"
+    "milliparsec": "^2.2.2"
   },
   "devDependencies": {
-    "prisma": "^3.5.0"
+    "prisma": "^4.11.0"
   }
 }
diff --git a/examples/pug/package.json b/examples/pug/package.json
@@ -10,6 +10,6 @@
     "start": "node index.js"
   },
   "devDependencies": {
-    "@types/pug": "^2.0.5"
+    "@types/pug": "^2.0.6"
   }
 }
diff --git a/examples/session/index.js b/examples/session/index.js
@@ -1,22 +1,18 @@
 import { App } from '@tinyhttp/app'
 import { urlencoded } from 'milliparsec'
-import session from 'next-session/dist/connect.js'
-import MemoryStore from 'next-session/dist/store/memory.js'
-
-const modDefault = (x) => x.default
+import getSession from 'next-session'
 
 const app = new App()
-const store = new (modDefault(MemoryStore))()
 
 app.use(urlencoded())
 
-const sessionWare = modDefault(session)({
-  store,
-  secret: 'super secret text'
+app.use(async (req, res, next) => {
+  req.session = await getSession({
+    secret: 'super secret text'
+  })(req, res)
+  next()
 })
 
-app.use(sessionWare)
-
 app.get('/', (_req, res) => {
   res.send('Go to "/login" page to login')
 })
diff --git a/examples/session/package.json b/examples/session/package.json
@@ -3,8 +3,8 @@
   "private": true,
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "milliparsec": "^2.2.0",
-    "next-session": "^4.0.4"
+    "milliparsec": "^2.2.2",
+    "next-session": "^4.0.5"
   },
   "type": "module",
   "module": "index.js",
diff --git a/examples/swagger/package.json b/examples/swagger/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "@tinyhttp/swagger": "*"
+    "@tinyhttp/swagger": "^0.1.3"
   },
   "type": "module",
   "scripts": {
diff --git a/examples/typescript-decorators/package.json b/examples/typescript-decorators/package.json
@@ -9,6 +9,6 @@
     "express-decorators": "^1.2.1"
   },
   "devDependencies": {
-    "tsm": "^2.1.4"
+    "tsm": "^2.3.0"
   }
 }
diff --git a/examples/typescript-decorators/tsconfig.json b/examples/typescript-decorators/tsconfig.json
@@ -4,6 +4,7 @@
     "module": "ESNext",
     "esModuleInterop": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
+    "emitDecoratorMetadata": true,
+    "moduleResolution": "node"
   }
 }
diff --git a/examples/validator/package.json b/examples/validator/package.json
@@ -4,8 +4,8 @@
   "type": "module",
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "fastest-validator": "^1.12.0",
-    "milliparsec": "^2.2.0"
+    "fastest-validator": "^1.16.0",
+    "milliparsec": "^2.2.2"
   },
   "scripts": {
     "start": "node index.js"
diff --git a/examples/vue-ssr/app.js b/examples/vue-ssr/app.js
@@ -0,0 +1,9 @@
+// app.js (shared between server and client)
+import { createSSRApp } from 'vue'
+
+export function createApp() {
+  return createSSRApp({
+    data: () => ({ count: 1 }),
+    template: `<button @click="count++">{{ count }}</button>`
+  })
+}
diff --git a/examples/vue-ssr/client.js b/examples/vue-ssr/client.js
@@ -0,0 +1,4 @@
+// client.js
+import { createApp } from './app.js'
+
+createApp().mount('#app')
diff --git a/examples/vue-ssr/index.js b/examples/vue-ssr/index.js
@@ -1,40 +1,34 @@
 import { App } from '@tinyhttp/app'
-import { readFile } from 'fs/promises'
-import Vue from 'vue'
-import VueSSR from 'vue-server-renderer'
+import { renderToString } from 'vue/server-renderer'
+import sirv from 'sirv'
+import { createApp } from './app.js'
 
-const createRenderer = async () =>
-  VueSSR.createRenderer({
-    template: await readFile('./index.template.html', 'utf-8')
-  })
-
-const ctx = {
-  title: 'Vue SSR',
-  meta: `
-      <meta name="keyword" content="vue,ssr">
-      <meta name="description" content="vue ssr demo">
-  `
-}
-
-const server = new App()
+const app = new App()
 
-server
+app
+  .use(sirv())
   .get('*', async (req, res) => {
-    const app = new Vue({
-      data: {
-        url: req.url
-      },
-      template: `<div>The visited URL is: {{ url }}</div>`
-    })
+    const app = createApp()
 
-    const renderer = await createRenderer()
+    const html = await renderToString(app)
 
-    renderer.renderToString(app, ctx, (err, html) => {
-      if (err) {
-        res.status(500).end('Internal Server Error', () => console.log(err))
-        return
-      }
-      res.end(html)
-    })
+    res.send(`<!DOCTYPE html>
+    <html>
+      <head>
+        <title>Vue SSR Example</title>
+      </head>
+      <body>
+        <div id="app">${html}</div>
+        <script async src="https://ga.jspm.io/npm:es-module-shims@1.7.0/dist/es-module-shims.js"></script>
+        <script type="importmap">
+        {
+          "imports": {
+            "vue": "https://cdnjs.cloudflare.com/ajax/libs/vue/3.2.41/vue.esm-browser.prod.js"
+          }
+        }
+        </script>
+        <script type="module" src="./client.js"></script>
+      </body>
+    </html>`)
   })
   .listen(3000)
diff --git a/examples/vue-ssr/index.template.html b/examples/vue-ssr/index.template.html
diff --git a/examples/vue-ssr/package.json b/examples/vue-ssr/package.json
@@ -4,8 +4,9 @@
   "type": "module",
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
-    "vue": "^2.6.14",
-    "vue-server-renderer": "^2.6.14"
+    "sirv": "^2.0.2",
+    "vue": "^3.2.47",
+    "vue-server-renderer": "^2.7.14"
   },
   "scripts": {
     "start": "node index.js"
diff --git a/examples/ws/package.json b/examples/ws/package.json
@@ -5,6 +5,6 @@
   "dependencies": {
     "@tinyhttp/app": "workspace:*",
     "tinyws": "^0.1.0",
-    "ws": "^8.3.0"
+    "ws": "^8.13.0"
   }
 }
diff --git a/packages/app/src/app.ts b/packages/app/src/app.ts
@@ -106,7 +106,7 @@ export class App<
     super()
     this.onError = options?.onError || onErrorHandler
     this.noMatchHandler = options?.noMatchHandler || this.onError.bind(this, { code: 404 })
-    this.settings = options.settings || { xPoweredBy: true, views: process.cwd() }
+    this.settings = options.settings || { xPoweredBy: true, views: `${process.cwd()}/views` }
     this.applyExtensions = options?.applyExtensions
     this.attach = (req, res) => setImmediate(this.handler.bind(this, req, res, undefined), req, res)
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`},`
`7`	`7`	`"dependencies": {`
`8`	`8`	`"@tinyhttp/app": "workspace:*",`
`9`		`- "neo4j-driver": "^4.4.1"`
	`9`	`+ "neo4j-driver": "^5.6.0"`
`10`	`10`	`},`
`11`	`11`	`"type": "module"`
`12`	`12`	`}`