Skip to content

Moves bundle target/task to gulpfile.js #7240

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

Merged
merged 1 commit into from
Apr 25, 2016

Conversation

yurydelendik
Copy link
Contributor

@yurydelendik yurydelendik commented Apr 22, 2016

Add fixes double processing of the bundled files -- the //#expand __BUNDLE__ content was not processed first time.

Ref #7062


var BUILD_DIR = 'build/';
var L10N_DIR = 'l10n/';

require('./make.js');
var makeFile = require('./make.js');
var bundle = makeFile.bundler;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Shouldn't it be makeFile.bundle instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@yurydelendik yurydelendik force-pushed the bundle branch 6 times, most recently from 0e848b2 to ae989b8 Compare April 22, 2016 19:52
@@ -2179,7 +2179,7 @@ window.addEventListener('afterprint', function afterPrint(evt) {

exports.PDFViewerApplication = PDFViewerApplication;

// TODO remove circular reference of pdfjs-web/secondary_toolbar on app.
//// TODO remove circular reference of pdfjs-web/secondary_toolbar on app.
Copy link
Contributor Author

@yurydelendik yurydelendik Apr 22, 2016

Choose a reason for hiding this comment

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

Needed because our preprocessor removes this comment -- was not an issue since in the past it was a two stage preprocessing. See viewer.js

[COMMON_WEB_FILES_PREPROCESS, MOZCENTRAL_CONTENT_DIR + '/web'],
[BUILD_DIR + 'viewer.js', MOZCENTRAL_CONTENT_DIR + '/web'],
Copy link
Contributor

Choose a reason for hiding this comment

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

Why can't we move this to the copy section above, just like the other targets?

@timvandermeij
Copy link
Contributor

/botio preview

@pdfjsbot
Copy link

From: Bot.io (Linux)


Received

Command cmd_preview from @timvandermeij received. Current queue size: 0

Live output at: http://107.21.233.14:8877/5f050352b6a457e/output.txt

@pdfjsbot
Copy link

From: Bot.io (Windows)


Received

Command cmd_preview from @timvandermeij received. Current queue size: 0

Live output at: http://107.22.172.223:8877/72529af7d1e6ce7/output.txt

@timvandermeij timvandermeij merged commit f220db5 into mozilla:master Apr 25, 2016
@timvandermeij
Copy link
Contributor

Nice work!

@Snuffleupagus
Copy link
Collaborator

Looking at the latest diff for pdfjs-dist, it seems that this patch (incorrectly) removed a bunch of code from the built pdf.js file, see mozilla/pdfjs-dist@621c731#diff-ad3795a3948fdb9ac121063b17190e22.
@yurydelendik Was this intentional, especially the changes below mozilla/pdfjs-dist@621c731#diff-ad3795a3948fdb9ac121063b17190e22L5263?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants