@unisphere/nx 1.22.4 → 1.22.6

package/dist/migrations/1-22-0/check-nx-version.js

@@ -12,7 +12,7 @@ function checkNxVersion(tree) {
     }
     const majorVersion = parseInt(nxVersion.match(/\d+/)?.[0] ?? '0');
     if (majorVersion < 22) {
-        const errorMessage = `❌ This migration requires Nx 22 or higher. read https://unisphere.kaltura.com/docs/create/changelog/1-22-4-changelog`;
+        const errorMessage = `❌ This migration requires Nx 22 or higher. read https://unisphere.kaltura.com/docs/create/changelog/1-22-6-changelog`;
         devkit_1.logger.error(errorMessage);
         throw new Error(errorMessage);
     }

package/dist/migrations/1-22-0/patches/@nx+rollup+22.1.3.patch

@@ -0,0 +1,27 @@
+diff --git a/node_modules/@nx/rollup/src/plugins/with-nx/with-nx.js b/node_modules/@nx/rollup/src/plugins/with-nx/with-nx.js
+index 1135bba..4762053 100644
+--- a/node_modules/@nx/rollup/src/plugins/with-nx/with-nx.js
++++ b/node_modules/@nx/rollup/src/plugins/with-nx/with-nx.js
+@@ -149,7 +149,13 @@ dependencies) {
+         else {
+             options.generatePackageJson ??= true;
+         }
+-        const compilerOptions = createTsCompilerOptions(projectRoot, tsConfig, options, dependencies);
++        let compilerOptionsInterceptor = ((config) => config);
++        if (rollupConfig.unisphere?.interceptors?.compilerOptions) {
++            console.log(`[unisphere.nx.rollup] using monkey patched interceptor for TS compiler options`);
++            compilerOptionsInterceptor = rollupConfig.unisphere?.interceptors?.compilerOptions;
++        }
++
++        const compilerOptions = compilerOptionsInterceptor(createTsCompilerOptions(projectRoot, tsConfig, options, dependencies));
+         compilerOptions.outDir = Array.isArray(finalConfig.output)
+             ? finalConfig.output[0].dir
+             : finalConfig.output.dir;
+@@ -170,6 +176,7 @@ dependencies) {
+                     return require('rollup-plugin-typescript2')({
+                         check: !options.skipTypeCheck,
+                         tsconfig: tsConfigPath,
++                        exclude: ['**/*.stories.ts', '**/*.stories.tsx'],
+                         tsconfigOverride: {
+                             compilerOptions,
+                         },

package/dist/migrations/1-22-0/replace-patches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replace-patches.d.ts","sourceRoot":"","sources":["../../../src/migrations/1-22-0/replace-patches.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAyB,MAAM,YAAY,CAAC;AAKzD,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAiC9D"}
+{"version":3,"file":"replace-patches.d.ts","sourceRoot":"","sources":["../../../src/migrations/1-22-0/replace-patches.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAmC,MAAM,YAAY,CAAC;AASnE,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAwD9D"}

package/dist/migrations/1-22-0/replace-patches.js

@@ -3,10 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = update;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const removePatchList = ['@changesets+cli'];
+const removePatchList = ['nx+rollup+', '@changesets+cli'];
+const forcePatchVersions = {
+    '@nx/rollup': '22.1.3',
+    '@changesets/cli': '2.29.7'
+};
 async function update(tree) {
     devkit_1.logger.info('🔄 Creating patches');
     try {
+        // Check @nx/rollup version
+        if (Object.keys(forcePatchVersions).length !== 0) {
+            devkit_1.logger.info('removing patches of older versions');
+            const pkg = (0, devkit_1.readJson)(tree, 'package.json');
+            Object.keys(forcePatchVersions).forEach(key => {
+                const version = pkg.devDependencies?.[key] || pkg.dependencies?.[key];
+                if (version !== forcePatchVersions[key]) {
+                    devkit_1.logger.error(`❌ ${key} version must be exactly ${forcePatchVersions[key]}`);
+                    throw new Error(`${key} version must be exactly ${forcePatchVersions[key]}. did you migrate nx to other version?`);
+                }
+            });
+        }
         // Create patches
         const patchesPath = 'patches';
         const patchesTemplatePath = (0, path_1.join)(__dirname, 'patches');
@@ -26,6 +42,11 @@ async function update(tree) {
         }
         // Copy all patch files using generateFiles
         (0, devkit_1.generateFiles)(tree, patchesTemplatePath, `./${patchesPath}`, {});
+        // Log created patches
+        const createdPatches = tree.children(patchesPath);
+        for (const patchFile of createdPatches) {
+            devkit_1.logger.info(`✅ Created patch: ${patchFile}`);
+        }
         // Always log that patches were created
         devkit_1.logger.info(`✅ All patches created successfully`);
     }

package/dist/migrations/1-22-2/add-os-and-cpu.js

@@ -9,7 +9,7 @@ async function update(tree) {
             json.os = [
                 "darwin",
                 "linux",
-                "windows"
+                "win32"
             ];
             json.cpu = [
                 "x64",

package/dist/migrations/1-22-2/templates/_publish-artifacts.template

@@ -12,7 +12,7 @@ jobs:
       has_applications: ${{ steps.check.outputs.has_applications }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
           fetch-tags: true
@@ -58,7 +58,7 @@ jobs:
       commit_sha: ${{ steps.capture_commit_sha.outputs.commit_sha }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
           fetch-tags: true
@@ -107,14 +107,14 @@ jobs:
     runs-on: codebuild-ovp-unisphere-runner-${{ github.run_id }}-${{ github.attempt }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        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: 20
+          node-version-file: '.nvmrc'
       
       - name: Setup JFrog        
         uses: jfrog/setup-jfrog-cli@v4
@@ -140,7 +140,7 @@ jobs:
           # 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 --githubToken ${{ secrets.GITHUB_TOKEN }} --jfrogToken ${{ steps.setup-jfrog.outputs.oidc-token }} --npmToken ${{ env.NPM_TOKEN }} --branch "${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}"
+        run: npx unisphere package publish --verbose --githubToken ${{ secrets.GITHUB_TOKEN }} --npmToken ${{ env.NPM_TOKEN }} --branch "${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}"
 
   deploy-runtimes:
     if: needs.prepare-runtimes.outputs.hasArtifacts == 'true'
@@ -162,14 +162,14 @@ jobs:
       - name: Check available disk space
         run: df -h
       - name: Checkout Repo at specific commit
-        uses: actions/checkout@v3
+        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: 20
+          node-version-file: '.nvmrc'
       
       - name: Setup JFrog        
         uses: jfrog/setup-jfrog-cli@v4
@@ -212,7 +212,7 @@ jobs:
       commit_sha: ${{ steps.capture_commit_sha.outputs.commit_sha }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
           fetch-tags: true
@@ -224,10 +224,18 @@ jobs:
         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 --ignore-scripts
+        run: npm ci --ignore-scripts          
         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
@@ -263,18 +271,26 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout Repo at specific commit
-        uses: actions/checkout@v3
+        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: 20
+          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 --ignore-scripts
+        run: npm ci --ignore-scripts          
         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:

package/dist/migrations/1-22-4/summary.d.ts

@@ -0,0 +1,2 @@
+export default function (): Promise<void>;
+//# sourceMappingURL=summary.d.ts.map

package/dist/migrations/1-22-4/summary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../../src/migrations/1-22-4/summary.ts"],"names":[],"mappings":"AAEA,0CAOC"}

package/dist/migrations/{summaries/1-22-4-summary.js → 1-22-4/summary.js}

@@ -7,6 +7,6 @@ async function default_1() {
     devkit_1.logger.info('🎉 Migration to @unisphere/nx 1.22.4 finished successfully!');
     devkit_1.logger.info('');
     devkit_1.logger.info('📋 Full details:');
-    devkit_1.logger.info('https://unisphere.kaltura.com/docs/create/changelog/1-22-4-changelog');
+    devkit_1.logger.info('https://unisphere.kaltura.com/docs/create/changelog/1-22-6-changelog');
     devkit_1.logger.info('');
 }

package/migrations.json

@@ -18,10 +18,10 @@
     },
     "1-22-0-replace-patches": {
       "version": "1.22.0",
-      "description": "Replaces patches with updated version for Nx 22.1.3",
+      "description": "Replaces patches with updated version for Nx 22.1.3 and changeset cli",
       "factory": "./dist/migrations/1-22-0/replace-patches.js",
       "cli": {
-        "postUpdateMessage": "✅ Patches have been replaced with updated version for Nx 22.1.3."
+        "postUpdateMessage": "✅ Patches have been replaced with updated version for Nx 22.1.3 and changeset cli."
       }
     },
     "1-22-1-sync-inner-package-json-dependencies": {
@@ -61,7 +61,7 @@
     "000-1-22-4-summary": {
       "version": "1.22.4",
       "description": "Migration completion summary for 1.22.4",
-      "factory": "./dist/migrations/summaries/1-22-4-summary.js"
+      "factory": "./dist/migrations/1-22-4/summary.js"
     }
   },
   "packageJsonUpdates": {

package/package.json

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

package/dist/migrations/summaries/1-22-4-summary.d.ts

@@ -1,2 +0,0 @@
-export default function (): Promise<void>;
-//# sourceMappingURL=1-22-4-summary.d.ts.map

package/dist/migrations/summaries/1-22-4-summary.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"1-22-4-summary.d.ts","sourceRoot":"","sources":["../../../src/migrations/summaries/1-22-4-summary.ts"],"names":[],"mappings":"AAEA,0CAOC"}