From 5b6716d9d77f6db251e13250e898b82031b2379e Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Wed, 19 Sep 2018 19:32:20 +0000
Subject: [PATCH] Revert "Roll back to old phoenix.js"
This reverts commit 17fbb3d5cf4b88051a0b2634beea45c1fe801bd2.
---
package-lock.json | 5 ++---
package.json | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 1b3932991..61e6e706e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9859,9 +9859,8 @@
"dev": true
},
"phoenix": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/phoenix/-/phoenix-1.3.0.tgz",
- "integrity": "sha512-g1I6kJKTQx7wGsJCc2b1RfXeHUfITTV5kdqJPFoqmrGDfFEKQIrQkkBtv8QeJ0s1iN9+vvryrQLv+4SfmH/wqg=="
+ "version": "github:gfodor/phoenix-js#9e6f6acdca5c9642429564fa28b657a2057deedd",
+ "from": "github:gfodor/phoenix-js#master"
},
"pify": {
"version": "3.0.0",
diff --git a/package.json b/package.json
index 702b723f0..105c0753a 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"naf-janus-adapter": "github:mozilla/naf-janus-adapter#flexible-transport",
"networked-aframe": "github:mozillareality/networked-aframe#master",
"nipplejs": "github:mozillareality/nipplejs#mr-social-client/master",
- "phoenix": "^1.3.0",
+ "phoenix": "github:gfodor/phoenix-js#master",
"raven-js": "^3.20.1",
"react": "^16.1.1",
"react-dom": "^16.1.1",
--
GitLab