Skip to content

Commit

Permalink
Update node, fix yarn lockfile
Browse files Browse the repository at this point in the history
mike-marcacci committed Jul 22, 2022
1 parent 351c04b commit cf26f7a
Showing 7 changed files with 955 additions and 640 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@ jobs:

steps:
- uses: actions/[email protected]
- name: Use Node 12
- name: Use Node 16
uses: actions/[email protected]
with:
node-version: "12.x"
node-version: "16.x"
- name: Cache node modules
uses: actions/[email protected]
with:
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -28,10 +28,10 @@ jobs:
[ ! -z "$VERSION" ]
echo "::set-output name=version::$VERSION"
- uses: actions/[email protected]
- name: Use Node 12
- name: Use Node 16
uses: actions/[email protected]
with:
node-version: "12.x"
node-version: "16.x"
- name: Cache node modules
uses: actions/[email protected]
with:
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# base
# ----

FROM node:14 AS base
FROM node:16 AS base

RUN mkdir -p /workspace
WORKDIR /workspace
6 changes: 3 additions & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ services:

# This container installs node modules into the node_modules volume.
installer:
image: node:14.11.0
image: node:16.16.0
working_dir: /workspace
command: yarn
environment:
@@ -40,7 +40,7 @@ services:
builder:
depends_on:
- installer
image: node:14.11.0
image: node:16.16.0
working_dir: /workspace
command: ./scripts/await.sh node_modules/.bin/lerna yarn build:development:chained
environment:
@@ -58,7 +58,7 @@ services:
depends_on:
- builder
- postgres
image: node:14.11.0
image: node:16.16.0
working_dir: /workspace
command: ./scripts/await.sh node_modules/.bin/nodemon ./scripts/await.sh dist/server.js yarn start:development
environment:
12 changes: 11 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -58,5 +58,15 @@
],
"timeout": "60s"
},
"packageManager": "[email protected]"
"packageManager": "[email protected]",
"dependencies": {
"@authx/authx": "workspace:^",
"@authx/interface": "workspace:^",
"@authx/scopes": "workspace:^",
"@authx/strategy-email": "workspace:^",
"@authx/strategy-openid": "workspace:^",
"@authx/strategy-password": "workspace:^",
"@authx/strategy-saml": "workspace:^",
"@authx/tools": "workspace:^"
}
}
2 changes: 1 addition & 1 deletion packages/interface/package.json
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@
"main": "dist/server/index.js",
"name": "@authx/interface",
"peerDependencies": {
"@authx/authx": "3.1.0-alpha.18",
"@authx/authx": "3.1.0-alpha.49",
"koa": "^2.7.0"
},
"repository": "https://github.com/the-control-group/authx",
1,565 changes: 935 additions & 630 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit cf26f7a

Please sign in to comment.