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.

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

Compile GOV.UK Prototype Kit config to package top level #3623

Merged
merged 2 commits into from
May 18, 2023

Conversation

colinrotherham
Copy link
Contributor

This PR moves our GOV.UK Frontend Prototype Kit config for backwards compatibility

  1. Ensures config is exported from govuk-frontend/govuk-prototype-kit.config.json
  2. Ensures config macros, assets and Nunjucks paths add dist/ prefix

This was previously noted under Restructure govuk-frontend repository for v5 Implications

  • We need to keep making sure our configuration for the GOV.UK Prototype Kit gets recognised by the Kit and picks up our files as necessary.

@colinrotherham colinrotherham marked this pull request as draft May 12, 2023 14:13
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 12, 2023 14:13 Inactive
@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from c37a3bf to 039d6c9 Compare May 12, 2023 14:34
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 12, 2023 14:35 Inactive
@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from 039d6c9 to f7818b7 Compare May 12, 2023 14:36
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 12, 2023 14:36 Inactive
@colinrotherham colinrotherham force-pushed the delete-package-dist branch 2 times, most recently from 04e5168 to ece24c1 Compare May 15, 2023 17:47
@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from f7818b7 to 3bb4c8b Compare May 16, 2023 06:18
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 16, 2023 06:18 Inactive
@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from 3bb4c8b to 23a5a51 Compare May 16, 2023 06:29
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 16, 2023 06:29 Inactive
@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from 23a5a51 to fca5fe8 Compare May 16, 2023 13:52
@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from fca5fe8 to e6c114b Compare May 16, 2023 14:52
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 16, 2023 14:52 Inactive
@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from e6c114b to 8458905 Compare May 16, 2023 15:24
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 16, 2023 15:24 Inactive
@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from 8458905 to 3fcf7d1 Compare May 16, 2023 15:28
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 16, 2023 15:28 Inactive
@colinrotherham colinrotherham marked this pull request as ready for review May 16, 2023 15:37
@colinrotherham colinrotherham changed the base branch from delete-package-dist to main May 18, 2023 11:51
@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from 3fcf7d1 to ab45c0b Compare May 18, 2023 11:51
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 18, 2023 11:52 Inactive
@romaricpascal
Copy link
Member

Things worked fined with npm link locally. However, the Prototype Kit config doesn't seem to be pushed to pre-release branches 😔 I've created a pre-release for this PR there: https://github.com/alphagov/govuk-frontend/tree/pre-release-move-config-prototype-kit 😊

@colinrotherham
Copy link
Contributor Author

Things worked fined with npm link locally. However, the Prototype Kit config doesn't seem to be pushed to pre-release branches 😔 I've created a pre-release for this PR there: https://github.com/alphagov/govuk-frontend/tree/pre-release-move-config-prototype-kit 😊

Sadly we do two things which only #3498 can unblock

  1. Pre-releases check for unstaged changes
if [[ -n $(git status --porcelain) ]]; then
  1. Pre-releases exclude anything outside packages/govuk-frontend/dist
git filter-branch --force --subdirectory-filter packages/govuk-frontend

I've rebased #3498 with this branch so let's test there?

@colinrotherham colinrotherham force-pushed the move-config-prototype-kit branch from ab45c0b to 01fb250 Compare May 18, 2023 13:10
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-3623 May 18, 2023 13:11 Inactive
Copy link
Member

@romaricpascal romaricpascal left a comment

Choose a reason for hiding this comment

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

Tests with #3498 were OK, so let's merge them both one after the other (rather than going through some tedious rebasing).

@@ -6,6 +6,7 @@
"files": [
"src",
"dist",
"govuk-prototype-kit.config.json",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This ensures GOV.UK Prototype Kit can find the config

But paths at their end are still hard coded: alphagov/govuk-prototype-kit@953830a

@colinrotherham colinrotherham merged commit b351178 into main May 18, 2023
@colinrotherham colinrotherham deleted the move-config-prototype-kit branch May 18, 2023 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

3 participants