From d22c28c94a8dda55b22dd9f8d6ba26ca9d5a8f2e Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Mon, 25 Nov 2024 18:41:20 +0200 Subject: [PATCH 1/5] fix(cli): remove build step from github pages --- .../files/__dot__github/workflows/github-pages.yml | 13 +++---------- .../files/__dot__github/workflows/github-pages.yml | 13 +++---------- .../files/__dot__github/workflows/github-pages.yml | 13 +++---------- .../files/__dot__github/workflows/github-pages.yml | 13 +++---------- 4 files changed, 12 insertions(+), 40 deletions(-) diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml b/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml index 6bd130e0b..82a6570c4 100644 --- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml +++ b/packages/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_with_home/files/__dot__github/workflows/github-pages.yml b/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml index 65cc06fef..2222e3ead 100644 --- a/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml +++ b/packages/igx-templates/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 index 6bd130e0b..1f78eaa9d 100644 --- 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_with_home/files/__dot__github/workflows/github-pages.yml b/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml index 6bd130e0b..1f78eaa9d 100644 --- a/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml +++ b/packages/igx-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 From e4d2f44c019438e79bed72f82b45e30a7f9af2f5 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Tue, 26 Nov 2024 15:35:14 +0200 Subject: [PATCH 2/5] add overrides for templates --- .../react/igr-ts/projects/_base/files/package.json | 7 +++++++ .../webcomponents/igc-ts/projects/_base/files/package.json | 7 +++++++ .../igx-ts-legacy/projects/_base/files/package.json | 7 +++++++ .../igx-templates/igx-ts/projects/_base/files/package.json | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/packages/cli/templates/react/igr-ts/projects/_base/files/package.json b/packages/cli/templates/react/igr-ts/projects/_base/files/package.json index 2d45e5817..f607c80d7 100644 --- a/packages/cli/templates/react/igr-ts/projects/_base/files/package.json +++ b/packages/cli/templates/react/igr-ts/projects/_base/files/package.json @@ -15,6 +15,13 @@ "resize-observer-polyfill": "^1.5.1", "vitest": "^0.34.4" }, + "overrides": { + "igniteui-angular-charts": { + "@angular/core": "^19.0.0", + "@angular/common": "^19.0.0", + "@angular/compiler": "^19.0.0" + } + }, "devDependencies": { "@types/react": "^18.2.15", "@types/react-dom": "^18.2.7", diff --git a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json index b548350e0..606955fc7 100644 --- a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json +++ b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json @@ -25,6 +25,13 @@ "typescript": "~5.5.4", "igniteui-webcomponents": "~5.1.0" }, + "overrides": { + "igniteui-angular-charts": { + "@angular/core": "^19.0.0", + "@angular/common": "^19.0.0", + "@angular/compiler": "^19.0.0" + } + }, "devDependencies": { "@babel/preset-env": "^7.20.2", "@open-wc/building-rollup": "^2.2.1", 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 index f6b2647cd..88ff51308 100644 --- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json +++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json @@ -26,6 +26,13 @@ "tslib": "~2.3.0", "zone.js": "~0.14.3" }, + "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/packages/igx-templates/igx-ts/projects/_base/files/package.json b/packages/igx-templates/igx-ts/projects/_base/files/package.json index e05fd371b..2a9031dd1 100644 --- 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", From 00868123b37916cd177710bee2a982e127fd2fac Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Tue, 26 Nov 2024 15:40:25 +0200 Subject: [PATCH 3/5] chore: release 14.3.1-beta.0 --- packages/cli/package.json | 6 +++--- packages/core/package.json | 2 +- packages/igx-templates/package.json | 4 ++-- packages/ng-schematics/package.json | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 75cc4b2a8..12dae65bd 100644 --- 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.0", "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.0", + "@igniteui/cli-core": "~14.3.1-beta.0", "@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 index 3d8ea25fd..80d072ad5 100644 --- 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.0", "description": "Base types and functionality for Ignite UI CLI", "repository": { "type": "git", diff --git a/packages/igx-templates/package.json b/packages/igx-templates/package.json index 5c4b94b6d..b1790a04d 100644 --- 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.0", "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.0", "typescript": "~5.5.4" } } diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json index 1badb86e1..0d1370cb7 100644 --- 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.0", "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.0", + "@igniteui/cli-core": "~14.3.1-beta.0", "@schematics/angular": "~19.0.0", "rxjs": "^7.8.1" }, From 09ef47cff7ffd526030c1fa2719801816c9a8ca0 Mon Sep 17 00:00:00 2001 From: lipata Date: Tue, 26 Nov 2024 16:31:23 +0200 Subject: [PATCH 4/5] chore: update zone.js for ng modules --- .../igx-ts-legacy/projects/_base/files/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 88ff51308..58186f7dc 100644 --- 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,7 @@ "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": { From e1b783fb2749080b057cd23f3e8261e6c55821e4 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Tue, 26 Nov 2024 16:45:06 +0200 Subject: [PATCH 5/5] chore: release 14.3.1-beta.1 --- packages/cli/package.json | 6 +++--- .../react/igr-ts/projects/_base/files/package.json | 7 ------- .../webcomponents/igc-ts/projects/_base/files/package.json | 7 ------- packages/core/package.json | 2 +- packages/igx-templates/package.json | 4 ++-- packages/ng-schematics/package.json | 6 +++--- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 12dae65bd..4f14b44ed 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "igniteui-cli", - "version": "14.3.1-beta.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.1431-beta.0", - "@igniteui/cli-core": "~14.3.1-beta.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/cli/templates/react/igr-ts/projects/_base/files/package.json b/packages/cli/templates/react/igr-ts/projects/_base/files/package.json index f607c80d7..2d45e5817 100644 --- a/packages/cli/templates/react/igr-ts/projects/_base/files/package.json +++ b/packages/cli/templates/react/igr-ts/projects/_base/files/package.json @@ -15,13 +15,6 @@ "resize-observer-polyfill": "^1.5.1", "vitest": "^0.34.4" }, - "overrides": { - "igniteui-angular-charts": { - "@angular/core": "^19.0.0", - "@angular/common": "^19.0.0", - "@angular/compiler": "^19.0.0" - } - }, "devDependencies": { "@types/react": "^18.2.15", "@types/react-dom": "^18.2.7", diff --git a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json index 606955fc7..b548350e0 100644 --- a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json +++ b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json @@ -25,13 +25,6 @@ "typescript": "~5.5.4", "igniteui-webcomponents": "~5.1.0" }, - "overrides": { - "igniteui-angular-charts": { - "@angular/core": "^19.0.0", - "@angular/common": "^19.0.0", - "@angular/compiler": "^19.0.0" - } - }, "devDependencies": { "@babel/preset-env": "^7.20.2", "@open-wc/building-rollup": "^2.2.1", diff --git a/packages/core/package.json b/packages/core/package.json index 80d072ad5..3b62b451b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/cli-core", - "version": "14.3.1-beta.0", + "version": "14.3.1-beta.1", "description": "Base types and functionality for Ignite UI CLI", "repository": { "type": "git", diff --git a/packages/igx-templates/package.json b/packages/igx-templates/package.json index b1790a04d..bf089e614 100644 --- a/packages/igx-templates/package.json +++ b/packages/igx-templates/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/angular-templates", - "version": "19.0.1431-beta.0", + "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.1-beta.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 index 0d1370cb7..00098ac36 100644 --- a/packages/ng-schematics/package.json +++ b/packages/ng-schematics/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/angular-schematics", - "version": "19.0.1431-beta.0", + "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.1431-beta.0", - "@igniteui/cli-core": "~14.3.1-beta.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" },