Skip to content

Commit 37ffeef

Browse files
authored
Merge pull request #120 from neonexus/master
Made setup.js generate default DEK and session secrets (when needed).
2 parents b0cb474 + fc8979d commit 37ffeef

File tree

6 files changed

+179
-162
lines changed

6 files changed

+179
-162
lines changed

.eslintrc

+14-18
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,18 @@
33
// ║╣ ╚═╗║ ║║║║ ║ ├┬┘│
44
// o╚═╝╚═╝╩═╝╩╝╚╝ ╩ ┴└─└─┘
55
// A set of basic code conventions designed to encourage quality and consistency
6-
// across your Sails app's code base. These rules are checked against
6+
// across your app's code base. These rules are checked against
77
// automatically any time you run `npm test`.
88
//
99
// > An additional eslintrc override file is included in the `assets/` folder
1010
// > right out of the box. This is specifically to allow for variations in acceptable
1111
// > global variables between front-end JavaScript code designed to run in the browser
1212
// > vs. backend code designed to run in a Node.js/Sails process.
1313
//
14-
// > Note: If you're using mocha, you'll want to add an extra override file to your
15-
// > `test/` folder so that eslint will tolerate mocha-specific globals like `before`
16-
// > and `describe`.
17-
// Designed for ESLint v4.
1814
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
1915
// For more information about any of the rules below, check out the relevant
2016
// reference page on eslint.org. For example, to get details on "no-sequences",
21-
// you would visit `http://eslint.org/docs/rules/no-sequences`. If you're unsure
22-
// or could use some advice, come by https://sailsjs.com/support.
17+
// you would visit `http://eslint.org/docs/rules/no-sequences`.
2318
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
2419

2520
"settings": {
@@ -195,24 +190,25 @@
195190
"allowTemplateLiterals": true
196191
}
197192
],
198-
"react/static-property-placement": "off",
199-
"react/jsx-one-expression-per-line": "off",
200193
"react/destructuring-assignment": "off",
201-
"react/jsx-no-literals": "off",
194+
"react/forbid-component-props": "off",
195+
"react/forbid-prop-types": "off",
196+
"react/jsx-handler-names": "off",
197+
"react/jsx-indent-props": "off",
198+
"react/jsx-max-depth": "off",
202199
"react/jsx-max-props-per-line": "off",
200+
"react/jsx-no-bind": "off",
201+
"react/jsx-no-literals": "off",
202+
"react/jsx-one-expression-per-line": "off",
203203
"react/jsx-sort-props": "off",
204-
"react/jsx-max-depth": "off",
204+
"react/no-multi-comp": "off",
205205
"react/no-unescaped-entities": "off",
206-
"react/jsx-indent-props": "off",
207206
"react/no-set-state": "off",
207+
"react/static-property-placement": "off",
208+
"react/react-in-jsx-scope": "off",
208209
"react/require-optimization": "off",
209-
"no-irregular-whitespace": "off",
210-
"react/forbid-component-props": "off",
211-
"react/jsx-no-bind": "off",
212-
"react/forbid-prop-types": "off",
213-
"react/no-multi-comp": "off",
214-
"react/jsx-handler-names": "off",
215210
"no-inner-declarations": "off",
211+
"no-irregular-whitespace": "off",
216212
"semi": [
217213
"warn",
218214
"always"

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [v5.2.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v5.1.1...v5.2.0) (2024-01-11)
4+
### Features
5+
6+
* Made setup script handle DEV default DEK and session secret generation.
7+
* NPM audit fix for `follow-redirects`.
8+
* Updated dependencies.
9+
310
## [v5.1.1](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v5.1.0...v5.1.1) (2024-01-06)
411
### Features
512

README.md

+7-9
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
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)
44
[![Codecov](https://img.shields.io/codecov/c/github/neonexus/sails-react-bootstrap-webpack?logo=codecov)](https://codecov.io/gh/neonexus/sails-react-bootstrap-webpack)
5-
[![Sails version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv5.1.0%2Fpackage.json&query=%24.dependencies.sails&label=Sails&logo=sailsdotjs)](https://sailsjs.com)
6-
[![React version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv5.1.0%2Fpackage.json&query=%24.devDependencies.react&label=React&logo=react)](https://react.dev)
7-
[![Bootstrap version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv5.1.0%2Fpackage.json&query=%24.devDependencies.bootstrap&label=Bootstrap&logo=bootstrap&logoColor=white)](https://getbootstrap.com)
8-
[![Webpack version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv5.1.0%2Fpackage.json&query=%24.devDependencies.webpack&label=Webpack&logo=webpack)](https://webpack.js.org)
5+
[![Sails version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv5.2.0%2Fpackage.json&query=%24.dependencies.sails&label=Sails&logo=sailsdotjs)](https://sailsjs.com)
6+
[![React version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv5.2.0%2Fpackage.json&query=%24.devDependencies.react&label=React&logo=react)](https://react.dev)
7+
[![Bootstrap version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv5.2.0%2Fpackage.json&query=%24.devDependencies.bootstrap&label=Bootstrap&logo=bootstrap&logoColor=white)](https://getbootstrap.com)
8+
[![Webpack version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fneonexus%2Fsails-react-bootstrap-webpack%2Fv5.2.0%2Fpackage.json&query=%24.devDependencies.webpack&label=Webpack&logo=webpack)](https://webpack.js.org)
99

1010
[![Discord Server](https://img.shields.io/badge/Discord_server-silver?logo=discord)](http://discord.gg/Y5K73E84Tc)
1111

@@ -487,7 +487,7 @@ variable `checkPwnedPasswords` can be set to `false` to disable it globally.
487487

488488
## Working With Ngrok
489489

490-
This repo has a custom script ([`ngrok.js`](ngrok.js)), which will start a Ngrok tunnel (using the NPM package [`@ngrok/ngrok`](https://npmjs.com/package/@ngrok/ngrok)), build assets, and start Sails.
490+
This repo has a custom script ([`ngrok.js`](ngrok.js)), which will start a Ngrok tunnel (using the official Ngrok NPM package [`@ngrok/ngrok`](https://npmjs.com/package/@ngrok/ngrok)), build assets, and start Sails.
491491

492492
### First thing's first
493493

@@ -550,10 +550,8 @@ middleware: {
550550
'favicon' // default hook to serve favicon
551551
],
552552

553-
// REMEMBER! Environment variables are your friends!!!
554-
prerender
555-
:
556-
require('prerender-node').set('prerenderToken', 'YOUR_TOKEN')
553+
// REMEMBER! Environment variables are your friends!!!
554+
prerender: require('prerender-node').set('prerenderToken', 'YOUR_TOKEN')
557555

558556
}
559557
```

0 commit comments

Comments
 (0)