Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/11.1' into cascading/11.…
Browse files Browse the repository at this point in the history
…0.0-11.1.0

 Conflicts:
	packages/@o3r/components/package.json
	packages/@o3r/rules-engine/package.json
	yarn.lock
  • Loading branch information
cpaulve-1A committed Oct 18, 2024
2 parents 98b421e + 8c0961e commit b7ce58b
Show file tree
Hide file tree
Showing 250 changed files with 9,796 additions and 8,071 deletions.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 18 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ module.exports = {
'rules': {
'@o3r/json-dependency-versions-harmonize': ['error', {
ignoredPackages: ['@o3r/build-helpers'],
alignPeerDependencies: false
alignPeerDependencies: false,
alignEngines: true
}],
'@nx/dependency-checks': ['error', {
'buildTargets': ['build', 'build-builders', 'compile', 'test'],
Expand All @@ -53,6 +54,22 @@ module.exports = {
}]
}
},
{
'files': [
'./package.json'
],
'plugins': [
'@o3r'
],
'rules': {
'@o3r/json-dependency-versions-harmonize': ['error', {
ignoredPackages: ['@o3r/build-helpers'],
ignoredDependencies: ['npm'],
alignPeerDependencies: false,
alignEngines: true
}]
}
},

{
'parser': require.resolve('yaml-eslint-parser'),
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql/codeql-config.yml

- name: Autobuild
uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: yarn update-package ${{ inputs.docFolder }}/package.json --name ${{ inputs.packageName }} --version ${{ inputs.version }}
- run: zip -q -r ${{ inputs.artifactName }}.zip "${{ inputs.docFolder }}" -x "*/node_modules/*" ".cache/*"
shell: bash
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
- uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
with:
name: ${{ inputs.artifactName }}
path: ${{ inputs.artifactName }}.zip
Expand All @@ -61,7 +61,7 @@ jobs:
url: ${{ steps.deploy.outputs.static_web_app_url }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: ${{ inputs.artifactName }}
path: '.'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/it-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: zip -r verdaccio.zip ./.verdaccio
shell: bash
- name: Publish verdaccio storage
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
with:
name: verdaccio
path: verdaccio.zip
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
!.cache/test-app/cache/@o3r*
!.cache/test-app/npm-cache/_npx/**
key: ${{ runner.os }}-test-app-${{ matrix.packageManager }}-${{ env.currentMonth }}
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
name: Download verdaccio storage prepared in the previous job
with:
name: verdaccio
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
shell: bash
- name: Publish generated tests environment on failure
if: failure() && steps.it-tests.conclusion == 'failure'
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
with:
name: it-tests-${{ matrix.os }}-${{ matrix.packageManager }}
path: it-tests.zip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
CHROME_REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }}
- name: Expose Chrome extension artifact
if: (success() || failure()) && !inputs.prerelease
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
with:
name: chrome-extension
path: apps/chrome-devtools/chrome-extension.zip
6 changes: 3 additions & 3 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -58,14 +58,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
with:
sarif_file: results.sarif
894 changes: 0 additions & 894 deletions .yarn/releases/yarn-4.3.1.cjs

This file was deleted.

925 changes: 925 additions & 0 deletions .yarn/releases/yarn-4.4.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "5.4.5-sdk",
"version": "5.5.4-sdk",
"main": "./lib/typescript.js",
"type": "commonjs",
"bin": {
Expand Down
15 changes: 6 additions & 9 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
compressionLevel: mixed

enableScripts: false

enableGlobalCache: false

enableScripts: false

nodeLinker: pnp

packageExtensions:
"@design-factory/design-factory@*":
dependencies:
"@ng-select/ng-select": ~12.0.7
"@storybook/manager-api@*":
dependencies:
react: ^18.0.0
react-dom: ^18.0.0
"@swc-node/register@^1.9.0":
dependencies:
"@swc/types": "*"
"@typescript-eslint/utils@*":
dependencies:
typescript: ~5.4.2
"@design-factory/design-factory@*":
dependencies:
"@ng-select/ng-select": "~12.0.7"

yarnPath: .yarn/releases/yarn-4.3.1.cjs
yarnPath: .yarn/releases/yarn-4.4.0.cjs
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ The following table provides the status of the Otter versions under support and

| Otter version | Angular version | Support ends |
| :-----------: | :-------------: | :----------: |
| 11 | 18 | 2026-11-20 |
| 10 | 17 | 2025-05-15 |
| 9 | 16 | 2024-11-08 |
| 8 | 15 | 2024-05-18 |

## Reporting a Vulnerability

Expand Down
46 changes: 23 additions & 23 deletions apps/chrome-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@
"dist/"
],
"devDependencies": {
"@angular-devkit/build-angular": "~18.0.0",
"@angular-eslint/builder": "~18.0.0",
"@angular-eslint/eslint-plugin": "~18.0.0",
"@angular-eslint/eslint-plugin-template": "~18.0.0",
"@angular-eslint/template-parser": "~18.0.0",
"@angular/cli": "~18.0.0",
"@angular/compiler": "~18.0.0",
"@angular/compiler-cli": "~18.0.0",
"@nx/eslint-plugin": "~19.3.0",
"@nx/jest": "~19.3.0",
"@angular-devkit/build-angular": "~18.1.0",
"@angular-eslint/builder": "~18.1.0",
"@angular-eslint/eslint-plugin": "~18.1.0",
"@angular-eslint/eslint-plugin-template": "~18.1.0",
"@angular-eslint/template-parser": "~18.1.0",
"@angular/cli": "~18.1.0",
"@angular/compiler": "~18.1.0",
"@angular/compiler-cli": "~18.1.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-config-otter": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@o3r/localization": "workspace:^",
"@o3r/logger": "workspace:^",
"@o3r/rules-engine": "workspace:^",
"@stylistic/eslint-plugin-ts": "~2.4.0",
"@types/chrome": "^0.0.268",
"@types/chrome": "^0.0.269",
"@types/jest": "~29.5.2",
"@types/tinycolor2": "^1.4.6",
"@typescript-eslint/eslint-plugin": "^7.14.1",
Expand All @@ -59,32 +59,32 @@
"eslint": "^8.57.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-plugin-jest": "~28.6.0",
"eslint-plugin-jsdoc": "~48.4.0",
"eslint-plugin-jsdoc": "~48.10.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^54.0.0",
"globby": "^11.1.0",
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.1.0",
"jest-preset-angular": "~14.2.0",
"jsonc-eslint-parser": "~2.4.0",
"minimist": "^1.2.6",
"nx": "~19.3.0",
"nx": "~19.5.0",
"rimraf": "^5.0.1",
"tsc-watch": "^6.0.4",
"typescript": "~5.4.2"
"typescript": "~5.5.4"
},
"dependencies": {
"@agnos-ui/angular": "~0.2.0",
"@amadeus-it-group/tansu": "~1.0.0",
"@angular/animations": "~18.0.0",
"@angular/common": "~18.0.0",
"@angular/core": "~18.0.0",
"@angular/forms": "~18.0.0",
"@angular/localize": "~18.0.0",
"@angular/platform-browser": "~18.0.0",
"@angular/platform-browser-dynamic": "~18.0.0",
"@angular/router": "~18.0.0",
"@angular/animations": "~18.1.0",
"@angular/common": "~18.1.0",
"@angular/core": "~18.1.0",
"@angular/forms": "~18.1.0",
"@angular/localize": "~18.1.0",
"@angular/platform-browser": "~18.1.0",
"@angular/platform-browser-dynamic": "~18.1.0",
"@angular/router": "~18.1.0",
"@design-factory/design-factory": "~17.1.0",
"@ng-bootstrap/ng-bootstrap": "^17.0.0",
"@ng-select/ng-select": "^12.0.7",
Expand Down
42 changes: 21 additions & 21 deletions apps/github-cascading-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@
},
"devDependencies": {
"@actions/github": "^6.0.0",
"@angular-devkit/build-angular": "~18.0.0",
"@angular-devkit/core": "~18.0.0",
"@angular-eslint/builder": "~18.0.0",
"@angular-eslint/eslint-plugin": "~18.0.0",
"@angular-eslint/eslint-plugin-template": "~18.0.0",
"@angular/animations": "~18.0.0",
"@angular/common": "~18.0.0",
"@angular/compiler": "~18.0.0",
"@angular/compiler-cli": "~18.0.0",
"@angular/core": "~18.0.0",
"@angular/platform-browser": "~18.0.0",
"@angular/platform-browser-dynamic": "~18.0.0",
"@nx/eslint": "~19.3.0",
"@nx/eslint-plugin": "~19.3.0",
"@nx/jest": "~19.3.0",
"@nx/js": "~19.3.0",
"@angular-devkit/build-angular": "~18.1.0",
"@angular-devkit/core": "~18.1.0",
"@angular-eslint/builder": "~18.1.0",
"@angular-eslint/eslint-plugin": "~18.1.0",
"@angular-eslint/eslint-plugin-template": "~18.1.0",
"@angular/animations": "~18.1.0",
"@angular/common": "~18.1.0",
"@angular/compiler": "~18.1.0",
"@angular/compiler-cli": "~18.1.0",
"@angular/core": "~18.1.0",
"@angular/platform-browser": "~18.1.0",
"@angular/platform-browser-dynamic": "~18.1.0",
"@nx/eslint": "~19.5.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/js": "~19.5.0",
"@o3r/eslint-config-otter": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin-ts": "~2.4.0",
Expand All @@ -54,21 +54,21 @@
"eslint": "^8.57.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-plugin-jest": "~28.6.0",
"eslint-plugin-jsdoc": "~48.4.0",
"eslint-plugin-jsdoc": "~48.10.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^54.0.0",
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.1.0",
"jest-preset-angular": "~14.2.0",
"jsonc-eslint-parser": "~2.4.0",
"nock": "^13.0.5",
"nx": "~19.3.0",
"nx": "~19.5.0",
"rxjs": "^7.8.1",
"smee-client": "^2.0.0",
"ts-jest": "~29.1.2",
"ts-jest": "~29.2.0",
"tslib": "^2.6.2",
"typescript": "~5.4.2",
"typescript": "~5.5.4",
"zone.js": "~0.14.2"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion apps/intellij-extension/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("java")
id("org.jetbrains.kotlin.jvm") version "2.0.0"
id("org.jetbrains.intellij") version "1.17.3"
id("org.jetbrains.intellij") version "1.17.4"
}

group = "com.amadeus"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
}
],
"status": "available"
},
{
"id": 6,
"category": {
"id": 0,
"name": "otter"
},
"name": "???",
"photoUrls": [
"https://amadeusitgroup.github.io/otter/#/random-url-that-should-never-be-used"
],
"tags": [
{
"id": 0,
"name": "otter"
}
],
"status": "available"
}
]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b7ce58b

Please sign in to comment.