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.

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

Merge main into release/12.0.0-next #2639

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
13e487e
feat(design): add description to the exploded tokens
kpanot Dec 17, 2024
2125b51
feat(design): add description to the exploded tokens (#2603)
kpanot Dec 17, 2024
a72ba7a
fix: jest.config.ut.js not processing array in tsconfig paths correctly
divdavem Dec 17, 2024
6a9e0da
fix: jest.config.ut.js not processing array in tsconfig paths correct…
kpanot Dec 17, 2024
aa07319
chore: remove index.js files for builders
fpaul-1A Dec 17, 2024
711beaa
fix: add missing dev dependency
kpanot Dec 18, 2024
8de7221
fix: add missing dev dependency (#2607)
kpanot Dec 18, 2024
5edde0f
chore: remove index.js files for builders (#2604)
fpaul-1A Dec 18, 2024
acb451a
fix: linter issue with typescript-eslint 8.18
fpaul-1A Dec 18, 2024
b131702
fix: linter issue with typescript-eslint 8.18 (#2619)
fpaul-1A Dec 18, 2024
15dd775
fix(deps): update typescript dependencies to ~8.18.0
renovate[bot] Dec 18, 2024
5892a1a
chore: add auto generated yarn ignored files
kpanot Dec 19, 2024
21efca9
fix(deps): update typescript dependencies to ~8.18.0 (main) (#2617)
kpanot Dec 19, 2024
71ffca3
fix(#2630): use posix to compute path for outputPath
matthieu-crouzet Dec 19, 2024
fae0dd1
fix(#2630): use posix to compute path for outputPath (#2634)
matthieu-crouzet Dec 19, 2024
52e1c1c
fix: github-action package not working
fpaul-1A Dec 19, 2024
0a97daf
chore: add auto generated yarn ignored files (#2631)
kpanot Dec 20, 2024
b0bc18b
feat(config): add support for restrictionKeys
matthieu-crouzet Dec 16, 2024
88b7d37
fix: github-action package not working (#2637)
fpaul-1A Dec 20, 2024
c8834dc
feat(config): add support for restrictionKeys (#2602)
matthieu-crouzet Dec 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,18 @@ jobs:
env:
lintCmd: ${{ inputs.affected && format('lint:affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'lint'}}
run: yarn ${{ env.lintCmd }} --configuration ci

# Check that the packaging of github-actions is still working
github-actions:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: ${{ inputs.affected && '0' || '1' }}
- name: Setup
uses: ./tools/github-actions/setup
- name: Package github actions
env:
nxCmd: ${{ inputs.affected && format('nx affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'nx run-many'}}
run: yarn ${{ env.nxCmd }} --target=package-github-action

5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@
"search.useIgnoreFiles": true,
"search.exclude": {
"**/*.code-search": true,
"**/.yarn/**": true,
"**/github-actions/*/packaged-action/**": true
"**/github-actions/*/packaged-action/**": true,
"**/.yarn": true,
"**/.pnp.*": true
},
"typescript.enablePromptUseWorkspaceTsdk": true,
"typescript.tsdk": ".yarn/sdks/typescript/lib"
Expand Down
5 changes: 3 additions & 2 deletions apps/chrome-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
],
"devDependencies": {
"@angular-devkit/build-angular": "~18.2.0",
"@angular-devkit/schematics": "~18.2.0",
"@angular/cli": "~18.2.0",
"@angular/compiler": "~18.2.0",
"@angular/compiler-cli": "~18.2.0",
Expand All @@ -46,7 +47,7 @@
"@types/chrome": "^0.0.283",
"@types/jest": "~29.5.2",
"@types/tinycolor2": "^1.4.6",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"angular-eslint": "~18.4.0",
"archiver": "^7.0.0",
"chokidar": "^3.5.2",
Expand Down Expand Up @@ -75,7 +76,7 @@
"rimraf": "^5.0.1",
"tsc-watch": "^6.0.4",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0"
"typescript-eslint": "~8.18.0"
},
"dependencies": {
"@agnos-ui/angular-bootstrap": "~0.4.1",
Expand Down
5 changes: 3 additions & 2 deletions apps/github-cascading-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"devDependencies": {
"@actions/github": "^6.0.0",
"@angular-devkit/schematics": "~18.2.0",
"@angular/animations": "~18.2.0",
"@angular/common": "~18.2.0",
"@angular/compiler": "~18.2.0",
Expand All @@ -43,7 +44,7 @@
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/semver": "^7.3.13",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
"ejs": "^3.1.9",
Expand All @@ -69,7 +70,7 @@
"ts-jest": "~29.2.0",
"tslib": "^2.6.2",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0",
"typescript-eslint": "~8.18.0",
"zone.js": "~0.14.2"
},
"engines": {
Expand Down
6 changes: 6 additions & 0 deletions apps/showcase/eslint.local.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ export default [
}
}
}
],
'@o3r/o3r-restriction-key-tags': [
'error',
{
supportedKeys: ['api owners']
}
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"@types/bootstrap": "^5.2.10",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"@webcontainer/api": "~1.5.0",
"angular-eslint": "~18.4.0",
"concurrently": "^8.0.0",
Expand All @@ -137,7 +137,7 @@
"rimraf": "^5.0.1",
"ts-jest": "~29.2.0",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0",
"typescript-eslint": "~8.18.0",
"webpack": "~5.96.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface ConfigurationPresConfig extends Configuration {
* @o3rWidgetParam allDestinationsDifferent true
* @o3rWidgetParam atLeastOneDestinationAvailable true
* @o3rWidgetParam destinationPattern "[A-Z][a-zA-Z-' ]+"
* @o3rRestrictionKey "api owners"
*/
destinations: DestinationConfiguration[];
/**
Expand Down
4 changes: 2 additions & 2 deletions apps/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/vscode": "^1.67.0",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"@vscode/vsce": "^2.16.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
Expand All @@ -395,7 +395,7 @@
"rxjs": "^7.8.1",
"ts-jest": "~29.2.0",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0",
"typescript-eslint": "~8.18.0",
"zone.js": "~0.14.2"
}
}
5 changes: 3 additions & 2 deletions docs/ab-testing/AB_TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ export class ExperimentFactsService extends FactsService<ExperimentFacts> {
}
}
```
**Warning** Your service must be imported only once in the application. A good way to do it is to provide it in root as
a singleton.
> [!WARNING]
> Your service must be imported only once in the application.
> A good way to do it is to provide it in root as a singleton.

#### The A/B Testing service
Now, you need to link ``ExperimentFactsService`` and the ``AbTestBridge`` to update the ``experiments`` fact that reflects the
Expand Down
65 changes: 65 additions & 0 deletions docs/linter/eslint-plugin/rules/o3r-restriction-key-tags.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# @o3r/o3r-restriction-key-tags

Ensures that the tags `@o3rRestrictionKey` are used with correct values.

> [!WARNING]
> This rule must be configured to be used.

## How to use

```json
{
"@o3r/o3r-restriction-key-tags": [
"error",
{
"supportedInterfaceNames": ["NestedConfiguration", "Configuration", "CustomConfigurationInterface"],
"supportedKeys": ["restriction", "restriction_with_underscores", "restriction with spaces"]
}
]
}
```

## Valid code example

```typescript
export interface ConfigExample extends Configuration {
/**
* @o3rRestrictionKey restriction_with_underscores
*/
prop1: string;
/**
* @o3rRestrictionKey restriction
* @o3rRestrictionKey "restriction with spaces"
*/
prop2: string;
}
```

## Invalid code example

```typescript
export interface ConfigExample extends Configuration {
/**
* @o3rRestrictionKey restriction with spaces
*/
prop: string;
}
```

```typescript
export interface ConfigExample extends Configuration {
/**
* @o3rRestrictionKey unknownRestriction
*/
prop: string | number;
}
```

```typescript
export interface NotAConfigInterface {
/**
* @o3rRestrictionKey restriction
*/
prop: string;
}
```
6 changes: 3 additions & 3 deletions docs/linter/eslint-plugin/rules/o3r-widget-tags.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# @o3r/o3r-widget-tags

Ensures that @o3rWidget and @o3rWidgetParam are used with correct value.
Ensures that the tags @o3rWidget and @o3rWidgetParam are used with correct values.


**Warning** This rule must be configured to be used.
> [!WARNING]
> This rule must be configured to be used.

## How to use

Expand Down
4 changes: 2 additions & 2 deletions jest.config.ut.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ module.exports.getJestProjectConfig = (rootDir, isAngularSetup, options) => {
).config;
const relativePath = relative(rootDir, options?.baseTsconfig ? __dirname(options.baseTsconfig) : __dirname);
const moduleNameMapper = Object.fromEntries(
Object.entries(pathsToModuleNameMapper(compilerOptions.paths))
.map(([moduleName, path]) => [moduleName, `<rootDir>/${relativePath}/${path}`])
Object.entries(pathsToModuleNameMapper(compilerOptions.paths || {}))
.map(([moduleName, paths]) => [moduleName, (Array.isArray(paths) ? paths : [paths]).map(path => `<rootDir>/${relativePath}/${path}`)])
);
return {
preset: 'ts-jest',
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/semver": "^7.3.13",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/rule-tester": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"@typescript-eslint/rule-tester": "~8.18.0",
"@yarnpkg/sdks": "^3.2.0",
"ag-grid-angular": "~32.3.0",
"ag-grid-community": "~32.3.0",
Expand Down Expand Up @@ -266,7 +266,7 @@
"ts-node": "~10.9.2",
"tsc-watch": "^6.0.4",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0",
"typescript-eslint": "~8.18.0",
"uuid": "^10.0.0",
"webpack": "~5.96.0",
"winston": "^3.8.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/@ama-sdk/client-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/uuid": "^9.0.0",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
"eslint": "~9.14.0",
Expand All @@ -120,7 +120,7 @@
"ts-node": "~10.9.2",
"type-fest": "^4.10.2",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0",
"typescript-eslint": "~8.18.0",
"zone.js": "~0.14.2"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@ama-sdk/client-beacon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/uuid": "^9.0.0",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
"eslint": "~9.14.0",
Expand All @@ -118,7 +118,7 @@
"ts-node": "~10.9.2",
"type-fest": "^4.10.2",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0",
"typescript-eslint": "~8.18.0",
"zone.js": "~0.14.2"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@ama-sdk/client-fetch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/uuid": "^9.0.0",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
"eslint": "~9.14.0",
Expand All @@ -123,7 +123,7 @@
"ts-node": "~10.9.2",
"type-fest": "^4.10.2",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0",
"typescript-eslint": "~8.18.0",
"zone.js": "~0.14.2"
},
"engines": {
Expand Down
13 changes: 0 additions & 13 deletions packages/@ama-sdk/client-fetch/schematics/ng-add/index.js

This file was deleted.

4 changes: 2 additions & 2 deletions packages/@ama-sdk/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@types/uuid": "^9.0.0",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
"eslint": "~9.14.0",
Expand All @@ -168,7 +168,7 @@
"ts-node": "~10.9.2",
"type-fest": "^4.10.2",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0",
"typescript-eslint": "~8.18.0",
"zone.js": "~0.14.2"
},
"engines": {
Expand Down
13 changes: 0 additions & 13 deletions packages/@ama-sdk/core/schematics/ng-add/index.js

This file was deleted.

4 changes: 2 additions & 2 deletions packages/@ama-sdk/create/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@types/node": "^20.0.0",
"@types/pid-from-port": "^1.1.0",
"@types/semver": "^7.3.13",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
"eslint": "~9.14.0",
Expand All @@ -80,7 +80,7 @@
"ts-jest": "~29.2.0",
"tslib": "^2.6.2",
"type-fest": "^4.10.2",
"typescript-eslint": "~8.17.0"
"typescript-eslint": "~8.18.0"
},
"engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@ama-sdk/schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"@types/node": "^20.0.0",
"@types/pid-from-port": "^1.1.0",
"@types/semver": "^7.3.13",
"@typescript-eslint/parser": "~8.17.0",
"@typescript-eslint/parser": "~8.18.0",
"angular-eslint": "~18.4.0",
"commit-and-tag-version": "^12.0.0",
"copyfiles": "^2.4.1",
Expand Down Expand Up @@ -136,7 +136,7 @@
"ts-node": "~10.9.2",
"type-fest": "^4.10.2",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0"
"typescript-eslint": "~8.18.0"
},
"generatorDependencies": {
"@swc/cli": "~0.5.0",
Expand Down
Loading
Loading