diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 860fd56a52..c29857d942 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -109,7 +109,7 @@ jobs: - name: 'Publish Cascading Azure Functions' env: PUBLISH_PROFILE: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_8996AC226FB9456EA73A6B8439B12946 || secrets.CASCADING_AZURE_APP_PUBLISH_PROFILE }} - if: env.PUBLISH_PROFILE != null && steps.get-npm-tag.outputs.tag == 'latest' + if: env.PUBLISH_PROFILE != null && (github.base_ref == 'main' || github.ref_name == 'main') uses: Azure/functions-action@v1 with: app-name: 'github-cascading' diff --git a/.renovaterc.json b/.renovaterc.json index 4e85881dd4..d1c24a8b4b 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -195,12 +195,39 @@ } }, { + "groupName": "Update of bootstrap disabled as it is not supported by design-factory (Can be removed when upgrading design-factory to v16)", + "matchCurrentVersion": "<=5.2.0", "matchPackageNames": [ "bootstrap" ], "enabled": false }, { + "groupName": "Update of zone-js disabled as it is not supported by Angular < 17 (Can be removed when v10 goes into main)", + "matchUpdateTypes": [ + "major", + "minor" + ], + "matchCurrentVersion": "<0.14", + "matchPackageNames": [ + "zone.js" + ], + "enabled": false + }, + { + "groupName": "Update of @angular-devkit/architect disabled as it is not supported by Angular < 17 (Can be removed when v10 goes into main)", + "matchUpdateTypes": [ + "major", + "minor" + ], + "matchCurrentVersion": "<0.1700", + "matchPackageNames": [ + "@angular-devkit/architect" + ], + "enabled": false + }, + { + "groupName": "Major update of chalk disabled as it drops support on CommonJS", "matchUpdateTypes": [ "major" ], @@ -211,6 +238,7 @@ "enabled": false }, { + "groupName": "Major update of globby disabled as it drops support on CommonJS", "matchUpdateTypes": [ "major" ], diff --git a/apps/github-cascading-app/src/cascading/templates/pull-request-content.ejs b/apps/github-cascading-app/src/cascading/templates/pull-request-content.ejs index c63153eed4..294714a2a5 100644 --- a/apps/github-cascading-app/src/cascading/templates/pull-request-content.ejs +++ b/apps/github-cascading-app/src/cascading/templates/pull-request-content.ejs @@ -51,7 +51,7 @@ You can fix the issue locally with the following commands: and update this Pull Request with ```shell - git push origin <%= targetBranch %> + git push origin HEAD:<%= originBranchName %> ``` diff --git a/apps/showcase/project.json b/apps/showcase/project.json index 0ea5e042ca..99a62d103e 100644 --- a/apps/showcase/project.json +++ b/apps/showcase/project.json @@ -230,7 +230,8 @@ "tsConfig": "apps/showcase/tsconfig.cms.json", "outputFile": "apps/showcase/localisation.metadata.json", "libraries": [], - "extraFilePatterns": ["src/i18n/*.localization.json"] + "extraFilePatterns": ["src/i18n/*.localization.json"], + "strictMode": true }, "dependsOn": ["^build", "^build-builders"] }, diff --git a/apps/showcase/src/app/app.component.html b/apps/showcase/src/app/app.component.html index 2f40ac862a..c341eaf178 100644 --- a/apps/showcase/src/app/app.component.html +++ b/apps/showcase/src/app/app.component.html @@ -1,5 +1,7 @@
- +
Otter logo @@ -27,7 +29,7 @@
-
Links
+

Links

  • Github diff --git a/apps/showcase/src/app/configuration/configuration.template.html b/apps/showcase/src/app/configuration/configuration.template.html index 50b9ebd8f6..33fda1051d 100644 --- a/apps/showcase/src/app/configuration/configuration.template.html +++ b/apps/showcase/src/app/configuration/configuration.template.html @@ -30,8 +30,10 @@

    Examples

    - - + +

    @@ -49,7 +51,7 @@

    How to add configuration to a component<

    Metadata

    -

    How to extract

    +

    How to extract

    It will extract components' configuration and generate the two following files: component.config.metadata.json and component.class.metadata.json

    Check the list of options available by running:

    diff --git a/apps/showcase/src/app/dynamic-content/dynamic-content.template.html b/apps/showcase/src/app/dynamic-content/dynamic-content.template.html index 12a9cd604b..441f6b9d97 100644 --- a/apps/showcase/src/app/dynamic-content/dynamic-content.template.html +++ b/apps/showcase/src/app/dynamic-content/dynamic-content.template.html @@ -24,8 +24,10 @@

    Example

    - - + +

    diff --git a/apps/showcase/src/app/rules-engine/rules-engine.component.ts b/apps/showcase/src/app/rules-engine/rules-engine.component.ts index 93995a7703..3e302f2cd7 100644 --- a/apps/showcase/src/app/rules-engine/rules-engine.component.ts +++ b/apps/showcase/src/app/rules-engine/rules-engine.component.ts @@ -1,7 +1,7 @@ import { AsyncPipe } from '@angular/common'; import { AfterViewInit, ChangeDetectionStrategy, Component, OnInit, QueryList, ViewChildren, ViewEncapsulation } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { NgbNav, NgbNavItem, NgbNavLink } from '@ng-bootstrap/ng-bootstrap'; +import { NgbNav, NgbNavContent, NgbNavItem, NgbNavLink, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { ApplicationDevtoolsModule } from '@o3r/application'; import { ComponentsDevtoolsModule } from '@o3r/components'; @@ -53,6 +53,8 @@ import { CurrentTimeFactsService } from '../../services/current-time-facts.servi NgbNav, NgbNavItem, NgbNavLink, + NgbNavContent, + NgbNavOutlet, AsyncPipe ], templateUrl: './rules-engine.template.html', diff --git a/apps/showcase/src/app/rules-engine/rules-engine.template.html b/apps/showcase/src/app/rules-engine/rules-engine.template.html index 303d4f7416..235aa07f00 100644 --- a/apps/showcase/src/app/rules-engine/rules-engine.template.html +++ b/apps/showcase/src/app/rules-engine/rules-engine.template.html @@ -109,7 +109,7 @@

    How to extract

    It will extract application facts and operators in the following files: rules.facts.metadata.json and rules.operators.metadata.json

    Check the list of options available by running:

    -
    +

References

  • diff --git a/apps/showcase/src/components/showcase/basic/basic-pres.template.html b/apps/showcase/src/components/showcase/basic/basic-pres.template.html index ff0cda01eb..2fa7c0eb61 100644 --- a/apps/showcase/src/components/showcase/basic/basic-pres.template.html +++ b/apps/showcase/src/components/showcase/basic/basic-pres.template.html @@ -11,7 +11,7 @@

-
Where do you want to go?
+

Where do you want to go?

diff --git a/apps/showcase/src/components/showcase/configuration/configuration-pres.template.html b/apps/showcase/src/components/showcase/configuration/configuration-pres.template.html index 629817ccc7..fc34f36b93 100644 --- a/apps/showcase/src/components/showcase/configuration/configuration-pres.template.html +++ b/apps/showcase/src/components/showcase/configuration/configuration-pres.template.html @@ -11,7 +11,7 @@

-
Where do you want to go?
+

Where do you want to go?

diff --git a/apps/showcase/src/components/showcase/dynamic-content/dynamic-content-pres.template.html b/apps/showcase/src/components/showcase/dynamic-content/dynamic-content-pres.template.html index acba6c298f..1a52050ac5 100644 --- a/apps/showcase/src/components/showcase/dynamic-content/dynamic-content-pres.template.html +++ b/apps/showcase/src/components/showcase/dynamic-content/dynamic-content-pres.template.html @@ -11,7 +11,7 @@

-
Where do you want to go?
+

Where do you want to go?

diff --git a/apps/showcase/src/components/showcase/localization/localization-pres.template.html b/apps/showcase/src/components/showcase/localization/localization-pres.template.html index e2953770f3..8208dfcab0 100644 --- a/apps/showcase/src/components/showcase/localization/localization-pres.template.html +++ b/apps/showcase/src/components/showcase/localization/localization-pres.template.html @@ -15,7 +15,7 @@

-
{{ translations.question | translate }}
+

{{ translations.question | translate }}

diff --git a/apps/showcase/src/components/showcase/rules-engine/rules-engine-pres.template.html b/apps/showcase/src/components/showcase/rules-engine/rules-engine-pres.template.html index 5142692e3c..80b7961cc8 100644 --- a/apps/showcase/src/components/showcase/rules-engine/rules-engine-pres.template.html +++ b/apps/showcase/src/components/showcase/rules-engine/rules-engine-pres.template.html @@ -15,7 +15,7 @@

-
{{ translations.question | translate }}
+

{{ translations.question | translate }}

diff --git a/apps/showcase/src/components/showcase/sdk/sdk-pres.template.html b/apps/showcase/src/components/showcase/sdk/sdk-pres.template.html index c3b94ec8ff..548d7d446f 100644 --- a/apps/showcase/src/components/showcase/sdk/sdk-pres.template.html +++ b/apps/showcase/src/components/showcase/sdk/sdk-pres.template.html @@ -125,7 +125,7 @@