Skip to content

feat(app): use grunt config for server location #1248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Awk34 merged 1 commit into from
Sep 5, 2015
+17 −16
Merged

feat(app): use grunt config for server location #1248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions app/templates/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ module.exports = function (grunt) {
yeoman: {
// configurable paths
client: require('./bower.json').appPath || 'client',
server: 'server',
dist: 'dist'
},
express: {
Expand All @@ -39,13 +40,13 @@ module.exports = function (grunt) {
},
dev: {
options: {
script: 'server',
script: '<%%= yeoman.server %>',
debug: true
}
},
prod: {
options: {
script: 'dist/server'
script: '<%%= yeoman.dist %>/<%%= yeoman.server %>'
}
}
},
Expand All @@ -71,7 +72,7 @@ module.exports = function (grunt) {
tasks: ['injector:css']
},
mochaTest: {
files: ['server/**/*.{spec,integration}.js'],
files: ['<%%= yeoman.server %>/**/*.{spec,integration}.js'],
tasks: ['env:test', 'mochaTest']
},
jsTest: {
Expand Down Expand Up @@ -128,7 +129,7 @@ module.exports = function (grunt) {
}
},
express: {
files: ['server/**/*.{js,json}'],
files: ['<%%= yeoman.server %>/**/*.{js,json}'],
tasks: ['express:dev', 'wait'],
options: {
livereload: true,
Expand All @@ -149,15 +150,15 @@ module.exports = function (grunt) {
},
server: {
options: {
jshintrc: 'server/.jshintrc'
jshintrc: '<%%= yeoman.server %>/.jshintrc'
},
src: ['server/**/!(*.spec|*.integration).js']
src: ['<%%= yeoman.server %>/**/!(*.spec|*.integration).js']
},
serverTest: {
options: {
jshintrc: 'server/.jshintrc-spec'
jshintrc: '<%%= yeoman.server %>/.jshintrc-spec'
},
src: ['server/**/*.{spec,integration}.js']
src: ['<%%= yeoman.server %>/**/*.{spec,integration}.js']
},
all: ['<%%= yeoman.client %>/{app,components}/**/!(*.spec|*.mock).js'],
test: {
Expand All @@ -173,7 +174,7 @@ module.exports = function (grunt) {
files: {
src: [
'<%%= yeoman.client %>/app/**/*.js',
'server/**/*.js'
'<%%= yeoman.server %>/**/*.js'
]
}
}
Expand Down Expand Up @@ -223,7 +224,7 @@ module.exports = function (grunt) {
// Use nodemon to run server in debug mode with an initial breakpoint
nodemon: {
debug: {
script: 'server',
script: '<%%= yeoman.server %>',
options: {
nodeArgs: ['--debug-brk'],
env: {
Expand Down Expand Up @@ -393,7 +394,7 @@ module.exports = function (grunt) {
dest: '<%%= yeoman.dist %>',
src: [
'package.json',
'server/**/*'
'<%%= yeoman.server %>/**/*'
]
}]
},
Expand All @@ -407,7 +408,7 @@ module.exports = function (grunt) {

buildcontrol: {
options: {
dir: 'dist',
dir: '<%%= yeoman.dist %>',
commit: true,
push: true,
connectCommits: false,
Expand Down Expand Up @@ -480,10 +481,10 @@ module.exports = function (grunt) {
timeout: 5000 // set default mocha spec timeout
},
unit: {
src: ['server/**/*.spec.js']
src: ['<%%= yeoman.server %>/**/*.spec.js']
},
integration: {
src: ['server/**/*.integration.js']
src: ['<%%= yeoman.server %>/**/*.integration.js']
}
},

Expand All @@ -496,7 +497,7 @@ module.exports = function (grunt) {
mask: '**/*.spec.js',
coverageFolder: 'coverage/server/unit'
},
src: 'server'
src: '<%%= yeoman.server %>'
},
integration: {
options: {
Expand All @@ -506,7 +507,7 @@ module.exports = function (grunt) {
mask: '**/*.integration.js',
coverageFolder: 'coverage/server/integration'
},
src: 'server'
src: '<%%= yeoman.server %>'
}
},

Expand Down