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-xmcloud][create-sitecore-jss] Add sxa styles to angular-xmcloud add on #1865

Merged
merged 16 commits into from
Aug 5, 2024
Merged

[angular-xmcloud][create-sitecore-jss] Add sxa styles to angular-xmcloud add on #1865

merged 16 commits into from
Aug 5, 2024

Conversation

yavorsk
Copy link
Contributor

@yavorsk yavorsk commented Jul 30, 2024 •
edited
Loading

Description / Motivation

  • add sxa styles to angular-xmcloud addon and necessary updates to angular.json;
  • update transform process so that json files from addon are merged to json from base template (similarly to package.json) during initialization;

Testing Details

  • Unit Test Added
  • Manual Test/Other (Please elaborate)

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 changed the title [angular-xmcloud] Add sxa styles to angular-xmcloud add on [angular-xmcloud][create-sitecore-jss] Add sxa styles to angular-xmcloud add on Jul 30, 2024
@yavorsk yavorsk requested a review from a team July 30, 2024 15:44
Base automatically changed from feature/angular-xmc-proxy to dev July 31, 2024 09:32
ambrauer
ambrauer suggested changes Aug 1, 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.

Looks good overall! See some comments and also looks like there are now some merge conflicts.

packages/create-sitecore-jss/src/common/utils/helpers.ts Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/common/processes/transform.ts Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular-xmcloud/angular.json Show resolved Hide resolved
packages/create-sitecore-jss/src/templates/angular-xmcloud/angular.json Outdated Show resolved Hide resolved
yavorsk added 6 commits August 2, 2024 10:36
@yavorsk
xmcloud angular.json - add stylePreprocessorOptions for test config; …
03f8728 
…remove not needed setting as we have it in base
@yavorsk
create-sitecore-jss - modify openPackageJson and writePackageJson to …
4ada50c 
…be the more general openJsonFile and writeJsonFile; make the path parameter required for both functions; adjust unit tests
@yavorsk
Merge branch 'dev' into feature/jss-3664
4eb873e
@yavorsk
fix linting issues
ee942e8
@yavorsk
missed function renaming
facefae
@yavorsk
fix unit test
cf9e5ee
@yavorsk yavorsk requested a review from ambrauer August 2, 2024 13:57
ambrauer
ambrauer approved these changes Aug 5, 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.

Just minor jsdoc change, otherwise 👍

packages/create-sitecore-jss/src/common/utils/helpers.ts Outdated Show resolved Hide resolved
packages/create-sitecore-jss/src/common/utils/helpers.ts Outdated Show resolved Hide resolved
@ambrauer ambrauer merged commit 5c34447 into dev Aug 5, 2024
1 check passed
@ambrauer ambrauer deleted the feature/jss-3664 branch August 5, 2024 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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.
2 participants
@yavorsk @ambrauer