diff --git a/.yarnrc.yml b/.yarnrc.yml index d988cd92dd..c1d84df0bf 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -8,8 +8,9 @@ nodeLinker: pnp packageExtensions: "@design-factory/design-factory@*": - peerDependencies: - "@angular/router": ~17.0.4 + dependencies: + "@agnos-ui/style-bootstrap": "^0.1.1" + "@ng-select/ng-select": "~12.0.7" "@nx/angular@^18.0.0": dependencies: "@angular-devkit/build-angular": ~17.0.3 diff --git a/apps/chrome-devtools/package.json b/apps/chrome-devtools/package.json index f443d83372..051a431187 100644 --- a/apps/chrome-devtools/package.json +++ b/apps/chrome-devtools/package.json @@ -84,9 +84,8 @@ "@angular/platform-browser": "~17.0.4", "@angular/platform-browser-dynamic": "~17.0.4", "@angular/router": "~17.0.4", - "@design-factory/design-factory": "^15.2.2", + "@design-factory/design-factory": "^17.0.0", "@ng-bootstrap/ng-bootstrap": "^16.0.0", - "@ng-select/ng-select": "~12.0.0", "@ngrx/entity": "~17.1.0", "@ngrx/store": "~17.1.0", "@o3r/application": "workspace:^", @@ -96,10 +95,10 @@ "@o3r/localization": "workspace:^", "@o3r/rules-engine": "workspace:^", "@popperjs/core": "^2.11.5", - "ag-grid-angular": "~31.0.0", - "ag-grid-community": "~31.0.0", - "bootstrap": "5.2.0", - "bootstrap-icons": "^1.10.5", + "ag-grid-angular": "~31.0.3", + "ag-grid-community": "~31.0.3", + "bootstrap": "5.3.2", + "bootstrap-icons": "^1.11.3", "rxjs": "^7.8.1", "tslib": "^2.5.3", "zone.js": "~0.14.2" diff --git a/apps/chrome-devtools/src/styles/index.scss b/apps/chrome-devtools/src/styles/index.scss index 5d33fea013..492332463b 100644 --- a/apps/chrome-devtools/src/styles/index.scss +++ b/apps/chrome-devtools/src/styles/index.scss @@ -1,6 +1,7 @@ @use '@design-factory/design-factory' with ( $prefix: bs-, $df-spinner-circumference: 2rem, - $font-path: '@design-factory/design-factory/assets/fonts' + $font-path: '@design-factory/design-factory/assets/fonts', + $utilities-bg: () ); @use "bootstrap-icons/font/bootstrap-icons"; diff --git a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/component-replacement.png b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/component-replacement.png index c16fb208e9..7505f83aa2 100644 Binary files a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/component-replacement.png and b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/component-replacement.png differ diff --git a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/configuration.png b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/configuration.png index 7f72928264..6afe36e3dd 100644 Binary files a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/configuration.png and b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/configuration.png differ diff --git a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/design-token.png b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/design-token.png index c911e2415b..a3bd180c40 100644 Binary files a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/design-token.png and b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/design-token.png differ diff --git a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/dynamic-content.png b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/dynamic-content.png index cde55181d6..a678bff1c2 100644 Binary files a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/dynamic-content.png and b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/dynamic-content.png differ diff --git a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/home.png b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/home.png index f73e5eb5b2..7b4013ec11 100644 Binary files a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/home.png and b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/home.png differ diff --git a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/localization.png b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/localization.png index 1f8be06763..62144e2129 100644 Binary files a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/localization.png and b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/localization.png differ diff --git a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/rules-engine.png b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/rules-engine.png index 642e230ef9..d472af5ee3 100644 Binary files a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/rules-engine.png and b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/rules-engine.png differ diff --git a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/run-app-locally.png b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/run-app-locally.png index 7cc89ac5af..ba0ede729e 100644 Binary files a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/run-app-locally.png and b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/run-app-locally.png differ diff --git a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-generator.png b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-generator.png index a4d7a41c7c..b9f0116273 100644 Binary files a/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-generator.png and b/apps/showcase/e2e-playwright/sanity/screenshots/visual-sanity.e2e.ts/chromium/sdk-generator.png differ diff --git a/apps/showcase/package.json b/apps/showcase/package.json index 84790faa6d..b6c0b418ec 100644 --- a/apps/showcase/package.json +++ b/apps/showcase/package.json @@ -38,10 +38,9 @@ "@angular/platform-browser": "~17.0.4", "@angular/platform-browser-dynamic": "~17.0.4", "@angular/router": "~17.0.4", - "@design-factory/design-factory": "^15.2.2", + "@design-factory/design-factory": "^17.0.0", "@formatjs/intl-numberformat": "~8.10.0", "@ng-bootstrap/ng-bootstrap": "^16.0.0", - "@ng-select/ng-select": "~12.0.0", "@ngrx/effects": "~17.1.0", "@ngrx/entity": "~17.1.0", "@ngrx/store": "~17.1.0", @@ -59,10 +58,10 @@ "@o3r/rules-engine": "workspace:^", "@o3r/testing": "workspace:^", "@popperjs/core": "^2.11.5", - "ag-grid-angular": "~31.0.0", - "ag-grid-community": "~31.0.0", - "bootstrap": "5.2.0", - "bootstrap-icons": "^1.10.5", + "ag-grid-angular": "~31.0.3", + "ag-grid-community": "~31.0.3", + "bootstrap": "5.3.2", + "bootstrap-icons": "^1.11.3", "highlight.js": "^11.8.0", "intl-messageformat": "~10.5.1", "ngx-highlightjs": "^10.0.0", @@ -93,7 +92,7 @@ "@playwright/test": "~1.41.0", "@schematics/angular": "~17.0.3", "@stylistic/eslint-plugin-ts": "^1.5.4", - "@types/bootstrap": "^5.2.6", + "@types/bootstrap": "^5.2.10", "@types/jest": "~29.5.2", "@types/node": "^20.0.0", "@typescript-eslint/eslint-plugin": "^6.19.0", diff --git a/apps/showcase/project.json b/apps/showcase/project.json index c3a99881ac..3d1f31229f 100644 --- a/apps/showcase/project.json +++ b/apps/showcase/project.json @@ -88,7 +88,7 @@ { "type": "initial", "maximumWarning": "500kb", - "maximumError": "2mb" + "maximumError": "2.2mb" }, { "type": "anyComponentStyle", 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 235aa07f00..79ab5288c7 100644 --- a/apps/showcase/src/app/rules-engine/rules-engine.template.html +++ b/apps/showcase/src/app/rules-engine/rules-engine.template.html @@ -31,13 +31,13 @@

Example

Source code