From 085bf444a3aa1d6e66545b3bf050f5c92b527119 Mon Sep 17 00:00:00 2001
From: Hristo Hristov <57346540+Hristo313@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:50:40 +0200
Subject: [PATCH] update node version in yml files and fix build logic for
 angular templates (#1330)

---
 .../_base/files/__dot__github/workflows/github.io.yml |  5 +++--
 .../_base/files/__dot__github/workflows/node.js.yml   |  2 +-
 .../_base/files/__dot__github/workflows/github.io.yml |  5 +++--
 .../_base/files/__dot__github/workflows/node.js.yml   |  2 +-
 .../_base/files/__dot__github/workflows/github.io.yml | 11 ++++++-----
 .../_base/files/__dot__github/workflows/node.js.yml   |  2 +-
 .../files/__dot__github/workflows/github.io.yml       | 11 ++++++-----
 .../files/__dot__github/workflows/node.js.yml         |  2 +-
 .../_base/files/__dot__github/workflows/github.io.yml | 11 ++++++-----
 .../_base/files/__dot__github/workflows/node.js.yml   |  2 +-
 .../files/__dot__github/workflows/github.io.yml       | 11 ++++++-----
 .../files/__dot__github/workflows/node.js.yml         |  2 +-
 12 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github.io.yml b/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github.io.yml
index dce67a843..0bc046ab5 100644
--- a/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github.io.yml
+++ b/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github.io.yml
@@ -8,7 +8,8 @@ on:
 
 jobs:
   build-and-deploy:
-
+    # Deactivate the workflow. Will be changed when AB is ready
+    if: false
     runs-on: ubuntu-latest
 
     permissions:
@@ -17,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/node.js.yml b/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/node.js.yml
index beadfdb6e..161dbc00e 100644
--- a/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/node.js.yml
+++ b/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/node.js.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
diff --git a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github.io.yml b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github.io.yml
index d8e1fdf41..6c0ccd7d3 100644
--- a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github.io.yml
+++ b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github.io.yml
@@ -8,7 +8,8 @@ on:
 
 jobs:
   build-and-deploy:
-
+    # Deactivate the workflow. Will be changed when AB is ready
+    if: false
     runs-on: ubuntu-latest
 
     permissions:
@@ -17,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/node.js.yml b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/node.js.yml
index beadfdb6e..161dbc00e 100644
--- a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/node.js.yml
+++ b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/node.js.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github.io.yml b/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github.io.yml
index 897fef646..1fe28b2d8 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github.io.yml
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github.io.yml
@@ -8,7 +8,8 @@ on:
 
 jobs:
   build-and-deploy:
-
+    # Deactivate the workflow. Will be changed when AB is ready
+    if: false
     runs-on: ubuntu-latest
 
     permissions:
@@ -17,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -31,10 +32,10 @@ jobs:
       run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
     - name: Determine if project is standalone and set build path
       run: |
-        if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].schematics[\"@schematics/angular:application\"].standalone == false" angular.json > /dev/null; then
-          echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
-        else
+        if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
           echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
+        else
+          echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
         fi
     - name: Build project with dynamic base-href
       run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/node.js.yml b/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/node.js.yml
index f9d4b8f9b..5da123b0a 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/node.js.yml
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/node.js.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github.io.yml b/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github.io.yml
index c511bfbf7..b615a2b1a 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github.io.yml
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github.io.yml
@@ -8,7 +8,8 @@ on:
 
 jobs:
   build-and-deploy:
-
+    # Deactivate the workflow. Will be changed when AB is ready
+    if: false
     runs-on: ubuntu-latest
 
     permissions:
@@ -17,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -31,10 +32,10 @@ jobs:
       run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
     - name: Determine if project is standalone and set build path
       run: |
-        if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].schematics[\"@schematics/angular:application\"].standalone == false" angular.json > /dev/null; then
-          echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
-        else
+        if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
           echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
+        else
+          echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
         fi
     - name: Build project with dynamic base-href
       run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/node.js.yml b/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/node.js.yml
index 80c8e7632..52247850f 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/node.js.yml
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/node.js.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github.io.yml b/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github.io.yml
index 897fef646..1fe28b2d8 100644
--- a/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github.io.yml
+++ b/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github.io.yml
@@ -8,7 +8,8 @@ on:
 
 jobs:
   build-and-deploy:
-
+    # Deactivate the workflow. Will be changed when AB is ready
+    if: false
     runs-on: ubuntu-latest
 
     permissions:
@@ -17,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -31,10 +32,10 @@ jobs:
       run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
     - name: Determine if project is standalone and set build path
       run: |
-        if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].schematics[\"@schematics/angular:application\"].standalone == false" angular.json > /dev/null; then
-          echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
-        else
+        if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
           echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
+        else
+          echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
         fi
     - name: Build project with dynamic base-href
       run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/node.js.yml b/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/node.js.yml
index f9d4b8f9b..5da123b0a 100644
--- a/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/node.js.yml
+++ b/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/node.js.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
diff --git a/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github.io.yml b/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github.io.yml
index 897fef646..1fe28b2d8 100644
--- a/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github.io.yml
+++ b/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github.io.yml
@@ -8,7 +8,8 @@ on:
 
 jobs:
   build-and-deploy:
-
+    # Deactivate the workflow. Will be changed when AB is ready
+    if: false
     runs-on: ubuntu-latest
 
     permissions:
@@ -17,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -31,10 +32,10 @@ jobs:
       run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
     - name: Determine if project is standalone and set build path
       run: |
-        if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].schematics[\"@schematics/angular:application\"].standalone == false" angular.json > /dev/null; then
-          echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
-        else
+        if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
           echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
+        else
+          echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
         fi
     - name: Build project with dynamic base-href
       run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
diff --git a/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/node.js.yml b/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/node.js.yml
index f9d4b8f9b..5da123b0a 100644
--- a/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/node.js.yml
+++ b/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/node.js.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps: