Fixed node build

This commit is contained in:
Christoph Oberhofer
2016-02-25 22:30:41 +01:00
parent 16da30652c
commit 3c020d04bf
8 changed files with 155 additions and 441 deletions
+14 -9
View File
File diff suppressed because one or more lines are too long
+3 -3
View File
File diff suppressed because one or more lines are too long
+123 -419
View File
File diff suppressed because one or more lines are too long
-1
View File
@@ -1,6 +1,5 @@
let config; let config;
console.log(ENV);
if(ENV.development){ if(ENV.development){
config = require('./config.dev.js'); config = require('./config.dev.js');
} else if (ENV.node) { } else if (ENV.node) {
+1 -1
View File
@@ -163,7 +163,7 @@ function boxFromPatches(patches) {
vec2.transformMat2(box[j], box[j], transMat); vec2.transformMat2(box[j], box[j], transMat);
} }
if (ENV.development && _config.development.boxFromPatches.showBB) { if (ENV.development && _config.debug.boxFromPatches.showBB) {
ImageDebug.drawPath(box, {x: 0, y: 1}, _canvasContainer.ctx.binary, {color: '#ff0000', lineWidth: 2}); ImageDebug.drawPath(box, {x: 0, y: 1}, _canvasContainer.ctx.binary, {color: '#ff0000', lineWidth: 2});
} }
+2 -2
View File
@@ -8,10 +8,10 @@ import ImageDebug from './common/image_debug';
import {vec2} from 'gl-matrix'; import {vec2} from 'gl-matrix';
import ResultCollector from './analytics/result_collector'; import ResultCollector from './analytics/result_collector';
import Config from './config/config'; import Config from './config/config';
import InputStream from 'input_stream';
import FrameGrabber from 'frame_grabber';
const merge = require('lodash/object/merge'); const merge = require('lodash/object/merge');
const InputStream = require('./input/input_stream');
const FrameGrabber = require('./input/frame_grabber');
var _inputStream, var _inputStream,
_framegrabber, _framegrabber,
+3 -2
View File
@@ -16,9 +16,10 @@ module.exports = {
}, },
resolve: { resolve: {
extensions: ['', '.js', '.jsx'], extensions: ['', '.js', '.jsx'],
root: path.resolve(__dirname),
alias: { alias: {
'input_stream$': path.resolve(__dirname, 'src/input/input_stream'), 'input_stream$': 'src/input/input_stream',
'frame_grabber$': path.resolve(__dirname, 'src/input/frame_grabber') 'frame_grabber$': 'src/input/frame_grabber'
} }
}, },
output: { output: {
+8 -3
View File
@@ -5,9 +5,10 @@ module.exports = require('./webpack.config.js');
module.exports.resolve = { module.exports.resolve = {
extensions: ['', '.js', '.jsx'], extensions: ['', '.js', '.jsx'],
root: path.resolve(__dirname),
alias: { alias: {
'input_stream$': path.resolve(__dirname, 'lib/input_stream'), 'input_stream': 'lib/input_stream',
'frame_grabber$': path.resolve(__dirname, 'lib/frame_grabber') 'frame_grabber': 'lib/frame_grabber'
} }
}; };
@@ -19,6 +20,10 @@ module.exports.externals = [
"ndarray-linear-interpolate" "ndarray-linear-interpolate"
]; ];
module.exports.output.libraryTarget = "commonjs2"; module.exports.output.libraryTarget = "commonjs2";
module.exports.plugins = []; module.exports.plugins = [
new webpack.DefinePlugin({
ENV: require(path.join(__dirname, './env/', process.env.BUILD_ENV))
})
];
module.exports.output.path = __dirname + '/lib'; module.exports.output.path = __dirname + '/lib';
module.exports.output.filename = 'quagga.js'; module.exports.output.filename = 'quagga.js';