Merge pull request #39 from neonexus/master

v3.0.0-beta update (React Router v6 rewrites)

Author: neonexus

.dockerignore

@@ -4,6 +4,9 @@ node_modules
 config/local.js
 .tmp
 .idea
+.github
+.editorconfig
 
 README.md
+CHANGELOG.md
 LICENSE

.idea/runConfigurations/Start_API.xml renamed to .idea/runConfigurations/Start_API_DEV.xml

@@ -1,17 +1,40 @@
 # Changelog
 
-This changelog is incomplete, as it was not started until **v2** (and rehashing that far back in the past is a lot of work for very little gain). I've gone as far back as this template became "popular" (people other than me began to clone it).
+## [v3.0.0-beta](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v2.0.0...v2.1.0) (2021-03-19)
 
-# [v2.0.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.9.0...v2.0.0) (2021-99-99)
+### Features
+
+* Fixed this CHANGELOG (incorrect date).
+* Updated Dockerfile and package.json to new Node LTS v16.13 requirement.
+* Fixed Dockerfile to build PROD assets, not DEV assets.
+* Fixed a bug in the `forceUppercaseOnFirst` function in the [`User model`](api/models/User.js).
+* Changed default connections to datastores to have SSL enabled (must now explicitly disable SSL connections for remote servers).
+* Removed use of global model names, in-favor of `sails.models` usage (for consistency, and to more easily allow disabling of global models).
+
+### Breaking Changes
+
+* 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).
+
+### Known Issues
+
+* There is an issue with the Webpack dev server, and the way React routes are handled. Currently, if you aren't loading from an entry point, nothing renders. While this is not an issue for built assets, it is an issue if you are working with the auto-reload dev server. I'm still working on a fix for this, and suspect it's an issue from moving to new React Router.
+
+## [v2.0.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.9.0...v2.0.0) (2021-10-24)
 
 ### Features
 
-* Updated to Bootstrap v5. There are several **breaking changes** between [Bootstrap v4](https://getbootstrap.com/docs/4.6) and [Bootstrap v5](https://getbootstrap.com/docs/5.1), see the [migration documentation](https://getbootstrap.com/docs/5.1/migration/) for the complete list of breaking changes.
 * Updated all dependencies to most recent versions.
 * Built out more tests to get better coverage.
 * Created this CHANGELOG.
+* Fixed discrepancy between DEV and PROD environment variable names.
+
+### Breaking Changes
+
+* Updated to Bootstrap v5 and React-Bootstrap v2. There are several **breaking changes** between [Bootstrap v4](https://getbootstrap.com/docs/4.6) and [Bootstrap v5](https://getbootstrap.com/docs/5.1), see the [migration documentation](https://getbootstrap.com/docs/5.1/migration/) for the complete list of breaking changes. Also see [the React-Bootstrap migration guide](https://react-bootstrap.github.io/migrating/).
+* Changed default connections to datastores to have SSL enabled (must now explicitly disable SSL connections for remote servers).
 
-# [v1.9.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.8.1...v1.9.0) (2020-08-30)
+## [v1.9.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.8.1...v1.9.0) (2020-08-30)
 
 ### Features
 
@@ -22,27 +45,27 @@ This changelog is incomplete, as it was not started until **v2** (and rehashing
 
 * Removed `<APIConsumer>`. Must now pass around a state property (or some other form of variable).
 
-# [v1.8.1](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.8.0...v1.8.1) (2020-08-30)
+## [v1.8.1](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.8.0...v1.8.1) (2020-08-30)
 
 ### Features
 
 * Created API token handling (bearer tokens). Should only be used over HTTPs or for local testing tools.
 * Added a `<noscript>` message to the entry template.
 
-# [v1.8.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.7.0...v1.8.0) (2020-08-26)
+## [v1.8.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.7.0...v1.8.0) (2020-08-26)
 
 ### Features
 
 * Removed need for EJS to have Sails serve the different entry points (marketing vs admin).
 
-# [v1.7.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.6.0...v1.7.0) (2020-08-25)
+## [v1.7.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.6.0...v1.7.0) (2020-08-25)
 
 ### Features
 
 * Created pagination helpers; one for model queries, one for API output.
 * Created README in `.idea` (IntelliJ) folder.
 
-# [v1.6.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.5.2...v1.6.0) (2020-08-16)
+## [v1.6.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.5.2...v1.6.0) (2020-08-16)
 
 ### Features
 
@@ -51,9 +74,11 @@ This changelog is incomplete, as it was not started until **v2** (and rehashing
 * Updated NPM packages.
 * Built better testing for project hook.
 
-# [v1.5.2](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.5.1...v1.5.2) (2020-08-10)
+## [v1.5.2](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v1.5.1...v1.5.2) (2020-08-10)
 
 ### Features
 
 * Fixed webpack config.
 * Made `isLoggedIn` policy clear cookie if not logged in.
+
+This changelog is incomplete, as it was not started until **v2** (and rehashing that far back in the past is a lot of work for very little gain, the commits are there). I've gone as far back as this template became "popular" (people other than me began to clone it).

.idea/runConfigurations/Start_API_PROD.xml

@@ -1,4 +1,4 @@
-FROM node:14.8
+FROM node:16.13
 MAINTAINER NeoNexus DeMortis
 
 RUN apt-get update && apt-get upgrade -y
@@ -8,14 +8,14 @@ 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!
-ENV PORT=1337 DB_HOSTNAME=localhost DB_USERNAME=user DB_PASSWORD=pass DB_NAME=myappdb DB_PORT=3306 DB_SSL=true DATA_ENCRYPTION_KEY=1234abcd4321asdf0987lkjh SESSION_SECRET=0987poiuqwer1234zxcvmnbv
+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 cache more effectively.
+# This keeps builds more efficient, because we can use Docker cache more effectively.
 COPY package.json /var/www/myapp/package.json
 RUN npm install
 
 COPY . /var/www/myapp/
-RUN npm run build
+RUN npm run build:prod
 
 # Expose the compiled public assets, so Nginx can route to them, instead of using Sails to do the file serving.
 VOLUME /var/www/myapp/.tmp/public