Get scripts and assets from config #2319
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BenSurgisonGDS
force-pushed
the
get-scripts-and-assets-from-config
branch
2 times, most recently
from
4d31fab to
d8276fb
Compare
BenSurgisonGDS
changed the base branch from
main
to
using-internal-govuk-frontend-more-widely
Base automatically changed from
using-internal-govuk-frontend-more-widely
to
main
August 31, 2023 08:42
BenSurgisonGDS
force-pushed
the
get-scripts-and-assets-from-config
branch
from
5895226 to
03bd181
Compare
nataliecarey
suggested changes
Sep 21, 2023
| @@ -74,6 +74,11 @@ module.exports = function setupNodeEvents (on, config) { | |||
| config.env.packageFolder = path.join(config.env.projectFolder, 'node_modules', 'govuk-prototype-kit') | |||
| } | |||
|
|
|||
| if ('govuk-frontend' in dependencies) { | |||
| const frontEndConfigFile = path.join(config.env.projectFolder, 'node_modules', 'govuk-frontend', 'govuk-prototype-kit.config.json') | |||
| config.env.frontendAssetsFolder = fse.readJsonSync(frontEndConfigFile).assets.find(asset => !asset.split(path.sep).pop().includes('.')) | |||
There was a problem hiding this comment.
This closely targets the current implementation inside govuk-frontend - if they add another assets item to their config which doesn't have any dots then this may identify the wrong one.
| <script src="/manage-prototype/dependencies/govuk-frontend/govuk/all.js"></script> | ||
| <script src="/manage-prototype/dependencies/govuk-frontend/govuk-prototype-kit/init.js"></script> | ||
| <script src="/plugin-assets/govuk-prototype-kit/lib/assets/javascripts/kit.js"></script> | ||
| {% for scriptConfig in managePlugins.scripts %} |
There was a problem hiding this comment.
This seems to be a duplicate of govuk-prototype-kit/includes/scripts.njk, and both are taking their input from the plugin config. We should reuse the existing include rather than copying it. This can be done by calling the field in the model pluginConfig rather than managePlugins.
BenSurgisonGDS
force-pushed
the
get-scripts-and-assets-from-config
branch
2 times, most recently
from
eb696aa to
532b418
Compare
BenSurgisonGDS
force-pushed
the
get-scripts-and-assets-from-config
branch
from
532b418 to
9c11033
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove hard coded references for the locations of the govuk-frontend scripts and assets.