Skip to content

fix(gulp): add babel runtime options #1472

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

Merged
merged 2 commits into from
Dec 8, 2015
Merged

fix(gulp): add babel runtime options #1472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a9afa1
fix(gulp): add babel runtime options
david-mohr Dec 8, 2015
6f4d3b0
fix(gulp): update gulp.src in build:client
david-mohr Dec 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/templates/gulpfile.babel(gulp).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ let styles = lazypipe()

let transpile = lazypipe()
.pipe(plugins.sourcemaps.init)<% if(filters.babel) { %>
.pipe(plugins.babel)<% } else { %>
.pipe(plugins.babel, {
optional: ['es7.classProperties']
})<% } else { %>
.pipe(plugins.coffee, {bare: true})<% } %>
.pipe(plugins.sourcemaps.write, '.');<% } %>

Expand Down Expand Up @@ -392,7 +394,7 @@ gulp.task('build:client', ['transpile:client', 'styles', 'html'], () => {

let assets = plugins.useref.assets({searchPath: ['client', '.tmp']});
Copy link
Member

Choose a reason for hiding this comment

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

split this change out to a separate commit, since it's unrelated to the other changes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would you like a new PR, or just a separate commit? (sorry, pretty new to this)

Copy link
Member

Choose a reason for hiding this comment

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

Just pull it into a separate commit. If you know how to rebase, I'd suggest it. If not, just make a new PR.


return gulp.src(paths.mainView)<% if(filters.jade) { %>
return gulp.src(paths.client.mainView)<% if(filters.jade) { %>
.pipe(plugins.jade({pretty: true}))<% } %>
.pipe(assets)
.pipe(appFilter)
Expand Down