Skip to content

Commit 748c2b3

Browse files
committed
Minor consistency updates. Added Discord button. Dependency updates.
1 parent 825d5b3 commit 748c2b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+423
-409
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
# Changelog
2+
## [v4.2.3](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v4.2.2...v4.2.3) (2023-10-03)
3+
### Features
4+
5+
* Minor consistency tweaks.
6+
* Added Discord button to README.
7+
* Updated dependencies.
8+
29
## [v4.2.2](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v4.2.1...v4.2.2) (2023-09-13)
310
### Features
411

512
* Added in a new configuration to enable/disable automatic request logging.
6-
*
713
* Updated dependencies.
814

915
## [v4.2.1](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v4.2.0...v4.2.1) (2023-04-23)

README.md

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

33
[![Travis CI status](https://img.shields.io/travis/com/neonexus/sails-react-bootstrap-webpack.svg?branch=release&logo=travis)](https://app.travis-ci.com/github/neonexus/sails-react-bootstrap-webpack)
4-
[![Sails version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv4.2.2%2Fpackage.json&query=%24.dependencies.sails&label=Sails&logo=sailsdotjs)](https://sailsjs.com)
5-
[![React version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv4.2.2%2Fpackage.json&query=%24.devDependencies.react&label=React&logo=react)](https://react.dev)
6-
[![Bootstrap version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv4.2.2%2Fpackage.json&query=%24.devDependencies.bootstrap&label=Bootstrap&logo=bootstrap)](https://getbootstrap.com)
7-
[![Webpack version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv4.2.2%2Fpackage.json&query=%24.devDependencies.webpack&label=Webpack&logo=webpack)](https://webpack.js.org)
4+
[![Sails version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv4.2.3%2Fpackage.json&query=%24.dependencies.sails&label=Sails&logo=sailsdotjs)](https://sailsjs.com)
5+
[![React version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv4.2.3%2Fpackage.json&query=%24.devDependencies.react&label=React&logo=react)](https://react.dev)
6+
[![Bootstrap version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv4.2.3%2Fpackage.json&query=%24.devDependencies.bootstrap&label=Bootstrap&logo=bootstrap&logoColor=white)](https://getbootstrap.com)
7+
[![Webpack version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv4.2.3%2Fpackage.json&query=%24.devDependencies.webpack&label=Webpack&logo=webpack)](https://webpack.js.org)
88

9-
[![Gitter Room](https://img.shields.io/badge/Chat-on_Gitter-blue?logo=gitter)](https://app.gitter.im/#/room/#sails-react-bootstrap-webpack:gitter.im)
9+
[![Discord Server](https://img.shields.io/badge/Discord_server-silver?logo=discord)](http://discord.gg/Y5K73E84Tc)
1010

1111
This is an opinionated, base [Sails v1](https://sailsjs.com) application, using [Webpack](https://webpack.js.org) to handle [Bootstrap](https://getbootstrap.com) (using [SASS](https://sass-lang.com))
1212
and [React](https://react.dev) builds. It is designed such that, one can build multiple React frontends (an admin panel, and a customer site maybe), that use the same API backend. This allows

api/responses/created.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ module.exports = async function created(data) {
1616

1717
const out = _.merge({success: true}, data);
1818

19-
res.status(201);
20-
res.json(out);
19+
res.status(201).json(out);
2120

2221
await sails.helpers.finalizeRequestLog(req, res, out);
2322
};

api/responses/ok.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ module.exports = async function sendOK(data) {
2121

2222
const out = _.merge({success: true}, data);
2323

24-
res.status(200);
25-
res.json(out);
24+
res.status(200).json(out);
2625

2726
await sails.helpers.finalizeRequestLog(req, res, out);
2827
};

ngrok.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ for (let i = 2; i < process.argv.length; ++i) {
8484
if (thisFlag === 'nobuild') {
8585
config.buildAssets = false;
8686
} else if (thisFlag.startsWith('auth=')) {
87-
config.auth = process.argv[i].substring(5);
87+
config.auth = process.argv[i].substring(5); // don't use the lower-cased version
8888
} else if (thisFlag.startsWith('domain=')) {
8989
config.domain = thisFlag.substring(7);
9090
} else if (thisFlag.startsWith('region=')) {

package-lock.json

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

package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sails-react-bootstrap-webpack",
3-
"version": "4.2.2",
3+
"version": "4.2.3",
44
"description": "An opinionated base configuration of Sails, with Webpack for React support, and Bootstrap for styling. A start-up in a box!",
55
"keywords": [
66
"sails",
@@ -13,6 +13,7 @@
1313
],
1414
"dependencies": {
1515
"csrf": "3.1.0",
16+
"extract-zip": "^2.0.1",
1617
"json-stringify-safe": "5.0.1",
1718
"lodash": "4.17.21",
1819
"moment-timezone": "0.5.43",
@@ -26,37 +27,37 @@
2627
"superagent": "8.1.2"
2728
},
2829
"devDependencies": {
29-
"@babel/core": "7.22.17",
30+
"@babel/core": "7.23.0",
3031
"@babel/eslint-parser": "7.22.15",
31-
"@babel/preset-env": "7.22.15",
32+
"@babel/preset-env": "7.22.20",
3233
"@babel/preset-react": "7.22.15",
3334
"@popperjs/core": "2.11.8",
3435
"babel-loader": "9.1.3",
35-
"bootstrap": "5.3.1",
36-
"chai": "4.3.8",
36+
"bootstrap": "5.3.2",
37+
"chai": "4.3.10",
3738
"chai-spies": "1.0.0",
3839
"chai-uuid": "1.0.6",
3940
"copy-webpack-plugin": "11.0.0",
40-
"core-js": "3.32.2",
41+
"core-js": "3.33.0",
4142
"css-loader": "6.8.1",
42-
"eslint": "8.49.0",
43+
"eslint": "8.50.0",
4344
"eslint-plugin-react": "7.33.2",
4445
"favicons": "7.1.4",
4546
"favicons-webpack-plugin": "6.0.1",
4647
"file-loader": "6.2.0",
47-
"fixted": "4.2.1",
48+
"fixted": "4.2.2",
4849
"html-webpack-plugin": "5.5.3",
4950
"mini-css-extract-plugin": "2.7.6",
5051
"mocha": "10.2.0",
5152
"npm-run-all": "4.1.5",
5253
"nyc": "15.1.0",
5354
"prop-types": "15.8.1",
5455
"react": "18.2.0",
55-
"react-bootstrap": "v2.8.0",
56+
"react-bootstrap": "v2.9.0",
5657
"react-dom": "18.2.0",
5758
"react-router-dom": "6.16.0",
5859
"readline-sync": "1.4.10",
59-
"sass": "1.67.0",
60+
"sass": "1.68.0",
6061
"sass-loader": "13.3.2",
6162
"style-loader": "3.3.3",
6263
"supertest": "6.3.3",

test/coverage/controllers/admin/create-api-token.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">controllers/
157157
<div class='footer quiet pad2 space-top1 center small'>
158158
Code coverage generated by
159159
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
160-
at 2023-04-21T04:18:21.132Z
160+
at 2023-10-04T04:18:14.893Z
161161
</div>
162162
<script src="../../prettify.js"></script>
163163
<script>

test/coverage/controllers/admin/create-user.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">controllers/
394394
<div class='footer quiet pad2 space-top1 center small'>
395395
Code coverage generated by
396396
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
397-
at 2023-04-21T04:18:21.132Z
397+
at 2023-10-04T04:18:14.893Z
398398
</div>
399399
<script src="../../prettify.js"></script>
400400
<script>

test/coverage/controllers/admin/delete-user.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">controllers/
208208
<div class='footer quiet pad2 space-top1 center small'>
209209
Code coverage generated by
210210
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
211-
at 2023-04-21T04:18:21.132Z
211+
at 2023-10-04T04:18:14.893Z
212212
</div>
213213
<script src="../../prettify.js"></script>
214214
<script>

0 commit comments

Comments
 (0)