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

Fix part of #6732: Extensions objects webpack integration #6889

Merged
merged 19 commits into from
Jun 12, 2019
Merged

Fix part of #6732: Extensions objects webpack integration #6889

merged 19 commits into from
Jun 12, 2019

Conversation

kevinlee12
Copy link
Contributor

@kevinlee12 kevinlee12 commented Jun 10, 2019 •
edited
Loading

Explanation

Fixes part of #6732: This PR introduced webpack integration for extensions/objects/*.

Also a side note, some backend tests will fail, but should be fixed after #6882 and #6885 are merged.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The linter/Karma presubmit checks have passed.
    • These should run automatically, but if not, you can manually trigger them locally using python scripts/pre_commit_linter.py and bash scripts/run_frontend_tests.sh.
  • The PR is made from a branch that's not called "develop".
  • The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).
  • The PR follows the style guide.
  • The PR addresses the points mentioned in the codeowner checks for the files/folders changed. (See the codeowner's wiki page.)
  • The PR is assigned to an appropriate reviewer.
    • If you're a new contributor, please ask on Gitter for someone to assign a reviewer and don't tick this checkbox.
    • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue. Do not only request the review but also add the reviewer as an assignee.

@vojtechjelinek vojtechjelinek mentioned this pull request Jun 10, 2019
Closed
8 tasks
@oppiabot
Copy link

oppiabot bot commented Jun 10, 2019

Hi @kevinlee12. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks!

@codecov
Copy link

codecov bot commented Jun 11, 2019

Codecov Report

Merging #6889 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #6889   +/-   ##
========================================
  Coverage    95.12%   95.12%           
========================================
  Files          371      371           
  Lines        50429    50429           
========================================
  Hits         47973    47973           
  Misses        2456     2456

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a4efcdb...5906ccc. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 11, 2019 •
edited
Loading

Codecov Report

Merging #6889 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #6889   +/-   ##
========================================
  Coverage    95.32%   95.32%           
========================================
  Files          371      371           
  Lines        50558    50558           
========================================
  Hits         48193    48193           
  Misses        2365     2365

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 419a0f2...f995fc4. Read the comment docs.

@kevinlee12
Copy link
Contributor Author

@vojtechjelinek, comments addressed, ptal!

vojtechjelinek
vojtechjelinek approved these changes Jun 11, 2019
View reviewed changes
Copy link
Contributor

@vojtechjelinek vojtechjelinek left a comment

Choose a reason for hiding this comment

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

LGTM!

@vojtechjelinek
Copy link
Contributor

@seanlip Can we merge this?

@seanlip
Copy link
Member

seanlip commented Jun 11, 2019

Yes once Travis passes -- please ping the thread when that happens.

(Also, great to see the long lists of imports being removed. Thanks!)

@oppiabot
Copy link

oppiabot bot commented Jun 11, 2019

Hi @kevinlee12. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks!

@kevinlee12
Copy link
Contributor Author

@seanlip tests pass now!

@kevinlee12 kevinlee12 assigned seanlip and unassigned vojtechjelinek Jun 12, 2019
@seanlip
Copy link
Member

seanlip commented Jun 12, 2019

Merge conflicts?

seanlip
seanlip approved these changes Jun 12, 2019
View reviewed changes
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

LGTM, happy to merge once merge conflicts are resolved.

@seanlip
Copy link
Member

seanlip commented Jun 12, 2019

(and tests pass)

@kevinlee12
Copy link
Contributor Author

it happened literally right after the other extensions PR got merged 😝

I'm fixing the merge conflicts right now.

@seanlip
Copy link
Member

seanlip commented Jun 12, 2019

Alas @kevinlee12 -- still more merge conflicts FYI!

@oppiabot
Copy link

oppiabot bot commented Jun 12, 2019

Hi @kevinlee12. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks!

@kevinlee12
Copy link
Contributor Author

@seanlip, hopefully I've caught up now with the git conflicts 😝

@vojtechjelinek
Copy link
Contributor

@seanlip The coverage checks seem to be here too, so it maybe happens to other people too?
image

@seanlip
Copy link
Member

seanlip commented Jun 12, 2019

Oh, that is weird. @kevinlee12, do you happen to have a separate local instance of CircleCI set up too?

Merging this in any case.

@seanlip seanlip merged commit 442e19e into oppia:develop Jun 12, 2019
@kevinlee12
Copy link
Contributor Author

nope

@kevinlee12 kevinlee12 deleted the objects_webpack_integration branch June 12, 2019 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seanlip seanlip seanlip approved these changes

@vojtechjelinek vojtechjelinek vojtechjelinek approved these changes

@aks681 aks681 Awaiting requested review from aks681

@ankita240796 ankita240796 Awaiting requested review from ankita240796

@apb7 apb7 Awaiting requested review from apb7

@DubeySandeep DubeySandeep Awaiting requested review from DubeySandeep

@nithusha21 nithusha21 Awaiting requested review from nithusha21

@vinitamurthi vinitamurthi Awaiting requested review from vinitamurthi

Assignees

@seanlip seanlip

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kevinlee12 @vojtechjelinek @seanlip