Upgrade/phoenix 1.3

.gitignore

@@ -8,7 +8,7 @@
 erl_crash.dump
 
 # Static artifacts
-/node_modules
+/assets/node_modules
 
 # Since we are building assets from web/static,
 # we ignore priv/static. You may want to comment
@@ -27,5 +27,3 @@ erl_crash.dump
 *.~un
 .DS_Store
 npm-debug*
-*.swp
-*.un~

Capfile

@@ -4,6 +4,9 @@ require 'capistrano/setup'
 # Include default deployment tasks
 require 'capistrano/deploy'
 
+require 'capistrano/scm/git'
+install_plugin Capistrano::SCM::Git
+
 # Include tasks from other gems included in your Gemfile
 #
 # For documentation on these, see for example:

brunch-config.js → assets/brunch-config.js

@@ -23,13 +23,13 @@ exports.config = {
     stylesheets: {
       order: {
         before: [
-          'web/static/vendor/css/pure-min.css',
-          'web/static/vendor/css/grids-responsive-min.css'
+          'vendor/css/pure-min.css',
+          'vendor/css/grids-responsive-min.css'
         ]
       },
       joinTo: {
-        'css/app.css': /^(web\/static\/css\/app)|(web\/static\/vendor\/css)/,
-        'css/admin.css': /^web\/static\/css\/admin/
+        'css/app.css': /^(css\/app)|(vendor\/css)/,
+        'css/admin.css': /^css\/admin/
       }
     },
     templates: {
@@ -41,31 +41,28 @@ exports.config = {
     // This option sets where we should place non-css and non-js assets in.
     // By default, we set this to '/web/static/assets'. Files in this directory
     // will be copied to `paths.public`, which is "priv/static" by default.
-    assets: /^(web\/static\/assets)/
+    assets: /^(static)/
   },
 
   // Phoenix paths configuration
   paths: {
     // Dependencies and current project directories to watch
-    watched: ["deps/phoenix/web/static",
-              "deps/phoenix_html/web/static",
-              "web/static", "test/static"],
-
+    watched: ["static", "css", "js", "vendor"],
     // Where to compile files to
-    public: "priv/static"
+    public: "../priv/static"
   },
 
   // Configure your plugins
   plugins: {
     babel: {
       // Do not use ES6 compiler in vendor code
-      ignore: [/web\/static\/vendor/]
+      ignore: [/vendor/]
     }
   },
 
   modules: {
     autoRequire: {
-      'js/app.js': ['web/static/js/app']
+      'js/app.js': ['js/app']
     }
   },
 

assets/css/_font.scss

@@ -0,0 +1,3 @@
+@import url("//hello.myfonts.net/count/2fd706");
+
+@font-face {font-family: 'ITCAvantGardeW04-Bold';src: url('/fonts/2FD706_0_0.eot');src: url('/fonts/2FD706_0_0.eot?#iefix') format('embedded-opentype'),url('/fonts/2FD706_0_0.woff2') format('woff2'),url('/fonts/2FD706_0_0.woff') format('woff'),url('/fonts/2FD706_0_0.ttf') format('truetype');}

web/static/js/app.js → assets/js/app.js

@@ -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
 //

web/static/js/socket.js → assets/js/socket.js

@@ -3,9 +3,9 @@
 
 // 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")
+let socket = new Socket("/socket", {params: {token: window.userToken}})
 
 // When you connect, you'll often need to authenticate the client.
 // For example, imagine you have an authentication plug, `MyAuth`,