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.

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

feat: update major dependencies #1589

Merged
merged 18 commits into from
Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ orbs:
executors:
standard-node:
docker:
- image: "cimg/node:14.17.6"
- image: "cimg/node:18.14.2"
- image: "circleci/redis:6.2.1-alpine"
- image: "circleci/postgres:12.3-postgis"
environment:
Expand All @@ -15,7 +15,7 @@ executors:
POSTGRES_DB: bloom
cypress-node:
docker:
- image: "cypress/base:14.17.0"
- image: "cypress/base:18.14.1"
- image: "circleci/redis:6.2.1-alpine"
- image: "circleci/postgres:12.3-postgis"
environment:
Expand All @@ -35,9 +35,6 @@ executors:
REDIS_URL: "redis://localhost:6379/0"
REDIS_USE_TLS: "0"
PARTNERS_PORTAL_URL: "http://localhost:3001"
puppeteer-node:
docker:
- image: "cimg/node:14.17.6-browsers"

jobs:
setup:
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.6
18.14.2
15 changes: 7 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
language: node_js
node_js:
- 14
cache:
yarn: true
- 18
services:
- redis-server
before_install:
- sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
- sudo systemctl restart postgresql@11-main
- sudo systemctl restart postgresql@12-main
- sleep 1
before_script:
- cp sites/public/.env.template sites/public/.env
Expand Down Expand Up @@ -51,17 +49,18 @@ jobs:
- yarn start -p 3000 &
- yarn wait-on "http-get://localhost:3000" && yarn cypress run
- kill $(jobs -p) || true
dist: focal
addons:
postgresql: "11"
postgresql: "12"
apt:
packages:
- postgresql-11
- postgresql-client-11
- postgresql-12
- postgresql-client-12
- libgconf-2-4
env:
global: PGPORT=5433
PGUSER=travis
TEST_DATABASE_URL=postgres://localhost:5433/bloom_test
REDIS_TLS_URL=redis://127.0.0.1:6379/0
NEW_RELIC_ENABLED=false
NEW_RELIC_LOG_ENABLED=false
NEW_RELIC_LOG_ENABLED=false
6 changes: 3 additions & 3 deletions backend/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
"uuid": "^8.3.2"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/plugin-proposal-decorators": "^7.10.5",
"@babel/core": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@nestjs/schematics": "^8.0.7",
"@nestjs/testing": "^8.3.1",
"@types/axios": "^0.14.0",
Expand Down Expand Up @@ -145,7 +145,7 @@
"testEnvironment": "node"
},
"engines": {
"node": "14",
"node": "18",
"yarn": "^1.22"
}
}
2 changes: 1 addition & 1 deletion backend/core/test/activity-logs/activity-log.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { Listing } from "../../src/listings/entities/listing.entity"
declare const expect: jest.Expect
jest.setTimeout(30000)

describe.skip("Programs", () => {
describe.skip("Activity", () => {
let app: INestApplication
let adminId: string
let adminAccessToken: string
Expand Down
3 changes: 0 additions & 3 deletions detroit-ui-components/.storybook/constants.ts

This file was deleted.

71 changes: 0 additions & 71 deletions detroit-ui-components/.storybook/main.js

This file was deleted.

10 changes: 0 additions & 10 deletions detroit-ui-components/.storybook/next-link.js

This file was deleted.

3 changes: 0 additions & 3 deletions detroit-ui-components/.storybook/preview-body.html

This file was deleted.

12 changes: 0 additions & 12 deletions detroit-ui-components/.storybook/preview-head.html

This file was deleted.

51 changes: 0 additions & 51 deletions detroit-ui-components/.storybook/preview.ts

This file was deleted.

Loading