Remove build step from angular github pages yaml files (#1348)

IgniteUI · Nov 27, 2024 · 19241ab · 19241ab
1 parent 8b6a632
commit 19241ab
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 50 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "igniteui-cli",
-  "version": "14.3.0",
+  "version": "14.3.1-beta.1",
   "description": "CLI tool for creating Ignite UI projects",
   "keywords": [
     "CLI",
@@ -78,8 +78,8 @@
     "all": true
   },
   "dependencies": {
-    "@igniteui/angular-templates": "~19.0.1430",
-    "@igniteui/cli-core": "~14.3.0",
+    "@igniteui/angular-templates": "~19.0.1431-beta.1",
+    "@igniteui/cli-core": "~14.3.1-beta.1",
     "@inquirer/prompts": "^5.4.0",
     "@types/yargs": "^17.0.33",
     "chalk": "^5.3.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/cli-core",
-  "version": "14.3.0",
+  "version": "14.3.1-beta.1",
   "description": "Base types and functionality for Ignite UI CLI",
   "repository": {
     "type": "git",

diff --git a/...igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml b/...igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml
@@ -32,22 +32,15 @@ jobs:
     - run: npm i # replace with 'npm ci' after committing lock file from first install
     - name: Set project name
       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 }}\"].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 }}/"
     - name: Update Resource Paths
-      run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
+      run: find ./dist/${{ env.PROJECT_NAME }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
     - name: SPA routing handling
-      run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
+      run: cp ./dist/${{ env.PROJECT_NAME }}/index.html ./dist/${{ env.PROJECT_NAME }}/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with:
-        path: ${{ env.BUILD_PATH }}
+        path: ./dist/${{ env.PROJECT_NAME }}
     - name: Deploy to GitHub Pages
       uses: actions/deploy-pages@v1
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
@@ -24,7 +24,14 @@
     "minireset.css": "~0.0.7",
     "rxjs": "~7.8.0",
     "tslib": "~2.3.0",
-    "zone.js": "~0.14.3"
+    "zone.js": "~0.15.0"
+  },
+  "overrides": {
+    "igniteui-angular-charts": {
+        "@angular/core": "^19.0.0",
+        "@angular/common": "^19.0.0",
+        "@angular/compiler": "^19.0.0"
+    }
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~19.0.0",

diff --git a/...tes/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml b/...tes/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
@@ -32,22 +32,15 @@ jobs:
     - run: npm i # replace with 'npm ci' after committing lock file from first install
     - name: Set project name
       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 }}\"].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 }}/"
     - name: Update Resource Paths
-      run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
+      run: find ./dist/${{ env.PROJECT_NAME }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
     - name: SPA routing handling
-      run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
+      run: cp ./dist/${{ env.PROJECT_NAME }}/index.html ./dist/${{ env.PROJECT_NAME }}/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with:
-        path: ${{ env.BUILD_PATH }}
+        path: ./dist/${{ env.PROJECT_NAME }}
     - name: Deploy to GitHub Pages
       uses: actions/deploy-pages@v1
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github-pages.yml b/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
@@ -32,22 +32,15 @@ jobs:
     - run: npm i # replace with 'npm ci' after committing lock file from first install
     - name: Set project name
       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 }}\"].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 }}/"
     - name: Update Resource Paths
-      run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
+      run: find ./dist/${{ env.PROJECT_NAME }}/browser -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
     - name: SPA routing handling
-      run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
+      run: cp ./dist/${{ env.PROJECT_NAME }}/browser/index.html ./dist/${{ env.PROJECT_NAME }}/browser/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with:
-        path: ${{ env.BUILD_PATH }}
+        path: ./dist/${{ env.PROJECT_NAME }}/browser
     - name: Deploy to GitHub Pages
       uses: actions/deploy-pages@v1
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/package.json b/packages/igx-templates/igx-ts/projects/_base/files/package.json
@@ -26,6 +26,13 @@
     "tslib": "~2.3.0",
     "zone.js": "~0.15.0"
   },
+  "overrides": {
+    "igniteui-angular-charts": {
+        "@angular/core": "^19.0.0",
+        "@angular/common": "^19.0.0",
+        "@angular/compiler": "^19.0.0"
+    }
+  },
   "devDependencies": {
     "@angular-devkit/build-angular": "~19.0.0",
     "@angular-eslint/builder": "~19.0.0-alpha.1",

diff --git a/...-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml b/...-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
@@ -32,22 +32,15 @@ jobs:
     - run: npm i # replace with 'npm ci' after committing lock file from first install
     - name: Set project name
       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 }}\"].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 }}/"
     - name: Update Resource Paths
-      run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
+      run: find ./dist/${{ env.PROJECT_NAME }}/browser -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
     - name: SPA routing handling
-      run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
+      run: cp ./dist/${{ env.PROJECT_NAME }}/browser/index.html ./dist/${{ env.PROJECT_NAME }}/browser/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with:
-        path: ${{ env.BUILD_PATH }}
+        path: ./dist/${{ env.PROJECT_NAME }}/browser
     - name: Deploy to GitHub Pages
       uses: actions/deploy-pages@v1
diff --git a/packages/igx-templates/package.json b/packages/igx-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-templates",
-  "version": "19.0.1430",
+  "version": "19.0.1431-beta.1",
   "description": "Templates for Ignite UI for Angular projects and components",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   "author": "Infragistics",
   "license": "MIT",
   "dependencies": {
-    "@igniteui/cli-core": "~14.3.0",
+    "@igniteui/cli-core": "~14.3.1-beta.1",
     "typescript": "~5.5.4"
   }
 }
diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-schematics",
-  "version": "19.0.1430",
+  "version": "19.0.1431-beta.1",
   "description": "Ignite UI for Angular Schematics for ng new and ng generate",
   "repository": {
     "type": "git",
@@ -20,8 +20,8 @@
   "dependencies": {
     "@angular-devkit/core": "^19.0.0",
     "@angular-devkit/schematics": "^19.0.0",
-    "@igniteui/angular-templates": "~19.0.1430",
-    "@igniteui/cli-core": "~14.3.0",
+    "@igniteui/angular-templates": "~19.0.1431-beta.1",
+    "@igniteui/cli-core": "~14.3.1-beta.1",
     "@schematics/angular": "~19.0.0",
     "rxjs": "^7.8.1"
   },