Merge pull request #92 from neonexus/master

v4.1.0 update

Author: neonexus

.idea/runConfigurations/Run_Tests.xml

@@ -3,8 +3,8 @@ async-only: true # require use of "done" cb or an async function (a Promise)
 require:
     - 'test/startTests.js' # starting point for tests
 spec:
-    - 'test/unit/**/*.test.js'
-    - 'test/integration/**/*.test.js'
+    - 'test/unit/index.js'
+    - 'test/integration/index.js'
 timeout: 10000 # Give Sails some breathing room... We are building schemas / data fixtures.
 checkLeaks: true
 global:

.idea/runConfigurations/test_startTests_js.xml

@@ -1,6 +1,9 @@
-dist: focal
+dist: jammy
 language: node_js
-node_js: '18'
+node_js: node
+cache:
+    directories: [ node_modules ]
+install: npm install
 services: mysql
 before_install:
     - mysql -e 'CREATE DATABASE IF NOT EXISTS testing;'

.mocharc.yaml

@@ -1,11 +1,34 @@
 # Changelog
 
+## [v4.1.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v4.0.1...v4.1.0) (2023-03-13)
+### Features
+
+* Alphabetized the scripts in `package.json`.
+* Added custom configuration options to the main `README`.
+* Updated dependencies.
+* Reworked how tests are run, so they are a bit more organized in a nested tree for reporting.
+* Added JSDoc comments to most helpers to aid with auto-completion (some helpers aren't meant to be used outside of automation).
+* Added some `README` files to a few key folders.
+* Added table of contents to README.
+
+### Breaking Changes
+
+* Renamed `sails.config.logSensitiveData` -> `sails.config.security.requestLogger.logSensitiveData`.
+* Rewrote the [`keepModelsSafe` helper](api/helpers/keep-models-safe.js) to better handle dates (Javascript or Moment).
+* Changed `sails.helpers.getErrorMessages` to be a synchronous function.
+* Changed `sails.helpers.simplifyErrors` to be a synchronous function.
+* Changed `sails.helpers.generateToken` to use `SHA512` instead of `SHA256`, doubling the size of tokens (64 -> 128).
+
+### Future Plans
+
+* Switching [`Moment.js`](https://momentjs.com) -> [`Luxon`](https://moment.github.io/luxon/) per [Moment's recommendations](https://momentjs.com/docs/#/-project-status/recommendations/). There are a few difference to be aware of: [https://moment.github.io/luxon/#/moment](https://moment.github.io/luxon/#/moment). Display formats are also different between the 2.
+
 ## [v4.0.1](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v4.0.0...v4.0.1) (2023-02-19)
 ### Features
 
 * Updated GitHub CodeQL config.
 * Regenerated package-lock.json to use version 3.
-* Manually updated package-lock.json to clear `npm audit` issues.
+* Manually updated `package-lock.json` to clear `npm audit` issues.
 * Updated dependencies.
 * Updated Node min requirement to 18.14.
 
@@ -14,10 +37,13 @@
 ### Features
 
 * More work on automated tests and utilities.
-* Renamed tests entry point (hooks.js -> startTests.js).
 * Updated dependencies.
 * Removed `md5` / `sha1` / `uuid` packages, in favor of Node built-ins.
 
+### Breaking Changes
+
+* Renamed tests entry point (`hooks.js` -> `startTests.js`).
+
 ## [v3.2.1](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v3.2.0...v3.2.1) (2022-11-16)
 
 ### Features

.travis.yml

@@ -1,8 +1,6 @@
-FROM node:18.14
+FROM node:18.15
 MAINTAINER NeoNexus DeMortis
 
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y curl ntp nano
 RUN mkdir /var/www && mkdir /var/www/myapp
 WORKDIR /var/www/myapp
 
@@ -12,20 +10,15 @@ EXPOSE 1337
 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
+COPY package.json package.json
+COPY package-lock.json package-lock.json
 RUN npm install
 
-# More caching help
-COPY ./* /var/www/myapp/
-COPY config /var/www/myapp/config
-COPY assets /var/www/myapp/assets
-COPY webpack /var/www/myapp/webpack
+# Build the PRODUCTION assets
+COPY . .
 RUN npm run build
 
-# Copy the rest of the app
-COPY . /var/www/myapp/
-
 # 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
+VOLUME .tmp/public
 
 CMD NODE_ENV=production node app.js --max-stack-size 32000

CHANGELOG.md

@@ -1,7 +1,7 @@
 THIS LICENSE APPLIES ONLY TO THIS PARTICULAR COLLECTION AND
 CONFIGURATION OF SOFTWARE, AND DOES NOT NEGATE, OVERRIDE OR
-SUPERSEDE THE LICENSES OF THE OPEN SOURCE SOFTWARE USED IN
-THIS REPOSITORY.
+SUPERSEDE THE LICENSES OF THE OPEN SOURCE SOFTWARE DEPENDENCIES
+USED IN THIS REPOSITORY.
 
 This is free and unencumbered software released into the public domain.
 
@@ -20,7 +20,7 @@ software under copyright law.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR