Skip to content

Commit 25f041a

Browse files
committed
fix ng-component dependency issues
1 parent abe7b13 commit 25f041a

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

app/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
187187
'extensions': extensions,
188188
'basePath': 'client'
189189
}
190-
});
190+
}, { local: require.resolve('generator-ng-component/app/index.js') });
191191
},
192192

193193
ngModules: function() {

controller/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
33

44
var Generator = yeoman.generators.Base.extend({
55
compose: function() {
6-
this.composeWith('ng-component:controller', {arguments: this.arguments});
6+
this.composeWith('ng-component:controller', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/controller') });
77
}
88
});
99

decorator/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
33

44
var Generator = yeoman.generators.Base.extend({
55
compose: function() {
6-
this.composeWith('ng-component:decorator', {arguments: this.arguments});
6+
this.composeWith('ng-component:decorator', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/decorator') });
77
}
88
});
99

directive/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
33

44
var Generator = yeoman.generators.Base.extend({
55
compose: function() {
6-
this.composeWith('ng-component:directive', {arguments: this.arguments});
6+
this.composeWith('ng-component:directive', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/directive') });
77
}
88
});
99

factory/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
33

44
var Generator = yeoman.generators.Base.extend({
55
compose: function() {
6-
this.composeWith('ng-component:factory', {arguments: this.arguments});
6+
this.composeWith('ng-component:factory', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/factory') });
77
}
88
});
99

filter/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
33

44
var Generator = yeoman.generators.Base.extend({
55
compose: function() {
6-
this.composeWith('ng-component:filter', {arguments: this.arguments});
6+
this.composeWith('ng-component:filter', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/filter') });
77
}
88
});
99

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
"dependencies": {
2929
"yeoman-generator": "~0.17.0",
3030
"chalk": "~0.4.0",
31-
"wiredep": "~0.4.2"
31+
"wiredep": "~0.4.2",
32+
"generator-ng-component": ">=0.0.4"
3233
},
3334
"peerDependencies": {
34-
"yo": ">=1.0.0",
35-
"generator-ng-component": ">=0.0.1"
35+
"yo": ">=1.2.0"
3636
},
3737
"devDependencies": {
3838
"chai": "^1.9.1",

provider/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
33

44
var Generator = yeoman.generators.Base.extend({
55
compose: function() {
6-
this.composeWith('ng-component:provider', {arguments: this.arguments});
6+
this.composeWith('ng-component:provider', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/provider') });
77
}
88
});
99

route/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
33

44
var Generator = yeoman.generators.Base.extend({
55
compose: function() {
6-
this.composeWith('ng-component:route', {arguments: this.arguments});
6+
this.composeWith('ng-component:route', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/route') });
77
}
88
});
99

service/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
33

44
var Generator = yeoman.generators.Base.extend({
55
compose: function() {
6-
this.composeWith('ng-component:service', {arguments: this.arguments});
6+
this.composeWith('ng-component:service', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/service') });
77
}
88
});
99

0 commit comments

Comments
 (0)