@ossy/app 0.1.9 → 0.3.0

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

@@ -1,27 +1,42 @@
 import path from 'path';
 import url from 'url'
 import React, { createElement } from 'react';
-import express from 'express';
+import express from 'express'
+import morgan from 'morgan'
+import { Router } from '@ossy/router'
 import { prerenderToNodeStream } from 'react-dom/static'
+
 import App from '%%@ossy/app/source-file%%'
-import ApiRouter from '%%@ossy/api/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(express.static(ROOT_PATH));
+const middleware = [
+  morgan('tiny'),
+  express.static(ROOT_PATH),
+  ...(Middleware || [])
+]
+
+app.use(middleware)
+
+const ApiRouter = Router.of({ pages: ApiRoutes || [] })
 
-ApiRouter && app.use('/*api', ApiRouter)
+app.all('/*all', (req, res) => {
+  const pathname = req.originalUrl
 
-app.get('/*app', (req, res) => {
+  const apiRoute = ApiRouter.getPageByUrl(pathname)
 
-  console.log('[@ossy/cli][app][server] req.url: ', req.url)
+  if (apiRoute) {
+    apiRoute.handle(req, res)
+  }
 
-    renderToString(App, { url: req.url })
-      .then(html => { res.send(html) })
-      .catch(err => { res.send(err) })
+  renderToString(App, { url: req.url })
+    .then(html => { res.send(html) })
+    .catch(err => { res.send(err) })
 
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "0.1.9",
+  "version": "0.3.0",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -20,6 +20,8 @@
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
+    "@ossy/router": ">=0.1.9 <1.0.0",
+    "@ossy/router-react": ">=0.1.9 <1.0.0",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-babel": "6.0.4",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -32,6 +34,7 @@
     "arg": "^5.0.2",
     "babel-loader": "^9.2.1",
     "express": ">=5.0.0 <6.0.0",
+    "morgan": ">=1.10.1 <2.0.0",
     "react": ">=19.0.0 <20.0.0",
     "react-dom": ">=19.0.0 <20.0.0",
     "rollup": "^4.24.3",
@@ -47,5 +50,5 @@
     "/cli",
     "README.md"
   ],
-  "gitHead": "b12e155a1e0e5b57f60d786d548d5bf761dbefe6"
+  "gitHead": "0d51b85b7a041971810f0c224cf79d655c7f933c"
 }