Skip to content

Commit

Permalink
Revert "chore: bump deps, fixes and test updates (#786)"
Browse files Browse the repository at this point in the history
This reverts commit 1b874c9.
  • Loading branch information
djdembeck committed Aug 10, 2024
1 parent 1b874c9 commit b6a270a
Show file tree
Hide file tree
Showing 24 changed files with 3,393 additions and 5,385 deletions.
41 changes: 41 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"env": {
"node": true,
"es2021": true,
"jest/globals": true
},
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2021,
"sourceType": "module"
},
"plugins": ["@typescript-eslint", "jest", "simple-import-sort"],
"overrides": [
// override "simple-import-sort" config
{
"files": ["*.js", "*.jsx", "*.ts", "*.tsx"],
"rules": {
"simple-import-sort/imports": [
"error",
{
"groups": [
// Packages `react` related packages come first.
["^react", "^@?\\w"],
// Internal packages.
["^(@|components)(/.*|$)"],
// Side effect imports.
["^\\u0000"],
// Parent imports. Put `..` last.
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
// Other relative imports. Put same-folder imports and `.` last.
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
// Style imports.
["^.+\\.?(css)$"]
]
}
]
}
}
]
}
4 changes: 2 additions & 2 deletions .github/workflows/conventional-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
name: Conventional Commits
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0
- uses: webiny/action-conventional-commits@0cc64c05ba23b8179973090d3509f31dba971afb # v1.2.0
4 changes: 2 additions & 2 deletions .github/workflows/deploy-caprover.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- name: Set up npm
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4
with:
node-version: '14'

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -50,14 +50,14 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@60a0d343a0d8a18aedee9d34e62251f752153bdb
uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755
uses: docker/build-push-action@9f6f8c940b91232557f8699b21341a08624a8dce
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/jest-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
with:
version: latest
- uses: ArtiomTr/jest-coverage-report-action@c026e98ae079f4b0b027252c8e957f5ebd420610 # v2
- uses: ArtiomTr/jest-coverage-report-action@d438b94580c2c47599ce7abc62d26d1acd1661eb # v2
with:
test-script: pnpm test
package-manager: pnpm
6 changes: 3 additions & 3 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
node: ["lts/*", "current"]
name: Node ${{ matrix.node }} sample
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
with:
version: latest
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/release-please.yml

This file was deleted.

1 change: 0 additions & 1 deletion .prettierignore

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base with pnpm installed
FROM node:lts-alpine@sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 AS base
FROM node:lts-alpine@sha256:9e38d3d4117da74a643f67041c83914480b335c3bd44d37ccf5b5ad86cd715d1 AS base
WORKDIR /app

RUN apk add --no-cache curl \
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.7"

services:
node-server:
image: ghcr.io/laxamentumtech/audnexus:latest@sha256:cdb7159b7ec0576e2a00a944709859e8fdf51bdb414aedf48093745abcf162ff
image: ghcr.io/laxamentumtech/audnexus:latest
restart: always
environment:
ADP_TOKEN: ${NODE_ADP_TOKEN}
Expand Down Expand Up @@ -31,7 +31,7 @@ services:
replicas: 15

mongo:
image: mongo:7@sha256:54996a559c724c726a31fb8131e1c9088a05f7e531760e2897212389bbf20fed
image: mongo:7@sha256:5aa96e3cd219086c540c95ccc4554ff8aa86861628dc565d0ef4b32573e5c7b9
restart: always
volumes:
- /mnt/docker/mongo/data:/data/db
Expand All @@ -41,15 +41,15 @@ services:
- "27017:27017"

redis:
image: redis:alpine@sha256:eaea8264f74a95ea9a0767c794da50788cbd9cf5223951674d491fa1b3f4f2d2
image: redis:alpine@sha256:090276da2603db19b154602c374f505d94c10ea57e9749fc3e68e955284bf0fd
restart: always
networks:
- internal
ports:
- "6379:6379"

traefik:
image: traefik:v3.0@sha256:a208c74fd80a566d4ea376053bff73d31616d7af3f1465a7747b8b89ee34d97e
image: traefik:v3.0@sha256:ce055b97e7ddce1d9ad860b2c91758a352e19a08bb45d468ea4e7d41c59c017b
restart: always
command:
- "--providers.docker=true"
Expand Down
71 changes: 0 additions & 71 deletions eslint.config.mjs

This file was deleted.

52 changes: 24 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"build-ts": "tsc",
"build": "pnpm run build-ts",
"debug": "pnpm run build && pnpm run watch-debug",
"format": "prettier --config .prettierrc --write 'src/**/*.ts'",
"lint": "prettier --config .prettierrc --check 'src/**/*.ts' && tsc --noEmit && eslint \"**/*.{js,ts}\" --quiet --fix",
"format": "prettier --config .prettierrc --ignore-path .gitignore --write 'src/**/*.ts'",
"lint": "prettier --config .prettierrc --ignore-path .gitignore --check 'src/**/*.ts' && tsc --noEmit && eslint \"**/*.{js,ts}\" --quiet --fix --ignore-path .gitignore",
"preinstall": "npx only-allow pnpm",
"release": "standard-version",
"serve-debug": "nodemon --inspect dist/server.js",
Expand All @@ -28,51 +28,47 @@
"author": "David Dembeck",
"license": "GPL-3.0",
"dependencies": {
"@fastify/cors": "9.0.1",
"@fastify/cors": "8.4.2",
"@fastify/helmet": "^11.0.0",
"@fastify/rate-limit": "9.1.0",
"@fastify/redis": "6.2.0",
"@fastify/rate-limit": "9.0.1",
"@fastify/redis": "6.1.1",
"@fastify/schedule": "^4.1.1",
"axios": "^1.2.4",
"cheerio": "1.0.0-rc.12",
"domhandler": "5.0.3",
"fastify": "4.28.1",
"fastify": "4.24.3",
"html-to-text": "9.0.5",
"jest-mock-extended": "3.0.7",
"jsrsasign": "^11.0.0",
"jest-mock-extended": "3.0.5",
"jsrsasign": "^10.8.6",
"lodash": "4.17.21",
"module-alias": "2.2.3",
"moment": "^2.29.4",
"mongodb": "6.8.0",
"papr": "15.2.2",
"mongodb": "6.3.0",
"papr": "15.0.0",
"toad-scheduler": "^3.0.0",
"typescript": "5.5.4",
"typescript": "5.3.3",
"zod": "^3.20.6"
},
"devDependencies": {
"@eslint/compat": "1.1.1",
"@eslint/eslintrc": "3.1.0",
"@eslint/js": "9.8.0",
"@jest/types": "29.6.3",
"@redocly/cli": "1.19.0",
"@redocly/cli": "1.5.0",
"@types/html-to-text": "9.0.4",
"@types/jest": "29.5.12",
"@types/jsrsasign": "10.5.14",
"@types/lodash": "4.17.7",
"@types/node": "20.14.14",
"@typescript-eslint/eslint-plugin": "8.0.0",
"@typescript-eslint/parser": "8.0.0",
"@types/jest": "29.5.11",
"@types/jsrsasign": "10.5.12",
"@types/lodash": "4.14.202",
"@types/node": "20.10.4",
"@typescript-eslint/eslint-plugin": "6.14.0",
"@typescript-eslint/parser": "6.14.0",
"concurrently": "8.2.2",
"eslint": "9.8.0",
"eslint": "8.55.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-jest": "28.6.0",
"eslint-plugin-simple-import-sort": "12.1.1",
"globals": "15.9.0",
"eslint-plugin-jest": "27.6.0",
"eslint-plugin-simple-import-sort": "10.0.0",
"jest": "29.7.0",
"nodemon": "3.1.4",
"prettier": "3.3.3",
"nodemon": "3.0.2",
"prettier": "3.1.1",
"standard-version": "9.5.0",
"ts-jest": "29.2.4",
"ts-jest": "29.1.1",
"ts-node": "10.9.2"
},
"_moduleAliases": {
Expand Down
Loading

0 comments on commit b6a270a

Please sign in to comment.