@adobedjangir/commerce-admin-management 0.0.13 → 0.0.15

package/README.md

@@ -40,6 +40,7 @@ and an extension point for host apps to add their own pages and actions.
 | App Builder Database (ABDB) auto-provisioning on deploy | `ext.config.yaml` |
 | Host-extensible nav and pages | `configureWeb({ extraNav, extraPages })` |
 | Auto-scaffolded host scaffold on `npm install` | `scripts/setup.js` (postinstall hook) |
+| Auto-bump host React/Spectrum/Adobe deps to React-18 floor | `scripts/setup.js` mutates host `package.json` |
 
 ---
 
@@ -50,14 +51,15 @@ and an extension point for host apps to add their own pages and actions.
 aio app init my-commerce-admin
 cd my-commerce-admin
 
-# 2. Install the package — postinstall scaffolds everything
+# 2. Install. The postinstall bumps the host's package.json to the
+#    React 18 / Spectrum 4 floor and re-runs `npm install` automatically.
 npm install @adobedjangir/commerce-admin-management
 
 # 3. Fill in .env (see required values below)
 cp env.dist .env
 $EDITOR .env
 
-# 4. Deploy. ABDB is auto-provisioned; 11 actions + web assets ship to CDN.
+# 4. Deploy. ABDB is auto-provisioned; actions + web assets ship to CDN.
 aio app deploy
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobedjangir/commerce-admin-management",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "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.",
@@ -53,26 +53,20 @@
     "@adobe/aio-lib-core-auth": ">=1.1.0",
     "@adobe/aio-lib-db": ">=1.0.0",
     "@adobe/aio-lib-ims": ">=7.0.0",
-    "@adobe/aio-sdk": ">=5.0.0",
-    "@adobe/exc-app": ">=1.0.0",
-    "@adobe/react-spectrum": ">=3.30.0",
-    "@adobe/uix-guest": ">=0.8.0",
-    "@spectrum-icons/workflow": ">=3.0.0 <5.0.0",
-    "dotenv": ">=16.0.0",
-    "react": ">=18.0.0",
-    "react-dom": ">=18.0.0",
-    "react-error-boundary": ">=3.1.0",
-    "react-router-dom": ">=6.0.0"
+    "dotenv": ">=16.0.0"
   },
   "peerDependenciesMeta": {
     "@adobe/aio-lib-core-auth": {
-      "optional": false
+      "optional": true
     },
     "@adobe/aio-lib-db": {
-      "optional": false
+      "optional": true
     },
     "@adobe/aio-lib-ims": {
-      "optional": false
+      "optional": true
+    },
+    "dotenv": {
+      "optional": true
     }
   },
   "dependencies": {

package/scripts/setup.js

@@ -496,6 +496,122 @@ function stripExcshellSourceDir (projectRoot) {
   return { changed, reason: changed ? 'removed' : 'absent' }
 }
 
+/**
+ * Bump the host's package.json so the React 18 / Spectrum 4 stack we
+ * depend on is satisfied without the consumer running a long
+ * `npm install --save react@^18 …` chant. We declare these as peers (to
+ * avoid shipping duplicate React copies) but a fresh `aio app init` host
+ * still pins React 16 — so we patch the host's declared versions here.
+ *
+ * Strategy:
+ *   - Only touch entries that are MISSING or pin a version below our floor.
+ *   - Leave entries already satisfying the floor alone (don't downgrade).
+ *   - We mutate package.json only; the next `npm install` actually applies
+ *     the upgrade. We don't re-shell-out to npm from a postinstall — that
+ *     causes recursive installs and is fragile in workspaces / monorepos.
+ */
+const REQUIRED_HOST_DEPS = {
+  // React + DOM — package code uses createRoot/react-dom/client (React 18+).
+  'react':                       '^18.3.1',
+  'react-dom':                   '^18.3.1',
+  // React-error-boundary v4 dropped the default export the older versions
+  // shipped; we use named imports so v4 is the floor.
+  'react-error-boundary':        '^4.0.0',
+  'react-router-dom':            '^6.26.2',
+  // Adobe Spectrum trio — must be React-18 compatible.
+  '@adobe/react-spectrum':       '^3.47.0',
+  '@spectrum-icons/workflow':    '^4.2.4',
+  '@spectrum-icons/ui':          '^3.7.1',
+  // Adobe app runtime + helpers used by the bootstrap and actions.
+  '@adobe/exc-app':              '^1.6.0',
+  '@adobe/uix-guest':            '^0.8.3',
+  '@adobe/aio-sdk':              '^6.0.0'
+}
+
+// Parse a semver-ish version specifier ("^18.3.1", ">=3.0.0", "16.14.0",
+// "16.14.0 || >=18") and return the lowest concrete major.minor.patch it
+// could resolve to. Returns null for non-numeric specs we can't reason
+// about (workspace:*, file:..., git URLs) — those we leave alone.
+function lowestVersion (spec) {
+  if (!spec || typeof spec !== 'string') return null
+  const s = spec.split('||')[0].trim() // take the first range in an OR list
+  const m = s.match(/(\d+)\.(\d+)\.(\d+)/)
+  if (!m) return null
+  return { major: +m[1], minor: +m[2], patch: +m[3] }
+}
+
+function compareVersions (a, b) {
+  if (a.major !== b.major) return a.major - b.major
+  if (a.minor !== b.minor) return a.minor - b.minor
+  return a.patch - b.patch
+}
+
+function satisfiesFloor (currentSpec, floorSpec) {
+  const cur = lowestVersion(currentSpec)
+  const min = lowestVersion(floorSpec)
+  if (!cur || !min) return false
+  return compareVersions(cur, min) >= 0
+}
+
+/**
+ * Re-run `npm install` after bumping host package.json so the upgraded
+ * versions actually land in node_modules. Without this, the consumer
+ * would have to run `npm install` manually after our postinstall.
+ *
+ * Recursion is prevented by setting COMMERCE_ADMIN_MANAGEMENT_SKIP_SETUP=1
+ * in the child npm's env — main() bails immediately when it sees that
+ * flag, so the inner install doesn't loop back through this code.
+ *
+ * Failures here don't throw — we print a fallback hint and let the
+ * outer install report success. The consumer can re-run `npm install`
+ * manually if our auto-invocation can't reach the network.
+ */
+function autoRunNpmInstall (projectRoot) {
+  const { execSync } = require('child_process')
+  console.log('[@adobedjangir/commerce-admin-management] running `npm install` to apply the bumped versions…')
+  try {
+    execSync('npm install --no-audit --no-fund --silent --legacy-peer-deps', {
+      cwd: projectRoot,
+      stdio: 'inherit',
+      env: { ...process.env, COMMERCE_ADMIN_MANAGEMENT_SKIP_SETUP: '1' }
+    })
+    console.log('[@adobedjangir/commerce-admin-management] dependency upgrade complete ✓')
+  } catch (e) {
+    console.warn('[@adobedjangir/commerce-admin-management] auto-install failed. Run `npm install` manually.')
+    console.warn(`  reason: ${e.message}`)
+  }
+}
+
+function ensureHostDeps (projectRoot) {
+  const pkgPath = path.join(projectRoot, 'package.json')
+  if (!fs.existsSync(pkgPath)) {
+    return { changed: false, reason: 'no-package-json' }
+  }
+  let pkg
+  try { pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8')) } catch (_) {
+    return { changed: false, reason: 'unreadable-package-json' }
+  }
+  pkg.dependencies = pkg.dependencies || {}
+
+  const bumped = []
+  for (const [name, floor] of Object.entries(REQUIRED_HOST_DEPS)) {
+    const declared = pkg.dependencies[name] || (pkg.devDependencies && pkg.devDependencies[name])
+    if (declared && satisfiesFloor(declared, floor)) continue
+    // Move it to dependencies (out of devDependencies if it was there) and
+    // set to the floor.
+    pkg.dependencies[name] = floor
+    if (pkg.devDependencies && pkg.devDependencies[name]) {
+      delete pkg.devDependencies[name]
+    }
+    bumped.push({ name, was: declared || '(missing)', now: floor })
+  }
+
+  if (bumped.length === 0) return { changed: false, reason: 'already-satisfies' }
+
+  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8')
+  return { changed: true, bumped }
+}
+
 function setupAppConfig (projectRoot) {
   const appConfigPath = path.join(projectRoot, 'app.config.yaml')
   if (!fs.existsSync(appConfigPath)) {
@@ -519,9 +635,12 @@ function setupAppConfig (projectRoot) {
 }
 
 function main () {
-  if (process.env.CONFIGURATION_MANAGEMENT_SKIP_SETUP === '1') {
-    return
-  }
+  // Two opt-outs:
+  //   - CONFIGURATION_MANAGEMENT_SKIP_SETUP: legacy name kept for compat.
+  //   - COMMERCE_ADMIN_MANAGEMENT_SKIP_SETUP: set by autoRunNpmInstall to
+  //     prevent the recursive postinstall from re-running this code.
+  if (process.env.CONFIGURATION_MANAGEMENT_SKIP_SETUP === '1') return
+  if (process.env.COMMERCE_ADMIN_MANAGEMENT_SKIP_SETUP === '1') return
 
   const projectRoot = resolveProjectRoot()
   if (!projectRoot) {
@@ -539,6 +658,24 @@ function main () {
     console.log('[@adobedjangir/commerce-admin-management] removed src/dx-excshell-1/ (replaced by commerce/backend-ui/1)')
   }
 
+  // Bump host package.json so React-18 + Spectrum-4 peers are satisfied
+  // without the consumer running a long `npm install --save react@^18 ...`
+  // chant. If anything was bumped, automatically re-run npm install so the
+  // new versions actually land in node_modules. A guard env var prevents
+  // the recursive postinstall from re-running this step.
+  const deps = ensureHostDeps(projectRoot)
+  if (deps.changed) {
+    console.log('[@adobedjangir/commerce-admin-management] bumped host package.json:')
+    for (const b of deps.bumped) {
+      console.log(`  • ${b.name}: ${b.was} → ${b.now}`)
+    }
+    if (process.env.COMMERCE_ADMIN_MANAGEMENT_NO_AUTO_INSTALL === '1') {
+      console.log('[@adobedjangir/commerce-admin-management] auto-install disabled; run `npm install` to apply.')
+    } else {
+      autoRunNpmInstall(projectRoot)
+    }
+  }
+
   const app = setupAppConfig(projectRoot)
   if (app.changed) {
     console.log(