Skip to content

Commit a5e6541

Browse files
authored
Merge pull request #90 from neonexus/master
Updated GitHub CodeQL config. Fixed npm audit issues. Updated dependencies.
2 parents 76c689c + c518c96 commit a5e6541

File tree

12 files changed

+1556
-14703
lines changed

12 files changed

+1556
-14703
lines changed

.github/workflows/codeql-analysis.yml renamed to .github/workflows/codeql.yml

+16-19
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
# You may wish to alter this file to override the set of languages analyzed,
55
# or to provide custom queries or build logic.
66
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
127
name: "CodeQL"
138

149
on:
1510
push:
16-
branches: [ release ]
11+
branches: [ "release", "master" ]
1712
pull_request:
1813
# The branches below must be a subset of the branches above
19-
branches: [ release ]
14+
branches: [ "release", "master" ]
2015
schedule:
2116
- cron: '38 4 * * 5'
2217

@@ -39,11 +34,11 @@ jobs:
3934

4035
steps:
4136
- name: Checkout repository
42-
uses: actions/checkout@v2
37+
uses: actions/checkout@v3
4338

4439
# Initializes the CodeQL tools for scanning.
4540
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v1
41+
uses: github/codeql-action/init@v2
4742
with:
4843
languages: ${{ matrix.language }}
4944
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,19 +48,21 @@ jobs:
5348

5449
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5550
# If this step fails, then you should remove it and run the build manually (see below)
56-
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v1
51+
# - name: Autobuild
52+
# uses: github/codeql-action/autobuild@v1
5853

5954
# ℹ️ Command-line programs to run using the OS shell.
60-
# 📚 https://git.io/JvXDl
55+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
6156

62-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63-
# and modify them (or add more) to build your code if your project
64-
# uses a compiled language
57+
# If the Autobuild fails above, remove it and uncomment the following three lines.
58+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
6559

66-
#- run: |
67-
# make bootstrap
68-
# make release
60+
# - run: |
61+
# echo "Run, Build Application using script"
62+
# ./location_of_script_within_repo/buildscript.sh
6963

7064
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v1
65+
uses: github/codeql-action/analyze@v2
66+
with:
67+
category: "/language:${{matrix.language}}"
68+

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
dist: focal
12
language: node_js
2-
node_js: '16'
3+
node_js: '18'
34
services: mysql
45
before_install:
56
- mysql -e 'CREATE DATABASE IF NOT EXISTS testing;'

CHANGELOG.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [v4.0.1](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v4.0.0...v4.0.1) (2023-02-19)
4+
### Features
5+
6+
* Updated GitHub CodeQL config.
7+
* Regenerated package-lock.json to use version 3.
8+
* Manually updated package-lock.json to clear `npm audit` issues.
9+
* Updated dependencies.
10+
* Updated Node min requirement to 18.14.
11+
312
## [v4.0.0](https://github.com/neonexus/sails-react-bootstrap-webpack/compare/v3.2.1...v4.0.0) (2023-02-11)
413

514
### Features
@@ -20,7 +29,7 @@
2029
### Features
2130

2231
* Built out PnwedPasswords.com (HaveIBeenPwned.com) API functionality into `is-password-valid` helper.
23-
* Can be disabled in [config/security.js](config/security.js).
32+
* Can be disabled in [config/security.js](config/security.js).
2433
* FINALLY removed the usage of `res._headers`, so no more annoying deprecation message.
2534
* Simplified stored session data.
2635
* Updated dependencies.

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18.12
1+
FROM node:18.14
22
MAINTAINER NeoNexus DeMortis
33

44
RUN apt-get update && apt-get upgrade -y

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ See the [`package.json` for more details](package.json).
4242
This repo is not installable via `npm`. Instead, GitHub provides a handy "Use this template" (green) button at the top of this page. That will create a special fork of this repo (so there is a single, init commit, instead of the commit history from this repo).
4343

4444
### Configuration
45-
In the `config` folder, there is the `local.js.sample` file, which is meant to be copied to `local.js`. This file (`local.js` not the sample) is ignored by Git, and intended for use in local development, NOT remote servers. Generally one would use environment variables for remote server configuration (and this repo is already setup to handle environment variable configuration for both DEV and PROD). See: [config/env/development.js](config/env/development.js) and [config/env/production.js](config/env/production.js).
45+
In the `config` folder, there is the [`local.js.sample`](config/local.js.sample) file, which is meant to be copied to `local.js`. This file (`local.js`, not the sample) is ignored by Git, and intended for use in local development, NOT remote servers. Generally one would use environment variables for remote server configuration (and this repo is already setup to handle environment variable configuration for both DEV and PROD). See: [config/env/development.js](config/env/development.js) and [config/env/production.js](config/env/production.js).
4646

4747
#### Want to configure the "X-Powered-By" header?
48-
Sails, by default, has middleware (akin to [Express.js Middleware](https://expressjs.com/en/guide/using-middleware.html), Sails is built on Express.js after all...). Inside of [`config/http.js`](config/http.js) we disable the default middleware, and create our own `X-Powered-By` header, using Express.js Middleware.
48+
Sails, by default, has middleware (akin to [Express.js Middleware](https://expressjs.com/en/guide/using-middleware.html), Sails is built on Express.js after all...). Inside of [`config/http.js`](config/http.js) we create our own `X-Powered-By` header, using Express.js Middleware.
4949

5050
### Scripts built into [`package.json`](package.json):
5151

config/http.js

-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ module.exports.http = {
4242
],
4343

4444
customPoweredBy: (req, res, next) => {
45-
// disable the default "X-Powered-By" middleware
46-
sails.hooks.http.app.disable('x-powered-by');
47-
4845
// set our own custom "X-Powered-By" header
4946
res.set('X-Powered-By', 'Awesome Sauce');
5047

0 commit comments

Comments
 (0)