Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made setup.js generate default DEK and session secrets (when needed). #120

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Made setup.js generate default DEK and session secrets (when needed). #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,18 @@
// ║╣ ╚═╗║ ║║║║ ║ ├┬┘│
// o╚═╝╚═╝╩═╝╩╝╚╝ ╩ ┴└─└─┘
// A set of basic code conventions designed to encourage quality and consistency
// across your Sails app's code base. These rules are checked against
// across your app's code base. These rules are checked against
// automatically any time you run `npm test`.
//
// > An additional eslintrc override file is included in the `assets/` folder
// > right out of the box. This is specifically to allow for variations in acceptable
// > global variables between front-end JavaScript code designed to run in the browser
// > vs. backend code designed to run in a Node.js/Sails process.
//
// > Note: If you're using mocha, you'll want to add an extra override file to your
// > `test/` folder so that eslint will tolerate mocha-specific globals like `before`
// > and `describe`.
// Designed for ESLint v4.
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// For more information about any of the rules below, check out the relevant
// reference page on eslint.org. For example, to get details on "no-sequences",
// you would visit `http://eslint.org/docs/rules/no-sequences`. If you're unsure
// or could use some advice, come by https://sailsjs.com/support.
// you would visit `http://eslint.org/docs/rules/no-sequences`.
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

"settings": {
Expand Down Expand Up @@ -195,24 +190,25 @@
"allowTemplateLiterals": true
}
],
"react/static-property-placement": "off",
"react/jsx-one-expression-per-line": "off",
"react/destructuring-assignment": "off",
"react/jsx-no-literals": "off",
"react/forbid-component-props": "off",
"react/forbid-prop-types": "off",
"react/jsx-handler-names": "off",
"react/jsx-indent-props": "off",
"react/jsx-max-depth": "off",
"react/jsx-max-props-per-line": "off",
"react/jsx-no-bind": "off",
"react/jsx-no-literals": "off",
"react/jsx-one-expression-per-line": "off",
"react/jsx-sort-props": "off",
"react/jsx-max-depth": "off",
"react/no-multi-comp": "off",
"react/no-unescaped-entities": "off",
"react/jsx-indent-props": "off",
"react/no-set-state": "off",
"react/static-property-placement": "off",
"react/react-in-jsx-scope": "off",
"react/require-optimization": "off",
"no-irregular-whitespace": "off",
"react/forbid-component-props": "off",
"react/jsx-no-bind": "off",
"react/forbid-prop-types": "off",
"react/no-multi-comp": "off",
"react/jsx-handler-names": "off",
"no-inner-declarations": "off",
"no-irregular-whitespace": "off",
"semi": [
"warn",
"always"
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [v5.2.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v5.1.1...v5.2.0) (2024-01-11)
### Features

* Made setup script handle DEV default DEK and session secret generation.
* NPM audit fix for `follow-redirects`.
* Updated dependencies.

## [v5.1.1](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v5.1.0...v5.1.1) (2024-01-06)
### Features

Expand Down
16 changes: 7 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

[![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)
[![Codecov](https://img.shields.io/codecov/c/github/neonexus/sails-react-bootstrap-webpack?logo=codecov)](https://codecov.io/gh/neonexus/sails-react-bootstrap-webpack)
[![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)
[![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)
[![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)
[![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)
[![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)
[![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)
[![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)
[![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)

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

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

## Working With Ngrok

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.
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.

### First thing's first

Expand Down Expand Up @@ -550,10 +550,8 @@ middleware: {
'favicon' // default hook to serve favicon
],

// REMEMBER! Environment variables are your friends!!!
prerender
:
require('prerender-node').set('prerenderToken', 'YOUR_TOKEN')
// REMEMBER! Environment variables are your friends!!!
prerender: require('prerender-node').set('prerenderToken', 'YOUR_TOKEN')

}
```
Expand Down
Loading