Upgrade dependencies (#1015)

* Update Dependencies for Node 12 +

* Fix new lint issues due to upgrading dependencies

* Update nginx docker image to use Node 12

* Update node used by ./run up:build

* Upgrade Yarn to latest 1.22 version

* Update action versions

.github/workflows/main.yml

@@ -16,18 +16,18 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.DEPLOY__AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.DEPLOY__AWS_SECRET_ACCESS_KEY }}
       AWS_DEFAULT_REGION: ${{ secrets.DEPLOY__AWS_DEFAULT_REGION }}
       AWS_ECR_ACCOUNT: ${{ secrets.DEPLOY__AWS_ECR_ACCOUNT }}
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: "14"
+          node-version: 14
 
       - name: Get environment info
         run: |
@@ -63,15 +63,15 @@ jobs:
 
       - name: Configure AWS credentials (SIL)
         id: aws_sil
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.DEPLOY__AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.DEPLOY__AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ secrets.DEPLOY__AWS_DEFAULT_REGION }}
 
       - name: Login to AWS ECR (SIL)
         id: ecr_sil
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
         with:
           registries: ${{ secrets.DEPLOY__AWS_ECR_ACCOUNT }}
 

Dockerfile.nginx

@@ -1,15 +1,15 @@
 # ---- Base ----
-FROM nginx:1.15.8-alpine AS base
-# nginx 1.15.8 uses alpine 3.9
+FROM --platform=linux/amd64 nginx:1.18.0-alpine AS base
+# nginx 1.18.0 uses alpine 3.12
 #
 # so here is the nodejs search for that version of alpine
-# https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.9&repo=main
+# https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.12&repo=main
 #
 RUN apk add --no-cache git curl bash
 RUN apk add --no-cache \
       --repository http://dl-3.alpinelinux.org/alpine/edge/community \
-      nodejs=10.19.0-r0 \
-      npm=10.19.0-r0 \
+      nodejs=12.22.6-r0 \
+      npm=12.22.6-r0 \
       build-base \
     && npm config set unsafe-perm true \
     && npm install -qg yarn \
@@ -49,7 +49,7 @@ RUN bash -c "/src/scripts/refresh-languages.sh"
 RUN yarn webpack:build --output-path /src/_html_tmp
 
 # ---- Release ----
-FROM nginx:1.15.8-alpine AS release
+FROM --platform=linux/amd64 nginx:1.18.0-alpine AS release
 COPY --from=build /src/_html_tmp /usr/share/nginx/html
 COPY source/run-nginx.sh /usr/local/bin
 COPY source/config/nginx.conf etc/nginx/conf.d/default.conf.template

source/SIL.AppBuilder.Portal.Frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:10.17.0-buster
+FROM --platform=linux/amd64 node:12.22.12-bullseye
 
 ARG CHROME_VERSION="google-chrome-stable"
 

source/SIL.AppBuilder.Portal.Frontend/package.json

@@ -151,7 +151,6 @@
     "crypto-js": "^4.0.0",
     "css-loader": "2.0.0",
     "dotenv": "^8.0.0",
-    "ember-cli": "^3.8.1",
     "eslint": "^5.8.0",
     "eslint-config-prettier": "^3.1.0",
     "eslint-config-typescript": "^3.0.0",
@@ -185,7 +184,7 @@
     "karma-webpack": "^4.0.0",
     "karma-webpack-grep": "^1.0.1",
     "mocha": "^8.0.0",
-    "node-sass": "^4.9.0",
+    "node-sass": "^4.12.0",
     "prettier": "^1.14.3",
     "react-test-renderer": "^16.4.0",
     "redux-devtools-extension": "^2.13.5",
@@ -216,7 +215,7 @@
     "react-dom": "^16.9.0"
   },
   "volta": {
-    "node": "10.17.0",
-    "yarn": "1.22.4"
+    "node": "12.22.12",
+    "yarn": "1.22.22"
   }
 }

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/application-type/list.tsx

@@ -1,11 +1,7 @@
 import { compose } from 'recompose';
-
 import { ApplicationTypeResource } from '@data';
-
 import { buildOptions } from '@data';
-
 import { TYPE_NAME as APPLICATION_TYPE } from '@data/models/application-type';
-
 import { query } from '@data';
 
 export interface IOwnProps {

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/author/with-data-actions.tsx

@@ -1,9 +1,7 @@
 import * as React from 'react';
 import { withData as withOrbit, WithDataProps } from 'react-orbitjs';
 import { ResourceObject } from 'jsonapi-typescript';
-
 import { defaultOptions, AUTHORS_TYPE } from '@data';
-
 import { AuthorAttributes } from '@data/models/author';
 
 export interface IProvidedProps {

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/group/with-data-actions.tsx

@@ -3,13 +3,9 @@ import * as toast from '@lib/toast';
 import { compose } from 'recompose';
 import { withData as withOrbit, WithDataProps } from 'react-orbitjs';
 import { GroupAttributes, GroupResource } from '@data/models/group';
-
 import { defaultOptions } from '@data';
-
 import { requireProps } from '@lib/debug';
-
 import { OrganizationResource } from '@data';
-
 import { TransformBuilder } from '@orbit/data';
 
 export interface IProvidedProps {
@@ -83,8 +79,5 @@ export function withDataActions(InnerComponent) {
     }
   }
 
-  return compose(
-    withOrbit({}),
-    requireProps('organization')
-  )(DataActionWrapper);
+  return compose(withOrbit({}), requireProps('organization'))(DataActionWrapper);
 }

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/notification/with-collection-data-actions.tsx

@@ -1,14 +1,11 @@
 import { NotificationResource } from '@data';
-
-import { useLiveData } from '~/data/live';
-
 import { useCallback } from 'react';
-
-import { recordsThatStillExist } from '~/data/store-helpers';
-
 import { attributesFor } from 'react-orbitjs';
 import { destroy } from '@lib/fetch';
 
+import { recordsThatStillExist } from '~/data/store-helpers';
+import { useLiveData } from '~/data/live';
+
 export function useCollectionDataActions(notifications: NotificationResource[]) {
   const { pushData, dataStore } = useLiveData();
 

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/notification/with-data-actions.tsx

@@ -1,5 +1,4 @@
 import { useOrbit } from 'react-orbitjs';
-
 import { defaultOptions, NotificationResource } from '@data';
 
 import * as toast from '~/lib/toast';

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/organization-store/list.tsx

@@ -1,5 +1,4 @@
 import { query, buildOptions, OrganizationStoreResource } from '@data';
-
 import { IProvidedProps as IFilterProps } from '@data/containers/api/with-filtering';
 import { IPaginateProps } from '@data/containers/api/pagination';
 import { ISortProps } from '@data/containers/api/sorting';

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/organization/with-data-actions.tsx

@@ -2,7 +2,6 @@ import * as React from 'react';
 import { compose } from 'recompose';
 import { withData as withOrbit, WithDataProps } from 'react-orbitjs';
 import { create, update } from '@data/store-helpers';
-
 import {
   defaultOptions,
   OrganizationResource,
@@ -13,7 +12,6 @@ import {
   UserResource,
   relationshipFor,
 } from '@data';
-
 import { OrganizationAttributes } from '@data/models/organization';
 
 export interface IProvidedProps {

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/product-definition/list.tsx

@@ -1,7 +1,5 @@
 import { compose } from 'recompose';
-
 import { query, buildOptions, ProductDefinitionResource } from '@data';
-
 import { IProvidedProps as IFilterProps } from '@data/containers/api/with-filtering';
 import { IPaginateProps } from '@data/containers/api/pagination';
 import { ISortProps } from '@data/containers/api/sorting';

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/product-definition/with-data-actions.tsx

@@ -2,14 +2,12 @@ import * as React from 'react';
 import { compose } from 'recompose';
 import { withData as withOrbit, WithDataProps } from 'react-orbitjs';
 import { create, update } from '@data/store-helpers';
-
 import {
   defaultOptions,
   ProductDefinitionResource,
   ApplicationTypeResource,
   WorkflowDefinitionResource,
 } from '@data';
-
 import { ProductDefinitionAttributes } from '@data/models/product-definition';
 
 export interface IProvidedProps {

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/product/with-data-action.tsx

@@ -1,5 +1,4 @@
 import { useOrbit } from 'react-orbitjs/dist';
-
 import { defaultOptions } from '@data';
 
 import { ProductAttributes } from '~/data/models/product';

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/project/list.tsx

@@ -1,22 +1,17 @@
 import { compose } from 'recompose';
-
 import { buildOptions, ProjectResource } from '@data';
-
 import { IProvidedProps as IFilterProps } from '@data/containers/api/with-filtering';
 import { TYPE_NAME as PROJECT } from '@data/models/project';
 import { IPaginateProps } from '@data/containers/api/pagination';
 import { ISortProps } from '@data/containers/api/sorting';
 import { IProvidedProps as IOrgProps } from '@data/containers/with-current-organization';
-
 import { query } from '@data';
-
 import { roleInOrganizationOfResource } from '@data/containers/with-role';
+import { ROLE } from '@models/role';
 
 import { attributesFor } from '~/data/helpers';
-
 import { idFromRecordIdentity } from '~/data/store-helpers';
 
-import { ROLE } from '@models/role';
 export interface IOwnProps {
   projects: ProjectResource[];
   isLoading: boolean;

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/project/permissions.ts

@@ -1,12 +1,11 @@
-import { UserResource, ProjectResource, idFromRecordIdentity } from '~/data';
-
 import Store from '@orbit/store';
 import { attributesFor } from 'react-orbitjs';
 
-import { ROLE } from '~/data/models/role';
-
 import { roleInOrganizationOfResource } from '../../with-role';
 
+import { ROLE } from '~/data/models/role';
+import { UserResource, ProjectResource, idFromRecordIdentity } from '~/data';
+
 export function canUserArchive(dataStore: Store, user: UserResource, project: ProjectResource) {
   const currentUserId = parseInt(idFromRecordIdentity(user), 10);
   const { ownerId } = attributesFor(project);

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/project/public.tsx

@@ -1,5 +1,4 @@
 import { query, buildOptions } from '@data';
-
 import { buildFindRecord } from '@data/store-helpers';
 
 export function withPublicProject<T>(idGetter: (props: T) => string) {

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/project/with-bulk-actions.tsx

@@ -1,9 +1,7 @@
 import * as React from 'react';
 import { compose } from 'recompose';
 import { withData as withOrbit, WithDataProps } from 'react-orbitjs';
-
 import { ProjectResource, firstError, pushPayload, PUSH_PAYLOAD_OPERATION } from '@data';
-
 import { patch as authenticatedPatch, tryParseJson } from '@lib/fetch';
 import { idFromRecordIdentity } from '@data/store-helpers';
 import { ServerError } from '@data/errors/server-error';
@@ -113,9 +111,5 @@ export function withBulkActions<WrappedProps>(WrappedComponent) {
     }
   }
 
-  return compose(
-    withTranslations,
-    withOrbit({}),
-    withMomentTimezone
-  )(DataWrapper);
+  return compose(withTranslations, withOrbit({}), withMomentTimezone)(DataWrapper);
 }

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/project/with-data-actions.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { compose } from 'recompose';
 import { withOrbit, useOrbit, attributesFor } from 'react-orbitjs';
-
 import {
   defaultOptions,
   ProjectResource,
@@ -11,7 +10,6 @@ import {
   StoreResource,
   relationshipFor,
 } from '@data';
-
 import { useCurrentUser } from '@data/containers/with-current-user';
 import { ProjectAttributes } from '@data/models/project';
 import { recordIdentityFromKeys } from '@data/store-helpers';

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/reviewer/with-data-actions.tsx

@@ -1,9 +1,7 @@
 import * as React from 'react';
 import { withData as withOrbit, WithDataProps } from 'react-orbitjs';
 import { ResourceObject } from 'jsonapi-typescript';
-
 import { defaultOptions, REVIEWERS_TYPE } from '@data';
-
 import { ReviewerAttributes } from '@data/models/reviewer';
 
 export interface IProvidedProps {

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/role/list.tsx

@@ -1,5 +1,4 @@
 import { compose } from 'recompose';
-
 import { query, buildOptions, RoleResource } from '@data';
 
 export interface IProvidedProps {

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/store-type/with-data-actions.tsx

@@ -2,9 +2,7 @@ import * as React from 'react';
 import { compose } from 'recompose';
 import { withData as withOrbit, WithDataProps } from 'react-orbitjs';
 import { create, update } from '@data/store-helpers';
-
 import { defaultOptions, StoreTypeResource } from '@data';
-
 import { StoreTypeAttributes } from '@data/models/store-type';
 
 export interface IProvidedProps {

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/store/list.tsx

@@ -1,7 +1,5 @@
 import { compose } from 'recompose';
-
 import { query, buildOptions, StoreResource } from '@data';
-
 import { IProvidedProps as IFilterProps } from '@data/containers/api/with-filtering';
 import { IPaginateProps } from '@data/containers/api/pagination';
 import { ISortProps } from '@data/containers/api/sorting';

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/user-task/index.ts

@@ -1,9 +1,7 @@
 import { useOrbit, attributesFor, idFromRecordIdentity } from 'react-orbitjs';
 
 import { useRouter } from '~/lib/hooks';
-
 import { TaskResource } from '~/data';
-
 import { relationsFromPath } from '~/data/containers/with-relationship';
 
 export { withNetwork as withUserTaskList, IProvidedProps as IUserTaskListProps } from './list';

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/user-task/list.tsx

@@ -1,13 +1,11 @@
 import React from 'react';
-
 import { buildOptions, UserTaskResource } from '@data';
-
 import { useQuery, useCache } from 'react-orbitjs';
 
-import { useLiveData } from '~/data/live';
-
 import { useCurrentUser } from '../../with-current-user';
 
+import { useLiveData } from '~/data/live';
+
 interface IOptions {
   include?: string[];
 }

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/user/list.tsx

@@ -1,5 +1,4 @@
 import { query, buildOptions, UserResource } from '@data';
-
 import { IProvidedProps as IFilterProps } from '@data/containers/api/with-filtering';
 import { IPaginateProps } from '@data/containers/api/pagination';
 import { ISortProps } from '@data/containers/api/sorting';

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/user/with-data-actions.tsx

@@ -1,8 +1,6 @@
 import * as React from 'react';
 import { withData as withOrbit, WithDataProps } from 'react-orbitjs';
-
 import { defaultOptions, USERS_TYPE } from '@data';
-
 import { UserAttributes } from '@data/models/user';
 import { ResourceObject } from 'jsonapi-typescript';
 

source/SIL.AppBuilder.Portal.Frontend/src/data/containers/resources/user/with-user-groups.tsx

@@ -2,11 +2,8 @@ import * as React from 'react';
 import { compose } from 'recompose';
 import { withData as withOrbit, WithDataProps } from 'react-orbitjs';
 import * as toast from '@lib/toast';
-
 import { GroupResource, UserResource, GroupMembershipResource } from '@data';
-
 import { buildOptions, create } from '@data';
-
 import { attributesFor, isRelatedRecord } from '@data/helpers';
 import { IProvidedProps as ICurrentUserProps } from '@data/containers/with-current-user';