Skip to content

Commit

Permalink
chore: upgrade some major dependencies (#2752)
Browse files Browse the repository at this point in the history
## 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 -->
  • Loading branch information
fpaul-1A authored Jan 29, 2025
2 parents 1cf2769 + b11c053 commit 3d57087
Show file tree
Hide file tree
Showing 82 changed files with 348 additions and 271 deletions.
2 changes: 1 addition & 1 deletion apps/chrome-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@o3r/rules-engine": "workspace:^",
"@playwright/test": "~1.49.0",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/chrome": "^0.0.297",
"@types/jest": "~29.5.2",
"@types/tinycolor2": "^1.4.6",
Expand Down
2 changes: 1 addition & 1 deletion apps/github-cascading-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@nx/js": "~20.2.0",
"@o3r/eslint-config": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/ejs": "^3.1.2",
"@types/express-serve-static-core": "^4.19.5",
"@types/jest": "~29.5.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/github-cascading-app/src/cascading/cascading.ts
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ export abstract class Cascading {
}

const isIgnored = config.ignoredPatterns
.map(((pattern) => new RegExp(pattern)))
.map((pattern) => new RegExp(pattern))
.some((pattern) => pattern.test(currentBranchName));

if (isIgnored) {
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@ngrx/entity": "~19.0.0",
"@ngrx/store": "~19.0.0",
"@ngrx/store-devtools": "~19.0.0",
"@ngx-translate/core": "~15.0.0",
"@ngx-translate/core": "~16.0.4",
"@nx/jest": "~20.2.0",
"@o3r-training/showcase-sdk": "workspace:^",
"@o3r-training/training-tools": "workspace:^",
Expand Down Expand Up @@ -111,7 +111,7 @@
"@o3r/testing": "workspace:^",
"@playwright/test": "~1.49.0",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/bootstrap": "^5.2.10",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
"@o3r/eslint-plugin": "workspace:^",
"@o3r/schematics": "workspace:^",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/eslint": "~9.6.0",
"@types/glob": "^8.0.0",
"@types/jest": "~29.5.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export function generateComponentGenerateCommand(_context: ExtensionContext, fol
const componentPath = folder || await vscode.window.showInputBox({
title: 'Path to your component',
value: getCurrentFolder()
|| defaultOptions.path
|| vscode.workspace.workspaceFolders?.[0]?.uri?.fsPath,
|| defaultOptions.path
|| vscode.workspace.workspaceFolders?.[0]?.uri?.fsPath,
ignoreFocusOut: true
});

Expand Down
4 changes: 2 additions & 2 deletions apps/vscode-extension/src/commands/generate/module.command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ export function generateModuleGenerateCommand(_context: ExtensionContext, folder
const modulePath = folder || await vscode.window.showInputBox({
title: 'Path to your Modules folder',
value: getCurrentFolder()
|| defaultOptions.path
|| resolve(vscode.workspace.workspaceFolders?.[0]?.uri?.fsPath || '.', 'packages'),
|| defaultOptions.path
|| resolve(vscode.workspace.workspaceFolders?.[0]?.uri?.fsPath || '.', 'packages'),
ignoreFocusOut: true
});

Expand Down
4 changes: 2 additions & 2 deletions apps/vscode-extension/src/commands/generate/store.command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export function generateStoreGenerateCommand(_context: ExtensionContext, folder?
canPickMany: false,
ignoreFocusOut: true,
title: 'Which type of store do you want to create ? \n'
+ 'The entity store contains a collection of items in the state, while the simple one contains only one.\n'
+ 'The async store is designed to interact with an api, and handles the asynchronous call via effects.'
+ 'The entity store contains a collection of items in the state, while the simple one contains only one.\n'
+ 'The async store is designed to interact with an api, and handles the asynchronous call via effects.'
});

if (!storeType) {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
"@ngrx/router-store": "~19.0.0",
"@ngrx/store": "~19.0.0",
"@ngrx/store-devtools": "~19.0.0",
"@ngx-translate/core": "~15.0.0",
"@ngx-translate/core": "~16.0.4",
"@nx/angular": "~20.2.0",
"@nx/eslint": "~20.2.0",
"@nx/eslint-plugin": "~20.2.0",
Expand All @@ -192,7 +192,7 @@
"@playwright/test": "~1.49.0",
"@popperjs/core": "^2.11.5",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@swc-node/register": "^1.9.2",
"@swc/core": "~1.10.0",
"@swc/helpers": "~0.5.0",
Expand All @@ -219,7 +219,7 @@
"commit-and-tag-version": "^12.0.0",
"concurrently": "^9.1.0",
"cpy-cli": "^5.0.0",
"editorconfig-checker": "^5.1.8",
"editorconfig-checker": "^6.0.1",
"eslint": "~9.17.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.3",
Expand Down Expand Up @@ -268,7 +268,7 @@
"tsc-watch": "^6.0.4",
"typescript": "~5.6.2",
"typescript-eslint": "~8.21.0",
"uuid": "^10.0.0",
"uuid": "^11.0.5",
"webpack": "~5.97.0",
"winston": "^3.8.2",
"yaml-eslint-parser": "^1.2.2"
Expand Down
8 changes: 4 additions & 4 deletions packages/@ama-sdk/client-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"@swc/helpers": "~0.5.0",
"tslib": "^2.6.2",
"uuid": "^10.0.0"
"uuid": "^11.0.5"
},
"peerDependencies": {
"@ama-sdk/core": "workspace:^",
Expand Down Expand Up @@ -87,13 +87,13 @@
"@o3r/schematics": "workspace:^",
"@o3r/test-helpers": "workspace:^",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin-ts": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@stylistic/eslint-plugin-ts": "~3.0.0",
"@swc/cli": "~0.6.0",
"@swc/core": "~1.10.0",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/uuid": "^9.0.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/parser": "~8.21.0",
"angular-eslint": "~19.0.0",
"cpy-cli": "^5.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/@ama-sdk/client-beacon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"@swc/helpers": "~0.5.0",
"tslib": "^2.6.2",
"uuid": "^10.0.0"
"uuid": "^11.0.5"
},
"peerDependencies": {
"@ama-sdk/core": "workspace:^",
Expand Down Expand Up @@ -86,13 +86,13 @@
"@o3r/schematics": "workspace:^",
"@o3r/test-helpers": "workspace:^",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin-ts": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@stylistic/eslint-plugin-ts": "~3.0.0",
"@swc/cli": "~0.6.0",
"@swc/core": "~1.10.0",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/uuid": "^9.0.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/parser": "~8.21.0",
"angular-eslint": "~19.0.0",
"cpy-cli": "^5.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/@ama-sdk/client-fetch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@swc/helpers": "~0.5.0",
"ts-node": "~10.9.2",
"tslib": "^2.6.2",
"uuid": "^10.0.0"
"uuid": "^11.0.5"
},
"peerDependencies": {
"@ama-sdk/core": "workspace:^",
Expand Down Expand Up @@ -91,13 +91,13 @@
"@o3r/schematics": "workspace:^",
"@o3r/test-helpers": "workspace:^",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin-ts": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@stylistic/eslint-plugin-ts": "~3.0.0",
"@swc/cli": "~0.6.0",
"@swc/core": "~1.10.0",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/uuid": "^9.0.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/parser": "~8.21.0",
"angular-eslint": "~19.0.0",
"cpy-cli": "^5.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@ama-sdk/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"@swc/helpers": "~0.5.0",
"ts-node": "~10.9.2",
"tslib": "^2.6.2",
"uuid": "^10.0.0"
"uuid": "^11.0.5"
},
"peerDependencies": {
"@angular-devkit/schematics": "^19.0.0",
Expand Down Expand Up @@ -136,12 +136,12 @@
"@o3r/schematics": "workspace:^",
"@o3r/test-helpers": "workspace:^",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@swc/cli": "~0.6.0",
"@swc/core": "~1.10.0",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/uuid": "^9.0.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/parser": "~8.21.0",
"angular-eslint": "~19.0.0",
"cpy-cli": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-sdk/core/src/fwk/core/api-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export interface ApiClient {

/** Process HTTP call */
processCall<T>(url: string, options: RequestOptions, apiType: ApiTypes | string, apiName: string, revivers?: ReviverType<T> |
{ [key: number]: ReviverType<T> | undefined }, operationId?: string): Promise<T>;
{ [key: number]: ReviverType<T> | undefined }, operationId?: string): Promise<T>;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-sdk/create/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@o3r/eslint-plugin": "workspace:^",
"@o3r/telemetry": "workspace:^",
"@o3r/test-helpers": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jest": "~29.5.2",
"@types/minimist": "^1.2.2",
"@types/node": "^20.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-sdk/schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"@o3r/test-helpers": "workspace:^",
"@openapitools/openapi-generator-cli": "~2.15.0",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jest": "~29.5.2",
"@types/js-yaml": "^4.0.5",
"@types/minimatch": "^5.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-sdk/schematics/schematics/migrate/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function migrateFn(options: MigrateSchematicsSchemaOptions): Rule {
return (tree, context) => {
if (minimumVersion && gt(minimumVersion, currentVersion)) {
context.logger.warn(`The specified range "${to}" has a minimum supported version higher than the current version of @ama-sdk/schematics (${currentVersion}).`
+ ' The migration may not have any effect.');
+ ' The migration may not have any effect.');
}
const workingDirectory = (options?.projectName && getWorkspaceConfig(tree)?.projects[options.projectName]?.root) || '/';
const runMigrateSchematic = isTypescriptSdk(tree, workingDirectory) ? getMigrationRuleRunner(tsMigrationMap, { logger: context.logger }) : undefined;
Expand Down
10 changes: 5 additions & 5 deletions packages/@ama-sdk/schematics/schematics/typescript/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ const getRegexpTemplate = (regexp: RegExp) => `new RegExp('${regexp.toString().r
const getPathObjectTemplate = (pathObj: PathObject) => {
return `{
${
(Object.keys(pathObj) as (keyof PathObject)[]).map((propName) => {
const value = (propName) === 'regexp' ? getRegexpTemplate(pathObj[propName]) : JSON.stringify(pathObj[propName]);
return `${propName as string}: ${value}`;
}).join(',')
}
(Object.keys(pathObj) as (keyof PathObject)[]).map((propName) => {
const value = (propName) === 'regexp' ? getRegexpTemplate(pathObj[propName]) : JSON.stringify(pathObj[propName]);
return `${propName as string}: ${value}`;
}).join(',')
}
}`;
};

Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-sdk/swagger-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@nx/jest": "~20.2.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/glob": "^8.0.0",
"@types/jest": "~29.5.2",
"@types/js-yaml": "^4.0.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ export class DictionaryChecker implements Checker {
.filter((dictionaryReference) => !this.isDictionaryInDefinition(dictionaryReference, replyDefinition, definitionsWithReferer))
.map((dictionaryReference) => ({
message: `The dictionary ${dictionaryReference.dictionaryName} (type: ${dictionaryReference.fieldType}${dictionaryReference.isRequired ? ', required' : ''})`
+ ` referred by ${dictionaryReference.requestedBy}.${dictionaryReference.originField} is missing in ${replyDefinition}`,
+ ` referred by ${dictionaryReference.requestedBy}.${dictionaryReference.originField} is missing in ${replyDefinition}`,
details: this.findReferencePaths(replyDefinition, dictionaryReference.requestedBy, definitionsWithReferer)
.map((refPath) => `Path from ${replyDefinition} to ${dictionaryReference.requestedBy}: ${refPath.join(' -> ')}`),
swaggerNode: replyDefinition
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-terasu/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@o3r/eslint-plugin": "workspace:^",
"@o3r/telemetry": "workspace:^",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jest": "~29.5.2",
"@types/minimist": "^1.2.2",
"@types/node": "^20.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-terasu/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@nx/jest": "~20.2.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jest": "~29.5.2",
"@types/minimist": "^1.2.2",
"@types/node": "^20.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-terasu/schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@typescript-eslint/parser": "~8.21.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r-training/showcase-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"@o3r/eslint-plugin": "workspace:^",
"@openapitools/openapi-generator-cli": "~2.15.0",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@swc/cli": "~0.6.0",
"@swc/core": "~1.10.0",
"@types/jest": "~29.5.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r-training/training-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"@o3r/schematics": "workspace:^",
"@openapitools/openapi-generator-cli": "~2.15.0",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@swc/cli": "~0.6.0",
"@swc/core": "~1.10.0",
"@types/jest": "~29.5.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/@o3r-training/training-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
"@o3r/eslint-plugin": "workspace:^",
"@o3r/schematics": "workspace:^",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin-ts": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@stylistic/eslint-plugin-ts": "~3.0.0",
"@swc/cli": "~0.6.0",
"@swc/core": "~1.10.0",
"@swc/helpers": "~0.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/amaterasu/amaterasu-api-spec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@nx/jest": "~20.2.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jest": "~29.5.2",
"@types/js-yaml": "^4.0.5",
"@types/node": "^20.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/amaterasu/amaterasu-dodo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@nx/jest": "~20.2.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/tar": "~6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/amaterasu/amaterasu-otter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@nx/jest": "~20.2.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jest": "~29.5.2",
"@types/js-yaml": "^4.0.5",
"@types/node": "^20.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/amaterasu/amaterasu-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@nx/jest": "~20.2.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jest": "~29.5.2",
"@types/js-yaml": "^4.0.5",
"@types/node": "^20.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"@o3r/schematics": "workspace:^",
"@o3r/test-helpers": "workspace:^",
"@schematics/angular": "~19.0.0",
"@stylistic/eslint-plugin": "~2.7.0",
"@stylistic/eslint-plugin": "~3.0.0",
"@types/jasmine": "~5.1.0",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
Expand Down
Loading

0 comments on commit 3d57087

Please sign in to comment.