-
Notifications
You must be signed in to change notification settings - Fork 11.9k
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
Log gulp error to Chart.js #5143
Merged
Merged
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
142e19d
Log errors and skip for buildTask
loicbourgois 58bb9fe
Write gulp error to Chart.js
loicbourgois 2414daa
Remove unused require
loicbourgois 08cf096
Remove error + Proper require fs
loicbourgois d2327ef
Fix newline
loicbourgois ecffc82
Refactor
loicbourgois e490438
Put back browser errors
loicbourgois e21587b
Use options
loicbourgois ae0e7e7
Fix intentional error
loicbourgois c8388d6
Use yargs + Refactor
loicbourgois 251fcc3
remove space
loicbourgois 0b39c03
Fefactor
loicbourgois 6ad9149
Use booleans
loicbourgois File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,6 +20,7 @@ var collapse = require('bundle-collapser/plugin'); | |
var argv = require('yargs').argv | ||
var path = require('path'); | ||
var package = require('./package.json'); | ||
var fs = require('fs'); | ||
|
||
var srcDir = './src/'; | ||
var outDir = './dist/'; | ||
|
@@ -78,10 +79,15 @@ function bowerTask() { | |
} | ||
|
||
function buildTask() { | ||
|
||
var bundled = browserify('./src/chart.js', { standalone: 'Chart' }) | ||
.plugin(collapse) | ||
.bundle() | ||
.on('error', function (err) { | ||
util.log(util.colors.red('[Error]'), err.toString()) | ||
fs.writeFileSync(outDir+'Chart.bundle.js', 'console.error("Gulp: ' + err.toString() + '")'); | ||
fs.writeFileSync(outDir+'Chart.bundle.min.js', 'console.error("Gulp: ' + err.toString() + '")'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would not alter |
||
this.emit('end'); | ||
}) | ||
.pipe(source('Chart.bundle.js')) | ||
.pipe(insert.prepend(header)) | ||
.pipe(streamify(replace('{{ version }}', package.version))) | ||
|
@@ -96,6 +102,12 @@ function buildTask() { | |
.ignore('moment') | ||
.plugin(collapse) | ||
.bundle() | ||
.on('error', function (err) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we avoid code duplication by refactoring this method: var errorHandler = function (err) {
util.log(util.colors.red('[Error]'), err.toString());
this.emit('end');
}
// ...
.bundle()
.on('error', errorHandler)
// ...
.on('error', errorHandler) |
||
util.log(util.colors.red('[Error]'), err.toString()) | ||
fs.writeFileSync(outDir+'Chart.js', 'console.error("Gulp: ' + err.toString() + '")'); | ||
fs.writeFileSync(outDir+'Chart.min.js', 'console.error("Gulp: ' + err.toString() + '")'); | ||
this.emit('end'); | ||
}) | ||
.pipe(source('Chart.js')) | ||
.pipe(insert.prepend(header)) | ||
.pipe(streamify(replace('{{ version }}', package.version))) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nit] can we move
var fs
beforevar package
since the later one is a local file.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes
while i'm at it, is there any logic in the order for the non local dependencies ? alphabetical, date of addition ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No guideline for the order because some require() may need other ones. I'm used to gather related dependencies (e.g.
gulp-*
) and declare thepackage.json
at the end.