feat: support public directory

frouriojs · Jun 13, 2020 · 1e97a44 · 1e97a44
1 parent 5503330
commit 1e97a44
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/packages/frourio/__test__/index.spec.ts b/packages/frourio/__test__/index.spec.ts
@@ -12,7 +12,7 @@ const client = api(aspida(undefined, { baseURL }))
 let server: Server
 
 beforeEach(async () => {
-  server = (await run({ port, staticDir: 'packages/frourio/public' })).server
+  server = (await run({ port })).server
 })
 
 afterEach(fn => server.close(fn))

diff --git a/packages/frourio/server/$app.ts b/packages/frourio/server/$app.ts
@@ -2,6 +2,7 @@
 import 'reflect-metadata'
 import { tmpdir } from 'os'
 import { Server } from 'http'
+import path from 'path'
 import express, { Express } from 'express'
 import multer from 'multer'
 import helmet from 'helmet'
@@ -96,11 +97,7 @@ export const run = async (config: Config) => {
     app.use(router)
   }
 
-  if (config.staticDir) {
-    ;(Array.isArray(config.staticDir) ? config.staticDir : [config.staticDir]).forEach(dir =>
-      app.use(express.static(dir))
-    )
-  }
+  app.use(express.static(path.join(__dirname, 'public')))
 
   let connection: Connection
 

diff --git a/packages/frourio/server/index.ts b/packages/frourio/server/index.ts
@@ -3,6 +3,5 @@ import { run } from './$app'
 run({
   port: 10000,
   basePath: '/api',
-  staticDir: 'packages/frourio/public',
   cors: true
 })
diff --git a/packages/frourio/public/sample.json → packages/frourio/server/public/sample.json b/packages/frourio/public/sample.json → packages/frourio/server/public/sample.json
diff --git a/packages/frourio/src/buildServerFile.ts b/packages/frourio/src/buildServerFile.ts
@@ -11,6 +11,7 @@ export default (input: string): Template => {
 import 'reflect-metadata'
 import { tmpdir } from 'os'
 import { Server } from 'http'
+import path from 'path'
 import express, { Express } from 'express'
 import multer from 'multer'
 import helmet from 'helmet'
@@ -46,11 +47,7 @@ export const run = async (config: Config) => {
     app.use(router)
   }
 
-  if (config.staticDir) {
-    ;(Array.isArray(config.staticDir) ? config.staticDir : [config.staticDir]).forEach(dir =>
-      app.use(express.static(dir))
-    )
-  }
+  app.use(express.static(path.join(__dirname, 'public')))
 
   let connection: Connection
 

diff --git a/packages/frourio/src/index.ts b/packages/frourio/src/index.ts
@@ -17,7 +17,6 @@ export * as Validator from 'class-validator'
 export type Config = {
   port: number | string
   basePath?: string
-  staticDir?: string | string[]
   helmet?: boolean | IHelmetConfiguration
   cors?: boolean | CorsOptions
   typeorm?: ConnectionOptions