restructured scripts for building and some improvements

This commit is contained in:
logsol 2014-12-21 23:02:27 +01:00
parent 74134a53af
commit 8dbc088813
8 changed files with 231 additions and 15 deletions

View file

@ -2,10 +2,10 @@ define([
'http', 'http',
'node-static', 'node-static',
'Server/Api', 'Server/Api',
'zlib' 'fs'
], ],
function (http, nodeStatic, Api, zlib) { function (http, nodeStatic, Api, fs) {
function HttpServer (options, coordinator) { function HttpServer (options, coordinator) {
options.port = options.port || 1234; options.port = options.port || 1234;
@ -46,7 +46,13 @@ function (http, nodeStatic, Api, zlib) {
break; break;
case req.url == '/client.js': case req.url == '/client.js':
fs.exists('./build/client.min.js', function (exists) {
if (process.env.NODE_ENV && process.env.NODE_ENV == 'production' && exists) {
fileServer.serveFile('./build/client.min.js', 200, {}, req, res);
} else {
fileServer.serveFile('./client.js', 200, {}, req, res); fileServer.serveFile('./client.js', 200, {}, req, res);
}
});
break; break;
case req.url == '/client.min.js': case req.url == '/client.min.js':

View file

@ -1,9 +0,0 @@
#!/bin/bash
if [ -d "build" ]; then
cd build
echo "\\033[1;36mcompiling client scripts...\\033[0m"
rm -f "client.min.js.gz"
../node_modules/requirejs/bin/r.js -o build.js > /dev/null \
&& gzip -c client.min.js > client.min.js.gz && echo "\\033[1;32mdone.\\033[0m"
cd ..
fi

View file

@ -5,7 +5,7 @@
"socketio": "../node_modules/socket.io/node_modules/socket.io-client/dist/socket.io" "socketio": "../node_modules/socket.io/node_modules/socket.io-client/dist/socket.io"
}, },
name: "../client", name: "../client",
out: "client.min.js", out: "../build/client.min.js",
onBuildRead: function (moduleName, path, contents) { onBuildRead: function (moduleName, path, contents) {
var contents = contents.replace(/\" \+ GLOBALS.context \+ \"/g, "Client"); var contents = contents.replace(/\" \+ GLOBALS.context \+ \"/g, "Client");
return contents; return contents;

206
config/client.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -27,6 +27,6 @@
"config": { "port": "1234" }, "config": { "port": "1234" },
"private": true, "private": true,
"scripts": { "scripts": {
"prestart": "./build/build.sh" "prestart": "scripts/build.sh"
} }
} }

13
scripts/build.sh Executable file
View file

@ -0,0 +1,13 @@
#!/bin/bash
if env | grep -q "^NODE_ENV=production$"
then
echo "[ PRODUCTION ]"
mkdir -p build
echo "- compiling client scripts.."
rm -f "build/client.min.js.gz"
node_modules/requirejs/bin/r.js -o config/build-profile.js > /dev/null \
&& gzip -c build/client.min.js > build/client.min.js.gz \
&& echo "- done."
else
echo "[ DEVELOPMENT ]"
fi

View file

@ -78,6 +78,6 @@
<canvas id="canvas"></canvas> <canvas id="canvas"></canvas>
</div> </div>
</article> </article>
<script data-main="client.min" src="require.js"></script> <script data-main="client" src="require.js"></script>
</body> </body>
</html> </html>