@ossy/app 1.13.4 → 1.13.5

package/cli/build.js

@@ -501,7 +501,20 @@ export function pageRouteFromSource (pageAbsPath, srcDir) {
     const after = src.slice(metaIdx)
     const id = after.match(/\bid\s*:\s*['"]([^'"]+)['"]/)?.[1] ?? derived.id
     const strPath = after.match(/\bpath\s*:\s*['"]([^'"]+)['"]/)?.[1]
-    return { id, path: strPath ?? derived.path }
+    if (strPath) {
+      return { id, path: strPath }
+    }
+    const pathObjBody = after.match(/\bpath\s*:\s*\{([\s\S]*?)\}/)?.[1]
+    if (pathObjBody) {
+      const languagePathEntries = [...pathObjBody.matchAll(/([A-Za-z0-9_]+)\s*:\s*['"]([^'"]+)['"]/g)]
+      if (languagePathEntries.length > 0) {
+        return {
+          id,
+          path: Object.fromEntries(languagePathEntries.map(([, language, routePath]) => [language, routePath])),
+        }
+      }
+    }
+    return { id, path: derived.path }
   } catch {
     return derived
   }
@@ -562,7 +575,7 @@ export function generateHydrateEntry ({ pageFiles, srcDir, stubAbsPath }) {
     }
     seenIds.add(hydrateId)
     const rel = relToGeneratedImport(stubAbsPath, f)
-    pageLines.push(`  '${hydrateId}': () => import('./${rel}'),`)
+    pageLines.push(`  ${JSON.stringify(hydrateId)}: () => import('./${rel}'),`)
   }
 
   return [
@@ -637,8 +650,8 @@ export function generateSsrEntry ({ pageFiles, srcDir, stubAbsPath }) {
     }
     seenIds.add(id)
     const rel = relToGeneratedImport(stubAbsPath, f)
-    pagesLiteral.push(`  { id: '${id}', path: '${routePath}' },`)
-    pageModuleLines.push(`  '${id}': () => import('./${rel}'),`)
+    pagesLiteral.push(`  { id: ${JSON.stringify(id)}, path: ${JSON.stringify(routePath)} },`)
+    pageModuleLines.push(`  ${JSON.stringify(id)}: () => import('./${rel}'),`)
   }
 
   return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.13.4",
+  "version": "1.13.5",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -27,14 +27,14 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/connected-components": "^1.13.4",
-    "@ossy/design-system": "^1.13.4",
-    "@ossy/pages": "^1.13.4",
-    "@ossy/router": "^1.13.4",
-    "@ossy/router-react": "^1.13.4",
-    "@ossy/sdk": "^1.13.4",
-    "@ossy/sdk-react": "^1.13.4",
-    "@ossy/themes": "^1.13.4",
+    "@ossy/connected-components": "^1.13.5",
+    "@ossy/design-system": "^1.13.5",
+    "@ossy/pages": "^1.13.5",
+    "@ossy/router": "^1.13.5",
+    "@ossy/router-react": "^1.13.5",
+    "@ossy/sdk": "^1.13.5",
+    "@ossy/sdk-react": "^1.13.5",
+    "@ossy/themes": "^1.13.5",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "6.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -67,5 +67,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "c2640eba775b192c34a888bae8add3c3461305ee"
+  "gitHead": "6c3b6ef26328e2227ee96f830138250fc1db1126"
 }

package/src/index.js

@@ -4,4 +4,3 @@ export {
   resourceTemplatesDir,
   OSSY_RESOURCE_TEMPLATES_OUT,
 } from '../cli/build.js'
-export { dev } from '../cli/dev.js'