Skip to content

Commit

Permalink
Psp 7984 node 20 update (#3846)
Browse files Browse the repository at this point in the history
* node 20 update.

* node 20 dependency updates.

* test corrections.

* package json stylih update.

---------

Co-authored-by: Smith <[email protected]>
  • Loading branch information
devinleighsmith and Smith authored Mar 7, 2024
1 parent 03c0fad commit 7967cb2
Show file tree
Hide file tree
Showing 16 changed files with 3,581 additions and 1,807 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/app-react.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "16.15.0"
node-version: "20.11.1"
- run: npm ci
working-directory: ${{env.working-directory}}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "20"

- name: Setup git
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "20"

- name: Setup git
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "20"

- name: Setup git
run: |
Expand Down
4 changes: 2 additions & 2 deletions openshift/4.0/templates/app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Update the configuration file and set the appropriate parameters.
**Example**

```conf
BUILDIMAGE_NAME=nodejs-16
BUILDIMAGE_TAG=1-1
BUILDIMAGE_NAME=nodejs-20
BUILDIMAGE_TAG=1-34
RUNTIMEIMAGE_NAME=nginx-runtime
RUNTIMEIMAGE_TAG=dev
GIT_URL=https://github.com/bcgov/PSP.git
Expand Down
4 changes: 2 additions & 2 deletions openshift/4.0/templates/app/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ parameters:
- name: BUILDIMAGE_NAME
displayName: "Source Image Name"
description: "The image to use as the Builder Image."
value: "nodejs-16"
value: "nodejs-20"
- name: BUILDIMAGE_TAG
displayName: "Source Image Tag"
description: "The s2i image tag which is used to build the code."
value: "1-5"
value: "1-34"

- name: RUNTIMEIMAGE_NAME
displayName: "Source Image Name"
Expand Down
22 changes: 22 additions & 0 deletions openshift/4.0/templates/base-images/nodejs-20-ubi9.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
kind: ImageStream
apiVersion: image.openshift.io/v1
metadata:
name: nodejs-20
namespace: 3cd915-tools
annotations:
openshift.io/image.dockerRepositoryCheck: '2024-03-06T01:22:09Z'
description: ImageStream definitions for NodeJS 20
spec:
lookupPolicy:
local: false
tags:
- name: 1-34
annotations: null
from:
kind: DockerImage
name: 'registry.access.redhat.com/ubi9/nodejs-20:1-34'
generation: 1
importPolicy:
importMode: Legacy
referencePolicy:
type: Source
2 changes: 1 addition & 1 deletion source/frontend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"no-prototype-builtins": "off",
"no-debugger": "off"
},
"ignorePatterns": ["src/**/*.test.ts", "src/**/*.test.tsx"],
"ignorePatterns": ["src/**/*.test.ts", "src/**/*.test.tsx", "src/**/mockServiceWorker.js"],
"settings": {
"react": {
"version": "detect"
Expand Down
1 change: 1 addition & 0 deletions source/frontend/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ node_modules
build
*.yaml
*.yml
mockServiceWork.js
2 changes: 1 addition & 1 deletion source/frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-slim as node
FROM node:20-slim as node

# install build toolchain
RUN apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion source/frontend/config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
},
// The Jest config to use when running your jest tests
jest: function override(config) {
config.transformIgnorePatterns = ['node_modules/(?!(react-leaflet|@react-leaflet/core)/)'];
config.transformIgnorePatterns = ['<rootDir>/node_modules/(?!(react-leaflet|@react-leaflet))'];
return config;
},

Expand Down
Loading

0 comments on commit 7967cb2

Please sign in to comment.