Skip to content

Conversation

wAsnk
Copy link
Contributor

@wAsnk wAsnk commented Jun 12, 2025

Fixes #18018

@@ -1,11 +1,11 @@
/*!
* Start Bootstrap - Agency v7.0.11 (https://startbootstrap.com/theme/agency)
* Copyright 2013-2022 Start Bootstrap
Copy link
Member

Choose a reason for hiding this comment

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

I think such changes need to be done on the theme repo itself

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is there a separate repository?
Btw this is a generated change.

Copy link
Member

Choose a reason for hiding this comment

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

If I recall, there was an old change requested a long time ago, and @Piedone asked it to be done on the original repo.

@Piedone correct me if I'm wrong

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure what you're referring to, but we should add fixes to the original Bootstrap template, if viable (not always, we've waited years for PRs to be merged before). However, these changes come from 5.3.6 of the Bootstrap template.

Copy link
Contributor

Choose a reason for hiding this comment

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

These changes need to be addressed here, as well as in the theme repository. I fixed problems like this; this is basically the theme repo manually transformed to an OC theme.

If it's not viable (since we need to wait a lot to get the PR merged), then at least create an issue in the repository.

However, these changes come from 5.3.6 of the Bootstrap template.

Then it's basically just updating the OC theme to match with the Bootstrap one, so no PR is needed there, if I'm correct.

@wAsnk
Copy link
Contributor Author

wAsnk commented Jun 13, 2025

Updated to the newest files of the template itself. Then ran yarn build -gr for the wwwroot files.

Not sure what to do with the Validating the Building of Public Assets workflow, tried to add the popperjs in the dependant version, but that did not work.

Is there documentation to troubleshoot this?

@Piedone
Copy link
Member

Piedone commented Jun 13, 2025

Start from here: https://docs.orchardcore.net/en/latest/guides/assets-manager/#prerequisites And run the command not in the wwwroot folder but in the repo root.

@wAsnk
Copy link
Contributor Author

wAsnk commented Jun 13, 2025

Start from here: https://docs.orchardcore.net/en/latest/guides/assets-manager/#prerequisites And run the command not in the wwwroot folder but in the repo root.

Yeah, I did exactly that.

I get the same "error" as the GitHub workflow:
image

After these, running yarn build -gr succeeds, but then running the same yarn --no-check-resolutions command as the GitHub workflow runs gives back the same issue:
image

@wAsnk
Copy link
Contributor Author

wAsnk commented Jun 13, 2025

I committed the changed yarn.lock, not sure if that's needed, it's not documented. Now it fails at the "Check if git has changes" step.

@Piedone
Copy link
Member

Piedone commented Jun 13, 2025

I can only recommend you to look into the error message. That, and what comes from CI, suggests an improper NPM installation, what might be possible to solve simply with an npm install.

@wAsnk
Copy link
Contributor Author

wAsnk commented Jun 13, 2025

I can only recommend you to look into the error message. That, and what comes from CI, suggests an improper NPM installation, what might be possible to solve simply with an npm install.

The error message was not helpful at all. 🥲 It had nothing to do with why the GitHub workflow failed.

My solution:
I had to commit the root yarn.lock file after running the yarn commands. Then the "Check if git has changes" step failed in the GitHub workflow, because the yarn commands generated some changes in the Agency project again that I had to commit.

Comment on lines +44 to +49
"chokidar": "3.5.3",
"concurrently": "6.3.0",
"postcss": "8.4.21",
"prettier": "2.8.6",
"pug": "3.0.2",
"sass": "1.60.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

Why downgrade these dependencies?

Copy link
Contributor Author

@wAsnk wAsnk Jun 19, 2025

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

As these are dev dependencies I think it is fine to update them, especially as it was working before with the newer versions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's fine by me. Others asked me to use the newest template instead of a custom fix. So I used the template.
Let me know what you think @sebastienros if we should use the template entirely or keep these dev dependencies like they were before.

Copy link
Member

Choose a reason for hiding this comment

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

I'd rather see we do these changes on the source repository and then sync back.

Copy link
Contributor

This pull request has merge conflicts. Please resolve those before requesting a review.

@sebastienros
Copy link
Member

@wAsnk feel free to merge when you think it's ready

@Piedone
Copy link
Member

Piedone commented Aug 18, 2025

@wAsnk could you please fix the asset build? I wanted to merge this, seeing it was approved, and tried to fix the merge conflict, but I'm now out of ideas.

Copy link
Contributor

This pull request has merge conflicts. Please resolve those before requesting a review.

@Piedone
Copy link
Member

Piedone commented Sep 15, 2025

@wAsnk?

@wAsnk
Copy link
Contributor Author

wAsnk commented Sep 16, 2025

I'll check it now. Sorry about the delayed response.

@Piedone
Copy link
Member

Piedone commented Sep 16, 2025

Thanks!

@wAsnk
Copy link
Contributor Author

wAsnk commented Sep 16, 2025

@Piedone I think this is ready to be merged.

@Piedone
Copy link
Member

Piedone commented Sep 16, 2025

Thank you!

@Piedone Piedone merged commit 35742f1 into OrchardCMS:main Sep 16, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bootstrap Scrollspy in TheAgencyTheme throws exception
6 participants