@ossy/app 0.2.0 → 0.3.1

package/cli/Middleware.js

@@ -0,0 +1,3 @@
+// dummy file so it can be imported
+
+export default undefined

package/cli/build.js

@@ -33,6 +33,7 @@ export const build = async (cliArgs) => {
 
     const appSourcePath = path.resolve(options['--source'] || 'src/App.jsx');
     let apiSourcePath = path.resolve(options['--api-source'] || 'src/Api.js');
+    let middlewareSourcePath = path.resolve(options['--middleware-source'] || 'src/Middleware.js');
     const configPath = path.resolve(options['--config'] || 'src/config.js');
     const buildPath = path.resolve(options['--destination'] || 'build');
     const publicDir = path.resolve('public')
@@ -51,6 +52,10 @@ export const build = async (cliArgs) => {
       apiSourcePath = path.resolve(scriptDir, 'Api.js')
     }
 
+    if (!fs.existsSync(middlewareSourcePath)) {
+      apiSourcePath = path.resolve(scriptDir, 'Middleware.js')
+    }
+
     if (fs.existsSync(configPath)) {
         inputFiles.push(configPath)
     }
@@ -61,14 +66,22 @@ export const build = async (cliArgs) => {
           remove({ targets: buildPath }),
           // inject({ 'React': 'react' }),
           replace({
+            preventAssignment: true,
             delimiters: ['%%', '%%'],
             '@ossy/app/source-file': appSourcePath,
           }),
           replace({
+            preventAssignment: true,
             delimiters: ['%%', '%%'],
             '@ossy/api/source-file': apiSourcePath,
           }),
           replace({
+            preventAssignment: true,
+            delimiters: ['%%', '%%'],
+            '@ossy/middleware/source-file': apiSourcePath,
+          }),
+          replace({
+            preventAssignment: true,
             'process.env.NODE_ENV': JSON.stringify('production')
           }),
           json(),

package/cli/server.js

@@ -8,14 +8,25 @@ import { prerenderToNodeStream } from 'react-dom/static'
 
 import App from '%%@ossy/app/source-file%%'
 import ApiRoutes from '%%@ossy/api/source-file%%'
+import Middleware from '%%@ossy/middleware/source-file%%'
 
 const app = express();
 
 const currentDir = path.dirname(url.fileURLToPath(import.meta.url))
 const ROOT_PATH = path.resolve(currentDir, 'public')
 
-app.use(morgan('tiny'));
-app.use(express.static(ROOT_PATH));
+
+if (Middleware !== undefined) {
+  console.log(`[@ossy/cli][app][server] ${Middleware?.length || 0} custom middleware loaded`)
+}
+
+const middleware = [
+  morgan('tiny'),
+  express.static(ROOT_PATH),
+  ...(Middleware || [])
+]
+
+app.use(middleware)
 
 const ApiRouter = Router.of({ pages: ApiRoutes || [] })
 
@@ -25,6 +36,7 @@ app.all('/*all', (req, res) => {
   const apiRoute = ApiRouter.getPageByUrl(pathname)
 
   if (apiRoute) {
+    console.log(`[@ossy/cli][app][server] Handling API route: ${pathname}`)
     apiRoute.handle(req, res)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -50,5 +50,5 @@
     "/cli",
     "README.md"
   ],
-  "gitHead": "b63b938de06e69485066296ca287d71dc9558461"
+  "gitHead": "b97ec6944720f804a43ae63bde88c3e14b0521cf"
 }