@unisphere/nx 3.5.0 → 3.6.0

package/dist/migrations/3-0-0/reorganize-applications-by-distribution-channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reorganize-applications-by-distribution-channel.d.ts","sourceRoot":"","sources":["../../../src/migrations/3-0-0/reorganize-applications-by-distribution-channel.ts"],"names":[],"mappings":"AAAA;;;;;;;;EAQE;AAEF,OAAO,EACL,IAAI,EAML,MAAM,YAAY,CAAC;AAsmBpB;;GAEG;AACH,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAyE9D"}
+{"version":3,"file":"reorganize-applications-by-distribution-channel.d.ts","sourceRoot":"","sources":["../../../src/migrations/3-0-0/reorganize-applications-by-distribution-channel.ts"],"names":[],"mappings":"AAAA;;;;;;;;EAQE;AAEF,OAAO,EACL,IAAI,EAQL,MAAM,YAAY,CAAC;AAyuBpB;;GAEG;AACH,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAqE9D"}

package/dist/migrations/3-0-0/reorganize-applications-by-distribution-channel.js

@@ -11,27 +11,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = update;
 const devkit_1 = require("@nx/devkit");
-const generators_1 = require("@nx/workspace/generators");
-const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
-/**
- * Reset Nx cache to ensure fresh project graph
- * This is important before moving projects, as Nx caches project locations
- */
-function resetNxCache() {
-    try {
-        devkit_1.logger.info('Resetting Nx cache to ensure fresh project graph...');
-        (0, child_process_1.execSync)('npx nx reset', {
-            stdio: 'pipe',
-        });
-        devkit_1.logger.info('Nx cache reset successfully');
-    }
-    catch (error) {
-        // Log but don't fail - cache reset is best effort
-        devkit_1.logger.warn('Could not reset Nx cache (continuing anyway): ' + error);
-    }
-}
 /**
  * Get the subdirectory based on distribution channel
  */
@@ -401,7 +382,130 @@ function updateRootPackageJsonScripts(tree, oldPath, newPath) {
     }
 }
 /**
- * Migrate a single application
+ * Move all files from one tree path to another.
+ * Recursively walks the source directory and copies each file to the destination,
+ * then deletes the source. This replaces moveGenerator's moveProjectFiles.
+ */
+function moveFilesInTree(tree, fromPath, toPath) {
+    let movedCount = 0;
+    function walkAndMove(currentPath) {
+        const children = tree.children(currentPath);
+        for (const child of children) {
+            const childPath = `${currentPath}/${child}`;
+            if (tree.isFile(childPath)) {
+                const content = tree.read(childPath);
+                if (content) {
+                    const relativePath = childPath.substring(fromPath.length + 1);
+                    const newFilePath = `${toPath}/${relativePath}`;
+                    tree.write(newFilePath, content);
+                    movedCount++;
+                }
+                tree.delete(childPath);
+            }
+            else {
+                walkAndMove(childPath);
+            }
+        }
+    }
+    walkAndMove(fromPath);
+    // Delete the now-empty source directory
+    if (tree.exists(fromPath)) {
+        tree.delete(fromPath);
+    }
+    return movedCount;
+}
+/**
+ * Update project.json at the new location after moving files.
+ * Updates root, sourceRoot, $schema, and path references in target configurations.
+ */
+function updateProjectJsonAfterMove(tree, oldPath, newPath) {
+    const projectJsonPath = `${newPath}/project.json`;
+    if (!tree.exists(projectJsonPath)) {
+        return;
+    }
+    const projectJson = (0, devkit_1.readJson)(tree, projectJsonPath);
+    // Update root
+    projectJson.root = newPath;
+    // Update sourceRoot
+    if (projectJson.sourceRoot) {
+        projectJson.sourceRoot = projectJson.sourceRoot.replace(oldPath, newPath);
+    }
+    // Update $schema relative path
+    if (projectJson['$schema']) {
+        projectJson['$schema'] = projectJson['$schema'].replace(/^(\.\.\/)+/, (match) => `../${match}`);
+    }
+    // Update path references in targets
+    if (projectJson.targets) {
+        const targetStr = JSON.stringify(projectJson.targets);
+        // Replace all occurrences of old path with new path in targets
+        const updatedTargetStr = targetStr.replace(new RegExp(oldPath.replace(/[/\\]/g, '[\\\\/]'), 'g'), newPath);
+        projectJson.targets = JSON.parse(updatedTargetStr);
+    }
+    (0, devkit_1.writeJson)(tree, projectJsonPath, projectJson);
+}
+/**
+ * Ensure project.json has the correct name and will be discovered by Nx.
+ * We don't use removeProjectConfiguration/updateProjectConfiguration because they can
+ * cause the project.json file to be deleted. Instead, we rely on Nx's auto-discovery
+ * of projects from project.json files at their new locations.
+ */
+function updateNxProjectRegistration(tree, oldProjectName, newProjectName, newPath) {
+    // Verify project.json exists at new location
+    const projectJsonPath = `${newPath}/project.json`;
+    if (!tree.exists(projectJsonPath)) {
+        devkit_1.logger.warn(`  Cannot update Nx registration: project.json not found at ${projectJsonPath}`);
+        return;
+    }
+    // Read and update the project.json to ensure it has the correct name
+    const projectJson = (0, devkit_1.readJson)(tree, projectJsonPath);
+    // Update the name if needed
+    if (projectJson.name !== newProjectName) {
+        projectJson.name = newProjectName;
+        (0, devkit_1.writeJson)(tree, projectJsonPath, projectJson);
+        devkit_1.logger.info(`  Updated project.json name to: ${newProjectName}`);
+    }
+    else {
+        devkit_1.logger.info(`  Project.json name already correct: ${newProjectName}`);
+    }
+    // Nx will auto-discover the project from its project.json file at the new location
+    devkit_1.logger.info(`  Project will be auto-discovered by Nx at: ${newPath}`);
+}
+/**
+ * Update cross-project build target references.
+ * Scans all projects in the workspace for references to the old project name
+ * in their target configurations and updates them.
+ */
+function updateCrossProjectReferences(tree, oldProjectName, newProjectName) {
+    if (oldProjectName === newProjectName) {
+        return; // No rename, no cross-references to update
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    let updatedCount = 0;
+    for (const [name, config] of projects) {
+        if (!config.targets)
+            continue;
+        let configStr = JSON.stringify(config.targets);
+        // Match patterns like "old-project:build" or "old-project:build:production"
+        const pattern = new RegExp(`${oldProjectName.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')}:`, 'g');
+        if (pattern.test(configStr)) {
+            configStr = configStr.replace(pattern, `${newProjectName}:`);
+            config.targets = JSON.parse(configStr);
+            (0, devkit_1.updateProjectConfiguration)(tree, name, config);
+            updatedCount++;
+        }
+    }
+    if (updatedCount > 0) {
+        devkit_1.logger.info(`  Updated build target references in ${updatedCount} project(s)`);
+    }
+}
+/**
+ * Migrate a single application using manual tree operations.
+ *
+ * We bypass Nx's moveGenerator because it calls readAndCombineAllProjectConfigurations
+ * which uses the native WorkspaceContext (Rust addon) that caches stale file paths
+ * from the packages migration. The Rust addon's glob cache cannot be reliably reset
+ * from JavaScript. Manual tree operations avoid this entirely since Tree operates
+ * on an in-memory overlay on top of the filesystem.
  */
 async function migrateApplication(tree, target) {
     const { application: app, newPath, newNxProjectName } = target;
@@ -415,56 +519,40 @@ async function migrateApplication(tree, target) {
         devkit_1.logger.warn(`  Source project.json not found at ${sourceProjectJson}, skipping`);
         return;
     }
-    // Step 0: Clean node_modules from destination on disk if present.
-    // npm install may create node_modules/ at the target path (e.g. for workspace
-    // dependency resolution). tree.delete() only records a virtual deletion and
-    // doesn't remove on-disk children, so moveGenerator's checkDestination
-    // (which uses tree.children() -> readdirSync) would see node_modules and
-    // throw "Path is not empty". We must remove it from the real filesystem.
-    const destNodeModules = (0, path_1.join)(newPath, 'node_modules');
+    // Step 1: Clean node_modules from destination on disk if present.
+    const destNodeModules = (0, path_1.join)(tree.root, newPath, 'node_modules');
     if ((0, fs_1.existsSync)(destNodeModules)) {
-        devkit_1.logger.info(`  Removing leftover node_modules at destination: ${destNodeModules}`);
+        devkit_1.logger.info(`  Removing leftover node_modules at destination`);
         (0, fs_1.rmSync)(destNodeModules, { recursive: true, force: true });
     }
-    // Step 1: Use Nx moveGenerator for the heavy lifting
-    try {
-        await (0, generators_1.moveGenerator)(tree, {
-            projectName: app.currentNxProjectName,
-            destination: newPath,
-            newProjectName: newNxProjectName,
-            updateImportPath: false, // Applications are entry points, not libraries
-            skipFormat: true,
-        });
-        devkit_1.logger.info(`  Nx moved project successfully`);
-        // Reset Nx cache after move to ensure fresh project graph for next operations
-        // This is important because moveGenerator uses the project graph, and it can become stale
-        resetNxCache();
-    }
-    catch (error) {
-        devkit_1.logger.error(`  Failed to move project with Nx: ${error}`);
-        devkit_1.logger.error(`  Source path: ${app.currentPath}`);
-        devkit_1.logger.error(`  Destination path: ${newPath}`);
-        devkit_1.logger.error(`  Project name: ${app.currentNxProjectName}`);
-        throw error;
-    }
-    // Step 2: Update .unisphere configuration
+    // Step 2: Move all files from old path to new path in the tree
+    const movedCount = moveFilesInTree(tree, app.currentPath, newPath);
+    devkit_1.logger.info(`  Moved ${movedCount} files from ${app.currentPath} to ${newPath}`);
+    // Step 3: Update project.json at new location (root, sourceRoot, targets)
+    updateProjectJsonAfterMove(tree, app.currentPath, newPath);
+    devkit_1.logger.info(`  Updated project.json paths`);
+    // Step 4: Update Nx project registration (remove old, register new)
+    updateNxProjectRegistration(tree, app.currentNxProjectName, newNxProjectName, newPath);
+    // Step 5: Update cross-project build target references
+    updateCrossProjectReferences(tree, app.currentNxProjectName, newNxProjectName);
+    // Step 6: Update .unisphere configuration
     updateUnisphereSourceRoot(tree, app.name, newPath);
     devkit_1.logger.info(`  Updated .unisphere sourceRoot`);
-    // Step 3: Update package-lock.json
+    // Step 7: Update package-lock.json
     updatePackageLockPaths(tree, app.currentPath, newPath);
-    // Step 4: Fix .eslintrc.json extends path
+    // Step 8: Fix .eslintrc.json extends path
     fixEslintConfigPath(tree, newPath);
-    // Step 5: Fix tsconfig.json extends path
+    // Step 9: Fix tsconfig.json extends path
     fixTsconfigJsonPath(tree, newPath);
-    // Step 6: Fix jest.config.ts paths
+    // Step 10: Fix jest.config.ts paths
     fixJestConfigPath(tree, newPath, newPath);
-    // Step 7: Fix project.json paths
+    // Step 11: Fix project.json paths ($schema, sourceRoot)
     fixProjectJsonPath(tree, newPath, newPath);
-    // Step 8: Fix webpack.config.js output path
+    // Step 12: Fix webpack.config.js output path
     fixWebpackConfigPath(tree, newPath, newPath);
-    // Step 9: Update tsconfig.base.json paths
+    // Step 13: Update tsconfig.base.json paths
     updateTsConfigBasePaths(tree, app.currentPath, newPath);
-    // Step 10: Update root package.json scripts
+    // Step 14: Update root package.json scripts
     updateRootPackageJsonScripts(tree, app.currentPath, newPath);
 }
 /**
@@ -476,9 +564,6 @@ async function update(tree) {
     devkit_1.logger.info('Reorganizing applications by distribution channel');
     devkit_1.logger.info('========================================');
     devkit_1.logger.info('');
-    // Phase 0: Reset Nx cache to ensure fresh project graph
-    resetNxCache();
-    devkit_1.logger.info('');
     // Phase 1: Discover applications
     const applications = discoverApplications(tree);
     if (applications.length === 0) {

package/dist/migrations/3-0-0/reorganize-packages-by-distribution-channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reorganize-packages-by-distribution-channel.d.ts","sourceRoot":"","sources":["../../../src/migrations/3-0-0/reorganize-packages-by-distribution-channel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,IAAI,EAML,MAAM,YAAY,CAAC;AA8qBpB;;GAEG;AACH,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CA6E9D"}
+{"version":3,"file":"reorganize-packages-by-distribution-channel.d.ts","sourceRoot":"","sources":["../../../src/migrations/3-0-0/reorganize-packages-by-distribution-channel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,IAAI,EAML,MAAM,YAAY,CAAC;AA+rBpB;;GAEG;AACH,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAyH9D"}

package/dist/migrations/3-0-0/reorganize-packages-by-distribution-channel.js

@@ -20,27 +20,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = update;
 const devkit_1 = require("@nx/devkit");
 const generators_1 = require("@nx/workspace/generators");
-const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const has_react_dependency_1 = require("../utils/has-react-dependency");
-/**
- * Reset Nx cache to ensure fresh project graph
- * This is important before moving projects, as Nx caches project locations
- */
-function resetNxCache() {
-    try {
-        devkit_1.logger.info('Resetting Nx cache to ensure fresh project graph...');
-        (0, child_process_1.execSync)('npx nx reset', {
-            stdio: 'pipe',
-        });
-        devkit_1.logger.info('Nx cache reset successfully');
-    }
-    catch (error) {
-        // Log but don't fail - cache reset is best effort
-        devkit_1.logger.warn('Could not reset Nx cache (continuing anyway): ' + error);
-    }
-}
 /**
  * Check if a package name needs the "-react" suffix and return the new name.
  * Following the convention in validateReactNaming() from dependency-config.ts.
@@ -446,6 +428,10 @@ function verifyPackageJsonName(tree, packagePath, expectedName) {
  * Update tsconfig.base.json paths for the package.
  * This ensures paths are updated even if moveGenerator fails to do so
  * (e.g., due to stale project graph cache).
+ *
+ * Handles both:
+ * - Updating existing path mappings (when old path still exists)
+ * - Adding new path mappings (when old path was removed in cleanup phase)
  */
 function updateTsConfigBasePaths(tree, oldPath, newPath, oldImportPath, newImportPath) {
     if (!tree.exists('tsconfig.base.json')) {
@@ -456,6 +442,7 @@ function updateTsConfigBasePaths(tree, oldPath, newPath, oldImportPath, newImpor
         return;
     }
     let updated = false;
+    let foundOldPath = false;
     const newPaths = {};
     for (const [key, paths] of Object.entries(tsconfigBase.compilerOptions.paths)) {
         // Check if we need to rename the key (import path changed)
@@ -463,6 +450,7 @@ function updateTsConfigBasePaths(tree, oldPath, newPath, oldImportPath, newImpor
         if (key === oldImportPath || key === `${oldImportPath}/*`) {
             newKey = key === oldImportPath ? newImportPath : `${newImportPath}/*`;
             updated = true;
+            foundOldPath = true;
         }
         // Update the path values
         if (Array.isArray(paths)) {
@@ -479,10 +467,41 @@ function updateTsConfigBasePaths(tree, oldPath, newPath, oldImportPath, newImpor
             newPaths[newKey] = paths;
         }
     }
+    // Ensure old import path is removed and new one is added
+    if (!foundOldPath) {
+        // Old path mapping wasn't found during iteration, so explicitly remove it
+        // This handles the case where moveGenerator didn't properly update the mapping
+        if (oldImportPath !== newImportPath) {
+            // Delete old import path mapping if it exists
+            if (newPaths[oldImportPath]) {
+                devkit_1.logger.info(`  Removing old tsconfig path mapping: "${oldImportPath}"`);
+                delete newPaths[oldImportPath];
+                updated = true;
+            }
+            // Also check for the wildcard version
+            if (newPaths[`${oldImportPath}/*`]) {
+                devkit_1.logger.info(`  Removing old tsconfig path mapping: "${oldImportPath}/*"`);
+                delete newPaths[`${oldImportPath}/*`];
+                updated = true;
+            }
+        }
+        // Add new path mapping
+        devkit_1.logger.info(`  Adding new tsconfig path mapping: "${newImportPath}" -> "${newPath}/src/index.ts"`);
+        newPaths[newImportPath] = [`${newPath}/src/index.ts`];
+        updated = true;
+    }
     if (updated) {
         tsconfigBase.compilerOptions.paths = newPaths;
         (0, devkit_1.writeJson)(tree, 'tsconfig.base.json', tsconfigBase);
-        devkit_1.logger.info(`  Updated tsconfig.base.json paths`);
+        // CRITICAL: Also write to disk immediately so subsequent migrations see the changes
+        // Nx's globWithWorkspaceContextSync reads from disk, not the Tree
+        try {
+            (0, fs_1.writeFileSync)('tsconfig.base.json', JSON.stringify(tsconfigBase, null, 2) + '\n', 'utf-8');
+            devkit_1.logger.info(`  Updated tsconfig.base.json paths (written to disk)`);
+        }
+        catch (error) {
+            devkit_1.logger.warn(`  Failed to write tsconfig.base.json to disk: ${error}`);
+        }
     }
 }
 /**
@@ -528,13 +547,10 @@ async function migratePackage(tree, target) {
             destination: newPath,
             newProjectName: newNxProjectName,
             importPath: newPackageJsonName,
-            updateImportPath: true,
+            updateImportPath: true, // Let moveGenerator update tsconfig paths
             skipFormat: true,
         });
         devkit_1.logger.info(`  Nx moved project successfully`);
-        // Reset Nx cache after move to ensure fresh project graph for next operations
-        // This is important because moveGenerator uses the project graph, and it can become stale
-        resetNxCache();
     }
     catch (error) {
         devkit_1.logger.error(`  Failed to move project with Nx: ${error}`);
@@ -582,9 +598,6 @@ async function update(tree) {
     devkit_1.logger.info('Reorganizing packages by distribution channel');
     devkit_1.logger.info('========================================');
     devkit_1.logger.info('');
-    // Phase 0: Reset Nx cache to ensure fresh project graph
-    resetNxCache();
-    devkit_1.logger.info('');
     // Phase 1: Discover packages
     const packages = await discoverPackages(tree);
     if (packages.length === 0) {
@@ -632,6 +645,52 @@ async function update(tree) {
     }
     // Format all files at the end
     await (0, devkit_1.formatFiles)(tree);
+    // Phase 5: Physically clean up any remaining old package directories from disk
+    // After formatFiles(), moveGenerator should have deleted old directories from the Tree
+    // But we need to ensure they're also gone from disk before the next migration runs
+    devkit_1.logger.info('');
+    devkit_1.logger.info('Physically cleaning up old package directories from disk...');
+    const packagesDir = (0, path_1.join)(tree.root, 'unisphere', 'packages');
+    if ((0, fs_1.existsSync)(packagesDir)) {
+        const subdirs = (0, fs_1.readdirSync)(packagesDir, { withFileTypes: true })
+            .filter(dirent => dirent.isDirectory())
+            .map(dirent => dirent.name);
+        let removedCount = 0;
+        for (const subdir of subdirs) {
+            // Keep only the new subdirectories (local, kaltura-corp, unisphere, kaltura-ai)
+            // Delete everything else (old package directories that moveGenerator may have left)
+            if (!['local', 'kaltura-corp', 'unisphere', 'kaltura-ai'].includes(subdir)) {
+                const oldPackagePath = (0, path_1.join)(packagesDir, subdir);
+                devkit_1.logger.info(`  Physically removing old package directory: ${oldPackagePath}`);
+                (0, fs_1.rmSync)(oldPackagePath, { recursive: true, force: true });
+                removedCount++;
+            }
+        }
+        if (removedCount > 0) {
+            devkit_1.logger.info(`  Physically removed ${removedCount} old package director(ies) from disk`);
+        }
+        else {
+            devkit_1.logger.info('  No old package directories found on disk to remove');
+        }
+    }
+    // Phase 6: Reset Nx's workspace data and in-memory context
+    // The native WorkspaceContext (Rust addon) persists a file index in .nx/workspace-data/.
+    // Since we deleted directories in Phase 5, the persisted index is stale. Delete the persisted
+    // data AND reset the in-memory singleton so subsequent migrations (e.g., applications
+    // reorganization) get a fresh disk scan via globWithWorkspaceContextSync().
+    const workspaceDataDir = (0, path_1.join)(tree.root, '.nx', 'workspace-data');
+    if ((0, fs_1.existsSync)(workspaceDataDir)) {
+        (0, fs_1.rmSync)(workspaceDataDir, { recursive: true, force: true });
+        devkit_1.logger.info('Deleted .nx/workspace-data/ (stale persisted file index)');
+    }
+    try {
+        const { resetWorkspaceContext } = require('nx/src/utils/workspace-context');
+        resetWorkspaceContext();
+        devkit_1.logger.info('Reset in-memory workspace context');
+    }
+    catch (e) {
+        devkit_1.logger.warn('Could not reset workspace context: ' + e);
+    }
     devkit_1.logger.info('');
     devkit_1.logger.info('========================================');
     devkit_1.logger.info(`Successfully reorganized ${migrated} package(s)`);

package/dist/migrations/3-0-0/upgrade-schema-to-2-0-0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade-schema-to-2-0-0.d.ts","sourceRoot":"","sources":["../../../src/migrations/3-0-0/upgrade-schema-to-2-0-0.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA+B,MAAM,YAAY,CAAC;AAE/D;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,yBAAyB,CAAC,IAAI,EAAE,IAAI,iBAoFjE"}
+{"version":3,"file":"upgrade-schema-to-2-0-0.d.ts","sourceRoot":"","sources":["../../../src/migrations/3-0-0/upgrade-schema-to-2-0-0.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA+B,MAAM,YAAY,CAAC;AAE/D;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,yBAAyB,CAAC,IAAI,EAAE,IAAI,iBA8FjE"}

package/dist/migrations/3-0-0/upgrade-schema-to-2-0-0.js

@@ -58,7 +58,7 @@ async function removeDistributionChannel(tree) {
         devkit_1.logger.warn(`⚠️  Unknown schemaVersion: ${config.schemaVersion}. Expected 1.0.0 or 2.0.0`);
         devkit_1.logger.info('');
     }
-    // Process packages only (not runtimes or applications)
+    // Process packages)
     if (config.elements?.packages) {
         for (const packageName in config.elements.packages) {
             const packageConfig = config.elements.packages[packageName];
@@ -68,6 +68,16 @@ async function removeDistributionChannel(tree) {
             }
         }
     }
+    // Process applications 
+    if (config.elements?.applications) {
+        for (const applicationName in config.elements.applications) {
+            const applicationConfig = config.elements.applications[applicationName];
+            if ('distributionChannel' in applicationConfig) {
+                delete applicationConfig.distributionChannel;
+                totalRemoved++;
+            }
+        }
+    }
     // Write updated configuration back
     if (totalRemoved > 0 || schemaUpdated) {
         try {

package/dist/migrations/3-5-0/templates/_publish-artifacts.template

@@ -0,0 +1,363 @@
+name: Shared Deployment Jobs
+
+on:
+  workflow_call:
+
+jobs:
+  check-elements:
+    runs-on:
+      - codebuild-ovp-unisphere-runner-${{ github.run_id }}-${{ github.run_attempt }}
+      - instance-size:small
+    outputs:
+      has_packages: ${{ steps.check.outputs.has_packages }}
+      has_runtimes: ${{ steps.check.outputs.has_runtimes }}
+      has_applications: ${{ steps.check.outputs.has_applications }}
+    steps:
+
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
+          fetch-tags: true
+
+      - name: Check elements in .unisphere
+        id: check
+        run: |
+          if [ -f .unisphere ]; then
+            PACKAGES=$(jq -r '.elements.packages // {} | length' .unisphere)
+            RUNTIMES=$(jq -r '(.elements.runtimes // {} | length) + (.elements.workspace // {} | length) + (.elements.loader // {} | length)' .unisphere)
+            APPLICATIONS=$(jq -r '.elements.applications // {} | length' .unisphere)
+
+            if [ "$PACKAGES" -gt 0 ]; then
+              echo "has_packages=true" >> $GITHUB_OUTPUT
+            else
+              echo "has_packages=false" >> $GITHUB_OUTPUT
+            fi
+
+            if [ "$RUNTIMES" -gt 0 ]; then
+              echo "has_runtimes=true" >> $GITHUB_OUTPUT
+            else
+              echo "has_runtimes=false" >> $GITHUB_OUTPUT
+            fi
+
+            if [ "$APPLICATIONS" -gt 0 ]; then
+              echo "has_applications=true" >> $GITHUB_OUTPUT
+            else
+              echo "has_applications=false" >> $GITHUB_OUTPUT
+            fi
+          else
+            echo "has_packages=false" >> $GITHUB_OUTPUT
+            echo "has_runtimes=false" >> $GITHUB_OUTPUT
+            echo "has_applications=false" >> $GITHUB_OUTPUT
+          fi
+
+  prepare-runtimes:
+    runs-on:
+      - codebuild-ovp-unisphere-runner-${{ github.run_id }}-${{ github.run_attempt }}
+      - instance-size:medium
+
+    if: needs.check-elements.outputs.has_runtimes == 'true'
+    needs: check-elements
+    outputs:
+      unisphereElementsArtifactsFolder: ${{ steps.prepare-runtimes.outputs.artifactsRootFolder }}
+      hasArtifacts: ${{ steps.prepare-runtimes.outputs.hasArtifacts }}
+      commit_sha: ${{ steps.capture_commit_sha.outputs.commit_sha }}
+    steps:
+      - name: Cache npm
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-
+
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
+          fetch-tags: true
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Clean workspace
+        run: git reset --hard HEAD
+      - name: Clean npm cache
+        run: npm cache clean --force
+
+      - name: Setup JFrog
+
+        uses: jfrog/setup-jfrog-cli@v4
+        id: setup-jfrog
+        env:
+          JF_URL: https://kalturaa.jfrog.io
+        with:
+          oidc-provider-name: ovp-github-oidc
+      - name: Install dependencies
+        run: npm ci --prefer-offline --include=optional --no-fund --verbose
+        env:
+          GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          KALTURA_JFROG_TOKEN: ${{ steps.setup-jfrog.outputs.oidc-token }}
+
+      - name: Prepare Unisphere Elements
+        id: prepare-runtimes
+        run: npx unisphere runtime publish prepare --verbose
+      - name: Capture Commit SHA
+        id: capture_commit_sha
+        run: echo "commit_sha=$(git rev-parse HEAD)" >> $GITHUB_ENV
+      - name: Set commit_sha as output
+        id: set_commit_sha
+        run: echo "commit_sha=${{ env.commit_sha }}" >> $GITHUB_OUTPUT
+      - uses: actions/upload-artifact@v4
+        id: upload-unisphere-elements-artifacts
+        with:
+          name: unisphere-elements
+          path: ${{ steps.prepare-runtimes.outputs.artifactsRootFolder }}
+          retention-days: 1
+
+  deploy-packages:
+    if: needs.check-elements.outputs.has_packages == 'true'
+    needs: check-elements
+    runs-on:
+      - codebuild-ovp-unisphere-runner-${{ github.run_id }}-${{ github.run_attempt }}
+      - instance-size:medium
+    steps:
+      - name: Cache npm
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-
+
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
+          fetch-tags: true
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup JFrog
+
+        uses: jfrog/setup-jfrog-cli@v4
+        id: setup-jfrog
+        env:
+          JF_URL: https://kalturaa.jfrog.io
+        with:
+          oidc-provider-name: ovp-github-oidc
+
+      - name: Install dependencies
+
+        run: |
+          npm ci --prefer-offline --include=optional --no-fund --verbose
+
+        env:
+          GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          KALTURA_JFROG_TOKEN: ${{ steps.setup-jfrog.outputs.oidc-token }}
+
+      - name: Get NPM Token from AWS Secrets Manager
+        id: get-npm-token
+        run: |
+          NPM_TOKEN=$(aws secretsmanager get-secret-value --secret-id arn:aws:secretsmanager:eu-central-1:785328604905:secret:unisphere-secrets-um86Cs --query SecretString --output text | jq -r '."NPM_UNISPHERE_TOKEN"')
+          echo "NPM_TOKEN=$NPM_TOKEN" >> $GITHUB_ENV
+          # Debug token existence (safely)
+          echo "::debug::Token exists: $([ ! -z "$NPM_TOKEN" ] && echo 'true' || echo 'false')"
+      - name: Deploy to registry
+        run: npx unisphere package publish --verbose --jfrogToken ${{ steps.setup-jfrog.outputs.oidc-token }} --jfrogUser ${{ steps.setup-jfrog.outputs.oidc-user }} --npmToken ${{ env.NPM_TOKEN }} --branch "${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}"
+
+  deploy-runtimes:
+    if: needs.prepare-runtimes.outputs.hasArtifacts == 'true'
+    needs: prepare-runtimes
+    runs-on:
+      - codebuild-ovp-unisphere-runner-${{ github.run_id }}-${{ github.run_attempt }}
+      - instance-size:medium
+    strategy:
+      matrix:
+        envs_regions:
+          - { env: 'nvp1', region: 'us-east-1', accountid: '583352821080' }
+          - { env: 'frp2', region: 'eu-central-1', accountid: '082111255551' }
+          - { env: 'irp2', region: 'eu-west-1', accountid: '137576761235' }
+          - { env: 'nvq2', region: 'us-east-1', accountid: '383697330906' }
+          - { env: 'sgp2', region: 'ap-southeast-1', accountid: '882351240370' }
+          - { env: 'syp2', region: 'ap-southeast-2', accountid: '650755435642' }
+          - { env: 'cap2', region: 'ca-central-1', accountid: '948632009361' }
+      fail-fast: false
+
+    steps:
+      - name: Cache npm
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-
+
+      - name: Check available disk space
+        run: df -h
+      - name: Checkout Repo at specific commit
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.prepare-runtimes.outputs.commit_sha }}
+          fetch-tags: true
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup JFrog
+
+        uses: jfrog/setup-jfrog-cli@v4
+        id: setup-jfrog
+        env:
+          JF_URL: https://kalturaa.jfrog.io
+        with:
+          oidc-provider-name: ovp-github-oidc
+
+      - name: Install dependencies
+
+        run: npm ci --prefer-offline --include=optional --no-fund --verbose
+        env:
+          GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          KALTURA_JFROG_TOKEN: ${{ steps.setup-jfrog.outputs.oidc-token }}
+
+      - name: Download artifacts folder
+        uses: actions/download-artifact@v4
+        with:
+          name: unisphere-elements
+          path: ${{ needs.prepare-runtimes.outputs.unisphereElementsArtifactsFolder }}
+      - name: Sync S3 bucket
+        run: |
+          npx unisphere runtime publish execute \
+          --env ${{ matrix.envs_regions.env }} \
+          --aws-region '${{ matrix.envs_regions.region }}' \
+          --aws-arn 'arn:aws:iam::${{matrix.envs_regions.accountid }}:role/${{ matrix.envs_regions.env }}-unisphere-content-role' \
+          --artifacts-folder '${{ needs.prepare-runtimes.outputs.unisphereElementsArtifactsFolder }}' \
+          --verbose
+
+  prepare-applications:
+    if: always() && needs.check-elements.outputs.has_applications == 'true'
+    needs: [deploy-runtimes, check-elements]
+    runs-on:
+      - codebuild-ovp-unisphere-runner-${{ github.run_id }}-${{ github.run_attempt }}
+      - instance-size:medium
+    outputs:
+      unisphereApplicationsArtifactsFolder: ${{ steps.prepare-applications.outputs.artifactsRootFolder }}
+      hasArtifacts: ${{ steps.prepare-applications.outputs.hasArtifacts }}
+      commit_sha: ${{ steps.capture_commit_sha.outputs.commit_sha }}
+    steps:
+      - name: Cache npm
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-
+
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
+          fetch-tags: true
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Clean workspace
+        run: git reset --hard HEAD
+      - name: Clean npm cache
+        run: npm cache clean --force
+      - name: Setup JFrog
+
+        uses: jfrog/setup-jfrog-cli@v4
+        id: setup-jfrog
+        env:
+          JF_URL: https://kalturaa.jfrog.io
+        with:
+          oidc-provider-name: ovp-github-oidc
+      - name: Install dependencies
+
+        run: npm ci --prefer-offline --include=optional --no-fund --verbose
+        env:
+          GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          KALTURA_JFROG_TOKEN: ${{ steps.setup-jfrog.outputs.oidc-token }}
+      - name: Prepare Unisphere Applications
+        id: prepare-applications
+        run: npx unisphere application publish prepare --verbose
+      - name: Capture Commit SHA
+        id: capture_commit_sha
+        run: echo "commit_sha=$(git rev-parse HEAD)" >> $GITHUB_ENV
+      - name: Set commit_sha as output
+        id: set_commit_sha
+        run: echo "commit_sha=${{ env.commit_sha }}" >> $GITHUB_OUTPUT
+      - uses: actions/upload-artifact@v4
+        id: upload-unisphere-applications-artifacts
+        with:
+          name: unisphere-applications
+          path: ${{ steps.prepare-applications.outputs.artifactsRootFolder }}
+          retention-days: 1
+
+  deploy-applications:
+    if: always() && needs.prepare-applications.outputs.hasArtifacts == 'true'
+    needs: [prepare-applications]
+    runs-on:
+      - codebuild-ovp-unisphere-runner-${{ github.run_id }}-${{ github.run_attempt }}
+      - instance-size:medium
+    strategy:
+      matrix:
+        envs_regions:
+          - { env: 'nvp1', region: 'us-east-1', accountid: '583352821080' }
+          - { env: 'frp2', region: 'eu-central-1', accountid: '082111255551' }
+          - { env: 'irp2', region: 'eu-west-1', accountid: '137576761235' }
+          - { env: 'nvq2', region: 'us-east-1', accountid: '383697330906' }
+          - { env: 'sgp2', region: 'ap-southeast-1', accountid: '882351240370' }
+          - { env: 'syp2', region: 'ap-southeast-2', accountid: '650755435642' }
+          - { env: 'cap2', region: 'ca-central-1', accountid: '948632009361' }
+      fail-fast: false
+    steps:
+      - name: Cache npm
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            dependencies-${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-
+
+      - name: Checkout Repo at specific commit
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.prepare-applications.outputs.commit_sha }}
+          fetch-tags: true
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Setup JFrog
+
+        uses: jfrog/setup-jfrog-cli@v4
+        id: setup-jfrog
+        env:
+          JF_URL: https://kalturaa.jfrog.io
+        with:
+          oidc-provider-name: ovp-github-oidc
+      - name: Install dependencies
+
+        run: npm ci --prefer-offline --include=optional --no-fund --verbose
+        env:
+          GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          KALTURA_JFROG_TOKEN: ${{ steps.setup-jfrog.outputs.oidc-token }}
+      - name: Download artifacts folder
+        uses: actions/download-artifact@v4
+        with:
+          name: unisphere-applications
+          path: ${{ needs.prepare-applications.outputs.unisphereApplicationsArtifactsFolder }}
+      - name: Sync S3 bucket
+        run: |
+          npx unisphere application publish execute \
+          --env ${{ matrix.envs_regions.env }} \
+          --aws-region '${{ matrix.envs_regions.region }}' \
+          --aws-arn 'arn:aws:iam::${{matrix.envs_regions.accountid }}:role/${{ matrix.envs_regions.env }}-unisphere-content-role' \
+          --artifacts-folder '${{ needs.prepare-applications.outputs.unisphereApplicationsArtifactsFolder }}' \
+          --verbose

package/dist/migrations/3-5-0/update-publish-artifacts-workflow.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;
+//# sourceMappingURL=update-publish-artifacts-workflow.d.ts.map

package/dist/migrations/3-5-0/update-publish-artifacts-workflow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-publish-artifacts-workflow.d.ts","sourceRoot":"","sources":["../../../src/migrations/3-5-0/update-publish-artifacts-workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAU,MAAM,YAAY,CAAC;AAI1C,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAiC9D"}

package/dist/migrations/3-5-0/update-publish-artifacts-workflow.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const fs_1 = require("fs");
+const path_1 = require("path");
+async function update(tree) {
+    devkit_1.logger.info('🔄 Updating GitHub _publish-artifacts workflow for v3.5.0');
+    // Ensure .github/workflows directory exists
+    if (!tree.exists('.github')) {
+        tree.write('.github/.gitkeep', '');
+        devkit_1.logger.info('✅ Created .github directory');
+    }
+    if (!tree.exists('.github/workflows')) {
+        tree.write('.github/workflows/.gitkeep', '');
+        devkit_1.logger.info('✅ Created .github/workflows directory');
+    }
+    try {
+        // Update publishArtifacts.yml
+        const publishArtifactsWorkflowPath = '.github/workflows/_publish-artifacts.yml';
+        const publishArtifactsTemplatePath = (0, path_1.join)(__dirname, 'templates', '_publish-artifacts.template');
+        const publishArtifactsTemplateContent = (0, fs_1.readFileSync)(publishArtifactsTemplatePath, 'utf-8');
+        const publishArtifactsExists = tree.exists(publishArtifactsWorkflowPath);
+        tree.write(publishArtifactsWorkflowPath, publishArtifactsTemplateContent);
+        if (publishArtifactsExists) {
+            devkit_1.logger.info(`✅ Updated ${publishArtifactsWorkflowPath}`);
+        }
+        else {
+            devkit_1.logger.info(`✅ Created ${publishArtifactsWorkflowPath}`);
+        }
+    }
+    catch (error) {
+        devkit_1.logger.error(`❌ Failed to update GitHub publishArtifacts workflow: ${error?.message || 'Unknown error'}`);
+        throw error;
+    }
+}

package/migrations.json

@@ -298,6 +298,14 @@
       "cli": {
         "postUpdateMessage": "✅ .github/workflows/cicd.yml updated successfully"
       }
+    },
+    "3-5-0-update-publish-artifacts-workflow": {
+      "version": "3.5.0",
+      "description": "Updates .github/workflows/publish-artifacts.yml with JFrog OIDC setup and improved cache management",
+      "factory": "./dist/migrations/3-5-0/update-publish-artifacts-workflow.js",
+      "cli": {
+        "postUpdateMessage": "✅ .github/workflows/publish-artifacts.yml updated successfully"
+      }
     }
   },
   "packageJsonUpdates": {
@@ -453,6 +461,28 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "3.5.1": {
+      "version": "3.5.1",
+      "cli": "nx",
+      "postUpdateMessage": "🎉 Migration to @unisphere/nx 3.5.1 completed successfully!",
+      "packages": {
+        "@unisphere/cli": {
+          "version": "2.6.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "3.6.0": {
+      "version": "3.6.0",
+      "cli": "nx",
+      "postUpdateMessage": "🎉 Migration to @unisphere/nx 3.6.0 completed successfully!",
+      "packages": {
+        "@unisphere/cli": {
+          "version": "2.6.4",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unisphere/nx",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "private": false,
   "main": "./dist/index.js",
   "module": "./dist/index.js",