Skip to content
This repository has been archived by the owner on Mar 26, 2018. It is now read-only.

Finishing experimental Gulp implementation #837

Merged
merged 1 commit into from
Jul 24, 2015

Conversation

hermansje
Copy link

I solved the merge conflicts of pending pull request #672 and meanwhile updated some gulp dependencies (clean -> rimraf, ngmin -> ngAnnotate) and adjusted the code to the changed file structure.

var cb = this.async();

this.prompt([{
type: 'confirm',
name: 'bootstrap',
message: 'Would you like to include Bootstrap?',
message: 'Would you like to include Twitter Bootstrap?',
Copy link
Member

Choose a reason for hiding this comment

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

no

@hermansje
Copy link
Author

I updated both Bootstrap mentions. Sorry for overlooking those.

@stevemao
Copy link
Contributor

stevemao commented Sep 3, 2014

@hermansje hermansje force-pushed the master branch 2 times, most recently from 1f40520 to 776d125 Compare September 3, 2014 11:32
@hermansje
Copy link
Author

I rebased my pull request and tried to follow the guidelines.
If there is still something I have to do, please tell me.

@eddiemonge
Copy link
Member

What does this add over #672? That pr wasn't waiting for a cleanup, it was waiting for a major new release.

@hermansje
Copy link
Author

It doesn't add new features.
I only tried to update the pull request because it was outdated in some ways (and nobody reacted to the ping of @sindresorhus two months ago).

@sars
Copy link

sars commented Oct 29, 2014

@sformisano
Copy link

Any news on this?

@hermansje hermansje force-pushed the master branch 2 times, most recently from adecaf0 to cd420f7 Compare December 14, 2014 20:40
@esetnik
Copy link

esetnik commented Mar 22, 2015

I'd like to see this get merged in as well. The most popular angular generator should probably support the two most popular build systems. I don't feel it necessary to break this into two projects as we can cleanly encapsulate the build logic without creating a maintainability headache.

@arthurvr
Copy link
Member

Honestly, at this point I'd even say it makes sense to drop Grunt in favor of Gulp. I don't see any reason not to. Also makes it way easier to maintain. I wonder what @eddiemonge thinks.

@stevemao
Copy link
Contributor

👍

@eddiemonge
Copy link
Member

I still like Grunt. I would prefer to see Grunt as the default and Gulp as an advanced option (not a prompt). I'd also want to make sure all the tools that are used for angular (some that aren't in here yet that I use daily) are supported in both first.

@eddiemonge
Copy link
Member

can you rebase and resolve the conflicts please?

add an option to use Gulp instead of Grunt

Closes yeoman#672 (+1 squashed commits)

Squashed commits:

[87a7e7c] feat(gen): add support for Gulp

Add an option to use Gulp instead of Grunt
@hermansje
Copy link
Author

I solved the conflicts and rebased the pull request.

}.bind(this));
};

Generator.prototype.askForStyles = function askForStyles() {
Copy link
Member

Choose a reason for hiding this comment

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

this shouldnt be a part of this PR

eddiemonge added a commit that referenced this pull request Jul 24, 2015
Finishing experimental Gulp implementation
@eddiemonge eddiemonge merged commit 30cd991 into yeoman:master Jul 24, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants