From 9cac2cf2c736395e1d491c9305d22b1ae0596b94 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Fri, 6 Dec 2024 14:12:54 +0200 Subject: [PATCH 1/2] fix(web-components): fix navigation path in rollup config --- packages/cli/package.json | 6 +++--- .../_base/files/__dot__github/workflows/github-pages.yml | 6 ++++-- packages/core/package.json | 2 +- packages/igx-templates/package.json | 4 ++-- packages/ng-schematics/package.json | 6 +++--- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index f93ff0385..0d5a93d5b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "igniteui-cli", - "version": "14.3.5-beta.0", + "version": "14.3.5-beta.1", "description": "CLI tool for creating Ignite UI projects", "keywords": [ "CLI", @@ -76,8 +76,8 @@ "all": true }, "dependencies": { - "@igniteui/angular-templates": "~19.0.1435-beta.0", - "@igniteui/cli-core": "~14.3.5-beta.0", + "@igniteui/angular-templates": "~19.0.1435-beta.1", + "@igniteui/cli-core": "~14.3.5-beta.1", "@inquirer/prompts": "^5.4.0", "@types/yargs": "^17.0.33", "chalk": "^5.3.0", diff --git a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml index 7dcb5ad43..bef89c09f 100644 --- a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml +++ b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml @@ -30,8 +30,10 @@ jobs: node-version: ${{ matrix.node-version }} # cache: 'npm' # enable after committing lock file from first install - run: npm i # replace with 'npm ci' after committing lock file from first install - - name: Update Router Navigation - run: find ./src -type f -name "*.ts" -exec sed -i "s|Router.go(\`/|Router.go(\`/${{ github.event.repository.name }}/|g" {} \; + - name: Update Router Navigation + run: | + find ./src -type f -name "*.ts" -exec sed -i "s|Router.go(\`/|Router.go(\`/${{ github.event.repository.name }}/|g" {} \; + find ./ -type f -name "rollup.config.mjs" -exec sed -i "s|navigateFallback: '/index.html'|navigateFallback: 'index.html'|g" {} \; - run: npm run build - name: Update base href in index.html run: | diff --git a/packages/core/package.json b/packages/core/package.json index f0c3983cb..65ff72358 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/cli-core", - "version": "14.3.5-beta.0", + "version": "14.3.5-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 d76a51823..a6921991f 100644 --- a/packages/igx-templates/package.json +++ b/packages/igx-templates/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/angular-templates", - "version": "19.0.1435-beta.0", + "version": "19.0.1435-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.5-beta.0", + "@igniteui/cli-core": "~14.3.5-beta.1", "typescript": "~5.5.4" } } diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json index a34309f0d..dad4b196b 100644 --- a/packages/ng-schematics/package.json +++ b/packages/ng-schematics/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/angular-schematics", - "version": "19.0.1435-beta.0", + "version": "19.0.1435-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.1435-beta.0", - "@igniteui/cli-core": "~14.3.5-beta.0", + "@igniteui/angular-templates": "~19.0.1435-beta.1", + "@igniteui/cli-core": "~14.3.5-beta.1", "@schematics/angular": "~19.0.0", "minimatch": "^10.0.1", "rxjs": "^7.8.1" From 875a851a388ca90d6d383231ea4bf3a4560336c1 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Fri, 6 Dec 2024 15:03:10 +0200 Subject: [PATCH 2/2] fix(web-components): fix space in workflow --- packages/cli/package.json | 6 +++--- .../_base/files/__dot__github/workflows/github-pages.yml | 2 +- packages/core/package.json | 2 +- packages/igx-templates/package.json | 4 ++-- packages/ng-schematics/package.json | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 0d5a93d5b..72096188e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "igniteui-cli", - "version": "14.3.5-beta.1", + "version": "14.3.5-beta.2", "description": "CLI tool for creating Ignite UI projects", "keywords": [ "CLI", @@ -76,8 +76,8 @@ "all": true }, "dependencies": { - "@igniteui/angular-templates": "~19.0.1435-beta.1", - "@igniteui/cli-core": "~14.3.5-beta.1", + "@igniteui/angular-templates": "~19.0.1435-beta.2", + "@igniteui/cli-core": "~14.3.5-beta.2", "@inquirer/prompts": "^5.4.0", "@types/yargs": "^17.0.33", "chalk": "^5.3.0", diff --git a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml index bef89c09f..51df0793a 100644 --- a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml +++ b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml @@ -30,7 +30,7 @@ jobs: node-version: ${{ matrix.node-version }} # cache: 'npm' # enable after committing lock file from first install - run: npm i # replace with 'npm ci' after committing lock file from first install - - name: Update Router Navigation + - name: Update Router Navigation run: | find ./src -type f -name "*.ts" -exec sed -i "s|Router.go(\`/|Router.go(\`/${{ github.event.repository.name }}/|g" {} \; find ./ -type f -name "rollup.config.mjs" -exec sed -i "s|navigateFallback: '/index.html'|navigateFallback: 'index.html'|g" {} \; diff --git a/packages/core/package.json b/packages/core/package.json index 65ff72358..4228e2f6e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/cli-core", - "version": "14.3.5-beta.1", + "version": "14.3.5-beta.2", "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 a6921991f..0f54b72c0 100644 --- a/packages/igx-templates/package.json +++ b/packages/igx-templates/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/angular-templates", - "version": "19.0.1435-beta.1", + "version": "19.0.1435-beta.2", "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.5-beta.1", + "@igniteui/cli-core": "~14.3.5-beta.2", "typescript": "~5.5.4" } } diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json index dad4b196b..5355092b6 100644 --- a/packages/ng-schematics/package.json +++ b/packages/ng-schematics/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/angular-schematics", - "version": "19.0.1435-beta.1", + "version": "19.0.1435-beta.2", "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.1435-beta.1", - "@igniteui/cli-core": "~14.3.5-beta.1", + "@igniteui/angular-templates": "~19.0.1435-beta.2", + "@igniteui/cli-core": "~14.3.5-beta.2", "@schematics/angular": "~19.0.0", "minimatch": "^10.0.1", "rxjs": "^7.8.1"