This repository was archived by the owner on Mar 26, 2018. It is now read-only.
feat(app): read module name form bower.json #975
Merged
Conversation
This file contains hidden or 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
|
pushes further job done with #572 - with it --app-suffix will be saved for future submodules runs. |
| @@ -20,5 +20,6 @@ | |||
| "angular-mocks": "^<%= ngVer %>", | |||
| "angular-scenario": "^<%= ngVer %>" | |||
| }<% if (appPath) { %>, | |||
| "appPath": "<%= appPath %>"<% } %> | |||
| "appPath": "<%= appPath %>"<% } %>, | |||
| "moduleName": "<%= scriptAppName %>" | |||
There was a problem hiding this comment.
@eddiemonge these should be in .yo-rc.json.
| @@ -14,7 +14,12 @@ var Generator = module.exports = function Generator() { | |||
| this.appname = path.basename(process.cwd()); | |||
| } | |||
| this.appname = this._.slugify(this._.humanize(this.appname)); | |||
| this.scriptAppName = this._.camelize(this.appname) + angularUtils.appName(this); | |||
|
|
|||
| try { | |||
There was a problem hiding this comment.
change this try catch to make the bower.json variables available as a top level variable so it can be used on line 27(32) as well without having two try catch blocks for essentially the same thing.
eventually (soon) these are going int he .yo-rc.json file.
marcin-wosinek
force-pushed
the
master
branch
from
284f821 to
d836bce
Compare
| try { | ||
| this.env.options.appPath = require(path.join(process.cwd(), 'bower.json')).appPath; | ||
| } catch (e) {} | ||
| this.env.options.appPath = bowerJson.appPath; | ||
| } | ||
| this.env.options.appPath = this.env.options.appPath || 'app'; |
There was a problem hiding this comment.
remove 33-35 and change 36 to:
this.env.options.appPath = this.env.options.appPath || bowerJson.appPath || 'app';
app-suffix option is not saved for later uses and needs to be readded to each future subgenerator. This change reads module name from new bower.json field so module author have full flexibility about naming it.
marcin-wosinek
force-pushed
the
master
branch
from
d836bce to
b3d09f0
Compare
eddiemonge
added a commit
that referenced
this pull request
Feb 5, 2015
feat(app): read module name form bower.json
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
app-suffix option is not saved for later uses and needs to be readded to each
future subgenerator. This change reads module name from new bower.json field
so module author have full flexibility about naming it.