Align node and npm versions to fix overrides

This commit is contained in:
Abel Luck 2023-06-07 10:24:48 +00:00
parent 754131fbe1
commit ffee8f42e4
8 changed files with 1564 additions and 2966 deletions

18
.editorconfig Normal file
View file

@ -0,0 +1,18 @@
# http://editorconfig.org
root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
[*.md]
max_line_length = 0
trim_trailing_whitespace = false
[{Makefile,**.mk}]
# Use tabs for indentation (Makefiles require tabs)
indent_style = tab

2
.nvmrc
View file

@ -1 +1 @@
v20 v20.2.0

View file

@ -29,14 +29,13 @@
"graphile-worker": "^0.13.0", "graphile-worker": "^0.13.0",
"hapi-auth-bearer-token": "^8.0.0", "hapi-auth-bearer-token": "^8.0.0",
"hapi-auth-jwt2": "^10.4.0", "hapi-auth-jwt2": "^10.4.0",
"hapi-postgraphile": "^0.11.0",
"hapi-swagger": "^16.0.1", "hapi-swagger": "^16.0.1",
"joi": "^17.9.2", "joi": "^17.9.2",
"jsonwebtoken": "^9.0.0", "jsonwebtoken": "^9.0.0",
"jwks-rsa": "^3.0.1", "jwks-rsa": "^3.0.1",
"long": "^5.2.3", "long": "^5.2.3",
"p-memoize": "^7.1.1", "p-memoize": "^7.1.1",
"pg": "^7.4.1", "pg": "^8.11.0",
"pg-monitor": "^2.0.0", "pg-monitor": "^2.0.0",
"pg-promise": "^11.4.3", "pg-promise": "^11.4.3",
"postgraphile-plugin-connection-filter": "^2.3.0", "postgraphile-plugin-connection-filter": "^2.3.0",

View file

@ -2,8 +2,8 @@ import * as Glue from "@hapi/glue";
import * as Metamigo from "@digiresilience/metamigo-common"; import * as Metamigo from "@digiresilience/metamigo-common";
import * as Blipp from "blipp"; import * as Blipp from "blipp";
import HapiBasic from "@hapi/basic"; import HapiBasic from "@hapi/basic";
import HapiJwt from "hapi-auth-jwt2"; //import HapiJwt from "hapi-auth-jwt2";
import HapiPostgraphile from "hapi-postgraphile"; //import HapiPostgraphile from "hapi-postgraphile";
import { getPostGraphileOptions } from "@digiresilience/metamigo-db"; import { getPostGraphileOptions } from "@digiresilience/metamigo-db";
import AppPlugin from "../app/index.js"; import AppPlugin from "../app/index.js";
import type { IAppConfig } from "../config.js"; import type { IAppConfig } from "../config.js";
@ -25,7 +25,7 @@ const build = async (config: IAppConfig): Promise<Glue.Manifest> => {
register: { register: {
plugins: [ plugins: [
// jwt plugin, required for our jwt auth plugin // jwt plugin, required for our jwt auth plugin
{ plugin: HapiJwt }, //{ plugin: HapiJwt },
// Blipp prints the nicely formatted list of endpoints at app boot // Blipp prints the nicely formatted list of endpoints at app boot
{ plugin: Blipp }, { plugin: Blipp },
@ -44,6 +44,8 @@ const build = async (config: IAppConfig): Promise<Glue.Manifest> => {
}, },
}, },
// load Postgraphile // load Postgraphile
/*
{ {
plugin: HapiPostgraphile, plugin: HapiPostgraphile,
options: { options: {
@ -67,6 +69,7 @@ const build = async (config: IAppConfig): Promise<Glue.Manifest> => {
}, },
}, },
}, },
*/
], ],
}, },
}; };

View file

@ -20,7 +20,7 @@
"graphile-worker": "^0.13.0", "graphile-worker": "^0.13.0",
"node-jose": "^2.2.0", "node-jose": "^2.2.0",
"postgraphile": "4.12.3", "postgraphile": "4.12.3",
"graphql": "16.6.0" "graphql": "15.8.0"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^29.5.1", "@types/jest": "^29.5.1",

4483
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -29,10 +29,15 @@
}, },
"hapi-postgraphile": { "hapi-postgraphile": {
"pg": "^8.11.0" "pg": "^8.11.0"
} },
"graphql": "15.8.0"
}, },
"devDependencies": { "devDependencies": {
"prettier": "^2.8.8", "prettier": "^2.8.8",
"dotenv-cli": "latest" "dotenv-cli": "latest"
},
"engines": {
"npm": ">=9.6.7",
"node": ">=20"
} }
} }

View file

@ -11,7 +11,7 @@
"@digiresilience/metamigo-config": "^0.2.0", "@digiresilience/metamigo-config": "^0.2.0",
"@graphile-contrib/pg-many-to-many": "^1.0.2", "@graphile-contrib/pg-many-to-many": "^1.0.2",
"graphile-migrate": "^1.4.1", "graphile-migrate": "^1.4.1",
"graphql": "16.6.0", "graphql": "15.8.0",
"postgraphile": "4.12.3" "postgraphile": "4.12.3"
}, },
"devDependencies": { "devDependencies": {