@adobedjangir/commerce-admin-management 0.0.11 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobedjangir/commerce-admin-management",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Schema-driven system configuration for Adobe Commerce App Builder sync apps. Magento-style scoped config in Adobe App Builder Database (ABDB) with encryption, Commerce REST helpers, and React Admin UI.",
   "license": "Apache-2.0",
   "author": "Adobe Inc.",

package/scripts/setup.js

@@ -230,13 +230,29 @@ configureWeb({
 
 window.React = React
 
+// Mount strategy:
+//   - If we're inside the Experience Cloud Shell iframe, init(...) installs a
+//     ready-listener that the shell pings within ~100ms. bootstrapInExcShell
+//     renders with the IMS context.
+//   - If we're on the raw CDN URL (no shell), init(...) still completes but
+//     the ready event never arrives. We race a 2-second timer and fall back
+//     to bootstrapRaw so React still mounts.
+let booted = false
+function boot (fn) {
+  if (booted) return
+  booted = true
+  fn()
+}
+
 try {
   require('./exc-runtime')
   init(bootstrapInExcShell)
 } catch (e) {
   console.log('application not running in Adobe Experience Cloud Shell')
-  bootstrapRaw()
+  boot(bootstrapRaw)
 }
+// Safety net: shell never sent 'ready' → mount raw so the page isn't blank.
+setTimeout(() => boot(bootstrapRaw), 2000)
 
 function renderApp (runtime, ims) {
   createRoot(document.getElementById('root')).render(
@@ -254,11 +270,11 @@ function bootstrapInExcShell () {
 
   runtime.on('ready', ({ imsOrg, imsToken, imsProfile }) => {
     runtime.done()
-    renderApp(runtime, {
+    boot(() => renderApp(runtime, {
       profile: imsProfile,
       org: imsOrg,
       token: imsToken
-    })
+    }))
   })
 
   runtime.solution = {
@@ -451,15 +467,33 @@ function setupWebSrc (projectRoot) {
  */
 function stripExcshellSourceDir (projectRoot) {
   const dir = path.join(projectRoot, 'src', 'dx-excshell-1')
-  if (!fs.existsSync(dir)) {
-    return { changed: false, reason: 'absent' }
+  const parent = path.join(projectRoot, 'src')
+  let changed = false
+
+  if (fs.existsSync(dir)) {
+    try {
+      fs.rmSync(dir, { recursive: true, force: true })
+      changed = true
+    } catch (err) {
+      return { changed: false, reason: `rm-failed: ${err.message}` }
+    }
   }
-  try {
-    fs.rmSync(dir, { recursive: true, force: true })
-    return { changed: true, reason: 'removed' }
-  } catch (err) {
-    return { changed: false, reason: `rm-failed: ${err.message}` }
+
+  // If src/ is now empty (or was never anything but dx-excshell-1) drop it
+  // too — leaving an empty src/ in the project root is just clutter. We
+  // never remove it when it still contains other files (the host's own
+  // code), so this is safe.
+  if (fs.existsSync(parent)) {
+    try {
+      const remaining = fs.readdirSync(parent).filter((n) => n !== '.DS_Store')
+      if (remaining.length === 0) {
+        fs.rmSync(parent, { recursive: true, force: true })
+        changed = true
+      }
+    } catch (_) { /* best effort */ }
   }
+
+  return { changed, reason: changed ? 'removed' : 'absent' }
 }
 
 function setupAppConfig (projectRoot) {