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

Update dependency @automattic/calypso-build to v6.1.0 #14849

Merged
merged 3 commits into from
Mar 25, 2020
Merged

Update dependency @automattic/calypso-build to v6.1.0 #14849

merged 3 commits into from
Mar 25, 2020

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Feb 29, 2020 •
edited by kraftbj
Loading

This PR contains the following updates:

Package Type Update Change
@automattic/calypso-build dependencies minor 6.0.0 -> 6.1.0

Release Notes

Automattic/wp-calypso

v6.1.0

Compare Source

Renovate configuration

📅 Schedule: "every weekend" in timezone UTC.

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻️ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.

  • If you want to rebase/retry this PR, check this box

This PR has been generated by WhiteSource Renovate. View repository job log here.

@renovate renovate bot requested a review from a team February 29, 2020 01:10
@renovate renovate bot added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. [Type] Janitorial labels Feb 29, 2020
@matticbot
Copy link
Contributor

Caution: This PR has changes that must be merged to WordPress.com
Hello renovate[bot]! These changes need to be synced to WordPress.com - If you 're an a11n, please commandeer, review, and approve D39643-code before merging this PR. Thank you!

@jetpackbot
Copy link

jetpackbot commented Feb 29, 2020 •
edited
Loading

Warnings
⚠️

pre-commit hook was skipped for one or more commits
⚠️ "Testing instructions" are missing for this PR. Please add some
⚠️ "Proposed changelog entry" is missing for this PR. Please include any meaningful changes

This is an automated check which relies on PULL_REQUEST_TEMPLATE. We encourage you to follow that template as it helps Jetpack maintainers do their job. If you think 'Testing instructions' or 'Proposed changelog entry' are not needed for your PR - please explain why you think so. Thanks for cooperation 🤖

Generated by 🚫 dangerJS against f147069

@jeherve jeherve self-assigned this Mar 4, 2020
@matticbot
Copy link
Contributor

renovate[bot], Your synced wpcom patch D39643-code has been updated.

@jeherve
Copy link
Member

jeherve commented Mar 4, 2020 •
edited
Loading

I've updated all babel deps to match what's used in Calypso Build. Looks like we can't update to 7.8.6 just yet, as it causes issues with the build:

[13:43:59] ModuleBuildError in plugin "webpack"
Message:
    Module build failed (from ./node_modules/babel-loader/lib/index.js):
Error: [BABEL] /wp-content/plugins/jetpack/node_modules/@automattic/format-currency/node_modules/debug/src/browser.js: Cannot find module '@babel/plugin-transform-runtime' from '/wp-content/plugins/jetpack'
    at Function.module.exports [as sync] (/wp-content/plugins/jetpack/node_modules/resolve/lib/sync.js:71:15)

@jeherve jeherve added the Build label Mar 4, 2020
@jeherve jeherve added this to the 8.4 milestone Mar 4, 2020
@matticbot
Copy link
Contributor

renovate[bot], Your synced wpcom patch D39643-code has been updated.

@jeherve
Copy link
Member

jeherve commented Mar 4, 2020 •
edited
Loading

@jsnajdr Do you think you could take a look at this? I've added Enzyme as a new dependency for Jetpack, since it seemed to be necessary after the change in Automattic/wp-calypso#38190

Without explicitly declaring the dependency, I was getting warnings locally:

[4/5] 🔗  Linking dependencies...
warning " > @automattic/calypso-build@6.1.0" has unmet peer dependency "enzyme@^3.11.0".
warning "@automattic/calypso-build > enzyme-adapter-react-16@1.15.1" has unmet peer dependency "enzyme@^3.0.0".
warning "@automattic/calypso-build > enzyme-to-json@3.4.3" has unmet peer dependency "enzyme@^3.4.0".
warning "@automattic/calypso-build > jest-enzyme@7.1.2" has unmet peer dependency "enzyme@>=3.4.0".
warning "@automattic/calypso-build > jest-enzyme > enzyme-matchers@7.1.2" has unmet peer dependency "enzyme@>=3.4.0".
warning "@automattic/calypso-build > jest-enzyme > jest-environment-enzyme@7.1.2" has unmet peer dependency "enzyme@3.x".

And our tests were failing in Travis as we were getting this error:

Error: Cannot find module 'enzyme'

It seems to work here in Jetpack in my tests, but is this the right approach?

@jeherve jeherve removed the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Mar 4, 2020
jeherve
jeherve previously approved these changes Mar 4, 2020
View reviewed changes
@jeherve jeherve force-pushed the renovate/automattic-calypso-build-6.x branch from 8e0fcb6 to d9276e3 Compare March 17, 2020 13:49
@matticbot
Copy link
Contributor

renovate[bot], Your synced wpcom patch D39643-code has been updated.

@jeherve
Copy link
Member

jeherve commented Mar 17, 2020

@Automattic/team-calypso Do you think you could take a look at this, just to make sure my changes make sense?

Thanks!

jeherve
jeherve previously approved these changes Mar 17, 2020
View reviewed changes
@renovate renovate bot force-pushed the renovate/automattic-calypso-build-6.x branch from d9276e3 to 1c103d5 Compare March 24, 2020 12:37
@matticbot
Copy link
Contributor

renovate[bot], Your synced wpcom patch D39643-code has been updated.

@jeherve jeherve force-pushed the renovate/automattic-calypso-build-6.x branch from 1c103d5 to 30a7725 Compare March 24, 2020 12:57
@matticbot
Copy link
Contributor

renovate[bot], Your synced wpcom patch D39643-code has been updated.

griffbrad
griffbrad previously approved these changes Mar 24, 2020
View reviewed changes
Copy link
Contributor

@griffbrad griffbrad 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. enzyme was added as a peerDependency, yes. That means consumers of the package need to depend on it. This helps prevent duplicate/conflicting versions of enzyme from being installed simultaneously.

@jeherve jeherve added the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Mar 24, 2020
@jeherve jeherve force-pushed the renovate/automattic-calypso-build-6.x branch from 30a7725 to 0ac4f03 Compare March 25, 2020 09:16
@matticbot
Copy link
Contributor

renovate[bot], Your synced wpcom patch D39643-code has been updated.

@renovate renovate bot force-pushed the renovate/automattic-calypso-build-6.x branch from 0ac4f03 to 8d45dcc Compare March 25, 2020 16:14
@matticbot
Copy link
Contributor

renovate[bot], Your synced wpcom patch D39643-code has been updated.

@jeherve jeherve force-pushed the renovate/automattic-calypso-build-6.x branch from 8d45dcc to 684b145 Compare March 25, 2020 16:19
@matticbot
Copy link
Contributor

renovate[bot], Your synced wpcom patch D39643-code has been updated.

@renovate
Copy link
Contributor Author

renovate bot commented Mar 25, 2020

PR has been edited

👷 This PR has received other commits, so Renovate will stop updating it to avoid conflicts or other problems. If you wish to abandon your changes and have Renovate start over you may click the "rebase" checkbox in the PR body/description.

kraftbj
kraftbj previously approved these changes Mar 25, 2020
View reviewed changes
@kraftbj kraftbj added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Mar 25, 2020
@jeherve
Copy link
Member

jeherve commented Mar 25, 2020

r204795-wpcom

@jeherve jeherve force-pushed the renovate/automattic-calypso-build-6.x branch from 684b145 to f147069 Compare March 25, 2020 16:47
@jeherve jeherve merged commit f92456e into master Mar 25, 2020
@jeherve jeherve deleted the renovate/automattic-calypso-build-6.x branch March 25, 2020 17:44
@matticbot matticbot added [Status] Needs Changelog and removed [Status] Ready to Merge Go ahead, you can push that green button! labels Mar 25, 2020
@jeherve jeherve mentioned this pull request Mar 25, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brbrr brbrr brbrr approved these changes

@griffbrad griffbrad griffbrad left review comments

@jeherve jeherve jeherve left review comments

@kraftbj kraftbj kraftbj left review comments

Assignees

@jeherve jeherve

Labels
Build Touches WP.com Files [Type] Janitorial
Projects
None yet
Milestone
8.4
Development

Successfully merging this pull request may close these issues.
7 participants
@matticbot @jetpackbot @jeherve @kraftbj @griffbrad @brbrr @renovate-bot