From 01c5a6cb5abac51f29c81f0a81546c8dfbc60f6e Mon Sep 17 00:00:00 2001 From: Uku Taht <uku.taht@gmail.com> Date: Wed, 24 Nov 2021 12:13:53 +0200 Subject: [PATCH] Use phoenix javascript from NPM --- assets/package-lock.json | 26 +++++++++++++++++--------- assets/package.json | 4 ++-- mix.exs | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/assets/package-lock.json b/assets/package-lock.json index ec1eff7e..8abecf4e 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -32,8 +32,8 @@ "downshift": "^6.1.3", "iframe-resizer": "^4.3.2", "mini-css-extract-plugin": "^1.6.0", - "phoenix": "file:../deps/phoenix", - "phoenix_html": "file:../deps/phoenix_html", + "phoenix": "1.5.0", + "phoenix_html": "2.12", "postcss": "^8.3.0", "postcss-loader": "^6.1.1", "react": "^16.13.1", @@ -66,10 +66,12 @@ }, "../deps/phoenix": { "version": "1.5.13", + "extraneous": true, "license": "MIT" }, "../deps/phoenix_html": { - "version": "2.14.3" + "version": "2.14.3", + "extraneous": true }, "node_modules/@babel/code-frame": { "version": "7.12.13", @@ -6571,12 +6573,14 @@ } }, "node_modules/phoenix": { - "resolved": "../deps/phoenix", - "link": true + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/phoenix/-/phoenix-1.5.0.tgz", + "integrity": "sha512-Vzz6eb64BEufIXTVkTcT5HiNdRyLY2DF/l2eN1LaeedRbBhGCsdRWdDISFjBSjxODjqY+w2NmSzBeHM8MieLRw==" }, "node_modules/phoenix_html": { - "resolved": "../deps/phoenix_html", - "link": true + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/phoenix_html/-/phoenix_html-2.12.0.tgz", + "integrity": "sha512-UulYUsew5h2qeCSIMs1VWINkkpCauEn8uEq0zt2Ky9FpfEW6LsasMJ+Vgi01tUBbBFEy73E+sUvucQ+okL69Aw==" }, "node_modules/picocolors": { "version": "0.2.1", @@ -13958,10 +13962,14 @@ "version": "4.0.0" }, "phoenix": { - "version": "file:../deps/phoenix" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/phoenix/-/phoenix-1.5.0.tgz", + "integrity": "sha512-Vzz6eb64BEufIXTVkTcT5HiNdRyLY2DF/l2eN1LaeedRbBhGCsdRWdDISFjBSjxODjqY+w2NmSzBeHM8MieLRw==" }, "phoenix_html": { - "version": "file:../deps/phoenix_html" + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/phoenix_html/-/phoenix_html-2.12.0.tgz", + "integrity": "sha512-UulYUsew5h2qeCSIMs1VWINkkpCauEn8uEq0zt2Ky9FpfEW6LsasMJ+Vgi01tUBbBFEy73E+sUvucQ+okL69Aw==" }, "picocolors": { "version": "0.2.1", diff --git a/assets/package.json b/assets/package.json index 0c74d468..1c96e79b 100644 --- a/assets/package.json +++ b/assets/package.json @@ -35,8 +35,8 @@ "downshift": "^6.1.3", "iframe-resizer": "^4.3.2", "mini-css-extract-plugin": "^1.6.0", - "phoenix": "file:../deps/phoenix", - "phoenix_html": "file:../deps/phoenix_html", + "phoenix": "1.5.0", + "phoenix_html": "2.12", "postcss": "^8.3.0", "postcss-loader": "^6.1.1", "react": "^16.13.1", diff --git a/mix.exs b/mix.exs index 9f31b287..4be1eac3 100644 --- a/mix.exs +++ b/mix.exs @@ -58,7 +58,7 @@ defmodule Plausible.MixProject do {:jason, "~> 1.2"}, {:phoenix, "~> 1.5.0"}, {:phoenix_ecto, "~> 4.0"}, - {:phoenix_html, "~> 2.11"}, + {:phoenix_html, "~> 2.12"}, {:phoenix_live_reload, "~> 1.2", only: :dev}, {:phoenix_pubsub, "~> 2.0"}, {:plug_cowboy, "~> 2.3"}, -- GitLab