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.

Sign up for GitHub

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

Jump to bottom

[Angular XMC Proxy] Extract SXP related things from the base Angular template #1838

Merged
merged 39 commits into from
Jul 26, 2024
Merged

[Angular XMC Proxy] Extract SXP related things from the base Angular template #1838

merged 39 commits into from
Jul 26, 2024

Conversation

yavorsk
Copy link
Contributor

@yavorsk yavorsk commented Jul 17, 2024 •
edited by illiakovalenko
Loading

Description / Motivation

This PR extracts all SXP related code from the base Angular template into a new angular-sxp addon template.
It also adds initializer for the new add on. The regular Angular app should now be initialized by providing both templates: 'angular,angular-sxp'

Illia:

  • Added new "scripts" module/component to make scripts extendable (will be needed in angular-xmcloud addon)
  • Decomposed "scripts" from "routing" module
  • data-fetcher service is injected in the root module using "providedIn", so it doesn't require to import this service directly in "app.module"
  • Cleaned up dependencies

Testing Details

  • Unit Test Added
  • Manual Test/Other (Please elaborate) - yarn watch with templates 'angular', 'angular-sxp'; teamcity pipelines should pass

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

@yavorsk yavorsk requested a review from a team July 17, 2024 08:33
addy-pathania
addy-pathania reviewed Jul 18, 2024
View reviewed changes
Copy link
Contributor

@addy-pathania addy-pathania left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a part of this we also need to add an empty angular-xmc add-on

illiakovalenko
illiakovalenko requested changes Jul 19, 2024
View reviewed changes
Copy link
Contributor

@illiakovalenko illiakovalenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good progress!
See some ideas/questions below

packages/create-sitecore-jss/src/templates/angular-sxp/proxy.conf.js Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/package.json Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/package.json Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular-sxp/scripts/bootstrap.ts Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/package.json Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/package.json Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/package.json Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/package.json Show resolved Hide resolved
...s/create-sitecore-jss/src/templates/angular-sxp/src/app/routing/layout/layout.component.html Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@yavorsk
add proxy config for the base angular template
b8df21b
@yavorsk
lint:yml script only for angular-sxp
b3ddbdc
@yavorsk
move lint-yml script to angular-sxp
64e67a1
@yavorsk
move entire sitecore folder under angular-sxp template
8a8eb8a
@yavorsk
update readme
9de7bb0
@yavorsk
introduce plugin functionality for angular addons
9cedabe
@yavorsk
move styleguide fragment types out of sngular base template
5face19
@yavorsk
move jss-data-fetcher.service.ts to angular-sxp addon
4105f5a
@yavorsk
reintroduce navigation component to base package and remove unnecesar…
d56ed91 
…y links
@yavorsk
update changelog
87bff57
@yavorsk
removed sitecoreLayoutServiceConfig config property; layoutServiceCon…
f73f319 
…figurationName config property is set only for angular-sxp via plugin; removed rest services from the base template; moved fetchWith env variable in angular-sxp
@yavorsk
update import
8a1bd4b
@yavorsk
use no manifest parameter for scaffold script in angular base template
0f45f02
@yavorsk
exstract scaffold script call from angular base to angular add ons
0944bc8
@yavorsk yavorsk mentioned this pull request Jul 23, 2024
Merged
8 tasks
illiakovalenko
illiakovalenko requested changes Jul 24, 2024
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular-sxp/.env Outdated Show resolved Hide resolved
...s/create-sitecore-jss/src/templates/angular-sxp/src/app/routing/layout/layout.component.html Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/.env Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/package.json Show resolved Hide resolved
...eate-sitecore-jss/src/templates/angular/src/app/routing/navigation/navigation.component.html Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/src/graphql-fragment-types.ts Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/README.md Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/src/lib/config.ts Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular-sxp/src/app/app.module.ts Outdated Show resolved Hide resolved
yavorsk and others added 13 commits July 24, 2024 18:11
ambrauer
ambrauer approved these changes Jul 25, 2024
View reviewed changes
Copy link
Contributor

@ambrauer ambrauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some final questions / suggestions, otherwise looks good!

CHANGELOG.md Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/scripts/config/plugins/fallback.ts Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/scripts/generate-config.ts Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/src/app/lib/config.ts Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular/src/app/routing/routing.module.ts Show resolved Hide resolved
@illiakovalenko illiakovalenko merged commit 93a0cbd into feature/angular-xmc-proxy Jul 26, 2024
1 check passed
@illiakovalenko illiakovalenko deleted the feature/jss-3538 branch July 26, 2024 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@addy-pathania addy-pathania addy-pathania left review comments

@illiakovalenko illiakovalenko illiakovalenko requested changes

@art-alexeyenko art-alexeyenko art-alexeyenko left review comments

@ambrauer ambrauer ambrauer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@yavorsk @ambrauer @art-alexeyenko @illiakovalenko @addy-pathania