Skip to content

Commit

Permalink
Merge pull request #73 from telostat/72-upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
alioguzhan authored May 7, 2024
2 parents 368acf4 + d19ac13 commit 711d4e5
Show file tree
Hide file tree
Showing 11 changed files with 11,625 additions and 6,410 deletions.
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn run commitlint --edit "$1"
npx commitlint --edit "$1"
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn run lint-staged
npx lint-staged
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13.1
v20
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM node:18-alpine as build
FROM node:20-alpine as build

WORKDIR /usr/src/app

COPY src ./src
COPY package.json tsconfig.json webpack.config.js typedoc.json ./
RUN yarn install && yarn build
RUN npm install && npm run build

FROM node:18-alpine
FROM node:20-alpine

WORKDIR /app

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.openfaas
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM ghcr.io/openfaas/of-watchdog:0.9.11 as watchdog

FROM node:18-alpine as build
FROM node:20-alpine as build

WORKDIR /usr/src/app

COPY src ./src
COPY package.json tsconfig.json webpack.config.js typedoc.json ./
RUN yarn install && yarn build
RUN npm install && npm run build

FROM node:18-alpine
FROM node:20-alpine

## Copy watchdog and make it executable:
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ docker run --rm -p 1025:25 -p 1080:80 tophfr/mailcatcher:0.7.1
Build the app and run the development server:

```
yarn build
yarn start
npm run build
npm start
```

Send an email:
Expand Down Expand Up @@ -69,7 +69,7 @@ ncu -u
## Testing

```
yarn test
npm run test
```

## Production
Expand Down
8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"nixpkgs": {
"branch": "release-23.05",
"branch": "23.11",
"description": "Nix Packages collection",
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "14d17e6b1f9fbee8ffa624277e241fb7b04440db",
"sha256": "04q7hfw895l9k1y5k3j9d372xgyfdly19av9hj85ddbp3i0v3hz3",
"rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
"sha256": "1ndiv385w1qyb3b18vw13991fzb9wg4cl21wglk89grsfsnra41k",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/14d17e6b1f9fbee8ffa624277e241fb7b04440db.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/057f9aecfb71c4437d2b27d3323df7f93c010b7e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
Loading

0 comments on commit 711d4e5

Please sign in to comment.