Skip to content

Commit

Permalink
deps: Angular 13.0.2 update + dependencies updates + configuration ad…
Browse files Browse the repository at this point in the history
…aptions

* Angular:
   - use 'es2015' as target for tests as well
   - adapt jest.config to use necessary modules
   - Angular build cache should not be included in git, docker or prettier (https://blog.angular.io/angular-v13-is-now-available-cce66f7bc296)
   - remove codelyzer dependency (obsolete without tslint)

BREAKING CHANGE: Angular 13 and dependecies update (see [Migrations / 1.4 to 2.0](https://github.com/intershop/intershop-pwa/blob/develop/docs/guides/migrations.md#14-to-20) for more details).
  • Loading branch information
Eisie96 committed Feb 1, 2022
1 parent 81341ce commit 6f68e77
Show file tree
Hide file tree
Showing 11 changed files with 10,643 additions and 10,575 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
/.nb-gradle
/nbproject/
/.nvmrc
/.angular/cache
**/*.log
/src/environments/environment.local.ts
/src/environments/environment.development.ts
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ node_modules
/.nvmrc

# misc
/.angular/cache
*.log
/src/environments/environment.local.ts
/src/environments/environment.development.ts
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Dockerfile*
.browserslistrc
node_modules
/cache
/.angular/cache
/dist/**/browser/**
/dist/**/server/**
/out-tsc
Expand Down
1 change: 0 additions & 1 deletion .vscode/intershop.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ ISREST

Angular
Angular's
Codelyzer
NgUniversal
Mockito
PWA's
Expand Down
9 changes: 9 additions & 0 deletions docs/guides/migrations.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ The ICM channel preference 'basket.maxItemQuantity' is included to validate the
You find this preference as 'Maximum Quantity per Product in Cart' under the Application Settings -> Shopping Cart & Checkout.
The default value is 100.

The Intershop PWA 2.0 release includes the Angular 13 update and updates to a lot of other dependencies (NgRx, RxJS, Formly, Swiper).
These dependencies updates require many necessary code adaptions that are included in additional commits.
The following official guides might help to migrate custom code as well:

- https://update.angular.io/?l=3&v=12.0-13.0
- https://ngrx.io/guide/migration/v13
- https://github.com/ngx-formly/ngx-formly/blob/v6.0.0-next.7/UPGRADE-6.0.md
- https://swiperjs.com/migration-guide

## 1.1 to 1.2

The `dist` folder now only contains results of the build process (except for `healthcheck.js`).
Expand Down
9 changes: 1 addition & 8 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
const esModules = [
'jest-test',
'@ngrx',
'ngx-bootstrap',
'@angular/common/locales',
'lodash-es/.*',
'ngx-utils-cookies-port',
];
const esModules = ['lodash-es/.*', '.*\\.mjs$'];

module.exports = {
globals: {
Expand Down
Loading

0 comments on commit 6f68e77

Please sign in to comment.