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

release: 2024-07-24 #1630

Merged
merged 9 commits into from
Jul 26, 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
The table of contents is too big for display.
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: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,4 @@
**/values.dev.yaml
backend/core/dist
backend/core/test
detroit-ui-components/__tests__
detroit-ui-components/storybook-static
README.md
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ module.exports = {
},
ignorePatterns: [
"node_modules",
"storybook-static",
".next",
"dist",
"migration/",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18

# ESLint and Prettier must be in `package.json`
- name: Install Node.js dependencies
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pre-release_components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Pre-release ui-components
on:
# Triggers the workflow on push only for the dev branch
push:
branches: [ dev ]
branches: [dev]

jobs:
build:
Expand All @@ -21,18 +21,18 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.ADMIN_TOKEN }}

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 14
registry-url: 'https://registry.npmjs.org'
node-version: 18
registry-url: "https://registry.npmjs.org"

- name: Version ui-components
run: yarn version:prerelease:ui-components
env:
GITHUB_TOKEN: ${{ secrets.ADMIN_TOKEN }}

- name: Publish ui-components
run: yarn publish:ui-components
env:
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ yarn-error.log*
.next/
**/out/_next*

# Storybook build output
storybook-static

# Cypress test output videos
**/cypress/videos
**/cypress/screenshots
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
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
**/*.hbs
.github
.travis.yml
detroit-ui-components/CHANGELOG.md
sites/public/CHANGELOG.md
sites/public/src/md_content/*
sites/partners/CHANGELOG.md
Expand Down
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
1 change: 0 additions & 1 deletion Dockerfile.sites-partners
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ WORKDIR /usr/src/app/
# to ensure that breaking changes in local dependencies from those packages are included
# instead of being pulled from npm.
COPY backend/core ./backend/core
COPY detroit-ui-components ./detroit-ui-components

COPY --from=development /usr/src/app/package.json ./
COPY --from=development /usr/src/app/yarn*.lock ./
Expand Down
1 change: 0 additions & 1 deletion Dockerfile.sites-public
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ WORKDIR /usr/src/app/
# to ensure that breaking changes in local dependencies from those packages are included
# instead of being pulled from npm.
COPY backend/core ./backend/core
COPY detroit-ui-components ./detroit-ui-components

COPY --from=development /usr/src/app/package.json ./package.json
COPY --from=development /usr/src/app/yarn*.lock ./
Expand Down
28 changes: 0 additions & 28 deletions Dockerfile.ui-components

This file was deleted.

5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ In some cases the sites diverge slightly to accomodate jurisdictional customizat
- `shared-helpers` contains types and functions intended for shared use between the public and partners sites.
- Visit [shared-helpers/README](https://github.com/bloom-housing/bloom/blob/dev/shared-helpers/README.md) for more details.

---

- `detroit-ui-components` contains our internal component library based on our internal design system. It is comprised of React components that we consume internally and also build to be configurable for outside consumers. We use [Storybook](https://storybook.js.org/), an environment that renders each of our components to provide documentation and display iterations.
- Visit [ui-components/README](https://github.com/bloom-housing/bloom/blob/dev/ui-components/README.md) for more details and view our [published Storybook](https://storybook.bloom.exygy.dev/).

## Getting Started for Developers

If this is your first time working with Bloom, please be sure to check out the `sites/public`, `sites/partners` and `backend/core` README files for important configuration information specific to those pieces.
Expand Down
8 changes: 4 additions & 4 deletions backend/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"dependencies": {
"@anchan828/nest-sendgrid": "^0.3.25",
"@google-cloud/translate": "^6.2.6",
"@nestjs/bull": "^0.4.2",
"@nestjs/bull": "^0.6.3",
"@types/mapbox": "^1.6.42",
"bull": "^4.1.0",
"@nestjs/cli": "^8.2.1",
Expand Down 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
2 changes: 0 additions & 2 deletions detroit-ui-components/.env.template

This file was deleted.

99 changes: 0 additions & 99 deletions detroit-ui-components/.npmignore

This file was deleted.

3 changes: 0 additions & 3 deletions detroit-ui-components/.storybook/constants.ts

This file was deleted.

Loading