diff --git a/.gitignore b/.gitignore index 601aee1..3a41242 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,11 @@ node_modules .DS_Store Thumbs.db *.log +rats.json /dist /temp +/web # ignore everything in 'app' folder what had been generated from 'src' folder /app/app.js diff --git a/package.json b/package.json index 87faace..cc7a904 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "type": "git", "url": "https://github.com/DEgITx/rats-search.git" }, + "serverDataDirectory": "./", "build": { "appId": "com.ratsontheboat.search", "files": [ @@ -105,7 +106,8 @@ "start": "node build/start.js", "prebuild": "webpack --config=build/webpack.app.config.js --env=production", "build": "electron-builder", - "server": "node src/background/server.js" + "server": "node src/background/server.js", + "buildweb": "node src/background/webpack.js" }, "dependencies": { "bencode": "^1.0.0", diff --git a/src/background/server.js b/src/background/server.js index f012996..fbf7331 100644 --- a/src/background/server.js +++ b/src/background/server.js @@ -8,6 +8,10 @@ const express = require('express'); const app = express(); const server = http.Server(app); const io = require('socket.io')(server); +const fs = require('fs'); +const path = require('path') + +const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8')); server.listen(appConfig.httpPort); console.log('Listening web server on', appConfig.httpPort, 'port') @@ -28,6 +32,6 @@ sphinx = startSphinx(() => { dbPatcher(() => { spider = spiderCall((...data) => io.sockets.emit(...data), (message, callback) => { socketMessages[message] = callback - }, './', '0.7.1', 'development') + }, path.resolve(packageJson.serverDataDirectory), packageJson.version, 'production') }, null, sphinx) -}, './', () => {}) \ No newline at end of file +}, path.resolve(packageJson.serverDataDirectory), () => {}) \ No newline at end of file diff --git a/src/background/webpack.js b/src/background/webpack.js index aa10e6a..9e72878 100644 --- a/src/background/webpack.js +++ b/src/background/webpack.js @@ -6,7 +6,9 @@ compiler.run((err, stats) => { if(err) throw new Error(err) - console.log('succesfully builder') - if(stats.compilation.errors) - console.error(stats.compilation.errors) + + if(stats.compilation.errors && stats.compilation.errors.length > 0) + console.error('compilation errors', stats.compilation.errors) + else + console.log('succesfully builded web version') })