Skip to content

Commit 69d3f7b

Browse files
committed
changed server and client folder names to a more standard naming convention, public, lib
added deploy sub generator, :deploy heroku currently creates a Procfile for heroku
1 parent 3507748 commit 69d3f7b

File tree

7 files changed

+66
-6
lines changed

7 files changed

+66
-6
lines changed

Diff for: deploy/USAGE

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Description:
2+
Creates a Heroku deployment folder and grunt configuration
3+
4+
Example:
5+
yo angular-fullstack:deploy heroku
6+
7+
This will create:
8+
heroku deployment folder

Diff for: deploy/index.js

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
var util = require('util');
3+
var ScriptBase = require('../script-base.js');
4+
5+
6+
var Generator = module.exports = function Generator() {
7+
ScriptBase.apply(this, arguments);
8+
};
9+
10+
util.inherits(Generator, ScriptBase);
11+
12+
Generator.prototype.deployHeroku = function deployHeroku() {
13+
if(this.name.toLowerCase() != "heroku") return;
14+
this.template('../deploy/heroku/Procfile', 'heroku/Procfile');
15+
};

Diff for: templates/common/Gruntfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = function (grunt) {
1515
yeoman: {
1616
// configurable paths
1717
app: require('./bower.json').appPath || 'app',
18-
dist: 'dist'
18+
dist: 'public'
1919
},
2020
express: {
2121
options: {
@@ -58,7 +58,7 @@ module.exports = function (grunt) {
5858
'{.tmp,<%= yeoman.app %>}/scripts/{,*//*}*.js',
5959
'<%%= yeoman.app %>/images/{,*//*}*.{png,jpg,jpeg,gif,webp,svg}',
6060
'server.js',
61-
'server/{,*//*}*.{js,json}'
61+
'lib/{,*//*}*.{js,json}'
6262
],
6363
tasks: ['express:dev'],
6464
options: {

Diff for: templates/deploy/heroku/Procfile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
web: node server.js

Diff for: templates/deploy/heroku/copytemplate.js

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
clean: {
2+
dist: {
3+
files: [{
4+
src: [
5+
'heroku/*',
6+
'!heroku/.git*',
7+
'!heroku/Procfile'
8+
]
9+
}]
10+
},
11+
},
12+
copy: {
13+
heroku: {
14+
files: [{
15+
expand: true,
16+
dot: true,
17+
cwd: '<%= yeoman.dist %>',
18+
dest: 'heroku/public',
19+
src: [
20+
'**/**'
21+
]
22+
}, {
23+
expand: true,
24+
dest: 'heroku',
25+
src: [
26+
'package.json',
27+
'server.js',
28+
'lib/**/*'
29+
]
30+
}]
31+
}
32+
}
33+
34+
grunt.registerTask('build', [
35+
'copy:heroku'
36+
]);
File renamed without changes.

Diff for: templates/express/server.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
var express = require('express')
66
, http = require('http')
77
, path = require('path')
8-
, routes = require('./server/routes');
8+
, api = require('./lib/api');
99

1010
var app = express();
1111

1212
// all environments
1313
app.set('port', process.env.PORT || 3000);
1414

15-
app.use(express.favicon());
1615
app.use(express.logger('dev'));
1716
app.use(express.bodyParser());
1817
app.use(express.methodOverride());
@@ -26,10 +25,11 @@ if ('development' == app.get('env')) {
2625
}
2726
// production only
2827
else {
29-
app.use(express.static(path.join(__dirname, 'dist')));
28+
app.use(express.favicon(path.join(__dirname, 'public/favicon.ico')));
29+
app.use(express.static(path.join(__dirname, 'public')));
3030
}
3131

32-
app.get('/api/awesomeThings', routes.awesomeThings);
32+
app.get('/api/awesomeThings', api.awesomeThings);
3333

3434
http.createServer(app).listen(app.get('port'), function () {
3535
console.log("Express server listening on port %d in %s mode", app.get('port'), app.get('env'));

0 commit comments

Comments
 (0)