@ossy/app 0.5.0 → 0.5.1

package/cli/build.js

@@ -33,7 +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');
+    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')
@@ -53,7 +53,7 @@ export const build = async (cliArgs) => {
     }
 
     if (!fs.existsSync(middlewareSourcePath)) {
-      middlewareSourcePath = path.resolve(scriptDir, 'Middleware.js')
+      middlewareSourcePath = path.resolve(scriptDir, 'middleware.js')
     }
 
     if (fs.existsSync(configPath)) {

package/cli/proxy-internal.js

@@ -0,0 +1,47 @@
+export function ProxyInternal() {
+    return (req, res, next) => {
+
+        if (!req.originalUrl.startsWith('/@ossy')) {
+            return next()
+        }
+    
+        const domain = process.env.OSSY_API_URL || 'https://api.ossy.se'
+        const url = `${domain}${req.path}`
+        const headers = JSON.parse(JSON.stringify(req.headers)) // Clone headers
+        const workspaceId = headers.workspaceId || config.workspaceId
+    
+        if (workspaceId) {
+            headers['workspaceid'] = workspaceId
+        }
+    
+        const request = {
+            method: req.method,
+            headers: JSON.parse(JSON.stringify(req.headers))
+        }
+    
+        if (!['GET', 'HEAD'].includes(req.method)) {
+            request.body = JSON.stringify(req.body)
+        }
+    
+        fetch(url, request)
+            .then((response) => {
+    
+                if (response.headers.get('content-type')?.includes('application/json')) {
+                    return response.json()
+                        .then(data => {
+                            res.status(response.status)
+                            res.json(data)
+                        })
+                }
+    
+                res.status(response.status)
+                res.json("")
+            })
+            .catch((error) => {
+                const status = error.status
+                res.status(status || 500)
+                res.json({ message: error.message || 'Internal Server Error' })
+            })
+    
+    }
+}

package/cli/server.js

@@ -5,6 +5,7 @@ import express from 'express'
 import morgan from 'morgan'
 import { Router } from '@ossy/router'
 import { prerenderToNodeStream } from 'react-dom/static'
+import { ProxyInternal } from './proxy-internal.js'
 
 import App from '%%@ossy/app/source-file%%'
 import ApiRoutes from '%%@ossy/api/source-file%%'
@@ -24,6 +25,7 @@ const middleware = [
   morgan('tiny'),
   express.static(ROOT_PATH),
   express.json({ strict: false }),
+  ProxyInternal(),
   ...(Middleware || [])
 ]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -20,8 +20,15 @@
     "@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",
+    "@ossy/connected-components": ">=0.5.0 <1.0.0",
+    "@ossy/design-system": ">=0.5.0 <1.0.0",
+    "@ossy/design-system-extras": ">=0.5.0 <1.0.0",
+    "@ossy/resource-templates": ">=0.5.0 <1.0.0",
+    "@ossy/router": ">=0.5.0 <1.0.0",
+    "@ossy/router-react": ">=0.5.0 <1.0.0",
+    "@ossy/sdk": ">=0.5.0 <1.0.0",
+    "@ossy/sdk-react": ">=0.5.0 <1.0.0",
+    "@ossy/themes": ">=0.5.0 <1.0.0",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-babel": "6.0.4",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -50,5 +57,5 @@
     "/cli",
     "README.md"
   ],
-  "gitHead": "b1f4d323c5ef099ce345cdede9bfa22255c429a4"
+  "gitHead": "71269efebe05376c2ead8a2a81a94ddf098996c6"
 }