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

fix notebook require config to match tools/build-main #2888

Merged
merged 1 commit into from Oct 1, 2017

Conversation

Projects
None yet
3 participants
@jcb91
Copy link
Contributor

jcb91 commented Oct 1, 2017

#2140 altered the dependencies of a bunch of modules, without updating the require config used on page.html template. The updated tools/build-main.js require config ensures that this isn't a problem for pages with built minified js, but the changes currently break any extension template which tries to load affected modules.

This only goes partway to fixing this, since the final thing I haven't figured out how to fix correctly is nbjs.json, which unfortunately sits below the server-root static directory (d'oh!) so can be loaded by the minifier build, but not by requirejs in an extension-templated page. Not sure what the best approach to fix that would be - I'd go for moving it into the static directory, but don't know enough (anything!) about the i18n mechanics to know whether that might cause other problems. Any thoughts appreciated - @JCEmmons I guess you're the most appropriate to ask about the i18n stuff?

fix notebook require config to match tools/build-main
as otherwise, any template based on page will fail to load unless
it already has its own minified js including the dependencies
@rgbkrk

rgbkrk approved these changes Oct 1, 2017

@rgbkrk rgbkrk merged commit 3c4c470 into jupyter:master Oct 1, 2017

4 checks passed

codecov/patch Coverage not affected when comparing 1cdb411...97d6ead
Details
codecov/project 79.24% remains the same compared to 1cdb411
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@rgbkrk

This comment has been minimized.

Copy link
Member

rgbkrk commented Oct 1, 2017

@Carreau @gnestor we'll want to make another release soon after because of this one

@gnestor gnestor added this to the 5.2 milestone Oct 13, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.