Skip to content

Commit

Permalink
remaining fixes to get the bower components working, v3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
cgross committed Apr 10, 2016
1 parent cc6f721 commit ae32a1b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Running a generator:

The name paramater passed (i.e. 'my-awesome-directive') will be used as the file names. The generators will derive appropriate class names from this parameter (ex. 'my-awesome-directive' will convert to a class name of 'MyAwesomeDirective'). Each sub-generator will ask for the folder in which to create the new skeleton files. You may override the default folder for each sub-generator in the `.yo-rc.json` file.

The modal subgenerator is a convenient shortcut to create partials that work as modals for Bootstrap v3.1 and Angular-UI-Bootstrap v0.10 (both come preconfigured with this generator). If you choose not to use either of these libraries, simply don't use the modal subgenerator.
The modal subgenerator is a convenient shortcut to create partials that work as modals for Bootstrap v3 and Angular-UI-Bootstrap v1.3 (both come preconfigured with this generator). If you choose not to use either of these libraries, simply don't use the modal subgenerator.

Subgenerators are also customizable. Please read [CUSTOMIZING.md](CUSTOMIZING.md) for details.

Expand All @@ -125,7 +125,7 @@ Submodules allow you to more explicitly separate parts of your application. Use
Preconfigured Libraries
-------------

The new app will have a handful of preconfigured libraries included. This includes Angular 1.2, Bootstrap 3, AngularUI Bootstrap, AngularUI Utils, FontAwesome 4, JQuery 2, Underscore 1.5, LESS 1.6, and Moment 2.5. You may of course add to or remove any of these libraries. But the work to integrate them into the app and into the build process has already been done for you.
The new app will have a handful of preconfigured libraries included. This includes Angular 1.5, Bootstrap 3, AngularUI Bootstrap, FontAwesome, JQuery, LoDash, LESS, and Momentx. You may of course add to or remove any of these libraries. But the work to integrate them into the app and into the build process has already been done for you.

Build Process
-------------
Expand Down Expand Up @@ -154,6 +154,7 @@ Importantly, grunt-dom-munger uses CSS attribute selectors to manage the parsing

Release History
-------------
* 04/10/2016 - v3.30 - Upgrades to the Bower components including Angular to version 1.5.
* 11/9/2014 - v3.2.0 - Switch from ngmin to ng-annotate. Disabling grunt-contrib-imagemin so Windows users don't encounter its issues. Subgenerators prompt for a name if not entered. Other fixes.
* 7/6/2014 - v3.1.2 - Fix for directive template URLs with backslashes on Windows.
* 6/10/2014 - v3.1.1 - Fix for backslashes being used in injected routes/tags on subgenerators.
Expand Down
2 changes: 1 addition & 1 deletion app/templates/skeleton/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"lodash": "~4.9",
"bootstrap": "~3.3",
"angular": "~1.5",
<% if(uirouter) { print('"angular-ui-router": "~0.2",'); } else { print('"angular-route": "~1.2",'); } %>
<% if(uirouter) { print('"angular-ui-router": "~0.2",'); } else { print('"angular-route": "~1.5",'); } %>
"angular-animate": "~1.5",
"angular-resource": "~1.5",
"angular-cookies": "~1.5",
Expand Down
1 change: 0 additions & 1 deletion app/templates/skeleton/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="bower_components/angular-ui-utils/ui-utils.js"></script>
<!-- Add New Bower Component JS Above -->


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-cg-angular",
"version": "3.2.0",
"version": "3.3.0",
"description": "Yeoman Generator for Enterprise Angular projects.",
"keywords": [
"yeoman-generator",
Expand Down

0 comments on commit ae32a1b

Please sign in to comment.