Skip to content

Commit

Permalink
Add static asset paths and run.py for production
Browse files Browse the repository at this point in the history
  • Loading branch information
lassegit committed Sep 15, 2016
1 parent 462af90 commit 051e1e4
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 30 deletions.
25 changes: 12 additions & 13 deletions app/templates/assets.json
@@ -1,15 +1,14 @@
{
"app": {
"js": "/app.js"
},
"style": {
"js": "/style.js",
"css": "/style.css"
},
"vendor": {
"js": "/vendor.js"
},
"manifest": {
"js": "/manifest.js"
}
"manifest": {
"js": "/js/manifest.js"
},
"vendor": {
"js": "/js/vendor.js"
},
"app": {
"js": "/js/app.js"
},
"style": {
"css": "/style/style.css"
}
}
10 changes: 10 additions & 0 deletions run.py
@@ -0,0 +1,10 @@
#!/usr/bin/env python
import os

from app import create_app

env = os.environ.get('app_ENV', 'prod')
app = create_app('app.settings.%sConfig' % env.capitalize(), env=env)

if __name__ == '__main__':
app.run()
2 changes: 1 addition & 1 deletion uwsgi.ini
@@ -1,5 +1,5 @@
[uwsgi]
module = uwsgi
module = run
callable = app
master = true
processes = 10
Expand Down
10 changes: 0 additions & 10 deletions uwsgi.py

This file was deleted.

6 changes: 3 additions & 3 deletions webpack.config.js
Expand Up @@ -28,8 +28,8 @@ switch(TARGET) {
output: {
path: PATHS.build,
publicPath: '/',
filename: '[name].[chunkhash].js',
chunkFilename: '[chunkhash].js'
filename: 'js/[name].[chunkhash].js',
// chunkFilename: '[chunkhash].js'
},
plugins: [],
resolve: {
Expand Down Expand Up @@ -72,7 +72,7 @@ switch(TARGET) {
output: {
path: PATHS.dev,
publicPath: '/',
filename: '[name].js',
filename: 'js/[name].js',
},
plugins: [
new CopyWebpackPlugin([
Expand Down
6 changes: 3 additions & 3 deletions webpack.parts.js
Expand Up @@ -76,7 +76,7 @@ exports.minify = function() {
plugins: [
new webpack.optimize.DedupePlugin(),
new webpack.DefinePlugin({
'process.env.NODE_ENV': '"production"'
'process.env.NODE_ENV': 'production'
}),
new webpack.optimize.UglifyJsPlugin({
compress: {
Expand Down Expand Up @@ -115,10 +115,10 @@ exports.clean = function(path) {
}

exports.extractCSS = function(path, target) {
var filename = '[name].css';
var filename = 'style/[name].css';

if (target === 'BUILD') {
filename = '[name].[chunkhash].css';
filename = 'style/[name].[chunkhash].css';
}

return {
Expand Down

0 comments on commit 051e1e4

Please sign in to comment.