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

Production deploy #4112

Merged
merged 5 commits into from
Jan 7, 2025
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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.16.1
v22.10.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ planx-new is a monorepo containing our full application stack. Here's a quick su
- [Docker](https://docs.docker.com/get-docker/)
- [Docker Compose](https://docs.docker.com/compose/install/)
- [PNPM](https://github.com/pnpm/pnpm) `npm install -g [email protected]`
- [Node](https://nodejs.org/en/download) `pnpm env use --global 18.16.1`
- [Node](https://nodejs.org/en/download) `pnpm env use --global 22.10.0`
- [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html)

**If you're an OSL developer:**
Expand Down
6 changes: 3 additions & 3 deletions api.planx.uk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## BASE ##
# 18.16.1 = LTS
FROM node:18.16.1-alpine as base
# 22.10.0 = LTS
FROM node:22.10.0-alpine as base

# Setup Git - required for fetching git dependencies (planx-core)
RUN apk add --no-cache git
Expand All @@ -21,7 +21,7 @@ RUN pnpm install --recursive --prefer-offline
RUN pnpm build
RUN pnpm prune --production

FROM node:18.16.1-alpine as production
FROM node:22.10.0-alpine as production
WORKDIR /api

## PRODUCTION ##
Expand Down
2 changes: 1 addition & 1 deletion api.planx.uk/modules/send/bops/bops.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import nock from "nock";
import supertest from "supertest";
import type planxCore from "@opensystemslab/planx-core";
import type * as planxCore from "@opensystemslab/planx-core";
import { queryMock } from "../../../tests/graphqlQueryMock.js";
import app from "../../../server.js";
import { expectedPlanningPermissionPayload } from "../../../tests/mocks/digitalPlanningDataMocks.js";
Expand Down
2 changes: 1 addition & 1 deletion api.planx.uk/modules/send/email/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import supertest from "supertest";
import type planxCore from "@opensystemslab/planx-core";
import type * as planxCore from "@opensystemslab/planx-core";
import { queryMock } from "../../../tests/graphqlQueryMock.js";
import app from "../../../server.js";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type planxCore from "@opensystemslab/planx-core";
import type * as planxCore from "@opensystemslab/planx-core";
import { queryMock } from "../../../../tests/graphqlQueryMock.js";
import {
getSubmittedUnAnalyzedSessionIds,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type planxCore from "@opensystemslab/planx-core";
import type * as planxCore from "@opensystemslab/planx-core";
import { runSQL } from "../../../../lib/hasura/schema/index.js";
import { queryMock } from "../../../../tests/graphqlQueryMock.js";
import {
Expand Down
6 changes: 3 additions & 3 deletions api.planx.uk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"type": "module",
"exports": "./dist/index.js",
"engines": {
"node": ">=18.16",
"node": ">=22.10",
"pnpm": "8.6.6"
},
"dependencies": {
"@airbrake/node": "^2.1.8",
"@aws-sdk/client-s3": "^3.696.0",
"@aws-sdk/s3-request-presigner": "^3.701.0",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#a9848d4",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d004278",
"@types/isomorphic-fetch": "^0.0.36",
"adm-zip": "^0.5.10",
"axios": "^1.7.4",
Expand Down Expand Up @@ -92,7 +92,7 @@
"@types/jsonwebtoken": "^9.0.5",
"@types/lodash": "^4.17.0",
"@types/multer": "^1.4.11",
"@types/node": "^18.19.13",
"@types/node": "22.10.5",
"@types/passport": "^1.0.16",
"@types/passport-google-oauth20": "^2.0.14",
"@types/supertest": "^6.0.2",
Expand Down
Loading
Loading