Update versions (#103)

Author: ericmj

.github/workflows/main.yml

@@ -12,8 +12,8 @@ jobs:
 
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: 24.3.3
-          elixir-version: 1.13.4
+          otp-version: 27.2
+          elixir-version: 1.17.3
 
       - run: mix deps.get
       - run: mix format --check-formatted

Dockerfile

@@ -1,4 +1,8 @@
-FROM hexpm/elixir:1.13.4-erlang-24.3.3-alpine-3.15.3 as build
+ARG ELIXIR_VERSION=1.17.3
+ARG ERLANG_VERSION=27.2
+ARG ALPINE_VERSION=3.20.3
+
+FROM hexpm/elixir:${ELIXIR_VERSION}-erlang-${ERLANG_VERSION}-alpine-${ALPINE_VERSION} AS build
 
 # install build dependencies
 RUN apk add --no-cache --update git build-base nodejs yarn
@@ -35,7 +39,7 @@ COPY rel rel
 RUN mix do sentry.package_source_code, release
 
 # prepare release image
-FROM alpine:3.15.3 AS app
+FROM alpine:${ALPINE_VERSION} AS app
 RUN apk add --no-cache --update bash openssl git libstdc++
 
 RUN mkdir /app

assets/package.json

@@ -11,15 +11,14 @@
     "phoenix_live_view": "file:../deps/phoenix_live_view"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
-    "babel-loader": "^8.0.0",
-    "copy-webpack-plugin": "^4.5.0",
-    "css-loader": "^2.1.1",
-    "mini-css-extract-plugin": "^0.4.0",
-    "optimize-css-assets-webpack-plugin": "^4.0.0",
-    "uglifyjs-webpack-plugin": "^1.2.4",
-    "webpack": "4.4.0",
-    "webpack-cli": "^2.0.10"
+    "@babel/core": "^7.24.4",
+    "@babel/preset-env": "^7.24.4",
+    "babel-loader": "^9.1.3",
+    "copy-webpack-plugin": "^12.0.2",
+    "css-loader": "^7.1.1",
+    "css-minimizer-webpack-plugin": "^6.0.0",
+    "mini-css-extract-plugin": "^2.8.1",
+    "webpack-cli": "^5.1.4",
+    "webpack": "5.91.0"
   }
 }

assets/webpack.config.js

@@ -1,23 +1,22 @@
 const path = require('path');
-const glob = require('glob');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
+const TerserPlugin = require("terser-webpack-plugin");
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = (env, options) => ({
   optimization: {
     minimizer: [
-      new UglifyJsPlugin({ cache: true, parallel: true, sourceMap: false }),
-      new OptimizeCSSAssetsPlugin({})
+      new TerserPlugin(),
+      new CssMinimizerPlugin(),
     ]
   },
-  entry: {
-    './js/app.js': glob.sync('./vendor/**/*.js').concat(['./js/app.js'])
-  },
+  entry: [
+    './js/app.js'
+  ],
   output: {
-    filename: 'app.js',
-    path: path.resolve(__dirname, '../priv/static/js')
+    filename: 'js/app.js',
+    path: path.resolve(__dirname, '../priv/static')
   },
   module: {
     rules: [
@@ -36,6 +35,6 @@ module.exports = (env, options) => ({
   },
   plugins: [
     new MiniCssExtractPlugin({ filename: '../css/app.css' }),
-    new CopyWebpackPlugin([{ from: 'static/', to: '../' }])
+    new CopyWebpackPlugin({ patterns: [{ from: 'static/', to: '.' }] }),
   ]
 });

assets/yarn.lock

@@ -5,7 +5,7 @@
 # is restricted to this project.
 
 # General application configuration
-use Mix.Config
+import Config
 
 config :diff,
   cache_version: 2,
@@ -24,7 +24,7 @@ config :diff, DiffWeb.Endpoint,
   live_view: [signing_salt: "Bmk5Cupu"]
 
 # Configures Elixir's Logger
-config :logger, :console,
+config :logger, :default_formatter,
   format: "$metadata[$level] $message\n",
   metadata: [:request_id]
 

config/config.exs

@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # For development, we disable any cache and enable
 # debugging and code reloading.
@@ -16,7 +16,8 @@ config :diff, DiffWeb.Endpoint,
       "node_modules/webpack/bin/webpack.js",
       "--mode",
       "development",
-      "--watch-stdin",
+      "--watch",
+      "--watch-options-stdin",
       cd: Path.expand("../assets", __DIR__)
     ]
   ]
@@ -57,7 +58,7 @@ config :diff, DiffWeb.Endpoint,
   ]
 
 # Do not include metadata nor timestamps in development logs
-config :logger, :console, format: "[$level] $message\n"
+config :logger, :default_formatter, format: "[$level] $message\n"
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.

config/dev.exs

@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # For production, don't forget to configure the url host
 # to something meaningful, Phoenix uses this information
@@ -12,7 +12,6 @@ use Mix.Config
 config :diff, DiffWeb.Endpoint,
   http: [compress: true],
   url: [scheme: "https", port: 443],
-  load_from_system_env: true,
   cache_static_manifest: "priv/static/cache_manifest.json"
 
 config :diff,

config/prod.exs

@@ -0,0 +1,24 @@
+import Config
+
+if config_env() == :prod do
+  config :diff,
+    host: System.fetch_env!("DIFF_HOST"),
+    hexpm_host: System.fetch_env!("DIFF_HEXPM_HOST"),
+    cache_version: String.to_integer(System.fetch_env!("DIFF_CACHE_VERSION")),
+    bucket: System.fetch_env!("DIFF_BUCKET")
+
+  config :diff, DiffWeb.Endpoint,
+    http: [port: String.to_integer(System.fetch_env!("DIFF_PORT"))],
+    url: [host: System.fetch_env!("DIFF_HOST")],
+    secret_key_base: System.fetch_env!("DIFF_SECRET_KEY_BASE")
+
+  config :goth, json: System.fetch_env!("DIFF_GCP_CREDENTIALS")
+
+  config :sentry,
+    dsn: System.fetch_env!("DIFF_SENTRY_DSN"),
+    environment_name: System.fetch_env!("DIFF_ENV")
+
+  config :kernel,
+    inet_dist_listen_min: String.to_integer(System.fetch_env!("BEAM_PORT")),
+    inet_dist_listen_max: String.to_integer(System.fetch_env!("BEAM_PORT"))
+end

config/releases.exs

@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # We don't run a server during test. If one is required,
 # you can enable the server option below.
@@ -9,7 +9,7 @@ config :diff, DiffWeb.Endpoint,
 config :goth, config: %{"project_id" => "diff"}
 
 # Print only warnings and errors during test
-config :logger, level: :warn
+config :logger, level: :warning
 
 config :diff,
   package_store_impl: Diff.Package.StoreMock,

config/runtime.exs

@@ -51,7 +51,7 @@ defmodule Diff.Hex do
   def get_checksums(package, versions) do
     with {:ok, {200, _, releases}} <- :hex_repo.get_package(@config, package) do
       checksums =
-        for release <- releases, release.version in versions do
+        for release <- releases.releases, release.version in versions do
           release.outer_checksum
         end
 

config/test.exs

@@ -82,7 +82,7 @@ defmodule Diff.HTTP do
   end
 
   defp do_retry(fun, service, times, reason) do
-    Logger.warn("#{service} API ERROR: #{inspect(reason)}")
+    Logger.warning("#{service} API ERROR: #{inspect(reason)}")
 
     if times + 1 < @max_retry_times do
       sleep = trunc(:math.pow(3, times) * @base_sleep_time)

lib/diff/hex/hex.ex

@@ -40,7 +40,7 @@ defmodule Diff.Package.Updater do
     Process.send_after(self(), :update, 60_000)
   end
 
-  def format_packages(packages) do
+  def format_packages(%{packages: packages}) do
     Enum.map(packages, fn %{name: name, versions: versions} -> {name, versions} end)
   end
 end

lib/diff/http.ex

@@ -44,7 +44,7 @@ defmodule Diff.Storage.GCS do
   end
 
   defp headers() do
-    {:ok, token} = Goth.Token.for_scope(@oauth_scope)
+    token = Goth.fetch!(@oauth_scope)
     [{"authorization", "#{token.type} #{token.token}"}]
   end
 

lib/diff/package/updater.ex

@@ -44,7 +44,7 @@ defmodule DiffWeb do
   def live_view do
     quote do
       use Phoenix.LiveView,
-        layout: {DiffWeb.LayoutView, "live.html"}
+        layout: {DiffWeb.LayoutView, :live}
 
       unquote(view_helpers())
     end
@@ -79,7 +79,9 @@ defmodule DiffWeb do
   defp view_helpers do
     quote do
       # Use all HTML functionality (forms, tags, etc)
-      use Phoenix.HTML
+      import Phoenix.HTML
+      import Phoenix.HTML.Form
+      use PhoenixHTMLHelpers
 
       # Import LiveView helpers (live_render, live_component, live_patch, etc)
       import Phoenix.LiveView.Helpers

lib/diff/storage/gcs.ex

@@ -26,7 +26,7 @@ defmodule DiffWeb.Endpoint do
 
   plug DiffWeb.Plugs.Status
   plug Plug.RequestId
-  plug Logster.Plugs.Logger, excludes: [:params]
+  plug Logster.Plugs.Logger, excludes: [:params], log: :info
 
   plug Plug.Parsers,
     parsers: [:urlencoded, :multipart, :json],
@@ -50,25 +50,4 @@ defmodule DiffWeb.Endpoint do
   end
 
   plug DiffWeb.Router
-
-  def init(_key, config) do
-    if config[:load_from_system_env] do
-      port = System.fetch_env!("DIFF_PORT")
-
-      case Integer.parse(port) do
-        {_int, ""} ->
-          host = Application.fetch_env!(:diff, :host)
-          secret_key_base = System.fetch_env!("DIFF_SECRET_KEY_BASE")
-          config = put_in(config[:http][:port], port)
-          config = put_in(config[:url][:host], host)
-          config = put_in(config[:secret_key_base], secret_key_base)
-          {:ok, config}
-
-        :error ->
-          {:ok, config}
-      end
-    else
-      {:ok, config}
-    end
-  end
 end

lib/diff_web.ex

@@ -20,5 +20,5 @@ defmodule DiffWeb.Gettext do
 
   See the [Gettext Docs](https://hexdocs.pm/gettext) for detailed usage.
   """
-  use Gettext, otp_app: :diff
+  use Gettext.Backend, otp_app: :diff
 end

lib/diff_web/endpoint.ex

@@ -21,7 +21,7 @@ defmodule DiffWeb.Plugs.Forwarded do
           parsed_ip
 
         {:error, _} ->
-          Logger.warn("Invalid IP: #{inspect(ip)}")
+          Logger.warning("Invalid IP: #{inspect(ip)}")
           nil
       end
     end

lib/diff_web/gettext.ex

@@ -3,7 +3,7 @@ defmodule DiffWeb.ErrorHelpers do
   Conveniences for translating and building error messages.
   """
 
-  use Phoenix.HTML
+  use PhoenixHTMLHelpers
 
   @doc """
   Generates tag for inlined form input errors.

lib/diff_web/plugs/forwarded.ex

@@ -7,7 +7,6 @@ defmodule Diff.MixProject do
       version: "0.1.0",
       elixir: "~> 1.10",
       elixirc_paths: elixirc_paths(Mix.env()),
-      compilers: [:phoenix, :gettext] ++ Mix.compilers(),
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),
       releases: releases(),
@@ -34,19 +33,21 @@ defmodule Diff.MixProject do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:floki, "~> 0.32.0"},
+      {:floki, "~> 0.37.0"},
       {:gettext, "~> 0.11"},
       {:git_diff, github: "ericmj/git_diff", branch: "ericmj/fix-modes"},
       {:goth, "~> 1.0"},
       {:hackney, "~> 1.15"},
-      {:hex_core, "~> 0.8.0"},
+      {:hex_core, "~> 0.11.0"},
       {:jason, "~> 1.0"},
-      {:logster, "~> 1.0"},
-      {:mox, "~> 1.0.0", only: :test},
-      {:phoenix_html, "~> 3.2"},
+      {:logster, "~> 1.0.0"},
+      {:mox, "~> 1.0", only: :test},
+      {:phoenix_html, "~> 4.0"},
+      {:phoenix_html_helpers, "~> 1.0"},
       {:phoenix_live_reload, "~> 1.2", only: :dev},
-      {:phoenix_live_view, "~> 0.6"},
+      {:phoenix_live_view, "~> 1.0"},
       {:phoenix_pubsub, "~> 2.0"},
+      {:phoenix_view, "~> 2.0"},
       {:phoenix, "~> 1.6"},
       {:plug_cowboy, "~> 2.1"},
       {:sentry, "~> 10.2"}

lib/diff_web/views/error_helpers.ex

@@ -64,7 +64,7 @@ defmodule DiffWeb.SearchLiveViewTest do
       send(view.pid, {:search, "phoenix"})
 
       assert render_click(view, "go", %{result: "phoenix", to: "1.4.11", from: "1.4.10"}) ==
-               {:error, {:redirect, %{to: "/diff/phoenix/1.4.10..1.4.11"}}}
+               {:error, {:redirect, %{to: "/diff/phoenix/1.4.10..1.4.11", status: 302}}}
     end
 
     test "no duplicates for suggestions", %{conn: conn} do