Merge pull request #54 from neonexus/master

Updated Docker to use Node.js 16.14. Deps update.

Author: neonexus

.dockerignore

@@ -1,11 +1,13 @@
 node_modules
+config/local.js
 .git
+.github
 .gitignore
-config/local.js
-.tmp
 .idea
-.github
 .editorconfig
+.eslintignore
+.eslintrc
+.tmp
 
 README.md
 CHANGELOG.md

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [v3.0.0-beta](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v2.0.0...v3.0.0-beta.6) (2022-04-05)
+## [v3.0.0-beta](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v2.0.0...v3.0.0-beta.7) (2022-04-13)
 
 ### Features
 
@@ -12,7 +12,7 @@
 
 ### Breaking Changes
 
-* Updated to React v18. See: [the upgrade guid to React 18](https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html).
+* Updated to React v18. See: [the upgrade guide to React 18](https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html).
 * Updated to React Router DOM v6. See: [the v5 -> v6 migration guide](https://reactrouter.com/docs/en/v6/upgrading/v5). This requires a **MAJOR** overhaul of how routes are handled.
 * Moved some controllers into a "common" folder, instead of the "admin" folder (as they could be used outside of admin controls).
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.13
+FROM node:16.14
 MAINTAINER NeoNexus DeMortis
 
 RUN apt-get update && apt-get upgrade -y
@@ -7,7 +7,7 @@ RUN mkdir /var/www && mkdir /var/www/myapp
 WORKDIR /var/www/myapp
 
 EXPOSE 1337
-# REMEMBER! NEVER STORE SECRETS, DEK's, PASSWORDS, OR ANYTHING OF A SENSITIVE NATURE IN SOURCE CONTROL! USE ENVIRONMENT VARIABLES!
+# REMEMBER! NEVER STORE SECRETS, DEK's, PASSWORDS, OR ANYTHING OF A SENSITIVE NATURE IN SOURCE CONTROL (INCLUDING THIS FILE)! USE ENVIRONMENT VARIABLES!
 ENV PORT=1337 DB_HOSTNAME=localhost DB_USERNAME=root DB_PASSWORD=mypass DB_NAME=myapp DB_PORT=3306 DB_SSL=true DATA_ENCRYPTION_KEY=1234abcd4321asdf0987lkjh SESSION_SECRET=0987poiuqwer1234zxcvmnbv
 
 # This keeps builds more efficient, because we can use Docker cache more effectively.

README.md

@@ -12,15 +12,15 @@ The `master` branch is experimental, and the [release branch](https://github.com
 **FINAL WARNING: DO NOT RELY ON THE MASTER BRANCH!**
 
 # v3.0.0-beta Warning
-Moving from v5 -> v6 of the [React Router](https://reactrouter.com/) is a serious undertaking (see the [the v5 -> v6 migration guide](https://reactrouter.com/docs/en/v6/upgrading/v5)).
+Moving from v5 -> v6 of the [React Router](https://reactrouter.com/) is a serious undertaking (see [the v5 -> v6 migration guide](https://reactrouter.com/docs/en/v6/upgrading/v5)).
 
-While basic features have been upgraded to the new standard of the new React Router, there are still some quarks while developing... When the assets are built for remote use (`npm run build` or `npm run build:dev`), everything works as expected; however, when working with the auto-reloading Webpack dev server, if you don't start from a "root" path (like "/admin" or "/main"), and refresh a path like "/admin/dashboard", things will not render.
+While basic features have been upgraded to the new standard of the new React Router, there are still some quirks while developing... When the assets are built for remote use (`npm run build` or `npm run build:dev`), everything works as expected; however, when working with the auto-reloading Webpack dev server, if you don't start from a "root" path (like "/admin" or "/main"), and refresh a path like "/admin/dashboard", things will not render.
 
 I'm still working on a fix for this.
 
 If you would like to use v5 of React Router, make sure you are cloning [v2 of this repo](https://github.com/neonexus/sails-react-bootstrap-webpack/tree/v2.0.0).
 
-## Currently setup with
+## Current Dependencies
 * [Sails](https://sailsjs.com/) **v1**
 * [React](https://reactjs.org/) **v18**
 * [React Router](https://reactrouter.com/) **v6**
@@ -36,10 +36,10 @@ See the [`package.json` for more details](package.json).
 + Setup for Webpack auto-reload dev server.
 + Setup so Sails will serve Webpack-built bundles as separate apps (so, a marketing site, and an admin site can live side-by-side).
 + Includes [react-bootstrap](https://www.npmjs.com/package/react-bootstrap) to make using Bootstrap styles / features with React easier.
-+ Schema validation and enforcement for `PRODUCTION`. This repo is setup for `MySQL`. If you plan to use a different datastore, you will likely want to disable the schema validation and enforcement feature inside [`config/bootstrap.js`](config/bootstrap.js). See [schema validation and enforcement](#schema-validation-and-enforcement) for more info.
++ Schema validation and enforcement for `PRODUCTION`. This repo is set up for `MySQL`. If you plan to use a different datastore, you will likely want to disable the schema validation and enforcement feature inside [`config/bootstrap.js`](config/bootstrap.js). See [schema validation and enforcement](#schema-validation-and-enforcement) for more info.
 
 ## How to Use
-This repo is not installable via `npm`. Instead, Github provides a handy "Use this template" (green) button at the top of this page. That will create a special fork of this repo (so there is a single, init commit, instead of the commit history from this repo).
+This repo is not installable via `npm`. Instead, GitHub provides a handy "Use this template" (green) button at the top of this page. That will create a special fork of this repo (so there is a single, init commit, instead of the commit history from this repo).
 
 ### Configuration
 In the `config` folder, there is the `local.js.sample` file, which is meant to be copied to `local.js`. This file (`local.js` not the sample) is ignored by Git, and intended for use in local development, NOT remote servers. Generally one would use environment variables for remote server configuration (and this repo is already setup to handle environment variable configuration for both DEV and PROD). See: [config/env/development.js](config/env/development.js) and [config/env/production.js](config/env/production.js).

config/routes.js

@@ -8,13 +8,6 @@
  * https://sailsjs.com/anatomy/config/routes-js
  */
 
-const defaultStaticOptions = {
-    maxAge: process.env.NODE_ENV !== 'production' ? 1 : 31557600000, // in production, a little over a year in milliseconds
-    extensions: ['html'],
-    dotfiles: 'ignore',
-    redirect: false // prevents redirecting "/main" to "/main/"
-};
-
 const path = require('path');
 const fs = require('fs');
 const serveStatic = require('serve-static');
@@ -30,7 +23,12 @@ module.exports.routes = {
     'GET /*': { // default route used to auto switch React apps
         skipAssets: false,
         fn: [
-            serveStatic(path.resolve(__dirname, '../.tmp/public/'), defaultStaticOptions),
+            serveStatic(path.resolve(__dirname, '../.tmp/public/'), {
+                maxAge: process.env.NODE_ENV !== 'production' ? 1 : 31557600000, // in production, a little over a year in milliseconds
+                extensions: ['html'],
+                dotfiles: 'ignore',
+                redirect: false // prevents redirecting "/main" to "/main/"
+            }),
             async (req, res) => {
                 // This will determine which React app we need to serve.
                 const parts = req.url.split('/');