Get rid of umbrella application!

Author: RoyalIcing

Diff for: .formatter.exs

@@ -1,4 +1,4 @@
 [
-  inputs: ["mix.exs", "config/*.exs"],
-  subdirectories: ["apps/*"]
+  import_deps: [:phoenix],
+  inputs: ["*.{ex,exs}", "{config,lib,test}/**/*.{ex,exs}"]
 ]

Diff for: .gitignore

@@ -19,6 +19,19 @@ erl_crash.dump
 # Also ignore archive artifacts (built via "mix archive.build").
 *.ez
 
+# Ignore package tarball (built via "mix hex.build").
+components_guide-*.tar
+
+/assets/node_modules/
+
+# Since we are building assets from web/static,
+# we ignore priv/static. You may want to comment
+# this depending on your deployment strategy.
+/priv/static/
+
+# If NPM crashes, it generates a log, let's ignore it too.
+npm-debug.log
+
 .elixir_ls/
 
 .DS_Store

Diff for: Makefile

@@ -6,7 +6,7 @@ install_mix:
 	mix deps.get
 
 install_assets:
-	cd apps/components_guide_web/assets/ && npm ci
+	cd assets/ && npm ci
 
 test_watch:
 	watchexec -e ex,exs mix test
@@ -15,7 +15,7 @@ dev:
 	iex -S mix phx.server
 
 build:
-	cd apps/components_guide_web/ && mix template_assets && mix phx.digest
+	mix template_assets && mix phx.digest
 
 clean:
 	rm -rf ./_build

Diff for: README.md

@@ -2,6 +2,16 @@
 
 [![CC BY-SA 4.0][cc-by-sa-shield]][cc-by-sa]
 
+To start your Phoenix server:
+
+  * Install dependencies with `mix deps.get`
+  * Install Node.js dependencies with `cd assets && npm install`
+  * Start Phoenix endpoint with `mix phx.server`
+
+Now you can visit [`localhost:4333`](http://localhost:4333) from your browser.
+
+----
+
 This work is licensed under a
 [Creative Commons Attribution-ShareAlike 4.0 International License][cc-by-sa].
 

Diff for: apps/components_guide/.formatter.exs

@@ -0,0 +1,13 @@
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+/******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+var __webpack_exports__ = {};
+/******/ })()
+;

Diff for: apps/components_guide/.gitignore

@@ -9,13 +9,8 @@
 # move said applications out of the umbrella.
 use Mix.Config
 
-
-
-config :components_guide_web,
-  generators: [context_app: :components_guide]
-
 # Configures the endpoint
-config :components_guide_web, ComponentsGuideWeb.Endpoint,
+config :components_guide, ComponentsGuideWeb.Endpoint,
   url: [host: "localhost"],
   secret_key_base: "GIQzLogQXRdH7r9im+a6kEsZIbX6FmAvCt8bj+BYSkBahfkl6u9oRHSPs7Go81at",
   render_errors: [view: ComponentsGuideWeb.ErrorView, accepts: ~w(html json)],

Diff for: apps/components_guide/README.md

@@ -6,18 +6,18 @@ use Mix.Config
 # The watchers configuration can be used to run external
 # watchers to your application. For example, we use it
 # with webpack to recompile .js and .css sources.
-config :components_guide_web, ComponentsGuideWeb.Endpoint,
+config :components_guide, ComponentsGuideWeb.Endpoint,
   http: [port: 4333],
-  debug_errors: true,
+  check_origin: false,
   code_reloader: true,
+  debug_errors: true,
   # reloadable_compilers: [:phoenix, :gettext],
-  reloadable_apps: [:components_guide, :components_guide_web],
-  check_origin: false,
+  secret_key_base: "98yN/0NbJtdHMD0KaWg6ISyxFUpTDT/2nus2c96f8kMF76kqY7dqIWKkOL2Uk6SQ",
   watchers: [
     npm: [
       "run",
       "watch",
-      cd: Path.expand("../apps/components_guide_web/assets", __DIR__)
+      cd: Path.expand("../assets", __DIR__)
     ]
   ]
 
@@ -46,14 +46,13 @@ config :components_guide_web, ComponentsGuideWeb.Endpoint,
 # different ports.
 
 # Watch static and templates for browser reloading.
-config :components_guide_web, ComponentsGuideWeb.Endpoint,
+config :components_guide, ComponentsGuideWeb.Endpoint,
   live_reload: [
     patterns: [
       ~r"priv/static/.*(js|css|png|jpeg|jpg|gif|svg)$",
       ~r"priv/gettext/.*(po)$",
       ~r"lib/components_guide_web/{live,views}/.*(ex)$",
-      ~r"lib/components_guide_web/templates/.*(eex|md)$",
-      ~r{lib/components_guide_web/live/.*(ex)$}
+      ~r"lib/components_guide_web/templates/.*(eex|md)$"
     ]
   ]