Merge pull request #61 from neonexus/master

Fixed Webpack dev server's reloading issue (pages wouldn't render on reload). Updated dependencies. Updated all "substr" usages to "substring".

Author: neonexus

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v3.0.3](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v3.0.2...v3.0.3) (2022-08-18)
+
+### Features
+
+* Fixed an issue with `webpack-dev-server`'s reload issue with complex routes (/admin/dashboard would fail to render properly on reload).
+* Updated usage of `substr` -> `substring` throughout the project.
+* Updated dependencies (except Bootstrap v5.1.3 -> v5.2.0, because it fails to compile with SASS).
+
 ## [v3.0.2](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v3.0.1...v3.0.2) (2022-04-23)
 
 ### Features

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.14
+FROM node:16.17
 MAINTAINER NeoNexus DeMortis
 
 RUN apt-get update && apt-get upgrade -y
@@ -8,7 +8,7 @@ WORKDIR /var/www/myapp
 
 EXPOSE 1337
 # 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
+ENV PORT=1337 DB_HOSTNAME=dockerdb DB_USERNAME=dockeruser DB_PASSWORD=dockerpass DB_NAME=docker 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.
 COPY package.json /var/www/myapp/package.json

README.md

@@ -56,7 +56,7 @@ Sails, by default, has middleware (akin to [Express.js Middleware](https://expre
 | npm run debug                 | Alias for `node --inspect app.js`.                                                                                                                                                       |
 | npm run build                 | Will run `npm run clean`, then will build production-ready files with Webpack in the `.tmp/public` folder.                                                                               |
 | npm run build:dev             | Same thing as `npm run build`, except that it will not optimize the files, retaining newlines and empty spaces.                                                                          |
-| npm run clean                 | Will basically delete everything in the `.tmp` folder.                                                                                                                                   |
+| npm run clean                 | Will delete everything in the `.tmp` folder.                                                                                                                                             |
 | npm run lines                 | Will count the lines of code in the project, minus `.gitignore`'d files, for funzies. There are currently about 7k custom lines in this repo (views, controllers, helpers, hooks, etc).  |
 | npm run test                  | Run [Mocha](https://mochajs.org/) tests. Everything starts in the [`test/hooks.js`](test/hooks.js) file.                                                                                 |
 | npm run coverage              | Runs [NYC](https://www.npmjs.com/package/nyc) coverage reporting of the Mocha tests, which generates HTML in `test/coverage`.                                                            |

api/helpers/finalize-request-log.js

@@ -30,7 +30,7 @@ module.exports = {
         success: {}
     },
 
-    fn: async function(inputs, exits){
+    fn: async function(inputs, exits) {
         if (inputs.req.requestId) {
             let out = _.merge({}, inputs.body),
                 headers = _.merge({}, inputs.res._headers), // copy the object

api/helpers/generate-token.js

@@ -20,15 +20,13 @@ module.exports = {
 
     fn: function(inputs, exits) {
         return exits.success(
-            crypto.createHmac('sha256', sails.config.session.secret)
-            .update(
+            crypto.createHmac('sha256', sails.config.session.secret).update(
                 crypto.randomBytes(21) // cryptographically-secure random characters
                 + moment(new Date()).format() // throw in the current time stamp
                 + 'I am a tea pot' // the best HTTP status code
                 + inputs.extra // an optional way to add a bit more randomness to the mix
                 + crypto.randomBytes(21)
-            )
-            .digest('hex')
+            ).digest('hex')
         );
     }
 };

api/helpers/get-error-messages.js

@@ -12,7 +12,7 @@ module.exports = {
 
     exits: {},
 
-    fn: async function(inputs, exits){
+    fn: async function(inputs, exits) {
         let errors = [],
             err = inputs.err;
 

api/helpers/is-password-valid.js

@@ -1,7 +1,7 @@
 module.exports = {
     friendlyName: 'Is password valid',
 
-    description: 'Does the provided password conform to the given standards?',
+    description: 'Does the provided password conform to the given standards? Returns true, or an array of errors.',
 
     inputs: {
         password: {
@@ -25,7 +25,7 @@ module.exports = {
         }
 
         if (inputs.password.length > 70) {
-            // this 70 character limit is not arbitrary, it is the max size of MySQL utf8mb4 encoding
+            // this 70-character limit is not arbitrary, it is the max size of MySQL utf8mb4 encoding
             // (71 characters balloons past the 191 character limit of utf8mb4 varchar columns after hashing)
             errors.push('WOW. Password length is TOO good. Max is 70 characters. Sorry.');
         }

api/helpers/simplify-errors.js

@@ -12,7 +12,7 @@ module.exports = {
 
     exits: {},
 
-    fn: async function(inputs, exits){
+    fn: async function(inputs, exits) {
         let errors = {},
             err = inputs.err;
 

api/models/User.js

@@ -10,7 +10,7 @@ async function hashPassword(pass) {
 async function updatePassword(password) {
     // "binary to ASCII" aka base64
     // btoa('scrypt') = c2NyeXB0
-    if (password && password.length > 1 && password.substr(0, 8) !== 'c2NyeXB0') {
+    if (password && password.length > 1 && password.substring(0, 8) !== 'c2NyeXB0') {
         password = await hashPassword(password);
     }
 

api/policies/isAdmin.js

@@ -1,6 +1,6 @@
 // This policy requires the isLoggedIn policy run beforehand, as it is where the custom session handling lives.
 
-module.exports = function(req, res, next){
+module.exports = function(req, res, next) {
     if (req.session && req.session.user && req.session.user.role && req.session.user.role === 'admin') {
         return next();
     }