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

Migrate changed files if possible #2049

Merged
merged 22 commits into from
Apr 5, 2023
Merged

Migrate changed files if possible #2049

merged 22 commits into from
Apr 5, 2023

Conversation

BenSurgisonGDS
Copy link
Contributor

@BenSurgisonGDS BenSurgisonGDS commented Mar 16, 2023 •
edited
Loading

@BenSurgisonGDS BenSurgisonGDS force-pushed the migrate-changed-if-possible branch 7 times, most recently from 50e3fcc to d72d00a Compare March 21, 2023 09:53
@BenSurgisonGDS BenSurgisonGDS force-pushed the migrate-changed-if-possible branch 2 times, most recently from 5cc1d1a to 4800248 Compare March 29, 2023 09:41
@HannahJMWood HannahJMWood marked this pull request as ready for review March 29, 2023 09:53
@HannahJMWood HannahJMWood linked an issue Mar 29, 2023 that may be closed by this pull request
Convert application js if possible #2068
Closed
@BenSurgisonGDS BenSurgisonGDS force-pushed the migrate-changed-if-possible branch from 4800248 to ba776fa Compare March 29, 2023 10:28
nataliecarey
nataliecarey reviewed Mar 31, 2023
View reviewed changes
migrator/index.js
@@ -142,7 +143,7 @@ async function migrate () {
prepareSass('app/assets/sass/application.scss'),
deleteUnusedFiles(filesToDelete),
deleteUnusedDirectories(directoriesToDelete),
upgradeIfUnchanged(filesToUpdateIfUnchanged),
upgradeIfUnchanged(filesToUpdateIfUnchanged, '', upgradeIfPossible),

This comment was marked as resolved.

Sign in to view

@BenSurgisonGDS BenSurgisonGDS force-pushed the migrate-changed-if-possible branch 3 times, most recently from 6d42c66 to 2dbd2f9 Compare April 3, 2023 08:02
@BenSurgisonGDS BenSurgisonGDS force-pushed the migrate-changed-if-possible branch from 06b6224 to abfa486 Compare April 3, 2023 17:58
@BenSurgisonGDS BenSurgisonGDS changed the title Migrate changed files if possible Migrate changed application.js if possible Apr 4, 2023
@BenSurgisonGDS BenSurgisonGDS linked an issue Apr 4, 2023 that may be closed by this pull request
Convert filters.js if possible #2070
Closed
7 tasks
@BenSurgisonGDS BenSurgisonGDS changed the title Migrate changed application.js if possible Migrate changed files if possible Apr 4, 2023
@BenSurgisonGDS BenSurgisonGDS force-pushed the migrate-changed-if-possible branch from 1481a77 to 1eb72ab Compare April 4, 2023 16:29
@BenSurgisonGDS BenSurgisonGDS force-pushed the migrate-changed-if-possible branch from 1eb72ab to 40f2d4e Compare April 4, 2023 16:37
nataliecarey
nataliecarey reviewed Apr 5, 2023
View reviewed changes
__tests__/fixtures/test-v11-prototype/app/assets/javascripts/application.js

// Warn about using the kit in production
if (window.console && window.console.info) {
window.console.info('GOV.UK Prototype Kit - do not use for production')
}

$(document).ready(function () {
window.GOVUKFrontend.initAll()
// Use GOV.UK shim-links-with-button-role.js to trigger a link styled to look like a button,
Copy link
Contributor

Choose a reason for hiding this comment

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

You've removed initAll() from this test, I think it's important that it's still in.

nataliecarey
nataliecarey reviewed Apr 5, 2023
View reviewed changes
migrator/migration-steps.spec.js Outdated
const starterFileContents = `const govukPrototypeKit = require('govuk-prototype-kit')
const addFilter = govukPrototypeKit.views.addFilter
`
const expectedFileContents = `const govukPrototypeKit = require('govuk-prototype-kit')
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should add the comment that's in the starter kit.

I'd also like to remove the big old comment if it's unchanged - technically it still works but I think the user is better off having the new comment instead of the old comment.

Copy link
Contributor

Choose a reason for hiding this comment

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

I've just spotted that there's not a comment in the starter kit, I think we should remove the old one anyway.

@BenSurgisonGDS BenSurgisonGDS force-pushed the migrate-changed-if-possible branch from 38c3f36 to 0240eaf Compare April 5, 2023 10:42
@BenSurgisonGDS BenSurgisonGDS force-pushed the migrate-changed-if-possible branch from 0240eaf to 6a2f813 Compare April 5, 2023 10:54
@BenSurgisonGDS BenSurgisonGDS merged commit 2cc3d47 into main Apr 5, 2023
@BenSurgisonGDS BenSurgisonGDS deleted the migrate-changed-if-possible branch April 5, 2023 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nataliecarey nataliecarey nataliecarey approved these changes

@ollie-b-gds ollie-b-gds Awaiting requested review from ollie-b-gds

@HannahJMWood HannahJMWood Awaiting requested review from HannahJMWood

Assignees

@BenSurgisonGDS BenSurgisonGDS

@HannahJMWood HannahJMWood

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Convert filters.js if possible Convert application js if possible
3 participants
@BenSurgisonGDS @nataliecarey @HannahJMWood