@ossy/app 3.26.0 → 3.27.0

package/cli/manifest-plugin.js

@@ -73,7 +73,8 @@ import {
  * @typedef {object} IntegrationManifestEntry
  * @property {string} id              Unique integration slug (e.g. `'email'`).
  * @property {string} entry           URL the platform serves the integration bundle from.
- * @property {string[]} credentials   Env var names required by the integration.
+ * @property {string[]} credentials   Env var names required by a platform integration.
+ * @property {string[]} [secrets]     Secret key names for a workspace integration.
  *
  * @typedef {object} StartupManifestEntry
  * @property {string} id     Unique startup slug (e.g. `'create-bot-user'`).
@@ -257,15 +258,18 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
         // produce routable entries; they accumulate into a separate array.
         if (entryInfo.kind === 'integration') {
           const integrationId = mod && mod.id
-          const credentials = mod && mod.credentials
+          const credentials = Array.isArray(mod?.credentials) ? mod.credentials : null
+          const secrets = Array.isArray(mod?.secrets)
+            ? mod.secrets.filter((key) => typeof key === 'string' && key.trim())
+            : []
           if (typeof integrationId !== 'string' || integrationId.trim() === '') {
             this.error(
               `[@ossy/app][build] integration entry ${entryInfo.sourcePath} must export a non-empty string "id"`,
             )
           }
-          if (!Array.isArray(credentials)) {
+          if (!credentials && secrets.length === 0) {
             this.error(
-              `[@ossy/app][build] integration entry ${entryInfo.sourcePath} must export a "credentials" array`,
+              `[@ossy/app][build] integration entry ${entryInfo.sourcePath} must export a "credentials" array or a "secrets" array`,
             )
           }
           if (typeof mod.connect !== 'function') {
@@ -277,7 +281,13 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
             this.error(`[@ossy/app][build] Duplicate integration id "${integrationId}"`)
           }
           seenIntegrationIds.add(integrationId)
-          integrations.push(withSourcePath({ id: integrationId, entry: url, credentials, package: entryPackage(entryInfo, appPackageName) }, entryInfo, projectRoot))
+          integrations.push(withSourcePath({
+            id: integrationId,
+            entry: url,
+            credentials: credentials ?? [],
+            ...(secrets.length ? { secrets } : {}),
+            package: entryPackage(entryInfo, appPackageName),
+          }, entryInfo, projectRoot))
           continue
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "3.26.0",
+  "version": "3.27.0",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -50,21 +50,21 @@
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
     "@ossy/authentication": "^3.26.0",
-    "@ossy/design-system": "^3.26.0",
+    "@ossy/design-system": "^3.27.0",
     "@ossy/locale": "^3.4.0",
-    "@ossy/manifest": "^3.24.0",
-    "@ossy/package-catalog": "^3.26.0",
+    "@ossy/manifest": "^3.27.0",
+    "@ossy/package-catalog": "^3.27.0",
     "@ossy/pages": "^3.26.0",
-    "@ossy/platform": "^3.26.0",
-    "@ossy/resources": "^3.26.0",
+    "@ossy/platform": "^3.27.0",
+    "@ossy/resources": "^3.27.0",
     "@ossy/router": "^3.25.0",
-    "@ossy/router-react": "^3.18.0",
-    "@ossy/schema": "^3.24.0",
+    "@ossy/router-react": "^3.27.0",
+    "@ossy/schema": "^3.27.0",
     "@ossy/sdk": "^3.26.0",
     "@ossy/sdk-react": "^3.26.0",
     "@ossy/themes": "^3.26.0",
-    "@ossy/users": "^3.24.1",
-    "@ossy/workspaces": "^3.26.0",
+    "@ossy/users": "^3.27.0",
+    "@ossy/workspaces": "^3.27.0",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "^7.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -98,5 +98,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "0df308a330150a890b9dd4d6ffc2e9f28bd31966"
+  "gitHead": "f72042c42723468c010d0d9744ad69257143d0b9"
 }

package/src/shell/App.jsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import { SDK } from '@ossy/sdk'
 import { WorkspaceProvider } from '@ossy/sdk-react'
 import { Theme, ComponentSlotsProvider, LocaleProvider, DEFAULT_FORM_FIELD_SLOTS } from '@ossy/design-system'
@@ -13,6 +13,13 @@ import { Router } from '@ossy/router-react'
 import { AppContext } from './AppContext.js'
 import { UserSetupGuard } from './UserSetupGuard.jsx'
 
+function MarkHydrated () {
+  useEffect(() => {
+    document.documentElement.dataset.hydrated = 'true'
+  }, [])
+  return null
+}
+
 export const App = ({ children, language, messages, fallbackMessages, sdk: sdkOverride, ..._appSettings }) => {
   const appSettings = { ...defaultAppSettings(), ..._appSettings }
 
@@ -34,6 +41,7 @@ export const App = ({ children, language, messages, fallbackMessages, sdk: sdkOv
       supportedLanguages={appSettings.supportedLanguages}
     >
       <AppContext.Provider value={contextSettings}>
+        <MarkHydrated />
         <ComponentSlotsProvider slots={{ ...DEFAULT_FORM_FIELD_SLOTS, ...DEFAULT_SCHEMA_VIEW_SLOTS, ...DEFAULT_SCHEMA_FORM_SLOTS, ...(components || {}) }}>
           <Theme theme={appSettings.theme} themes={appSettings.themes}>
             <WorkspaceProvider