playground: Remove release.js.vom dependencies.
Change-Id: I8784a68697401d1538b37cdfa9384529e0754d74
diff --git a/client/bundles/fortune/ex0_js/server.js b/client/bundles/fortune/ex0_js/server.js
index fb61527..32d9ee9 100644
--- a/client/bundles/fortune/ex0_js/server.js
+++ b/client/bundles/fortune/ex0_js/server.js
@@ -1,6 +1,6 @@
// index=1
var veyron = require('veyron');
-var vom = require('vom');
+var vom = veyron.vom;
/**
* 1) Implement a simple fortune service
diff --git a/go/src/playground/Dockerfile b/go/src/playground/Dockerfile
index 6b52e14..bec57d6 100644
--- a/go/src/playground/Dockerfile
+++ b/go/src/playground/Dockerfile
@@ -32,15 +32,10 @@
# is publicly visible in NPM.
# NOTE(sadovsky): NPM is flaky. If any of the NPM commands below fail, simply
# retry them.
-WORKDIR /usr/local/vanadium/release/javascript/vom
-RUN $VANADIUM_ROOT/environment/cout/node/bin/npm install --production
-RUN $VANADIUM_ROOT/environment/cout/node/bin/npm link
WORKDIR /usr/local/vanadium/release/javascript/core
RUN $VANADIUM_ROOT/environment/cout/node/bin/npm install --production
-RUN $VANADIUM_ROOT/environment/cout/node/bin/npm link vom
RUN $VANADIUM_ROOT/environment/cout/node/bin/npm link
WORKDIR /home/playground
-RUN $VANADIUM_ROOT/environment/cout/node/bin/npm link vom
RUN $VANADIUM_ROOT/environment/cout/node/bin/npm link veyron
# Install Vanadium Go dependencies.
diff --git a/go/src/playground/lib/pg_test_util.sh b/go/src/playground/lib/pg_test_util.sh
index b5b55fd..629aa14 100755
--- a/go/src/playground/lib/pg_test_util.sh
+++ b/go/src/playground/lib/pg_test_util.sh
@@ -29,14 +29,9 @@
# TODO(nlacasse): Once release/javascript/core is publicly available in npm, replace this
# with "npm install vanadium".
- pushd "${VANADIUM_ROOT}/release/javascript/vom"
- npm link
- popd
pushd "${VANADIUM_ROOT}/release/javascript/core"
- npm link vom
npm link
popd
- npm link vom
npm link veyron
}
diff --git a/go/src/playground/testdata/src/pong/pong.js b/go/src/playground/testdata/src/pong/pong.js
index f9e32db..466423f 100644
--- a/go/src/playground/testdata/src/pong/pong.js
+++ b/go/src/playground/testdata/src/pong/pong.js
@@ -1,5 +1,5 @@
var veyron = require('veyron');
-var vom = require('vom');
+var vom = veyron.vom;
var pingPongService = {
ping: function(ctx, msg) {
