@ossy/app 1.39.0 → 1.39.2

package/cli/build.task.js

@@ -137,13 +137,20 @@ function generateResourceStub ({ stubAbs, sourceAbs }) {
 }
 
 // Components are re-exported as-is — the manifest plugin reads `metadata.id`
-// from the bundled output and records the entry URL. Components don't get
+// and the optional `slot` export from the bundled output. Components don't get
 // route stubs or hydration bootstrapping; they're loaded on-demand at runtime.
+// The `slot` export (when present) identifies the named shell slot this
+// component fills automatically — see PlatformShell for the slot registry.
+// We use `export *` for named exports rather than an explicit list because
+// `slot` is optional: some components don't export it, and a static named
+// re-export of a binding that doesn't exist causes a Rollup MISSING_EXPORT
+// error at build time.
 function generateComponentStub ({ stubAbs, sourceAbs }) {
   const importPath = relImport(stubAbs, sourceAbs)
   return [
     '// Generated by @ossy/app — do not edit',
-    `export { default, metadata } from '${importPath}'`,
+    `export * from '${importPath}'`,
+    `export { default } from '${importPath}'`,
     '',
   ].join('\n')
 }

package/cli/get-platform-files.task.js

@@ -35,7 +35,7 @@ export const LAYOUT_FILE_PATTERN = /\.layout\.(jsx?|tsx?)$/
  * @property {PlatformEntry[]} emails        Discovered `*.email.{jsx,tsx,...}` entries.
  * @property {PlatformEntry[]} actions       Discovered `*.action.{js,mjs,cjs}` entries.
  * @property {PlatformEntry[]} e2es          Discovered `*.e2e.{js,mjs,cjs}` entries (installed packages only).
- * @property {PlatformEntry[]} layouts       Discovered `*.layout.{jsx,tsx,...}` entries.
+ * @property {PlatformEntry[]} layouts       Discovered `*.layout.{jsx,tsx,...}` entries (app root `src/` only — never from installed packages).
  */
 export function discoverFilesByPattern (srcDir, filePattern) {
   const dir = path.resolve(srcDir)
@@ -104,24 +104,57 @@ export function filePathToRoute (absPath, srcDir) {
 }
 
 /**
- * Walks `node_modules/` in `projectRoot` looking for packages that declare an
- * `"ossy": { "src": "./src" }` field in their `package.json`. Returns entries
- * from those packages' source trees, tagged with `packageName` and
- * `packageSrcDir` so the build pipeline can namespace them correctly.
+ * Collects all `node_modules` directories that Node.js would search when
+ * resolving imports from `projectRoot`, walking up the filesystem the same
+ * way the Node module-resolution algorithm does. This is essential for npm
+ * workspaces where packages are hoisted to a root-level `node_modules` that
+ * may be several directories above the consuming project.
+ *
+ * @param {string} projectRoot
+ * @returns {string[]} Absolute paths to existing `node_modules` directories,
+ *   ordered from most-specific (closest to `projectRoot`) to least-specific.
+ */
+function collectNodeModulesDirs (projectRoot) {
+  const dirs = []
+  let current = projectRoot
+  while (true) {
+    const nm = path.join(current, 'node_modules')
+    if (fs.existsSync(nm) && fs.statSync(nm).isDirectory()) dirs.push(nm)
+    const parent = path.dirname(current)
+    if (parent === current) break
+    current = parent
+  }
+  return dirs
+}
+
+/**
+ * Walks `node_modules/` directories reachable from `projectRoot` looking for
+ * packages that declare an `"ossy": { "src": "./src" }` field in their
+ * `package.json`. Returns entries from those packages' source trees, tagged
+ * with `packageName` and `packageSrcDir` so the build pipeline can namespace
+ * them correctly.
  *
  * Handles both flat packages (`node_modules/foo`) and scoped packages
- * (`node_modules/@scope/foo`).
+ * (`node_modules/@scope/foo`). Walks up the directory tree following Node.js
+ * module-resolution order so that monorepo setups with hoisted packages
+ * (where dependencies live in a root-level `node_modules` rather than a
+ * package-local one) are discovered correctly.
  *
  * @param {string} projectRoot Absolute path to the consuming project root (parent of `src/`).
  * @returns {PlatformEntry[]}
  */
 export function discoverInstalledPackageEntries (projectRoot) {
-  const nmDir = path.join(projectRoot, 'node_modules')
-  if (!fs.existsSync(nmDir) || !fs.statSync(nmDir).isDirectory()) return []
+  const nmDirs = collectNodeModulesDirs(projectRoot)
+  if (nmDirs.length === 0) return []
 
   const entries = []
+  const seen = new Set()
 
   const tryPackageDir = (pkgDir) => {
+    const real = fs.realpathSync(pkgDir)
+    if (seen.has(real)) return
+    seen.add(real)
+
     const pkgJsonPath = path.join(pkgDir, 'package.json')
     if (!fs.existsSync(pkgJsonPath)) return
     let pkg
@@ -141,7 +174,8 @@ export function discoverInstalledPackageEntries (projectRoot) {
       ...discoverFilesByPattern(packageSrcDir, EMAIL_FILE_PATTERN),
       ...discoverFilesByPattern(packageSrcDir, ACTION_FILE_PATTERN),
       ...discoverFilesByPattern(packageSrcDir, E2E_FILE_PATTERN),
-      ...discoverFilesByPattern(packageSrcDir, LAYOUT_FILE_PATTERN),
+      // Layouts are intentionally excluded: *.layout.jsx is an app-level
+      // primitive only. Feature packages must never define layouts.
     ]
     for (const sourcePath of files) {
       const stat = fs.statSync(sourcePath)
@@ -152,17 +186,19 @@ export function discoverInstalledPackageEntries (projectRoot) {
     }
   }
 
-  for (const entry of fs.readdirSync(nmDir, { withFileTypes: true })) {
-    if (!entry.isDirectory() && !entry.isSymbolicLink()) continue
-    if (entry.name.startsWith('@')) {
-      const scopeDir = path.join(nmDir, entry.name)
-      for (const scoped of fs.readdirSync(scopeDir, { withFileTypes: true })) {
-        if (scoped.isDirectory() || scoped.isSymbolicLink()) {
-          tryPackageDir(path.join(scopeDir, scoped.name))
+  for (const nmDir of nmDirs) {
+    for (const entry of fs.readdirSync(nmDir, { withFileTypes: true })) {
+      if (!entry.isDirectory() && !entry.isSymbolicLink()) continue
+      if (entry.name.startsWith('@')) {
+        const scopeDir = path.join(nmDir, entry.name)
+        for (const scoped of fs.readdirSync(scopeDir, { withFileTypes: true })) {
+          if (scoped.isDirectory() || scoped.isSymbolicLink()) {
+            tryPackageDir(path.join(scopeDir, scoped.name))
+          }
         }
+      } else {
+        tryPackageDir(path.join(nmDir, entry.name))
       }
-    } else {
-      tryPackageDir(path.join(nmDir, entry.name))
     }
   }
 
@@ -192,6 +228,9 @@ export default async function getPlatformFiles (srcDir) {
   // from the local `src/` — to avoid pulling in per-project duplicates of the
   // same aggregate class or test suite that is canonically owned by the feature
   // package.
+  // Layouts are the opposite restriction: they are only discovered from the
+  // app's own `src/`, never from installed packages. Feature packages are pure
+  // content (pages, actions, tasks, etc.) and must never define layouts.
   const localFiles = [
     ...discoverFilesByPattern(srcDir, PAGE_FILE_PATTERN),
     ...discoverFilesByPattern(srcDir, API_FILE_PATTERN),

package/cli/manifest-plugin.js

@@ -39,8 +39,14 @@ import { metadataIdFromFile, defaultPageRoute } from './get-platform-files.task.
  *                                        (e.g. `/static/home.page-7f2a.js`).
  *
  * @typedef {object} ComponentManifestEntry
- * @property {string} id     Unique component id (from `metadata.id`).
- * @property {string} entry  URL the platform serves the component bundle from.
+ * @property {string} id      Unique component id (from `metadata.id`).
+ * @property {string} entry   URL the platform serves the component bundle from.
+ * @property {string} [slot]  Named shell slot this component fills (from `export const slot`).
+ *
+ * @typedef {object} SlotManifestEntry
+ * @property {string} slot     Named shell slot (e.g. `'header'`, `'sidebar'`, `'resource:booking/service/form'`).
+ * @property {string} entry    URL the platform serves the component bundle from.
+ * @property {string} [package] npm package name that contributed this slot (from installed packages).
  *
  * @typedef {object} AggregateManifestEntry
  * @property {string} id     AggregateType string (e.g. `'User'`).
@@ -78,6 +84,7 @@ import { metadataIdFromFile, defaultPageRoute } from './get-platform-files.task.
  * @typedef {object} Manifest
  * @property {ManifestEntry[]} entries              Flat, ordered list of every routable thing.
  * @property {ComponentManifestEntry[]} components  Discovered `*.component.*` entries, keyed by id.
+ * @property {SlotManifestEntry[]} slots            Components that declare `export const slot` — auto-injected into shell slots.
  * @property {object[]} resourceTemplates           Each `*.resource.js` file's default-exported template object.
  * @property {AggregateManifestEntry[]} aggregates  Discovered `*.aggregate.js` entries from installed packages.
  * @property {IntegrationManifestEntry[]} integrations  Discovered `*.integration.js` entries.
@@ -150,6 +157,8 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
       const seenStartupIds = new Set()
       const seenEmailIds = new Set()
       const seenActionIds = new Set()
+      /** @type {SlotManifestEntry[]} */
+      const slots = []
       /** @type {E2eManifestEntry[]} */
       const e2es = []
       const seenE2eIds = new Set()
@@ -399,7 +408,12 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
         seenIds[entryInfo.kind].add(id)
 
         if (entryInfo.kind === 'component') {
-          components.push({ id, entry: url })
+          const slotName = typeof mod.slot === 'string' && mod.slot.trim() ? mod.slot.trim() : undefined
+          components.push({ id, entry: url, ...(slotName ? { slot: slotName } : {}) })
+          if (slotName) {
+            const packageName = entryInfo.packageName
+            slots.push({ slot: slotName, entry: url, ...(packageName ? { package: packageName } : {}) })
+          }
           continue
         }
 
@@ -425,7 +439,7 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
       }
 
       /** @type {Manifest} */
-      const manifest = { entries, components, resourceTemplates, aggregates, integrations, startups, emails, actions, e2es, layouts, config: configValue || {} }
+      const manifest = { entries, components, slots, resourceTemplates, aggregates, integrations, startups, emails, actions, e2es, layouts, config: configValue || {} }
       fs.mkdirSync(path.dirname(manifestPath), { recursive: true })
       fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), 'utf8')
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.39.0",
+  "version": "1.39.2",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -38,14 +38,14 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/design-system": "^1.39.0",
+    "@ossy/design-system": "^1.39.2",
     "@ossy/pages": "^1.23.0",
-    "@ossy/platform": "^1.38.0",
-    "@ossy/router": "^1.39.0",
-    "@ossy/router-react": "^1.39.0",
-    "@ossy/sdk": "^1.39.0",
-    "@ossy/sdk-react": "^1.39.0",
-    "@ossy/themes": "^1.39.0",
+    "@ossy/platform": "^1.38.2",
+    "@ossy/router": "^1.39.2",
+    "@ossy/router-react": "^1.39.2",
+    "@ossy/sdk": "^1.39.2",
+    "@ossy/sdk-react": "^1.39.2",
+    "@ossy/themes": "^1.39.2",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "^7.0.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -79,5 +79,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "150285065e45f9be2ee19794e493abc50cd85e44"
+  "gitHead": "51e33c2eaff6973c34f00024a082c6912252ec72"
 }