mirror of https://github.com/TryGhost/Ghost.git
Merge pull request #7006 from kevinansfield/subgrunt-init
Use subgrunt to install client dependencies
This commit is contained in:
commit
14c3d0e9ef
|
@ -232,9 +232,6 @@ var _ = require('lodash'),
|
||||||
ember: {
|
ember: {
|
||||||
command: function (mode) {
|
command: function (mode) {
|
||||||
switch (mode) {
|
switch (mode) {
|
||||||
case 'init':
|
|
||||||
return 'echo Installing client dependencies... && npm install && bower install';
|
|
||||||
|
|
||||||
case 'prod':
|
case 'prod':
|
||||||
return emberPath + ' build --environment=production --silent';
|
return emberPath + ' build --environment=production --silent';
|
||||||
|
|
||||||
|
@ -347,6 +344,10 @@ var _ = require('lodash'),
|
||||||
// ### grunt-subgrunt
|
// ### grunt-subgrunt
|
||||||
// Run grunt tasks in submodule Gruntfiles
|
// Run grunt tasks in submodule Gruntfiles
|
||||||
subgrunt: {
|
subgrunt: {
|
||||||
|
init: {
|
||||||
|
'core/client': 'init'
|
||||||
|
},
|
||||||
|
|
||||||
lint: {
|
lint: {
|
||||||
'core/client': 'lint'
|
'core/client': 'lint'
|
||||||
}
|
}
|
||||||
|
@ -769,7 +770,7 @@ var _ = require('lodash'),
|
||||||
// `bower` does have some quirks, such as not running as root. If you have problems please try running
|
// `bower` does have some quirks, such as not running as root. If you have problems please try running
|
||||||
// `grunt init --verbose` to see if there are any errors.
|
// `grunt init --verbose` to see if there are any errors.
|
||||||
grunt.registerTask('init', 'Prepare the project for development',
|
grunt.registerTask('init', 'Prepare the project for development',
|
||||||
['update_submodules', 'shell:ember:init', 'assets', 'default']);
|
['update_submodules', 'subgrunt:init', 'assets', 'default']);
|
||||||
|
|
||||||
// ### Basic Asset Building
|
// ### Basic Asset Building
|
||||||
// Builds and moves necessary client assets. Prod additionally builds the ember app.
|
// Builds and moves necessary client assets. Prod additionally builds the ember app.
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 2f4d0568544ffb1daf65f2e54d09ab86b804b1c3
|
Subproject commit 339563f85d1623a5ecd6858fda53f808ad9692ad
|
Loading…
Reference in New Issue