diff --git a/package.json b/package.json index 1ef0c9a..497b8c0 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "buildJs": "r.js -o static/js/requirejs/buid.js", "buildClean": "rm static/index.html", "buildHtml": "jade views/index.jade --obj '{\"env\": \"production\"}' -o static/", - "build": "npm run buildJs && npm run buildHtml && git checkout static/scripts/app.js" + "build": "npm run buildJs && npm run buildHtml && git checkout static/js/app.build.js", + "prepublish": "npm run build" }, "repository": { "type": "git", diff --git a/static/js/app.build.js b/static/js/app.build.js new file mode 100644 index 0000000..8e161c9 --- /dev/null +++ b/static/js/app.build.js @@ -0,0 +1,2 @@ +// client build for production replaces this file, this file exists only +// for jade include - file must exists even if include is conditional \ No newline at end of file diff --git a/static/js/requirejs/buid.js b/static/js/requirejs/buid.js index 5f83c6a..1ed63b6 100644 --- a/static/js/requirejs/buid.js +++ b/static/js/requirejs/buid.js @@ -13,5 +13,5 @@ preserveLicenseComments: false, optimize: 'uglify2', useStrict: true, - out: '../../scripts/app.js' + out: '../../js/app.build.js' }); diff --git a/static/js/requirejs/production.js b/static/js/requirejs/production.js index c015399..7261299 100644 --- a/static/js/requirejs/production.js +++ b/static/js/requirejs/production.js @@ -1,4 +1,3 @@ require.config({ - baseUrl: '/scripts' }); diff --git a/static/scripts/app.js b/static/scripts/app.js deleted file mode 100644 index e69de29..0000000 diff --git a/views/index.jade b/views/index.jade index 84fcf09..aee9400 100644 --- a/views/index.jade +++ b/views/index.jade @@ -18,7 +18,7 @@ html script include ../static/js/requirejs/production.js script - include ../static/scripts/app.js + include ../static/js/app.build.js script(type="text/javascript"). require(['app/app']);