Update build setup of models to use ES bundle (#31)

dsmilkov · web-flow · commit c3331788759b · 2018-06-12T16:20:25.000-04:00
Update build setup of models to use ES bundle. Also rename `src/posenet.ts` to `src/posenet_model.ts` to avoid conflict with `posenet.js` (the bundle) since all gets stored in `dist/`
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 node_modules
 dist/
-dist-es6/
 
 **/*/node_modules
 **/*/coverage
diff --git a/mobilenet/.npmignore b/mobilenet/.npmignore
@@ -0,0 +1,14 @@
+.vscode/
+.rpt2_cache/
+demos/
+scripts/
+src/
+coverage/
+node_modules/
+karma.conf.js
+*.tgz
+dist/**/*.js.map
+.travis.yml
+.npmignore
+tslint.json
+yarn.lock
diff --git a/mobilenet/package.json b/mobilenet/package.json
@@ -5,30 +5,30 @@
   "main": "dist/index.js",
   "unpkg": "dist/mobilenet.min.js",
   "jsdelivr": "dist/mobilenet.min.js",
-  "jsnext:main": "dist-es6/index.js",
-  "module": "dist-es6/index.js",
+  "jsnext:main": "dist/mobilenet.esm.js",
+  "module": "dist/mobilenet.esm.js",
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/tensorflow/tfjs-models.git"
   },
   "peerDependencies": {
-    "@tensorflow/tfjs": "~0.11.2"
+    "@tensorflow/tfjs": "~0.11.6"
   },
   "devDependencies": {
-    "@tensorflow/tfjs": "~0.11.2",
+    "@tensorflow/tfjs": "~0.11.6",
     "babel-core": "^6.26.0",
     "babel-plugin-transform-runtime": "~6.23.0",
     "rimraf": "~2.6.2",
     "rollup": "~0.58.2",
     "rollup-plugin-node-resolve": "~3.3.0",
     "rollup-plugin-typescript2": "~0.13.0",
+    "rollup-plugin-uglify": "~3.0.0",
     "tslint": "~5.8.0",
-    "typescript": "2.7.2",
-    "uglify-js": "~3.0.28"
+    "typescript": "2.7.2"
   },
   "scripts": {
-    "build": "rimraf dist dist-es6 && tsc --project tsconfig-es5.json && tsc && rollup -c && uglifyjs dist/mobilenet.js -c -m -o dist/mobilenet.min.js",
+    "build": "rimraf dist && tsc && rollup -c",
     "test": "karma start",
     "publish-npm": "yarn build && npm publish",
     "dev": "npm run watch && cs demos && npm run watch",
diff --git a/mobilenet/rollup.config.js b/mobilenet/rollup.config.js
@@ -17,23 +17,36 @@
 
 import node from 'rollup-plugin-node-resolve';
 import typescript from 'rollup-plugin-typescript2';
+import uglify from 'rollup-plugin-uglify';
 
-export default {
-  input: 'index.ts',
-  plugins: [
-    typescript(),
-    node()
-  ],
-  external: [
-    '@tensorflow/tfjs'
-  ],
-  output: {
-    banner: `// @tensorflow/tfjs-models Copyright ${(new Date).getFullYear()} Google`,
-    file: 'dist/mobilenet.js',
-    format: 'umd',
-    name: 'mobilenet',
-    globals: {
-      '@tensorflow/tfjs': 'tf'
-    }
-  }
-};
+const PREAMBLE =
+    `// @tensorflow/tfjs-models Copyright ${(new Date).getFullYear()} Google`;
+
+function minify() {
+  return uglify({output: {preamble: PREAMBLE}});
+}
+
+function config({plugins = [], output = {}}) {
+  return {
+    input: 'src/index.ts',
+    plugins: [
+      typescript({tsconfigOverride: {compilerOptions: {module: 'ES2015'}}}),
+      node(), ...plugins
+    ],
+    output: {banner: PREAMBLE, globals: {'@tensorflow/tfjs': 'tf'}, ...output},
+    external: ['@tensorflow/tfjs']
+  };
+}
+
+export default [
+  config(
+      {output: {format: 'umd', name: 'mobilenet', file: 'dist/mobilenet.js'}}),
+  config({
+    plugins: [minify()],
+    output: {format: 'umd', name: 'mobilenet', file: 'dist/mobilenet.min.js'}
+  }),
+  config({
+    plugins: [minify()],
+    output: {format: 'es', file: 'dist/mobilenet.esm.js'}
+  })
+];
diff --git a/mobilenet/src/imagenet_classes.ts b/mobilenet/src/imagenet_classes.ts
diff --git a/mobilenet/src/index.ts b/mobilenet/src/index.ts
diff --git a/mobilenet/tsconfig-es5.json b/mobilenet/tsconfig-es5.json
diff --git a/mobilenet/tsconfig.json b/mobilenet/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "module": "ES2015",
+    "module": "commonjs",
     "moduleResolution": "node",
     "noImplicitAny": true,
     "sourceMap": true,
@@ -9,7 +9,7 @@
     "declaration": true,
     "target": "es5",
     "lib": ["es2015", "dom"],
-    "outDir": "./dist-es6",
+    "outDir": "./dist",
     "noUnusedLocals": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,
@@ -21,7 +21,7 @@
     "experimentalDecorators": true
   },
   "include": [
-    "./"
+    "src/"
   ],
   "exclude": [
     "node_modules/",
diff --git a/mobilenet/yarn.lock b/mobilenet/yarn.lock
@@ -63,7 +63,7 @@
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.6.6.tgz#6869c86ed01905271ebe707d6324ba04119b73ab"
 
-"@tensorflow/tfjs@~0.11.2":
+"@tensorflow/tfjs@~0.11.6":
   version "0.11.6"
   resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.11.6.tgz#f89faee3a62c8726d64fc88d69cf02ef73384ba8"
   dependencies:
@@ -294,9 +294,9 @@ commander@^2.9.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
-commander@~2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+commander@~2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -755,6 +755,12 @@ rollup-plugin-typescript2@~0.13.0:
     rollup-pluginutils "^2.0.1"
     tslib "^1.9.0"
 
+rollup-plugin-uglify@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-3.0.0.tgz#a34eca24617709c6bf1778e9653baafa06099b86"
+  dependencies:
+    uglify-es "^3.3.7"
+
 rollup-pluginutils@^2.0.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4"
@@ -787,10 +793,14 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
 strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -845,12 +855,12 @@ typescript@2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
 
-uglify-js@~3.0.28:
-  version "3.0.28"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.28.tgz#96b8495f0272944787b5843a1679aa326640d5f7"
+uglify-es@^3.3.7:
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
   dependencies:
-    commander "~2.11.0"
-    source-map "~0.5.1"
+    commander "~2.13.0"
+    source-map "~0.6.1"
 
 universalify@^0.1.0:
   version "0.1.1"
diff --git a/posenet/.npmignore b/posenet/.npmignore
@@ -8,8 +8,7 @@ node_modules/
 karma.conf.js
 *.tgz
 dist/**/*.js.map
-dist-es6/**/*.js.map
 .travis.yml
 .npmignore
 tslint.json
-yarn.lock
+yarn.lock
diff --git a/posenet/package.json b/posenet/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.2",
   "description": "Pretrained PoseNet model in tensorflow.js",
   "main": "dist/index.js",
-  "jsnext:main": "dist-es6/index.js",
-  "module": "dist-es6/index.js",
+  "jsnext:main": "dist/posenet.esm.js",
+  "module": "dist/posenet.esm.js",
   "unpkg": "dist/posenet.min.js",
   "jsdelivr": "dist/posenet.min.js",
   "types": "dist/index.d.ts",
@@ -13,10 +13,10 @@
     "url": "https://github.com/tensorflow/tfjs-models.git"
   },
   "peerDependencies": {
-    "@tensorflow/tfjs": "~0.11.2"
+    "@tensorflow/tfjs": "~0.11.6"
   },
   "devDependencies": {
-    "@tensorflow/tfjs": "~0.11.2",
+    "@tensorflow/tfjs": "~0.11.6",
     "@types/jasmine": "~2.5.53",
     "babel-core": "^6.26.0",
     "babel-plugin-transform-runtime": "~6.23.0",
@@ -31,12 +31,12 @@
     "rollup": "~0.58.2",
     "rollup-plugin-node-resolve": "~3.3.0",
     "rollup-plugin-typescript2": "~0.13.0",
+    "rollup-plugin-uglify": "~3.0.0",
     "tslint": "~5.8.0",
-    "typescript": "2.7.2",
-    "uglify-js": "~3.0.28"
+    "typescript": "2.7.2"
   },
   "scripts": {
-    "build": "rimraf dist dist-es6 && tsc --project tsconfig-es5.json && tsc && rollup -c && uglifyjs dist/posenet.js -c -m -o dist/posenet.min.js",
+    "build": "rimraf dist && tsc && rollup -c",
     "test": "karma start",
     "test-travis": "karma start --browsers='bs_firefox_mac,bs_chrome_mac' --singleRun",
     "publish-npm": "yarn build && npm publish",
diff --git a/posenet/rollup.config.js b/posenet/rollup.config.js
@@ -17,23 +17,35 @@
 
 import node from 'rollup-plugin-node-resolve';
 import typescript from 'rollup-plugin-typescript2';
+import uglify from 'rollup-plugin-uglify';
 
-export default {
-  input: 'src/index.ts',
-  plugins: [
-    typescript(),
-    node()
-  ],
-  external: [
-    '@tensorflow/tfjs'
-  ],
-  output: {
-    banner: `// @tensorflow/tfjs-models Copyright ${(new Date).getFullYear()} Google`,
-    file: 'dist/posenet.js',
-    format: 'umd',
-    name: 'posenet',
-    globals: {
-      '@tensorflow/tfjs': 'tf'
-    }
-  }
-};
+const PREAMBLE =
+    `// @tensorflow/tfjs-models Copyright ${(new Date).getFullYear()} Google`;
+
+function minify() {
+  return uglify({output: {preamble: PREAMBLE}});
+}
+
+function config({plugins = [], output = {}}) {
+  return {
+    input: 'src/index.ts',
+    plugins: [
+      typescript({tsconfigOverride: {compilerOptions: {module: 'ES2015'}}}),
+      node(), ...plugins
+    ],
+    output: {banner: PREAMBLE, globals: {'@tensorflow/tfjs': 'tf'}, ...output},
+    external: ['@tensorflow/tfjs']
+  };
+}
+
+export default [
+  config({output: {format: 'umd', name: 'posenet', file: 'dist/posenet.js'}}),
+  config({
+    plugins: [minify()],
+    output: {format: 'umd', name: 'posenet', file: 'dist/posenet.min.js'}
+  }),
+  config({
+    plugins: [minify()],
+    output: {format: 'es', file: 'dist/posenet.esm.js'}
+  })
+];
diff --git a/posenet/src/index.ts b/posenet/src/index.ts
@@ -16,7 +16,7 @@
  */
 
 import {decodeMultiplePoses} from './multiPose/decodeMultiplePoses';
-import {load, PoseNet} from './posenet';
+import {load, PoseNet} from './posenet_model';
 import {decodeSinglePose} from './singlePose/decodeSinglePose';
 
 export {checkpoints} from './checkpoints';
diff --git a/posenet/src/posenet_model.ts b/posenet/src/posenet_model.ts
diff --git a/posenet/src/posenet_test.ts b/posenet/src/posenet_test.ts
@@ -17,7 +17,7 @@
 
 import * as tf from '@tensorflow/tfjs';
 
-import {load, PoseNet} from './posenet';
+import {load, PoseNet} from './posenet_model';
 
 describe('PoseNet', () => {
   let net: PoseNet;
diff --git a/posenet/tsconfig-es5.json b/posenet/tsconfig-es5.json
diff --git a/posenet/tsconfig.json b/posenet/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "module": "ES2015",
+    "module": "commonjs",
     "moduleResolution": "node",
     "noImplicitAny": true,
     "sourceMap": true,
@@ -9,7 +9,7 @@
     "declaration": true,
     "target": "es5",
     "lib": ["es2015", "dom"],
-    "outDir": "./dist-es6",
+    "outDir": "./dist",
     "noUnusedLocals": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,
diff --git a/posenet/yarn.lock b/posenet/yarn.lock
