Skip to content

Commit

Permalink
feat!: upgrade angular to v15 (#2564)
Browse files Browse the repository at this point in the history
* chore: upgrade `@angular/pwa` to v13

fairly sure it should have been this anyway

* feat: upgrade to Angular v14

ng update @angular/{pwa,core,cdk,cli,animations,common,compiler,elements,forms,platform-browser,platform-browser-dynamic,platform-server,router,
service-worker,compiler-cli,language-service}@14.0.0 @nguniversal/[email protected] @angular-devkit/{schematics,build-angular,core}@14.0.0 @angular-eslint/{builder,eslint-plugin,eslint-plugin-template,sche
matics,template-parser}@14.0.0 @ngrx/{effects,entity,router-store,schematics,store,store-devtools}@14.0.0 [email protected] @angular-devkit/[email protected]
The installed Angular CLI version is outdated.
Installing a temporary Angular CLI versioned 14.2.12 to perform the update.
✔ Package successfully installed.
DEPRECATED: The 'defaultProject' workspace option has been deprecated. The project to use will be determined from the current working directory.
Using package manager: npm
Collecting installed dependencies...
Found 107 dependencies.
Fetching dependency metadata from registry...
    Updating package.json with dependency @angular-devkit/architect @ "0.1402.0" (was "0.1302.6")...
    Updating package.json with dependency @angular-devkit/build-angular @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular-devkit/core @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular-devkit/schematics @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular-eslint/builder @ "14.0.0" (was "13.0.0")...
    Updating package.json with dependency @angular-eslint/eslint-plugin @ "14.0.0" (was "13.1.0")...
    Updating package.json with dependency @angular-eslint/eslint-plugin-template @ "14.0.0" (was "13.1.0")...
    Updating package.json with dependency @angular-eslint/schematics @ "14.0.0" (was "13.1.0")...
    Updating package.json with dependency @angular-eslint/template-parser @ "14.0.0" (was "13.1.0")...
    Updating package.json with dependency @angular/cli @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/compiler-cli @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/language-service @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @ngrx/store-devtools @ "14.0.0" (was "13.0.2")...
    Updating package.json with dependency @nguniversal/builders @ "14.0.0" (was "13.1.0")...
    Updating package.json with dependency ng-packagr @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/animations @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/cdk @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/common @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/compiler @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/core @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/elements @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/forms @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/platform-browser @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/platform-browser-dynamic @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/platform-server @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/pwa @ "14.0.0" (was "13.0.0")...
    Updating package.json with dependency @angular/router @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @angular/service-worker @ "14.0.0" (was "13.3.0")...
    Updating package.json with dependency @ngrx/effects @ "14.0.0" (was "13.0.2")...
    Updating package.json with dependency @ngrx/entity @ "14.0.0" (was "13.0.2")...
    Updating package.json with dependency @ngrx/router-store @ "14.0.0" (was "13.0.2")...
    Updating package.json with dependency @ngrx/schematics @ "14.0.0" (was "13.0.2")...
    Updating package.json with dependency @ngrx/store @ "14.0.0" (was "13.0.2")...
UPDATE package.json (4265 bytes)
✔ Packages successfully installed.
** Executing migrations of package '@angular-eslint/schematics' **

▸ Updates @angular-eslint to v14.
UPDATE package.json (4270 bytes)
UPDATE angular.json (71879 bytes)
✔ Packages installed successfully.
  Migration completed.

** Executing migrations of package '@angular/cli' **

▸ Remove 'defaultProject' option from workspace configuration.
  The project to use will be determined from the current working directory.
UPDATE angular.json (71851 bytes)
  Migration completed.

▸ Remove 'showCircularDependencies' option from browser and server builders.
  Migration completed.

▸ Replace 'defaultCollection' option in workspace configuration with 'schematicCollections'.
  Migration completed.

▸ Update Angular packages 'dependencies' and 'devDependencies' version prefix to '^' instead of '~'.
✔ Packages installed successfully.
  Migration completed.

▸ Remove 'package.json' files from library projects secondary entrypoints.
DELETE libs/authorizenet/driver/package.json
DELETE libs/authorizenet/driver/in-memory/package.json
DELETE libs/authorizenet/driver/magento/package.json
DELETE libs/authorizenet/driver/testing/package.json
DELETE libs/authorizenet/state/package.json
DELETE libs/authorizenet/state/testing/package.json
DELETE libs/product/driver/package.json
DELETE libs/product/driver/in-memory/package.json
DELETE libs/product/driver/magento/package.json
DELETE libs/product/driver/magento/testing/package.json
DELETE libs/product/driver/shopify/package.json
DELETE libs/product/driver/testing/package.json
DELETE libs/product/routing/package.json
DELETE libs/product/state/package.json
DELETE libs/product/state/testing/package.json
DELETE libs/product/testing/package.json
DELETE libs/related-products/driver/package.json
DELETE libs/related-products/driver/in-memory/package.json
DELETE libs/related-products/driver/magento/package.json
DELETE libs/related-products/driver/magento/testing/package.json
DELETE libs/related-products/driver/testing/package.json
DELETE libs/related-products/state/package.json
DELETE libs/related-products/state/testing/package.json
DELETE libs/related-products/testing/package.json
DELETE libs/upsell-products/driver/package.json
DELETE libs/upsell-products/driver/in-memory/package.json
DELETE libs/upsell-products/driver/magento/package.json
DELETE libs/upsell-products/driver/magento/testing/package.json
DELETE libs/upsell-products/driver/testing/package.json
DELETE libs/upsell-products/state/package.json
DELETE libs/upsell-products/state/testing/package.json
DELETE libs/upsell-products/testing/package.json
DELETE libs/product-configurable/driver/in-memory/package.json
DELETE libs/product-configurable/driver/magento/package.json
DELETE libs/product-configurable/driver/magento/testing/package.json
DELETE libs/product-configurable/driver/testing/package.json
DELETE libs/product-configurable/state/package.json
DELETE libs/product-configurable/state/testing/package.json
DELETE libs/product-configurable/testing/package.json
DELETE libs/product-composite/driver/in-memory/package.json
DELETE libs/product-composite/driver/magento/package.json
DELETE libs/product-composite/driver/magento/testing/package.json
DELETE libs/product-composite/driver/testing/package.json
DELETE libs/product-composite/routing/package.json
DELETE libs/product-composite/state/package.json
DELETE libs/product-composite/state/testing/package.json
DELETE libs/product-composite/testing/package.json
DELETE libs/cart/driver/package.json
DELETE libs/cart/driver/in-memory/package.json
DELETE libs/cart/driver/magento/package.json
DELETE libs/cart/driver/magento/testing/package.json
DELETE libs/cart/driver/testing/package.json
DELETE libs/cart/routing/package.json
DELETE libs/cart/state/package.json
DELETE libs/cart/state/testing/package.json
DELETE libs/cart/testing/package.json
DELETE libs/cart-customer/driver/magento/package.json
DELETE libs/cart-customer/state/package.json
DELETE libs/category/driver/package.json
DELETE libs/category/driver/in-memory/package.json
DELETE libs/category/driver/magento/package.json
DELETE libs/category/driver/magento/testing/package.json
DELETE libs/category/driver/testing/package.json
DELETE libs/category/routing/package.json
DELETE libs/category/state/package.json
DELETE libs/category/state/testing/package.json
DELETE libs/category/testing/package.json
DELETE libs/checkout/testing/package.json
DELETE libs/core/graphql/package.json
DELETE libs/core/routing/package.json
DELETE libs/core/state/package.json
DELETE libs/core/state/testing/package.json
DELETE libs/core/testing/package.json
DELETE libs/driver/hubspot/package.json
DELETE libs/driver/magento/package.json
DELETE libs/driver/magento/testing/package.json
DELETE libs/design/accordion/examples/package.json
DELETE libs/design/article/examples/package.json
DELETE libs/design/button/examples/package.json
DELETE libs/design/callout/examples/package.json
DELETE libs/design/card/examples/package.json
DELETE libs/design/checkbox/examples/package.json
DELETE libs/design/container/examples/package.json
DELETE libs/design/hero/examples/package.json
DELETE libs/design/image/examples/package.json
DELETE libs/design/input/examples/package.json
DELETE libs/design/list/examples/package.json
DELETE libs/design/loading-icon/examples/package.json
DELETE libs/design/media-gallery/examples/package.json
DELETE libs/design/menu/examples/package.json
DELETE libs/design/modal/examples/package.json
DELETE libs/design/navbar/examples/package.json
DELETE libs/design/notification/package.json
DELETE libs/design/notification/examples/package.json
DELETE libs/design/paginator/examples/package.json
DELETE libs/design/quantity-field/examples/package.json
DELETE libs/design/radio/examples/package.json
DELETE libs/design/sidebar/examples/package.json
DELETE libs/design/tree/package.json
DELETE libs/design/tree/examples/package.json
DELETE libs/navigation/driver/package.json
DELETE libs/navigation/driver/in-memory/package.json
DELETE libs/navigation/driver/magento/package.json
DELETE libs/navigation/driver/testing/package.json
DELETE libs/navigation/state/package.json
DELETE libs/navigation/state/testing/package.json
DELETE libs/navigation/testing/package.json
DELETE libs/newsletter/driver/package.json
DELETE libs/newsletter/driver/hubspot/package.json
DELETE libs/newsletter/driver/in-memory/package.json
DELETE libs/newsletter/driver/testing/package.json
DELETE libs/newsletter/state/package.json
DELETE libs/newsletter/state/testing/package.json
DELETE libs/auth/driver/package.json
DELETE libs/auth/driver/in-memory/package.json
DELETE libs/auth/driver/magento/package.json
DELETE libs/auth/driver/testing/package.json
DELETE libs/auth/routing/package.json
DELETE libs/auth/state/package.json
DELETE libs/auth/state/testing/package.json
DELETE libs/auth/testing/package.json
DELETE libs/geography/driver/package.json
DELETE libs/geography/driver/in-memory/package.json
DELETE libs/geography/driver/magento/package.json
DELETE libs/geography/driver/testing/package.json
DELETE libs/geography/state/package.json
DELETE libs/geography/state/testing/package.json
DELETE libs/geography/testing/package.json
DELETE libs/paypal/driver/package.json
DELETE libs/paypal/driver/in-memory/package.json
DELETE libs/paypal/driver/magento/package.json
DELETE libs/paypal/driver/testing/package.json
DELETE libs/paypal/routing/package.json
DELETE libs/paypal/state/package.json
DELETE libs/paypal/state/testing/package.json
DELETE libs/paypal/testing/package.json
DELETE libs/order/driver/package.json
DELETE libs/order/driver/in-memory/package.json
DELETE libs/order/driver/magento/2.4.0/package.json
DELETE libs/order/driver/magento/2.4.1/package.json
DELETE libs/order/driver/magento/2.4.1/testing/package.json
DELETE libs/order/driver/testing/package.json
DELETE libs/order/routing/package.json
DELETE libs/order/state/package.json
DELETE libs/order/state/testing/package.json
DELETE libs/order/testing/package.json
DELETE libs/external-router/driver/package.json
DELETE libs/external-router/driver/in-memory/package.json
DELETE libs/external-router/driver/magento/package.json
DELETE libs/external-router/driver/magento/2.4.1/package.json
DELETE libs/external-router/driver/magento/2.4.2/package.json
DELETE libs/external-router/driver/magento/2.4.3/package.json
DELETE libs/external-router/driver/testing/package.json
DELETE libs/external-router/routing/package.json
DELETE libs/search/driver/package.json
DELETE libs/search/driver/federated/package.json
DELETE libs/search/driver/in-memory/package.json
DELETE libs/search/driver/testing/package.json
DELETE libs/search/routing/package.json
DELETE libs/search/state/package.json
DELETE libs/search/state/testing/package.json
DELETE libs/search/testing/package.json
DELETE libs/search-product/driver/package.json
DELETE libs/search-product/driver/in-memory/package.json
DELETE libs/search-product/driver/magento/package.json
DELETE libs/search-product/driver/testing/package.json
DELETE libs/search-product/routing/package.json
DELETE libs/search-product/state/package.json
DELETE libs/search-product/state/testing/package.json
DELETE libs/search-product/testing/package.json
DELETE libs/search-product-composite/state/package.json
DELETE libs/search-product-configurable/state/package.json
DELETE libs/search-category/driver/package.json
DELETE libs/search-category/driver/in-memory/package.json
DELETE libs/search-category/driver/magento/package.json
DELETE libs/search-category/driver/testing/package.json
DELETE libs/search-category/testing/package.json
DELETE libs/seo/state/package.json
DELETE libs/content/driver/package.json
DELETE libs/content/driver/magento/package.json
DELETE libs/content/driver/magento/testing/package.json
DELETE libs/content/driver/testing/package.json
DELETE libs/content/testing/package.json
DELETE libs/reviews/driver/package.json
DELETE libs/reviews/driver/in-memory/package.json
DELETE libs/reviews/driver/magento/package.json
DELETE libs/reviews/driver/magento/testing/package.json
DELETE libs/reviews/driver/testing/package.json
DELETE libs/reviews/state/package.json
DELETE libs/reviews/state/testing/package.json
DELETE libs/reviews/testing/package.json
DELETE libs/payment/driver/package.json
DELETE libs/payment/driver/in-memory/package.json
DELETE libs/payment/driver/testing/package.json
DELETE libs/payment/state/package.json
DELETE libs/payment/state/testing/package.json
DELETE libs/payment/testing/package.json
DELETE libs/customer/driver/package.json
DELETE libs/customer/driver/in-memory/package.json
DELETE libs/customer/driver/magento/package.json
DELETE libs/customer/driver/magento/testing/package.json
DELETE libs/customer/driver/testing/package.json
DELETE libs/customer/routing/package.json
DELETE libs/customer/state/package.json
DELETE libs/customer/state/testing/package.json
DELETE libs/customer/testing/package.json
DELETE libs/customer-auth/state/package.json
DELETE libs/customer-order/driver/package.json
DELETE libs/customer-order/driver/magento/package.json
DELETE libs/customer-order/driver/magento/testing/package.json
DELETE libs/customer-store-credit/driver/package.json
DELETE libs/customer-store-credit/driver/in-memory/package.json
DELETE libs/customer-store-credit/driver/magento/package.json
DELETE libs/customer-store-credit/driver/magento/testing/package.json
DELETE libs/customer-store-credit/driver/testing/package.json
DELETE libs/customer-store-credit/routing/package.json
DELETE libs/customer-store-credit/state/package.json
DELETE libs/customer-store-credit/state/testing/package.json
DELETE libs/customer-store-credit/testing/package.json
DELETE libs/cart-store-credit/driver/package.json
DELETE libs/cart-store-credit/driver/in-memory/package.json
DELETE libs/cart-store-credit/driver/magento/package.json
DELETE libs/cart-store-credit/driver/magento/testing/package.json
DELETE libs/cart-store-credit/driver/testing/package.json
DELETE libs/cart-store-credit/routing/package.json
DELETE libs/cart-store-credit/state/package.json
DELETE libs/cart-store-credit/state/testing/package.json
DELETE libs/cart-store-credit/testing/package.json
DELETE libs/customer-payment/driver/package.json
DELETE libs/customer-payment/driver/in-memory/package.json
DELETE libs/customer-payment/driver/testing/package.json
DELETE libs/customer-payment/routing/package.json
DELETE libs/customer-payment/state/package.json
DELETE libs/customer-payment/state/testing/package.json
DELETE libs/customer-payment/testing/package.json
DELETE libs/customer-payment-authorizenet/driver/package.json
DELETE libs/customer-payment-authorizenet/driver/magento/package.json
DELETE libs/customer-payment-authorizenet/driver/magento/testing/package.json
DELETE libs/customer-payment-authorizenet/state/package.json
DELETE libs/customer-payment-authorizenet/testing/package.json
  Migration completed.

▸ Update TypeScript compilation target to 'ES2020'.
UPDATE tsconfig.json (572 bytes)
UPDATE libs/theme-switch/tsconfig.lib.json (754 bytes)
  Migration completed.

** Executing migrations of package '@angular/cdk' **

▸ Updates the Angular CDK to v14.
    Skipping migration for project demo-e2e. Unable to determine 'tsconfig.json' file in workspace config.
    Skipping migration for project daffio-e2e. Unable to determine 'tsconfig.json' file in workspace config.
    Skipping migration for project design-land-e2e. Unable to determine 'tsconfig.json' file in workspace config.

      ✓  Updated Angular CDK to version 14

  Migration completed.

** Executing migrations of package '@angular/core' **

▸ As of Angular version 13, `entryComponents` are no longer necessary.
UPDATE apps/demo/src/app/cart/components/add-to-cart-notification/components/add-to-cart-notification/add-to-cart-notification.module.ts (1008 bytes)
UPDATE libs/design/src/atoms/image/image.module.ts (344 bytes)
UPDATE libs/design/src/molecules/backdrop/backdrop.module.ts (368 bytes)
UPDATE libs/design/article/examples/src/article-examples.module.ts (374 bytes)
UPDATE libs/design/list/examples/src/list-examples.module.ts (598 bytes)
UPDATE libs/design/paginator/examples/src/paginator-examples.module.ts (384 bytes)
UPDATE libs/design/src/molecules/modal/modal/spec/dynamic-content.spec.ts (1710 bytes)
UPDATE libs/design/src/molecules/modal/service/modal.service.spec.ts (2935 bytes)
UPDATE libs/design/src/molecules/modal/service/spec/multiple-modal.spec.ts (2550 bytes)
  Migration completed.

▸ In Angular version 14, the `pathMatch` property of `Routes` was updated to be a strict union of the two valid options: `'full'|'prefix'`.
  `Routes` and `Route` variables need an explicit type so TypeScript does not infer the property as the looser `string`.
  Migration completed.

▸ As of Angular version 14, Forms model classes accept a type parameter, and existing usages must be opted out to preserve backwards-compatibility.
UPDATE apps/demo/src/app/checkout/components/forms/address-form/components/address-form/address-form.component.ts (600 bytes)
UPDATE apps/demo/src/app/checkout/components/payment/payment-info-form/components/payment-info-form/payment-info-form.component.ts (1225 bytes)
UPDATE apps/demo/src/app/checkout/components/forms/address-form/factories/address-form.factory.ts (816 bytes)
UPDATE apps/demo/src/app/checkout/components/payment/payment-info-form/factories/payment-info-form.factory.ts (745 bytes)
UPDATE apps/demo/src/app/checkout/components/payment/payment-form/payment-form.component.ts (2150 bytes)
UPDATE apps/demo/src/app/checkout/components/shipping/shipping-options/components/shipping-options/shipping-options.component.ts (1139 bytes)
UPDATE apps/demo/src/app/checkout/components/shipping/shipping-options/components/factories/shipping-option-form.factory.ts (384 bytes)
UPDATE apps/demo/src/app/checkout/components/shipping/shipping-options/components/services/shipping-option-form.service.ts (572 bytes)
UPDATE apps/demo/src/app/checkout/components/shipping/shipping-form/shipping-form.component.ts (1325 bytes)
UPDATE apps/demo/src/app/newsletter/newsletter.component.ts (1551 bytes)
UPDATE libs/design/src/atoms/form/core/error-state-matcher/error-state-matcher.ts (242 bytes)
UPDATE libs/design/src/atoms/form/checkbox-set/checkbox-set.component.ts (1203 bytes)
UPDATE libs/design/src/atoms/form/quantity-field/quantity-input/quantity-input.component.ts (2720 bytes)
UPDATE libs/design/callout/examples/src/callout-text-alignment/callout-text-alignment.component.ts (791 bytes)
UPDATE libs/design/callout/examples/src/callout-theming/callout-theming.component.ts (956 bytes)
UPDATE libs/design/card/examples/src/card-orientation/card-orientation.component.ts (756 bytes)
UPDATE libs/design/card/examples/src/card-theming/card-theming.component.ts (876 bytes)
UPDATE libs/design/card/examples/src/linkable-card/linkable-card.component.ts (1011 bytes)
UPDATE libs/design/card/examples/src/raised-card/raised-card.component.ts (855 bytes)
UPDATE libs/design/card/examples/src/stroked-card/stroked-card.component.ts (859 bytes)
UPDATE libs/design/checkbox/examples/src/basic-checkbox/basic-checkbox.component.ts (634 bytes)
UPDATE libs/design/checkbox/examples/src/checkbox-set/checkbox-set.component.ts (885 bytes)
UPDATE libs/design/container/examples/src/container-sizes/container-sizes.component.ts (666 bytes)
UPDATE libs/design/hero/examples/src/hero-text-alignment/hero-text-alignment.component.ts (779 bytes)
UPDATE libs/design/hero/examples/src/hero-theming/hero-theming.component.ts (655 bytes)
UPDATE libs/design/input/examples/src/input-error/input-error.component.ts (517 bytes)
UPDATE libs/design/loading-icon/examples/src/loading-icon-color/loading-icon-color.component.ts (503 bytes)
UPDATE libs/design/navbar/examples/src/navbar-theming/navbar-theming.component.ts (867 bytes)
UPDATE libs/design/notification/examples/src/notification-orientations/notification-orientations.component.ts (735 bytes)
UPDATE libs/design/notification/examples/src/notification-status/notification-status.component.ts (705 bytes)
UPDATE libs/design/quantity-field/examples/src/basic-quantity-field/basic-quantity-field.component.ts (491 bytes)
UPDATE libs/design/quantity-field/examples/src/custom-range-quantity-field/custom-range-quantity-field.component.ts (518 bytes)
UPDATE libs/design/quantity-field/examples/src/disabled-quantity-field/disabled-quantity-field.component.ts (534 bytes)
UPDATE libs/design/quantity-field/examples/src/select-max-quantity-field/select-max-quantity-field.component.ts (510 bytes)
UPDATE libs/design/radio/examples/src/basic-radio/basic-radio.component.ts (550 bytes)
UPDATE apps/design-land/src/app/form/form.component.ts (525 bytes)
UPDATE libs/forms/src/validators/not-empty.ts (647 bytes)
UPDATE apps/demo/src/app/checkout/components/forms/address-form/components/address-form/address-form.component.spec.ts (3322 bytes)
UPDATE apps/demo/src/app/checkout/components/forms/address-form/factories/address-form.factory.spec.ts (1748 bytes)
UPDATE apps/demo/src/app/checkout/components/payment/payment-form/payment-form.component.spec.ts (12543 bytes)
UPDATE apps/demo/src/app/checkout/components/payment/payment-info-form/components/payment-info-form/payment-info-form.component.spec.ts (3790 bytes)
UPDATE apps/demo/src/app/checkout/components/payment/payment-info-form/factories/payment-info-form.factory.spec.ts (1774 bytes)
UPDATE apps/demo/src/app/checkout/components/shipping/shipping-form/shipping-form.component.spec.ts (7205 bytes)
UPDATE apps/demo/src/app/checkout/components/shipping/shipping-options/components/factories/shipping-option-form.factory.spec.ts (1025 bytes)
UPDATE apps/demo/src/app/checkout/components/shipping/shipping-options/components/shipping-options/shipping-options.component.spec.ts (4575 bytes)
UPDATE libs/design/src/atoms/form/checkbox/cva/checkbox-cva.directive.spec.ts (2857 bytes)
UPDATE libs/design/src/atoms/form/checkbox-set/checkbox-set.component.spec.ts (2353 bytes)
UPDATE libs/design/src/atoms/form/core/error-state-matcher/error-state-matcher.spec.ts (1385 bytes)
UPDATE libs/design/src/atoms/form/form-field/form-field/form-field.component.spec.ts (4986 bytes)
UPDATE libs/design/src/atoms/form/input/input.component.spec.ts (2185 bytes)
UPDATE libs/design/src/atoms/form/native-select/native-select.component.spec.ts (2951 bytes)
UPDATE libs/design/src/atoms/form/quantity-field/quantity-field.component.spec.ts (4569 bytes)
UPDATE libs/design/src/atoms/form/quantity-field/quantity-input/quantity-input.component.spec.ts (3883 bytes)
UPDATE libs/design/src/atoms/form/quantity-field/quantity-select/quantity-select.component.spec.ts (3559 bytes)
UPDATE libs/design/src/atoms/form/radio/cva/radio-cva.directive.spec.ts (2594 bytes)
UPDATE libs/design/src/atoms/form/radio/specs/radio-with-set.spec.ts (2112 bytes)
UPDATE libs/design/src/atoms/form/radio/specs/radio.cva.spec.ts (2131 bytes)
UPDATE libs/design/src/atoms/form/radio-set/radio-set.component.spec.ts (2004 bytes)
UPDATE libs/forms/src/validators/not-empty.integration.spec.ts (2497 bytes)
UPDATE libs/forms/src/validators/not-empty.unit.spec.ts (2128 bytes)
UPDATE libs/forms/src/validators/password.spec.ts (5786 bytes)
  Migration completed.

** Executing migrations of package '@ngrx/router-store' **

▸ The road to v14.
UPDATE apps/daffio/src/app/app.module.ts (1845 bytes)
UPDATE apps/daffio/src/app/core/sidebar/effects/sidebar-routing-mode.effect.spec.ts (3688 bytes)
  Migration completed.

* chore: upgrade typescript to `4.7.2`

* build: update production flag in build command

* chore: fix enum const breaking changes

* fix(daffio): fix `initialNavigation` breaking change

* chore: upgrade `@nguniversal/express-engine` to v14

* chore: upgrade `angular-in-memory-web-api` to 0.14

* chore: upgrade `@types/node` to 16.18.48

* fix: add `type` to navigation event

* test: ensure percentage is not nully

* feat: replace package name periods with hyphens

* chore: upgrade `apollo-angular` to v4

* chore: upgrade eslint plugins

* style: fix linting

* feat!: upgrade to Angular v15

BREAKING CHANGE: Angular and associated deps have been upgraded to v15. TS has been upgraded to 4.8.

ng update @angular/{pwa,core,cdk,cli,animations,common,compiler,elements,forms,platform-browser,platform-browser-dynamic,platform-server,router,service-worker,compiler-cli,language-service}@15.0.0 @nguniversal/{builders,express-engine}@15.0.0 @angular-devkit/{schematics,build-angular,core}@15.0.0 @angular-eslint/{builder,eslint-plugin,eslint-plugin-template,schematics,template-parser}@15.0.0 @ngrx/{effects,entity,router-store,schematics,store,store-devtools}@15.0.0 [email protected] @angular-devkit/[email protected] [email protected] [email protected] [email protected] --force
The installed Angular CLI version is outdated.
Installing a temporary Angular CLI versioned 15.2.9 to perform the update.
✔ Packages successfully installed.
Using package manager: npm
Collecting installed dependencies...
Found 107 dependencies.
Fetching dependency metadata from registry...
                  Package "@ngrx/schematics" has an incompatible peer dependency to "@angular-devkit/schematics" (requires "14.2.9", would install "15.0.0").
                  Package "@ngrx/schematics" has an incompatible peer dependency to "@angular-devkit/schematics" (requires "14.2.9", would install "15.0.0")
    Updating package.json with dependency @angular-devkit/architect @ "0.1502.0" (was "0.1402.12")...
    Updating package.json with dependency @angular-devkit/build-angular @ "15.0.0" (was "14.2.12")...
    Updating package.json with dependency @angular-devkit/core @ "15.0.0" (was "14.2.12")...
    Updating package.json with dependency @angular-devkit/schematics @ "15.0.0" (was "14.2.12")...
    Updating package.json with dependency @angular-eslint/builder @ "15.0.0" (was "14.4.0")...
    Updating package.json with dependency @angular-eslint/eslint-plugin @ "15.0.0" (was "14.4.0")...
    Updating package.json with dependency @angular-eslint/eslint-plugin-template @ "15.0.0" (was "14.4.0")...
    Updating package.json with dependency @angular-eslint/schematics @ "15.0.0" (was "14.4.0")...
    Updating package.json with dependency @angular-eslint/template-parser @ "15.0.0" (was "14.4.0")...
    Updating package.json with dependency @angular/cli @ "15.0.0" (was "14.2.12")...
    Updating package.json with dependency @angular/compiler-cli @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/language-service @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @ngrx/store-devtools @ "15.0.0" (was "14.3.3")...
    Updating package.json with dependency @nguniversal/builders @ "15.0.0" (was "14.2.3")...
    Updating package.json with dependency ng-packagr @ "15.0.0" (was "14.2.2")...
    Updating package.json with dependency typescript @ "4.8.4" (was "4.7.4")...
    Updating package.json with dependency @angular/animations @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/cdk @ "15.0.0" (was "14.2.7")...
    Updating package.json with dependency @angular/common @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/compiler @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/core @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/elements @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/forms @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/platform-browser @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/platform-browser-dynamic @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/platform-server @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/pwa @ "15.0.0" (was "14.2.12")...
    Updating package.json with dependency @angular/router @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @angular/service-worker @ "15.0.0" (was "14.3.0")...
    Updating package.json with dependency @ngrx/effects @ "15.0.0" (was "14.3.3")...
    Updating package.json with dependency @ngrx/entity @ "15.0.0" (was "14.3.3")...
    Updating package.json with dependency @ngrx/router-store @ "15.0.0" (was "14.3.3")...
    Updating package.json with dependency @ngrx/schematics @ "15.0.0" (was "14.3.3")...
    Updating package.json with dependency @ngrx/store @ "15.0.0" (was "14.3.3")...
    Updating package.json with dependency @nguniversal/express-engine @ "15.0.0" (was "14.2.3")...
    Updating package.json with dependency angular-in-memory-web-api @ "0.15.0" (was "0.14.0")...
    Updating package.json with dependency apollo-angular @ "5.0.0" (was "4.2.1")...
UPDATE package.json (4269 bytes)
✔ Packages successfully installed.
** Executing migrations of package '@angular-eslint/schematics' **

▸ Updates @angular-eslint to v15.
UPDATE package.json (4270 bytes)
UPDATE angular.json (72033 bytes)
✔ Packages installed successfully.
  Migration completed (2 files modified).

** Executing migrations of package '@angular/cli' **

▸ Remove Browserslist configuration files that matches the Angular CLI default configuration.
DELETE libs/analytics/.browserslistrc
DELETE libs/analytics-provider-data-layer/.browserslistrc
DELETE libs/forms/.browserslistrc
  Migration completed (3 files modified).

▸ Remove exported `@angular/platform-server` `renderModule` method.
  The `renderModule` method is now exported by the Angular CLI.
  Migration completed (No changes made).

▸ Remove no longer needed require calls in Karma builder main file.
UPDATE libs/analytics/test.ts (591 bytes)
UPDATE libs/analytics-provider-data-layer/test.ts (591 bytes)
UPDATE apps/demo/src/test.ts (516 bytes)
UPDATE libs/authorizenet/test.ts (591 bytes)
UPDATE libs/product/test.ts (644 bytes)
UPDATE libs/related-products/test.ts (591 bytes)
UPDATE libs/upsell-products/test.ts (611 bytes)
UPDATE libs/product-configurable/test.ts (611 bytes)
UPDATE libs/product-composite/test.ts (611 bytes)
UPDATE libs/cart/test.ts (591 bytes)
UPDATE libs/cart-customer/test.ts (591 bytes)
UPDATE libs/category/test.ts (591 bytes)
UPDATE libs/checkout/test.ts (591 bytes)
UPDATE libs/core/test.ts (643 bytes)
UPDATE libs/driver/test.ts (591 bytes)
UPDATE libs/design/test.ts (590 bytes)
UPDATE apps/daffio/src/test.ts (516 bytes)
UPDATE apps/design-land/src/test.ts (516 bytes)
UPDATE libs/branding/src/test.ts (590 bytes)
UPDATE libs/theme-switch/src/test.ts (590 bytes)
UPDATE libs/navigation/test.ts (591 bytes)
UPDATE libs/newsletter/test.ts (591 bytes)
UPDATE libs/contact/test.ts (590 bytes)
UPDATE libs/auth/test.ts (591 bytes)
UPDATE libs/geography/test.ts (590 bytes)
UPDATE libs/paypal/test.ts (591 bytes)
UPDATE libs/order/test.ts (590 bytes)
UPDATE libs/external-router/test.ts (590 bytes)
UPDATE libs/search/test.ts (610 bytes)
UPDATE libs/search-product/test.ts (611 bytes)
UPDATE libs/search-product-composite/test.ts (611 bytes)
UPDATE libs/search-product-configurable/test.ts (611 bytes)
UPDATE libs/search-category/test.ts (611 bytes)
UPDATE libs/seo/test.ts (590 bytes)
UPDATE libs/content/test.ts (590 bytes)
UPDATE libs/reviews/test.ts (591 bytes)
UPDATE libs/payment/test.ts (610 bytes)
UPDATE libs/forms/test.ts (591 bytes)
UPDATE libs/customer/test.ts (610 bytes)
UPDATE libs/customer-auth/test.ts (591 bytes)
UPDATE libs/customer-order/test.ts (610 bytes)
UPDATE libs/customer-store-credit/test.ts (610 bytes)
UPDATE libs/cart-store-credit/test.ts (610 bytes)
UPDATE libs/customer-payment/test.ts (610 bytes)
UPDATE libs/customer-payment-authorizenet/test.ts (610 bytes)
  Migration completed (45 files modified).

▸ Update TypeScript compiler `target` and set `useDefineForClassFields`.
  These changes are for IDE purposes as TypeScript compiler options `target` and `useDefineForClassFields` are set to `ES2022` and `false` respectively by the Angular CLI.
  To control ECMA version and features use the Browerslist configuration.
UPDATE tsconfig.json (610 bytes)
UPDATE libs/theme-switch/tsconfig.lib.json (730 bytes)
  Migration completed (2 files modified).

▸ Remove options from 'angular.json' that are no longer supported by the official builders.
  Migration completed (No changes made).

** Executing migrations of package '@angular/cdk' **

▸ Updates the Angular CDK to v15.
    Skipping migration for project demo-e2e. Unable to determine 'tsconfig.json' file in workspace config.
    Skipping migration for project daffio-e2e. Unable to determine 'tsconfig.json' file in workspace config.
    Skipping migration for project design-land-e2e. Unable to determine 'tsconfig.json' file in workspace config.

      ✓  Updated Angular CDK to version 15

  Migration completed (No changes made).

** Executing migrations of package '@angular/core' **

▸ In Angular version 15, the deprecated `relativeLinkResolution` config parameter of the Router is removed.
  This migration removes all `relativeLinkResolution` fields from the Router config objects.
UPDATE apps/demo/src/app/app-routing.module.ts (1764 bytes)
UPDATE apps/daffio/src/app/app-routing.module.ts (1450 bytes)
UPDATE apps/design-land/src/app/app-routing.module.ts (4033 bytes)
UPDATE libs/seo/integration-tests/state/provided-canonical-updates.spec.ts (5935 bytes)
  Migration completed (4 files modified).

▸ Since Angular v15, the `RouterLink` contains the logic of the `RouterLinkWithHref` directive.
  This migration replaces all `RouterLinkWithHref` references with `RouterLink`.
  Migration completed (No changes made).

** Executing migrations of package '@ngrx/effects' **

▸ The road to v15 beta.
  Migration completed (No changes made).

* chore(product-composite): remove unused imports

* build: remove `enableIvy`

* style: fix linting

* build: fix `sourceRoot`

* fix(design): circular ref in nav accordion item content children

* fix: import newlines module broken with new angular eslint
  • Loading branch information
griest024 committed Oct 18, 2023
1 parent dca9b9b commit 0742b01
Show file tree
Hide file tree
Showing 1,161 changed files with 12,087 additions and 15,811 deletions.
100 changes: 52 additions & 48 deletions angular.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/daffio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"scripts": {
"build": "npm run build:client && npm run build:server && npm run build:serverless",
"build:client": "ng build daffio --prod",
"build:client": "ng build daffio --configuration production",
"build:server": "ng run daffio:server:production",
"build:serverless": "npm run build:serverless:compile && npm run build:serverless:vercel",
"build:serverless:compile": "webpack-cli --config serverless/webpack.serverless.config.js",
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/api/api-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import {
RouterModule,
} from '@angular/router';

import { DocsResolver } from '../docs/resolvers/docs-resolver.service';
import { DaffioApiListPageComponent } from './pages/api-list-page/api-list-page.component';
import { DaffioApiPageComponent } from './pages/api-page/api-page.component';
import { DaffioApiListResolver } from './resolvers/api-list-resolver.service';
import { DocsResolver } from '../docs/resolvers/docs-resolver.service';

export const apiRoutes: Routes = [
{
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/api/api.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import {
DaffContainerModule,
} from '@daffodil/design';

import { DaffioDocViewerModule } from '../docs/components/doc-viewer/doc-viewer.module';
import { DaffioDocsApiRoutingModule } from './api-routing.module';
import { DaffioApiListModule } from './components/api-list/api-list.module';
import { DaffioApiListPageComponent } from './pages/api-list-page/api-list-page.component';
import { DaffioApiPageComponent } from './pages/api-page/api-page.component';
import { DaffioDocViewerModule } from '../docs/components/doc-viewer/doc-viewer.module';

@NgModule({
imports: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { RouterTestingModule } from '@angular/router/testing';

import { DaffContainerModule } from '@daffodil/design';

import { DaffioApiReference } from '../../models/api-reference';
import { DaffioApiListComponent } from './api-list.component';
import { DaffioApiReference } from '../../models/api-reference';

@Component({ template: '<daffio-api-list [apiList]="apiListValue"></daffio-api-list>' })
class WrapperComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import { RouterTestingModule } from '@angular/router/testing';
import { cold } from 'jasmine-marbles';
import { BehaviorSubject } from 'rxjs';

import { DaffioApiListPageComponent } from './api-list-page.component';
import { DaffioApiListComponent } from '../../components/api-list/api-list.component';
import { DaffioApiReference } from '../../models/api-reference';
import { DaffioApiListPageComponent } from './api-list-page.component';

@Injectable({ providedIn: 'root' })
class ActivatedRouteStub {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import { RouterTestingModule } from '@angular/router/testing';
import { cold } from 'jasmine-marbles';
import { BehaviorSubject } from 'rxjs';

import { DaffioApiPageComponent } from './api-page.component';
import { DaffioDoc } from '../../../docs/models/doc';
import { DaffioDocsFactory } from '../../../docs/testing/factories/docs.factory';
import { DaffioApiPageComponent } from './api-page.component';

@Component({ selector: 'daffio-doc-viewer', template: '' })
class MockDaffioDocViewerComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import {
throwError,
} from 'rxjs';

import { DaffioApiListResolver } from './api-list-resolver.service';
import { DaffioApiReference } from '../models/api-reference';
import { DaffioApiServiceInterface } from '../services/api-service.interface';
import { DaffioApiService } from '../services/api.service';
import { DaffioApiListResolver } from './api-list-resolver.service';

describe('DaffioApiListResolver', () => {
let resolver: DaffioApiListResolver;
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/api/services/api.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import {
} from '@angular/core';
import { Observable } from 'rxjs';

import { DaffioApiServiceInterface } from './api-service.interface';
import { DAFFIO_DOCS_PATH_TOKEN } from '../../docs/services/docs-path.token';
import { DaffioApiReference } from '../models/api-reference';
import { DaffioApiServiceInterface } from './api-service.interface';

@Injectable({ providedIn: 'root' })
export class DaffioApiService implements DaffioApiServiceInterface {
Expand Down
3 changes: 1 addition & 2 deletions apps/daffio/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ export const appRoutes: Routes = [
@NgModule({
imports: [
RouterModule.forRoot(appRoutes, {
initialNavigation: 'enabled',
initialNavigation: 'enabledBlocking',
scrollPositionRestoration: 'enabled',
anchorScrolling: 'enabled',
//this ensures that clicking on the same fragment route a second time will scroll to the associated id.
onSameUrlNavigation: 'reload',
relativeLinkResolution: 'legacy',
}),
],
exports: [
Expand Down
6 changes: 3 additions & 3 deletions apps/daffio/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import { ServiceWorkerModule } from '@angular/service-worker';
import { EffectsModule } from '@ngrx/effects';
import {
StoreRouterConnectingModule,
DefaultRouterStateSerializer,
FullRouterStateSerializer,
} from '@ngrx/router-store';
import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';

import { DAFF_THEME_INITIALIZER } from '@daffodil/design';

import { environment } from '../environments/environment';
import { AppRoutingModule } from './app-routing.module';
import { DaffioAppComponent } from './app.component';
import { TemplateModule } from './core/template/template.module';
import { environment } from '../environments/environment';

@NgModule({
imports: [
Expand All @@ -30,7 +30,7 @@ import { TemplateModule } from './core/template/template.module';
AppRoutingModule,

//Make sure this loads after Router and Store
StoreRouterConnectingModule.forRoot({ serializer: DefaultRouterStateSerializer,
StoreRouterConnectingModule.forRoot({ serializer: FullRouterStateSerializer,
/*
They stateKey defines the name of the state used by the router-store reducer.
This matches the key defined in the map of reducers
Expand Down
4 changes: 2 additions & 2 deletions apps/daffio/src/app/content/home/home.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';

import { TemplateModule } from '../../core/template/template.module';
import { IphoneModule } from '../../design/device/iphone/iphone.module';
import { DaffioHomeRoutingModule } from './home-routing.module';
import { DaffioHomeViewModule } from './view/home-view.module';
import { TemplateModule } from '../../core/template/template.module';
import { IphoneModule } from '../../design/device/iphone/iphone.module';

@NgModule({
imports: [
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/content/home/view/home-view.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';

import { DaffioHomeViewComponent } from './home-view.component';
import { DaffioHomeCalloutPlatformsComponentModule } from '../components/home-callout-platforms/home-callout-platforms.module';
import { DaffioHomeCalloutPwaComponentModule } from '../components/home-callout-pwa/home-callout-pwa.module';
import { DaffioHomeHeroComponentModule } from '../components/home-hero/home-hero.module';
import { DaffioHomeViewComponent } from './home-view.component';

@NgModule({
imports: [
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/content/not-found/not-found.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
DaffButtonModule,
} from '@daffodil/design';

import { TemplateModule } from '../../core/template/template.module';
import { DaffioNotFoundComponent } from './component/not-found.component';
import { DaffioNotFoundRoutingModule } from './not-found-routing.module';
import { TemplateModule } from '../../core/template/template.module';


@NgModule({
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/content/support/support.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
DaffButtonModule,
} from '@daffodil/design';

import { TemplateModule } from '../../core/template/template.module';
import { DaffioSupportComponent } from './component/support.component';
import { DaffioSupportRoutingModule } from './support-routing.module';
import { TemplateModule } from '../../core/template/template.module';


@NgModule({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
DaffListModule,
} from '@daffodil/design';

import { DaffioFeatureComparisonModule } from '../feature-comparison/feature-comparison.module';
import { DaffioWhyPwaSolutionComponent } from './why-pwa-solution.component';
import { DaffioFeatureComparisonModule } from '../feature-comparison/feature-comparison.module';

@NgModule({
imports: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';

import { DaffioWhyPwaViewComponent } from './why-pwa-view.component';
import { DaffioWhyPwaExamplesComponentModule } from '../components/why-pwa-examples/why-pwa-examples.module';
import { DaffioWhyPwaHeroComponentModule } from '../components/why-pwa-hero/why-pwa-hero.module';
import { DaffioWhyPwaOverviewComponentModule } from '../components/why-pwa-overview/why-pwa-overview.module';
import { DaffioWhyPwaSolutionComponentModule } from '../components/why-pwa-solution/why-pwa-solution.module';
import { DaffioWhyPwaStatsComponentModule } from '../components/why-pwa-stats/why-pwa-stats.module';
import { DaffioWhyPwaViewComponent } from './why-pwa-view.component';

@NgModule({
imports: [
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/content/why-pwa/why-pwa.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';

import { TemplateModule } from '../../core/template/template.module';
import { DaffioWhyPwaViewModule } from './view/why-pwa-view.modules';
import { DaffioWhyPwaRoutingModule } from './why-pwa-routing.module';
import { TemplateModule } from '../../core/template/template.module';

@NgModule({
imports: [
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/core/footer/footer.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import {
DaffInputModule,
} from '@daffodil/design';

import { DaffioNewsletterModule } from '../../newsletter/newsletter.module';
import { DaffioSimpleFooterComponent } from './simple-footer/simple-footer.component';
import { DaffioSubFooterComponent } from './sub-footer/sub-footer.component';
import { DaffioNewsletterModule } from '../../newsletter/newsletter.module';



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
DaffContainerModule,
} from '@daffodil/design';

import { DaffioHeaderItemDirective } from './header-item/header-item.directive';
import { DaffioHeaderComponent } from './header/header.component';
import { DaffioHeaderItemDirective } from './header-item/header-item.directive';

@NgModule({
imports: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import {
Store,
} from '@ngrx/store';

import { DaffioHeaderContainer } from './header.component';
import { ToggleSidebar } from '../../sidebar/actions/sidebar.actions';
import * as fromSidebar from '../../sidebar/reducers/index';
import { DaffioHeaderContainer } from './header.component';

@Component({ template: '<daffio-header-container></daffio-header-container>' })
class WrapperComponent {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { DaffLogoModule } from '@daffodil/branding';
import { DaffButtonModule } from '@daffodil/design';
import { DaffThemeSwitchButtonModule } from '@daffodil/theme-switch';

import { DaffioHeaderComponentModule } from '../components/header.module';
import { DaffioHeaderContainer } from './header.component';
import { DaffioHeaderComponentModule } from '../components/header.module';

@NgModule({
imports: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import {
DaffSidebarComponent,
} from '@daffodil/design';

import { DaffioSidebarViewportContainer } from './sidebar-viewport.component';
import {
OpenSidebar,
CloseSidebar,
SetSidebarState,
} from '../../actions/sidebar.actions';
import * as fromSidebar from '../../reducers/index';
import { DaffioSidebarViewportContainer } from './sidebar-viewport.component';

describe('DaffioSidebarViewportContainer', () => {
let component: DaffioSidebarViewportContainer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,26 @@ import {
RouterStateSnapshot,
ActivatedRoute,
ActivatedRouteSnapshot,
EventType,
} from '@angular/router';
import { provideMockActions } from '@ngrx/effects/testing';
import {
ROUTER_NAVIGATED,
RouterNavigatedAction,
DefaultRouterStateSerializer,
FullRouterStateSerializer,
} from '@ngrx/router-store';
import {
hot,
cold,
} from 'jasmine-marbles';
import { Observable } from 'rxjs';

import { DaffioSidebarRoutingModeEffects } from './sidebar-routing-mode.effects';
import {
ResetMode,
SetSidebarMode,
SetSidebarState,
} from '../actions/sidebar.actions';
import { DaffioSidebarRoutingModeEffects } from './sidebar-routing-mode.effects';

const configureStubNavigationAction = (snapshot: any): RouterNavigatedAction => ({
type: ROUTER_NAVIGATED,
Expand All @@ -35,6 +36,7 @@ const configureStubNavigationAction = (snapshot: any): RouterNavigatedAction =>
root: <ActivatedRouteSnapshot><unknown>snapshot,
},
event: {
type: EventType.NavigationEnd,
id: 12,
url: '',
urlAfterRedirects: '',
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/core/sidebar/sidebar.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
DaffButtonModule,
} from '@daffodil/design';

import { DaffioGuidesNavModule } from '../../guides/components/guides-nav/guides-nav.module';
import { DaffioSidebarViewportContainer } from './containers/sidebar-viewport/sidebar-viewport.component';
import { DaffioSidebarStateModule } from './sidebar.state.module';
import { DaffioGuidesNavModule } from '../../guides/components/guides-nav/guides-nav.module';

@NgModule({
imports: [
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/core/template/template.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';


import { TemplateComponent } from './template.component';
import { DaffioFooterModule } from '../footer/footer.module';
import { DaffioHeaderModule } from '../header/containers/header.module';
import { DaffioSidebarModule } from '../sidebar/sidebar.module';
import { TemplateComponent } from './template.component';

@NgModule({
imports: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { RouterTestingModule } from '@angular/router/testing';

import { DaffArticleModule } from '@daffodil/design';

import { DaffioDocViewerComponent } from './doc-viewer.component';
import { DaffioDoc } from '../../models/doc';
import { DaffioDocsFactory } from '../../testing/factories/docs.factory';
import { DaffioDocsTableOfContentsModule } from '../table-of-contents/table-of-contents.module';
import { DaffioDocViewerComponent } from './doc-viewer.component';

@Component({
template: `<daffio-doc-viewer [doc]="doc"></daffio-doc-viewer>`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core';

import { DaffArticleModule } from '@daffodil/design';

import { DaffioDocsTableOfContentsModule } from '../table-of-contents/table-of-contents.module';
import { DaffioDocViewerComponent } from './doc-viewer.component';
import { DaffioDocsTableOfContentsModule } from '../table-of-contents/table-of-contents.module';

@NgModule({
declarations: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import { RouterTestingModule } from '@angular/router/testing';

import { DaffLinkSetModule } from '@daffodil/design';

import { DaffioDocsTableOfContentsComponent } from './table-of-contents.component';
import { DaffioDoc } from '../../models/doc';
import { DaffioDocsFactory } from '../../testing/factories/docs.factory';
import { DaffioDocsTableOfContentsComponent } from './table-of-contents.component';

describe('DaffioDocsTableOfContentsComponent', () => {
let component: DaffioDocsTableOfContentsComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import {
throwError,
} from 'rxjs';

import { DocsResolver } from './docs-resolver.service';
import { DaffioDoc } from '../models/doc';
import { DaffioGuideList } from '../models/guide-list';
import { DaffioDocsServiceInterface } from '../services/docs-service.interface';
import { DaffioDocsService } from '../services/docs.service';
import { DaffioDocsFactory } from '../testing/factories/docs.factory';
import { DocsResolver } from './docs-resolver.service';

describe('DocsResolver', () => {
let resolver: DocsResolver<DaffioDoc, DaffioGuideList>;
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/docs/services/docs.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import {
} from '@angular/common/http/testing';
import { TestBed } from '@angular/core/testing';

import { DaffioDocsService } from './docs.service';
import { DaffioDoc } from '../models/doc';
import { DaffioGuideList } from '../models/guide-list';
import { DaffioDocsFactory } from '../testing/factories/docs.factory';
import { mockGuides } from '../testing/factories/guide-list.factory';
import { DaffioDocsService } from './docs.service';

describe('DaffioDocsService', () => {
let service: DaffioDocsService<DaffioDoc, DaffioGuideList>;
Expand Down
Loading

0 comments on commit 0742b01

Please sign in to comment.