@ossy/app 1.16.1 → 1.16.3

package/cli/build.task.js

@@ -46,11 +46,21 @@ function ensureDir (dir) {
   fs.mkdirSync(dir, { recursive: true })
 }
 
-function stubFileNameFor (kind, sourcePath, srcDir) {
+// One source of truth for the per-entry name. Used both as the Rollup
+// `input` key (which becomes the `[name]` token in `entryFileNames`) and
+// as the basename of the generated stub. Flattening the full relative
+// path with `__` keeps two files with the same basename in different
+// folders (e.g. `apps/home.page.jsx` and `analytics/home.page.jsx`) from
+// colliding on the Rollup input map — which the filesystem already
+// guarantees can't happen at the relative-path level.
+function entryNameFromSource (sourcePath, srcDir) {
   const rel = path.relative(srcDir, sourcePath).replace(/\\/g, '/')
-  const flat = rel.replace(/\//g, '__')
+  return rel.replace(/\//g, '__').replace(/\.(jsx?|tsx?|mjs|cjs)$/, '')
+}
+
+function stubFileNameFor (kind, sourcePath, srcDir) {
   const ext = kind === 'page' ? '.entry.jsx' : '.entry.js'
-  return flat.replace(/\.(jsx?|tsx?|mjs|cjs)$/, '') + ext
+  return entryNameFromSource(sourcePath, srcDir) + ext
 }
 
 function relImport (fromAbs, toAbs) {
@@ -148,14 +158,9 @@ export async function build (cliArgs = []) {
 
   for (const entry of allEntries) {
     const { kind, sourcePath } = entry
-    const stubFileName = stubFileNameFor(kind, sourcePath, srcDir)
-    const stubAbs = path.join(stubDir, stubFileName)
+    const inputName = entryNameFromSource(sourcePath, srcDir)
+    const stubAbs = path.join(stubDir, stubFileNameFor(kind, sourcePath, srcDir))
     fs.writeFileSync(stubAbs, stubFor(kind, { stubAbs, sourceAbs: sourcePath }), 'utf8')
-
-    const inputName = path.basename(sourcePath).replace(/\.(jsx?|tsx?|mjs|cjs)$/, '')
-    if (stubInputMap[inputName]) {
-      throw new Error(`[@ossy/app][build] Duplicate entry name "${inputName}" between ${stubInputMap[inputName]} and ${stubAbs}.`)
-    }
     stubInputMap[inputName] = stubAbs
     entriesByStub.set(stubAbs, { kind, sourcePath })
   }

package/cli/manifest-plugin.js

@@ -123,6 +123,17 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
           const pagePath = rawMeta.path !== undefined ? rawMeta.path : defaultPageRoute(id)
           entries.push({ type: 'page', id, path: pagePath, title: rawMeta.title, entry: url })
         } else if (entryInfo.kind === 'api') {
+          // APIs have no sensible default route (unlike pages where we can
+          // derive `/<id>`). Failing here surfaces a missing `metadata.path`
+          // at build time instead of letting it 500 the router on first
+          // request — `OssyRouter.getPageByUrl` does `Object.entries(path)`
+          // and crashes when `path` is undefined.
+          if (rawMeta.path === undefined || rawMeta.path === null) {
+            this.error(
+              `[@ossy/app][build] api entry "${id}" (${entryInfo.sourcePath}) is missing metadata.path. ` +
+              `Add a \`path\` to the metadata or default-export object (e.g. \`path: '/api/${id}'\`).`,
+            )
+          }
           entries.push({ type: 'api', id, path: rawMeta.path, entry: url })
         } else {
           entries.push({ type: 'task', id, entry: url })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -33,15 +33,15 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/connected-components": "^1.16.1",
-    "@ossy/design-system": "^1.16.1",
-    "@ossy/pages": "^1.16.1",
-    "@ossy/platform": "^1.15.1",
-    "@ossy/router": "^1.16.1",
-    "@ossy/router-react": "^1.16.1",
-    "@ossy/sdk": "^1.16.1",
-    "@ossy/sdk-react": "^1.16.1",
-    "@ossy/themes": "^1.16.1",
+    "@ossy/connected-components": "^1.16.3",
+    "@ossy/design-system": "^1.16.3",
+    "@ossy/pages": "^1.16.3",
+    "@ossy/platform": "^1.15.3",
+    "@ossy/router": "^1.16.3",
+    "@ossy/router-react": "^1.16.3",
+    "@ossy/sdk": "^1.16.3",
+    "@ossy/sdk-react": "^1.16.3",
+    "@ossy/themes": "^1.16.3",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "6.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -75,5 +75,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "031e2329e267a3e0cebc2ec0d484fa11b53082d9"
+  "gitHead": "57ef30cf0b510dfb09b5b964cff3d847b9825360"
 }