Merge pull request #98 from justadudewhohacks/build-commonjs-and-es6

karma.conf.js

@@ -25,18 +25,14 @@ module.exports = function(config) {
       '**/*.ts': ['karma-typescript']
     },
     karmaTypescriptConfig: {
-      tsconfig: 'tsconfig.test.json',
-      bundlerOptions: {
-        transforms: [
-          require("karma-typescript-es6-transform")()
-        ]
-      }
+      tsconfig: 'tsconfig.test.json'
     },
     browsers: ['Chrome'],
-    browserNoActivityTimeout: 60000,
+    browserNoActivityTimeout: 120000,
+    captureTimeout: 60000,
     client: {
       jasmine: {
-        timeoutInterval: 30000
+        timeoutInterval: 60000
       }
     }
   })

package.json

@@ -2,13 +2,15 @@
   "name": "face-api.js",
   "version": "0.14.0",
   "description": "JavaScript API for face detection and face recognition in the browser with tensorflow.js",
-  "main": "./build/index.js",
-  "typings": "./build/index.d.ts",
+  "module": "./build/es6/index.js",
+  "main": "./build/commonjs/index.js",
+  "typings": "./build/commonjs/index.d.ts",
   "scripts": {
     "rollup-min": "rollup -c rollup.config.js --environment minify:true",
     "rollup": "rollup -c rollup.config.js",
-    "build-tsc": "tsc",
-    "build": "npm run rollup && npm run rollup-min && npm run build-tsc",
+    "tsc": "tsc",
+    "tsc-es6": "tsc --p tsconfig.es6.json",
+    "build": "npm run rollup && npm run rollup-min && npm run tsc && npm run tsc-es6",
     "test": "karma start"
   },
   "keywords": [
@@ -22,8 +24,8 @@
   "license": "MIT",
   "dependencies": {
     "@tensorflow/tfjs-core": "^0.12.14",
-    "tfjs-image-recognition-base": "0.1.0",
-    "tfjs-tiny-yolov2": "0.1.0",
+    "tfjs-image-recognition-base": "^0.1.1",
+    "tfjs-tiny-yolov2": "^0.1.2",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
@@ -34,7 +36,6 @@
     "karma-chrome-launcher": "^2.2.0",
     "karma-jasmine": "^1.1.2",
     "karma-typescript": "^3.0.12",
-    "karma-typescript-es6-transform": "^1.0.4",
     "rollup": "^0.65.0",
     "rollup-plugin-commonjs": "^9.1.6",
     "rollup-plugin-node-resolve": "^3.3.0",

rollup.config.js

@@ -18,7 +18,9 @@ export default {
       }
     }),
     node(),
-    commonjs()
+    commonjs({
+      include: 'node_modules/**'
+    })
   ].concat(minify ? uglify() : []),
   output: {
     extend: true,

src/faceLandmarkNet/FaceLandmark68Net.ts

 import * as tf from '@tensorflow/tfjs-core';
 import { NetInput, normalize } from 'tfjs-image-recognition-base';
-import { ConvParams } from 'tfjs-tiny-yolov2';
-import { SeparableConvParams } from 'tfjs-tiny-yolov2/build/tinyYolov2/types';
+import { ConvParams, SeparableConvParams } from 'tfjs-tiny-yolov2';
 
 import { depthwiseSeparableConv } from './depthwiseSeparableConv';
 import { extractParams } from './extractParams';

src/faceLandmarkNet/FaceLandmark68TinyNet.ts

 import * as tf from '@tensorflow/tfjs-core';
 import { NetInput, normalize } from 'tfjs-image-recognition-base';
-import { ConvParams } from 'tfjs-tiny-yolov2';
-import { SeparableConvParams } from 'tfjs-tiny-yolov2/build/tinyYolov2/types';
+import { ConvParams, SeparableConvParams } from 'tfjs-tiny-yolov2';
 
 import { depthwiseSeparableConv } from './depthwiseSeparableConv';
 import { extractParamsTiny } from './extractParamsTiny';

src/faceLandmarkNet/depthwiseSeparableConv.ts

 import * as tf from '@tensorflow/tfjs-core';
-import { SeparableConvParams } from 'tfjs-tiny-yolov2/build/tinyYolov2/types';
+import { SeparableConvParams } from 'tfjs-tiny-yolov2';
 
 export function depthwiseSeparableConv(
   x: tf.Tensor4D,

src/faceLandmarkNet/extractorsFactory.ts

 import * as tf from '@tensorflow/tfjs-core';
 import { ExtractWeightsFunction, ParamMapping } from 'tfjs-image-recognition-base';
-import { extractConvParamsFactory, FCParams } from 'tfjs-tiny-yolov2';
-import { SeparableConvParams } from 'tfjs-tiny-yolov2/build/tinyYolov2/types';
+import { extractConvParamsFactory, FCParams, SeparableConvParams } from 'tfjs-tiny-yolov2';
 
 import { DenseBlock3Params, DenseBlock4Params } from './types';
 

src/faceLandmarkNet/loadParamsFactory.ts

 import * as tf from '@tensorflow/tfjs-core';
 import { extractWeightEntryFactory, ParamMapping } from 'tfjs-image-recognition-base';
-import { ConvParams, FCParams } from 'tfjs-tiny-yolov2';
-import { SeparableConvParams } from 'tfjs-tiny-yolov2/build/tinyYolov2/types';
+import { ConvParams, FCParams, SeparableConvParams } from 'tfjs-tiny-yolov2';
 
 import { DenseBlock3Params, DenseBlock4Params } from './types';
 

src/faceLandmarkNet/types.ts

 import * as tf from '@tensorflow/tfjs-core';
-import { ConvParams, FCParams } from 'tfjs-tiny-yolov2';
-import { SeparableConvParams } from 'tfjs-tiny-yolov2/build/tinyYolov2/types';
+import { ConvParams, FCParams, SeparableConvParams } from 'tfjs-tiny-yolov2';
 
 export type ConvWithBatchNormParams = BatchNormParams & {
   filter: tf.Tensor4D

tsconfig.es6.json

+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "build/es6",
+    "module": "es6",
+    "target": "es5"
+  },
+  "include": [
+    "src"
+  ]
+}

tsconfig.json

@@ -18,10 +18,10 @@
     "suppressImplicitAnyIndexErrors": true,
     "strictNullChecks": true,
     "importHelpers": true,
+    "outDir": "build/commonjs",
     "module": "commonjs",
-    "moduleResolution": "node",
     "target": "es5",
-    "outDir": "build",
+    "moduleResolution": "node",
     "baseUrl": ".",
     "lib": ["es2015", "dom"],
     "typeRoots": [

tsconfig.test.json

 {
   "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "commonjs"
-  },
   "include": [
     "src",
     "test"