Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release/12.0.0-next into main #2772

Merged
merged 46 commits into from
Jan 31, 2025
Merged

Merge release/12.0.0-next into main #2772

merged 46 commits into from
Jan 31, 2025

Conversation

fpaul-1A
Copy link
Contributor

@fpaul-1A fpaul-1A commented Jan 31, 2025 •
edited
Loading

Proposed change

  • Create v12.0.0-prerelease.0 tag

Related issues

- No issue associated -

sdo-1A and others added 30 commits December 20, 2024 12:25
@sdo-1A
Feat/main to release 12 (#2640)
91befdd 
## Proposed change

Cascade from `main` to `release/12.0.0-next`
0 conflicts were found when opening this PR

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@fpaul-1A
chore: upgrade eslint
fa1a18e
@kpanot
chore: upgrade eslint (#2633)
595d12f
@matthieu-crouzet
fix: typo
e17f57b
@matthieu-crouzet
fix: typo (#2654)
cdf109c 
## Proposed change
- Rename option `dictionnary` into `dictionary`
- Rename `ConstrastPipe` and `AccessibilityConstrastScorePipe`,
respectively into `ContrastPipe` and `AccessibilityContrastScorePipe`

## Related issues

*- No issue associated -*
@vscaiceanu-1a
chore: update major deps for o3r 12
8c79e73
@vscaiceanu-1a
chore: update some major deps for o3r 12 (#2573)
7ff637f 
This PR should be merged on `release/12.0.0-next`
- [x] `release/12.0.0-next` created 

## Proposed change

Upgrading some independent dependencies to the latest version.


## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@sdo-1A
feat: clean up deprecated items for Otter v12
18470a5
@sdo-1A
feat: clean up deprecated items for Otter v12 (#2642)
c55cc70 
## Proposed change

Remove deprecated items from Otter v12
TO DO:
- [x]  remove `inputFacts` from `@o3r/rules-engine`
- [x]  remove `variable` from `@o3r/styling`
- [x]  delete `@o3r/dev-tools`
- [x]  delete storybook package
- [x]  remove java sdk generator

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@sdo-1A
fix: styling compile inputs and named input for assets
51ee1fa
@sdo-1A
fix: styling compile inputs and named input for assets (#2689)
5314e6e 
## Proposed change

Small fix as a follow up of this comment:
#2642 (comment)

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@vscaiceanu-1a
chore: angular 19
55bd61f
@vscaiceanu-1a
chore: angular 19 (#2612)
03a15a6 
## Proposed change

Migrate to Angular 19
<!--
Please include a summary of the changes and the related issue.
Please also include relevant motivation and context.
-->
## TODO
- [ ] fix failing unit test for stylelint-plugin
- [ ] switch default value for standalone to true for our schematics
after test updates
- [x] Rollback #2644 

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@vscaiceanu-1a
Merge branch 'main' into cascading/main-12-next
bfda814
@vscaiceanu-1a
chore: update training-sdk to angular 19
9c19f5f
@vscaiceanu-1a
Cascading/main 12 next (#2696)
fc94000 
## Proposed change

cascading changes to 12 next
@sdo-1A
feat: standalone components
575a36f
@sdo-1A
feat: standalone components (#2702)
3cf2ff3 
## Proposed change

After the update of Angular 19 with `standalone: true` as default,
update the `Components`, `Pipes`, and `Directives` in the repository.

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@fpaul-1A
Merge branch 'main' of https://github.com/AmadeusITGroup/otter into c…
97c27c5 
…ascading/12.0-next-main

# Conflicts:
#	apps/chrome-devtools/package.json
#	apps/github-cascading-app/package.json
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/component-replacement.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/configuration.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/design-token.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/dynamic-content.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/home.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/localization.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/placeholder.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/rules-engine.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/run-app-locally.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-generator.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-intro.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-training-step2.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-training-step3.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-training-step4.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-training-step5.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-training-step6.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-training-step7.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-training-step8.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-training-step9.png
#	apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-training.png
#	apps/showcase/package.json
#	apps/vscode-extension/package.json
#	package.json
#	packages/@ama-sdk/client-angular/package.json
#	packages/@ama-sdk/client-beacon/package.json
#	packages/@ama-sdk/client-fetch/package.json
#	packages/@ama-sdk/core/package.json
#	packages/@ama-sdk/create/package.json
#	packages/@ama-sdk/schematics/package.json
#	packages/@ama-sdk/swagger-builder/package.json
#	packages/@ama-terasu/cli/package.json
#	packages/@ama-terasu/core/package.json
#	packages/@ama-terasu/schematics/package.json
#	packages/@o3r-training/showcase-sdk/package.json
#	packages/@o3r-training/training-sdk/package.json
#	packages/@o3r-training/training-tools/package.json
#	packages/@o3r/amaterasu/amaterasu-api-spec/package.json
#	packages/@o3r/amaterasu/amaterasu-dodo/package.json
#	packages/@o3r/amaterasu/amaterasu-otter/package.json
#	packages/@o3r/amaterasu/amaterasu-sdk/package.json
#	packages/@o3r/analytics/package.json
#	packages/@o3r/apis-manager/package.json
#	packages/@o3r/application/package.json
#	packages/@o3r/artifactory-tools/package.json
#	packages/@o3r/azure-tools/package.json
#	packages/@o3r/components/package.json
#	packages/@o3r/configuration/package.json
#	packages/@o3r/core/package.json
#	packages/@o3r/create/package.json
#	packages/@o3r/design/package.json
#	packages/@o3r/dev-tools/package.json
#	packages/@o3r/dynamic-content/package.json
#	packages/@o3r/eslint-config-otter/package.json
#	packages/@o3r/eslint-config/package.json
#	packages/@o3r/eslint-plugin/package.json
#	packages/@o3r/extractors/package.json
#	packages/@o3r/forms/package.json
#	packages/@o3r/localization/package.json
#	packages/@o3r/logger/package.json
#	packages/@o3r/mobile/package.json
#	packages/@o3r/new-version/package.json
#	packages/@o3r/pipeline/package.json
#	packages/@o3r/routing/package.json
#	packages/@o3r/rules-engine/package.json
#	packages/@o3r/schematics/package.json
#	packages/@o3r/store-sync/package.json
#	packages/@o3r/storybook/package.json
#	packages/@o3r/stylelint-plugin/package.json
#	packages/@o3r/styling/package.json
#	packages/@o3r/telemetry/package.json
#	packages/@o3r/test-helpers/package.json
#	packages/@o3r/testing/package.json
#	packages/@o3r/third-party/package.json
#	packages/@o3r/workspace/package.json
#	tools/@o3r/build-helpers/package.json
#	tools/@o3r/workspace-helpers/package.json
#	tools/github-actions/audit/package.json
#	tools/github-actions/cascading/package.json
#	tools/github-actions/get-npm-tag/package.json
#	tools/github-actions/new-version/package.json
#	tools/github-actions/release/package.json
#	yarn.lock
@fpaul-1A
cascading: main into release/12.0.0-next (#2732)
0dca177 
## Proposed change

<!--
Please include a summary of the changes and the related issue.
Please also include relevant motivation and context.
-->

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@fpaul-1A
chore: upgrade capacitor major
57d1ce0
@fpaul-1A
chore: upgrade capacitor major (#2739)
c63d0da 
## Proposed change

<!--
Please include a summary of the changes and the related issue.
Please also include relevant motivation and context.
-->

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@sdo-1A
feat: v12 migration guide
f9bd03e
@sdo-1A
feat: v12 migration guide (#2738)
118f782 
## Proposed change

Migration guide for the deleted items from v12 and the deprecated items
for v13.

@AmadeusITGroup/otter_admins Should I add the deprecated items for v14
as well?

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@vscaiceanu-1a
fix: remove deprecated vars for templates
cd2cd05
@vscaiceanu-1a
fix: remove deprecated vars for templates (#2742)
e522aab 
## Proposed change

Follow up for #1587,
removing deprecated `vars` used in placeholder templates.
Documentation has been already updated
18470a5#diff-84b1c82a9c6fd7aaf05809ae0ad3020bdaf415d9b37ad73029fe22999ebfbb26
@fpaul-1A
chore: upgrade nx major
89483dd
@fpaul-1A
chore: upgrade nx major (#2736)
5154a6b 
## Proposed change

<!--
Please include a summary of the changes and the related issue.
Please also include relevant motivation and context.
-->

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@sdo-1A
fix: typos in URLS in v12 migration guide
b2f8bf8
@sdo-1A
fix: typos in URLS in v12 migration guide (#2748)
6b79a57 
## Proposed change

Fix the typo of the backslash in the URLs generated by the deprecated
items script.

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@codecov Codecov
Copy link

codecov bot commented Jan 31, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 84.21053% with 3 lines in your changes missing coverage. Please review.

Project coverage is 66.24%. Comparing base (3476f1b) to head (e0e646b).
Report is 47 commits behind head on main.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...ages/@ama-sdk/core/src/clients/api-fetch-client.ts 0.00% 1 Missing ⚠️
...r/components/builders/component-extractor/index.ts 0.00% 1 Missing ⚠️
...ation/src/devkit/configuration-devtools.service.ts 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@fpaul-1A fpaul-1A marked this pull request as ready for review January 31, 2025 10:07
@fpaul-1A fpaul-1A requested review from a team as code owners January 31, 2025 10:07
@fpaul-1A fpaul-1A added this pull request to the merge queue Jan 31, 2025
Merged via the queue into main with commit e2669b3 Jan 31, 2025
56 of 58 checks passed
@fpaul-1A fpaul-1A deleted the merge/v12-into-main branch January 31, 2025 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amadeus-pmeneguzzi amadeus-pmeneguzzi amadeus-pmeneguzzi approved these changes

@matthieu-crouzet matthieu-crouzet matthieu-crouzet approved these changes

@sdo-1A sdo-1A sdo-1A approved these changes

Assignees
No one assigned
Labels
bug Something isn't working enhancement New feature or request project:@ama-sdk/client-angular project:@ama-sdk/client-beacon project:@ama-sdk/client-fetch project:@ama-sdk/core project:@ama-sdk/create project:@ama-sdk/schematics project:@ama-sdk/swagger-builder project:@ama-terasu/cli project:@ama-terasu/core project:@ama-terasu/schematics project:audit-gh-action project:cascading-gh-action project:get-npm-tag-gh-action project:new-version-gh-action project:@o3r/amaterasu-api-spec project:@o3r/amaterasu-dodo project:@o3r/amaterasu-otter project:@o3r/amaterasu-sdk project:@o3r/analytics project:@o3r/apis-manager project:@o3r/application project:@o3r/artifactory-tools project:@o3r/azure-tools project:@o3r/build-helpers project:@o3r/chrome-devtools project:@o3r/components project:@o3r/configuration project:@o3r/core project:@o3r/create project:@o3r/design project:@o3r/dynamic-content project:@o3r/eslint-config project:@o3r/eslint-config-otter project:@o3r/eslint-plugin project:@o3r/extractors project:@o3r/forms project:@o3r/github-cascading-app project:@o3r/localization project:@o3r/logger project:@o3r/mobile project:@o3r/new-version project:@o3r/pipeline project:@o3r/routing project:@o3r/rules-engine project:@o3r/schematics project:@o3r/showcase project:@o3r/store-sync project:@o3r/stylelint-plugin project:@o3r/styling project:@o3r/telemetry project:@o3r/test-helpers project:@o3r/testing project:@o3r/third-party project:@o3r/workspace project:@o3r/workspace-helpers project:@o3r-training/showcase-sdk project:@o3r-training/training-sdk project:@o3r-training/training-tools project:otter-devtools project:release-gh-action
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@fpaul-1A @amadeus-pmeneguzzi @matthieu-crouzet @sdo-1A @kpanot @vscaiceanu-1a