Permalink
Browse files

Upgrading Phoenix 1.1.0 -> 1.1.2

  • Loading branch information...
urfolomeus committed Jan 10, 2016
1 parent 00016ae commit 621f87b03815359f81871d008c7f1037c06986cf
Showing with 11 additions and 10 deletions.
  1. +2 −3 brunch-config.js
  2. +1 −1 mix.exs
  3. +1 −1 mix.lock
  4. +5 −3 package.json
  5. +1 −1 web/static/js/app.js
  6. +1 −1 web/static/js/socket.js
View
@@ -39,8 +39,6 @@ exports.config = {
paths: {
// Dependencies and current project directories to watch
watched: [
"deps/phoenix/web/static",
"deps/phoenix_html/web/static",
"web/static",
"test/static",
"web/elm/SeatSaver.elm"
@@ -70,6 +68,7 @@ exports.config = {
},
npm: {
enabled: true
enabled: true,
whitelist: ["phoenix", "phoenix_html"]
}
};
View
@@ -30,7 +30,7 @@ defmodule SeatSaver.Mixfile do
#
# Type `mix help deps` for examples and options.
defp deps do
[{:phoenix, "~> 1.1"},
[{:phoenix, "~> 1.1.2"},
{:phoenix_ecto, "~> 2.0"},
{:postgrex, "~> 0.10"},
{:phoenix_html, "~> 2.3"},
View
@@ -8,7 +8,7 @@
"phoenix": {:hex, :phoenix, "1.1.2"},
"phoenix_ecto": {:hex, :phoenix_ecto, "2.0.0"},
"phoenix_html": {:hex, :phoenix_html, "2.3.1"},
"phoenix_live_reload": {:hex, :phoenix_live_reload, "1.0.1"},
"phoenix_live_reload": {:hex, :phoenix_live_reload, "1.0.2"},
"plug": {:hex, :plug, "1.0.3"},
"poison": {:hex, :poison, "1.5.0"},
"poolboy": {:hex, :poolboy, "1.5.1"},
View
@@ -2,12 +2,14 @@
"repository": {
},
"dependencies": {
"brunch": "^1.8.5",
"brunch": "^2.1.1",
"elm-brunch": "^0.3.0",
"babel-brunch": "^5.1.1",
"babel-brunch": "^6.0.0",
"clean-css-brunch": ">= 1.0 < 1.8",
"css-brunch": ">= 1.0 < 1.8",
"javascript-brunch": ">= 1.0 < 1.8",
"uglify-js-brunch": ">= 1.0 < 1.8"
"uglify-js-brunch": ">= 1.0 < 1.8",
"phoenix": "file:deps/phoenix",
"phoenix_html": "file:deps/phoenix_html"
}
}
View
@@ -11,7 +11,7 @@
//
// If you no longer want to use a dependency, remember
// to also remove its path from "config.paths.watched".
import "deps/phoenix_html/web/static/js/phoenix_html"
import "phoenix_html"
// Import local files
//
View
@@ -3,7 +3,7 @@
// To use Phoenix channels, the first step is to import Socket
// and connect at the socket path in "lib/my_app/endpoint.ex":
import {Socket} from "deps/phoenix/web/static/js/phoenix"
import {Socket} from "phoenix"
let socket = new Socket("/socket", {params: {token: window.userToken}})

0 comments on commit 621f87b

Please sign in to comment.