Skip to content

Commit 6f31234

Browse files
neonexusneonexus
committed
Updated self-update.sh to use SHA-512 instead of SHA-256. Updated Dockerfile to use Node v22. Fixed CHANGELOG. Updated dependencies. Removed versions from Ngrok installs.
1 parent 6c51bd1 commit 6f31234

File tree

11 files changed

+67
-39
lines changed

11 files changed

+67
-39
lines changed

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Changelog
22

3+
# [v6.1.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v6.0.1...v6.1.0) (2024-11-18)
4+
### Features
5+
6+
* Updated dependencies.
7+
* Fixed CHANGELOG.
8+
* Set minimum Node version to v22.11, to help encourage updating.
9+
* Updated self-updater to use SHA-512 for stronger file integrity, and future-proofing (also keeps in-line with Node standards).
10+
11+
# [v6.0.1](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v6.0.0...v6.0.1) (2024-11-12)
12+
### Features
13+
14+
* Updated Sails.
15+
* Rebuilt `package-lock.json` (it had several tweaks for security issues, which are no longer an issue).
16+
17+
# [v6.0.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v5.3.4...v6.0.0) (2024-11-06)
18+
### Features
19+
20+
* Removed unneeded index.jsx.
21+
* Made self-update a little smarter.
22+
* Updated dependencies.
23+
324
# [v5.3.4](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v5.3.3...v5.3.4) (2024-05-03)
425
### Features
526

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-slim
1+
FROM node:22-slim
22
MAINTAINER NeoNexus DeMortis
33

44
RUN mkdir /var/www && mkdir /var/www/myapp

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# sails-react-bootstrap-webpack
22

3-
[![Sails version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv6.0.1%2Fpackage.json&query=%24.dependencies.sails&label=Sails&logo=sailsdotjs)](https://sailsjs.com)
4-
[![React version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv6.0.1%2Fpackage.json&query=%24.devDependencies.react&label=React&logo=react)](https://react.dev)
5-
[![Bootstrap version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv6.0.1%2Fpackage.json&query=%24.devDependencies.bootstrap&label=Bootstrap&logo=bootstrap&logoColor=white)](https://getbootstrap.com)
6-
[![Webpack version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv6.0.1%2Fpackage.json&query=%24.devDependencies.webpack&label=Webpack&logo=webpack)](https://webpack.js.org)
3+
[![Sails version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv6.1.0%2Fpackage.json&query=%24.dependencies.sails&label=Sails&logo=sailsdotjs)](https://sailsjs.com)
4+
[![React version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv6.1.0%2Fpackage.json&query=%24.devDependencies.react&label=React&logo=react)](https://react.dev)
5+
[![Bootstrap version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv6.1.0%2Fpackage.json&query=%24.devDependencies.bootstrap&label=Bootstrap&logo=bootstrap&logoColor=white)](https://getbootstrap.com)
6+
[![Webpack version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv6.1.0%2Fpackage.json&query=%24.devDependencies.webpack&label=Webpack&logo=webpack)](https://webpack.js.org)
77

88
Latest version only:
99
[![FOSSA License Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fneonexus%2Fsails-react-bootstrap-webpack.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fneonexus%2Fsails-react-bootstrap-webpack?ref=badge_shield)

‎assets/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
Here is where images, fonts, styles, and React source files live.
44

5-
React source files can be found in `src`, while the rest can be found in their respective folders.
5+
React source files can be found in `src`, while the rest can be found in their respective folders (fonts, images, styles).

‎ngrok.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ try {
2828
if (answer.installNgrok) {
2929
function installNgrok() {
3030
return new Promise((resolve, reject) => {
31-
const ngrokInstall = spawn('npm', ['install', '@ngrok/ngrok@v0.9.1', '--save-dev', '--save-exact'], {cwd: __dirname, stdio: 'inherit'});
31+
const ngrokInstall = spawn('npm', ['install', '@ngrok/ngrok', '--save-dev', '--save-exact'], {cwd: __dirname, stdio: 'inherit'});
3232

3333
ngrokInstall.on('error', (err) => {
3434
return reject(err);

‎package-lock.json‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sails-react-bootstrap-webpack",
3-
"version": "6.0.1",
3+
"version": "6.1.0",
44
"description": "A glass-box starter framework that grows with you. Built on proven and reliable tech like Sails, React, Bootstrap & Webpack.",
55
"keywords": [
66
"sails",
@@ -49,7 +49,7 @@
4949
"favicons": "7.2.0",
5050
"favicons-webpack-plugin": "6.0.1",
5151
"file-loader": "6.2.0",
52-
"fixted": "4.2.6",
52+
"fixted": "4.2.7",
5353
"html-webpack-plugin": "5.6.3",
5454
"mini-css-extract-plugin": "2.9.2",
5555
"mocha": "10.8.2",
@@ -62,7 +62,7 @@
6262
"react-dom": "18.3.1",
6363
"react-router-dom": "6.28.0",
6464
"readline-sync": "1.4.10",
65-
"sass": "1.80.6",
65+
"sass": "1.81.0",
6666
"sass-loader": "16.0.3",
6767
"style-loader": "4.0.0",
6868
"supertest": "7.0.0",
@@ -116,6 +116,6 @@
116116
"author": "NeoNexus DeMortis <[email protected]>",
117117
"license": "Unlicense",
118118
"engines": {
119-
"node": ">=20.10"
119+
"node": ">=22.11"
120120
}
121121
}

‎scripts/README.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@ To run scripts in Sails, one just needs to `sails run SCRIPT_NAME`, where `SCRIP
1717
<td nowrap><a href="create-admin.js">create-admin.js</a></td>
1818
<td>
1919
<ul>
20-
<li><code>email</code></li>
21-
<li><code>firstName</code></li>
22-
<li><code>lastName</code></li>
23-
<li><code>password</code></li>
20+
<li>NONE (interactive)</li>
2421
</ul>
2522
</td>
2623
<td>
2724
Create an ADMIN user in the configured datastore. Can only be run once. For safety, if there is an active admin user found, the script will halt. The API endpoints must be used from that point forward.
2825
</td>
2926
</tr>
27+
<tr>
28+
<td><pre><code>sails run datastore-wipe</code></pre></td>
29+
<td nowrap><a href="datastore-wipe.js">datastore-wipe.js</a></td>
30+
<td><ul><li>NONE</li></ul></td>
31+
<td>Wipe the entire datastore this instance is connected to. Will be asked multiple, random questions to prevent disaster.<br /><br />WILL NEVER RUN ON PRODUCTION FOR SAFETY REASONS!</td>
32+
</tr>
3033
</tbody>
3134
</table>
3235

‎self-update.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
#!/usr/bin/env bash
22
##!/usr/bin/env zsh
33

4-
# This file will git pull, npm i, and if needed, build assets. See README "getting setup remotely" for more.
4+
# This file will git pull, npm install, and if needed, build assets. See README "getting setup remotely" for more.
55

6-
# Function to calculate hash using sha256sum or shasum based on availability
6+
# Function to calculate hash using SHA-512 based on availability
77
calculate_hash() {
88
local dir="$1"
99
local hash_command
1010

11-
# Check if sha256sum command is available
12-
if command -v sha256sum >/dev/null 2>&1; then
13-
hash_command="sha256sum"
11+
if command -v sha512sum >/dev/null 2>&1; then
12+
hash_command="sha512sum"
13+
elif command -v shasum >/dev/null 2>&1 && shasum -a 512 /dev/null >/dev/null 2>&1; then
14+
hash_command="shasum -a 512"
1415
else
15-
hash_command="shasum -a 256"
16+
echo "Error: SHA-512 is not available on your system. Please install 'sha512sum' or 'shasum' to proceed." >&2
17+
return 1
1618
fi
1719

1820
# Calculate hash using the determined command
1921
find "$dir" -type f -exec $hash_command {} + | awk '{print $1}' | $hash_command
2022
}
2123

24+
2225
# Calculate the old hash of the assets/webpack directories
2326
old_hash=$(calculate_hash "assets")
2427
old_wp_hash=$(calculate_hash "webpack")

‎setup.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ function generateDEK(){
416416

417417
function installNgrok() {
418418
return new Promise((resolve, reject) => {
419-
const ngrokInstall = spawn('npm', ['install', '@ngrok/ngrok@v1.4.1', '--save-dev', '--save-exact'], {cwd: __dirname, stdio: 'inherit'});
419+
const ngrokInstall = spawn('npm', ['install', '@ngrok/ngrok', '--save-dev', '--save-exact'], {cwd: __dirname, stdio: 'inherit'});
420420

421421
ngrokInstall.on('error', (err) => {
422422
return reject(err);

0 commit comments

Comments
 (0)