use webpack for build

auduno · Sep 12, 2016 · 2bcfb0a · 2bcfb0a
1 parent 90b79c1
commit 2bcfb0a
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 14 deletions.
diff --git a/examples/clm_video.html b/examples/clm_video.html
@@ -92,7 +92,7 @@
 	<body>
 		<script src="./ext_js/utils.js"></script>
 		<script src="../models/model_pca_20_svm.js"></script>
-		<script src="../clmtrackr.min.js"></script>
+		<script src="../clmtrackr.js"></script>
 		<script src="../node_modules/stats.js/src/Stats.js"></script>
 		<div id="content">
 			<h2>Facetracking example</h2>

diff --git a/examples/example.html b/examples/example.html
@@ -17,7 +17,7 @@
 	</head>
 	<body>
 		<script src="./ext_js/utils.js"></script>
-		<script src="../clmtrackr.min.js"></script>
+		<script src="../clmtrackr.js"></script>
 		<script src="../models/model_pca_20_svm.js"></script>
 		<div id="content">
 			<h2>Example</h2>

diff --git a/examples/face_deformation_video.html b/examples/face_deformation_video.html
@@ -94,7 +94,7 @@
 		<script src="../node_modules/exdat/build/dat.gui.min.js"></script>
 		<script src="./ext_js/utils.js"></script>
 		<script src="../models/model_pca_20_svm.js"></script>
-		<script src="../clmtrackr.min.js"></script>
+		<script src="../clmtrackr.js"></script>
 		<script src="../node_modules/stats.js/src/Stats.js"></script>
 		<script src="./ext_js/face_deformer.js"></script>
 		<div id="content">

diff --git a/examples/face_mask.html b/examples/face_mask.html
@@ -96,7 +96,7 @@
 	<body>
 		<script src="./ext_js/utils.js"></script>
 		<script src="../models/model_pca_20_svm.js"></script>
-		<script src="../clmtrackr.min.js"></script>
+		<script src="../clmtrackr.js"></script>
 		<script src="../node_modules/stats.js/src/Stats.js"></script>
 		<script src="./ext_js/face_deformer.js"></script>
 		<div id="content">

diff --git a/js/jsfeat_detect.js b/js/jsfeat_detect.js
@@ -1,6 +1,5 @@
 // simple wrapper for jsfeat face detector
-var jsfeat = require('jsfeat');
-var findFaceWorker = require('./jsfeat_detect_worker');
+var findFaceWorker = require('./jsfeat_detect_worker.js');
 
 // Curtousy of stackoverflow this function
 Worker.createURL = function(func_or_string){
@@ -22,7 +21,7 @@ var frontalface = require('./filters/frontalface.json');
 
 var jsfeat_face = function(image) {
 
-  var img_u8,work_canvas,work_ctx,ii_sum,ii_sqsum,ii_tilted,edg;
+  var work_canvas, work_ctx;
 
   var w = image.width;
   var h = image.height;

diff --git a/js/jsfeat_detect_worker.js b/js/jsfeat_detect_worker.js
diff --git a/package.json b/package.json
@@ -3,22 +3,26 @@
   "version": "0.0.1",
   "description": "Javascript library for precise tracking of facial features via Constrained Local Models",
   "scripts": {
-    "build": "browserify js/index.js -s clm -o ./clmtrackr.js; uglifyjs ./clmtrackr.js -m -r 'clm,clmtrackr' -o ./clmtrackr.min.js"
+    "build": "PROD_ENV=1 webpack --optimize-minimize --optimize-dedupe",
+    "watch": "webpack --debug --devtool eval-cheap-module-source-map --output-pathinfo --progress --colors --watch",
+    "serve": "webpack-dev-server --debug --devtool eval-cheap-module-source-map --output-pathinfo --inline --hot --host localhost"
   },
   "main": "clmtracker.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/auduno/clmtrackr.git"
   },
   "devDependencies": {
-    "browserify": "^13.0.0",
-    "getusermedia": "^1.3.5",
-    "exdat": "^0.6.2",
     "blob.js": "andyinabox/Blob.js",
+    "exdat": "^0.6.2",
     "filesaver.js": "andyinabox/FileSaver.js",
-    "uglify": "^0.1.5",
+    "getusermedia": "^1.3.5",
+    "json-loader": "^0.5.4",
     "raf": "^3.1.0",
-    "stats.js": "0.0.14-master"
+    "stats.js": "0.0.14-master",
+    "uglify": "^0.1.5",
+    "webpack": "^1.13.2",
+    "webpack-dev-server": "^1.15.1"
   },
   "dependencies": {
     "jsfeat": "0.0.8",

diff --git a/webpack.config.js b/webpack.config.js
@@ -0,0 +1,24 @@
+'use strict';
+const path = require('path');
+
+const PROD = JSON.parse(process.env.PROD_ENV || '0');
+
+module.exports = {
+  entry: {
+    clmtrackr: './js/index.js'
+  },
+  output: {
+    filename: PROD ? '[name].min.js' : '[name].js',
+    path: path.resolve(__dirname),
+    libraryTarget: 'umd',
+    library: 'clm'
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.json$/,
+        loader: 'json-loader'
+      }
+    ]
+  }
+};