From c8ef5fb224d242dc8d8cf6e8e208a0285f0e6ee0 Mon Sep 17 00:00:00 2001 From: Vadim Safonov Date: Tue, 15 Aug 2017 19:03:10 +0300 Subject: [PATCH] Fix start webpack-dev-server by phoenix --- assets/package.json | 1 + assets/webpack.config.js | 22 ++++++++--------- assets/yarn.lock | 51 ++++++++++++++++++++++++++++++++++++++-- config/dev.exs | 7 +++++- 4 files changed, 67 insertions(+), 14 deletions(-) diff --git a/assets/package.json b/assets/package.json index 7e37a097f..0e4a64f1a 100644 --- a/assets/package.json +++ b/assets/package.json @@ -14,6 +14,7 @@ }, "devDependencies": { "autoprefixer": "^7.1.2", + "babel-cli": "^6.24.1", "babel-core": "^6.25.0", "babel-eslint": "*", "babel-loader": "^7.1.1", diff --git a/assets/webpack.config.js b/assets/webpack.config.js index c5cca0438..1b9254cf8 100644 --- a/assets/webpack.config.js +++ b/assets/webpack.config.js @@ -18,17 +18,17 @@ module.exports = { loader: 'babel-loader', options: { cacheDirectory: true, - // presets: [ - // 'flow', - // ['env', { - // modules: false, - // targets: { - // browsers: '> 0%', - // uglify: true, - // }, - // useBuiltIns: true, - // }], - // ], + presets: [ + 'flow', + ['env', { + modules: false, + targets: { + browsers: '> 0%', + uglify: true, + }, + useBuiltIns: true, + }], + ], }, }, }, diff --git a/assets/yarn.lock b/assets/yarn.lock index 8a1b043c8..9fa751cd3 100644 --- a/assets/yarn.lock +++ b/assets/yarn.lock @@ -333,6 +333,27 @@ axobject-query@^0.1.0: dependencies: ast-types-flow "0.0.7" +babel-cli@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.1.tgz#207cd705bba61489b2ea41b5312341cf6aca2283" + dependencies: + babel-core "^6.24.1" + babel-polyfill "^6.23.0" + babel-register "^6.24.1" + babel-runtime "^6.22.0" + commander "^2.8.1" + convert-source-map "^1.1.0" + fs-readdir-recursive "^1.0.0" + glob "^7.0.0" + lodash "^4.2.0" + output-file-sync "^1.1.0" + path-is-absolute "^1.0.0" + slash "^1.0.0" + source-map "^0.5.0" + v8flags "^2.0.10" + optionalDependencies: + chokidar "^1.6.1" + babel-code-frame@^6.11.0, babel-code-frame@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4" @@ -1468,7 +1489,7 @@ charenc@~0.0.1: version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" -chokidar@^1.6.0, chokidar@^1.7.0: +chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" dependencies: @@ -1611,6 +1632,10 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" +commander@^2.8.1: + version "2.11.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" + commander@~2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" @@ -3013,6 +3038,10 @@ fs-extra@^4.0.0: jsonfile "^3.0.0" universalify "^0.1.0" +fs-readdir-recursive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -3260,7 +3289,7 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -5267,6 +5296,14 @@ osenv@0, osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" +output-file-sync@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76" + dependencies: + graceful-fs "^4.1.4" + mkdirp "^0.5.1" + object-assign "^4.1.0" + "over@>= 0.0.5 < 1": version "0.0.5" resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708" @@ -7119,6 +7156,10 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" +user-home@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" + util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -7141,6 +7182,12 @@ uuid@^3.0.0, uuid@^3.0.1: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" +v8flags@^2.0.10: + version "2.1.1" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" + dependencies: + user-home "^1.1.1" + vali-date@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6" diff --git a/config/dev.exs b/config/dev.exs index e40a69005..f1fa887fb 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -12,7 +12,12 @@ config :codebattle, CodebattleWeb.Endpoint, code_reloader: true, check_origin: false, cache_static_lookup: false, - watchers: [{Path.expand("assets/webpack.devserver.js"), []}] + watchers: [ + node: [ + Path.expand("assets/webpack.devserver.js"), + cd: Path.expand("../assets", __DIR__) + ] + ] # Watch static and templates for browser reloading.