save

dsmilkov · dsmilkov · commit c00006417771 · 2018-03-06T17:26:20.000-05:00
diff --git a/package.json b/package.json
@@ -15,10 +15,8 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "rollup": "~0.56.4",
-    "rollup-plugin-ascii": "~0.0.3",
-    "rollup-plugin-commonjs": "^9.0.0",
-    "rollup-plugin-node-resolve": "~3.0.3",
+    "browserify": "~16.1.1",
+    "tsify": "~3.0.4",
     "typescript": "2.7.2",
     "uglify-js": "~3.0.28"
   },
@@ -27,7 +25,7 @@
     "build-npm": "./scripts/build-npm.sh"
   },
   "dependencies": {
-    "@tensorflow/tfjs-core": "link:../deeplearnjs/",
-    "@tensorflow/tfjs-layers": "link:../tfjs-layers/"
+    "deeplearn": "link:../deeplearnjs/",
+    "tfjs-layers": "link:../tfjs-layers/"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
diff --git a/scripts/build-npm.sh b/scripts/build-npm.sh
@@ -20,7 +20,7 @@ set -e
 rm -rf dist/
 yarn
 node_modules/.bin/tsc --sourceMap false
-node_modules/.bin/rollup -c
+node_modules/.bin/browserify --standalone tf src/index.ts -p [tsify] > dist/tf.js
 node_modules/.bin/uglifyjs dist/tf.js -c -m -o dist/tf.min.js
 echo "Stored standalone library at dist/tf(.min).js"
 npm pack
diff --git a/src/index.ts b/src/index.ts
@@ -15,5 +15,5 @@
  * =============================================================================
  */
 
-export * from '@tensorflow/tfjs-core';
-export * from '@tensorflow/tfjs-layers';
+export * from 'deeplearn';
+export * from 'tfjs-layers';
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
-    "module": "es6",
-    "moduleResolution": "node",
+    "module": "commonjs",
     "noImplicitAny": true,
     "sourceMap": true,
     "removeComments": true,
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`		`- "module": "es6",`
`4`		`- "moduleResolution": "node",`
	`3`	`+ "module": "commonjs",`
`5`	`4`	`"noImplicitAny": true,`
`6`	`5`	`"sourceMap": true,`
`7`	`6`	`"removeComments": true,`