Skip to content

Commit

Permalink
feat(ICM 11): switch to ICM 11 as project dependency and configuratio…
Browse files Browse the repository at this point in the history
…n for develop, demo and review servers

BREAKING CHANGES: switch to ICM 11 and `-` as default application
  • Loading branch information
shauke committed Dec 22, 2023
1 parent cbb77f5 commit 0594bcc
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/demo-server-up.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
#
# 2. Change these variables for your configuration:
env:
ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
ICM_BASE_URL: https://review.icm.intershop.de

jobs:
CancelPrevious:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

env:
NODE_VERSION: 18.16.0
ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
ICM_BASE_URL: https://review.icm.intershop.de

jobs:
CancelPrevious:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
env:
NODE_VERSION: 18.16.0
NODE_OPTIONS: --max_old_space_size=10240
ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
ICM_BASE_URL: https://review.icm.intershop.de

jobs:
CancelPrevious:
Expand Down
4 changes: 2 additions & 2 deletions docs/concepts/hybrid-approach.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ For this reason, the PWA must be configured to know which application to use to
### Preparing the PWA for the Hybrid Approach with the Responsive Starter Store

- Use a recent PWA version
- Configure `icmApplication` setting to denote the `intershop.REST`-based application used by the PWA (`rest` in the demo scenario).
- Configure `hybridApplication` setting to denote the Responsive Starter Store application (this is usually `-`).
- Configure `icmApplication` setting to denote the `intershop.REST`-based application used by the PWA (usually `rest` in the inSPIRED demo scenario).
- Configure `hybridApplication` setting to denote the Responsive Starter Store application (usually `-` in the inSPIRED demo scenario).
- Follow the Hybrid configuration setup

> [!NOTE]
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/software-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ kb_sync_latest_only

This concept introduces some decisions made from an architectural point of view.

The Intershop Progressive Web App is a REST API based storefront client that works on top of the Intershop Commerce Management server version 7.10.
The Intershop Progressive Web App is a REST API based storefront client that works together with the Intershop Commerce Management server version 11 or 7.10.
This means that the communication between the Angular based storefront and Intershop Commerce Management only functions via REST.
Customizations should fit into that REST based pattern as well.

Expand Down
2 changes: 1 addition & 1 deletion docs/guides/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Use `ng serve --open` to start the development server and open the Progressive W
> The project is configured to work against a publicly available Intershop Commerce Management server by default (see `environment.model.ts`).
>
> ```
> icmBaseURL: 'https://pwa-ish-demo.test.intershop.com',
> icmBaseURL: 'https://develop.icm.intershop.de',
> ```
For actually setting up a customer project based on the Intershop PWA, read the [Customization Guide](customizations.md).
Expand Down
9 changes: 9 additions & 0 deletions docs/guides/migrations.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ kb_sync_latest_only

## From 4.2 to 5.0

Starting with the Intershop PWA 5.0 we develop and test against an Intershop Commerce Management 11 server.
For this reason the official Intershop Commerce Management requirement is now ICM 11 even though the PWA 5.0 will continue to work with current ICM 7.10 versions as well.
In the [changelog](../../CHANGELOG.md) of this project we will inform about features that will only work with ICM 11 or ICM versions above 7.10.38.x-LTS releases.
With the transition to ICM 11 the configured default `icmBaseURL` is now `'https://develop.icm.intershop.de'`.

With the switch to ICM 11 we switched to ICM deployments without the Responsive Starter Store as well.
Because of this the default `icmApplication` is now configured to `'-'`.
For ICM deployments with the Responsive Starter Store this probably has to be configured as it was before with `'rest'`.

The project has been updated to work with Angular 16.
Besides this a lot of other dependencies (NgRx, Typescript) have also been updated.

Expand Down
4 changes: 2 additions & 2 deletions docs/guides/nginx-startup.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ http://pwa/sitemap_pwa.xml
```
To make above sitemap index file available under your deployment, you need to add the environment variable `ICM_BASE_URL` to your nginx container.
Let `ICM_BASE_URL` point to your ICM backend installation, e.g., `https://pwa-ish-demo.test.intershop.com`.
Let `ICM_BASE_URL` point to your ICM backend installation, e.g., `https://develop.icm.intershop.de`.
When the container is started it will process cache-ignore and multi-channel templates as well as sitemap proxy rules like this:
```yaml
location /sitemap_ {
proxy_pass https://pwa-ish-demo.test.intershop.com/INTERSHOP/static/WFS/inSPIRED-inTRONICS-Site/rest/inSPIRED-inTRONICS/en_US/sitemaps/pwa/sitemap_;
proxy_pass https://develop.icm.intershop.de/INTERSHOP/static/WFS/inSPIRED-inTRONICS-Site/rest/inSPIRED-inTRONICS/en_US/sitemaps/pwa/sitemap_;
}
```

Expand Down
5 changes: 2 additions & 3 deletions src/environments/environment.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,10 @@ export interface Environment {

export const ENVIRONMENT_DEFAULTS: Omit<Environment, 'icmChannel'> = {
/* INTERSHOP COMMERCE MANAGEMENT REST API CONFIGURATION */
icmBaseURL: 'https://pwa-ish-demo.test.intershop.com',
icmBaseURL: 'https://develop.icm.intershop.de',
icmServer: 'INTERSHOP/rest/WFS',
icmServerStatic: 'INTERSHOP/static/WFS',
icmApplication: 'rest',
hybridApplication: '-',
icmApplication: '-',

/* FEATURE TOGGLES */
features: [
Expand Down

0 comments on commit 0594bcc

Please sign in to comment.