Skip to content

Commit

Permalink
Merge pull request #47 from UnownHash/chore-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
na-ji authored Nov 29, 2024
2 parents d6a2c0c + f1bc363 commit 51a9fdc
Show file tree
Hide file tree
Showing 20 changed files with 7,863 additions and 4,791 deletions.
10 changes: 8 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,18 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
}
]
}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ docker-compose.yml
.DS_Store
Thumbs.db

.nx/cache
.nx/cache
.nx/workspace-data
migrations.json
5 changes: 3 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

/dist
/coverage
/packages/connections/src/lib/utils/mitmProto.d.ts
/packages/connections/src/lib/utils/mitmProto*

/.nx/cache
/.nx/cache
/.nx/workspace-data
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18 AS build-env
FROM node:22 AS build-env
COPY package.json package-lock.json /app/
WORKDIR /app

Expand All @@ -8,7 +8,7 @@ RUN npm run build
# re-install without dev dependencies
RUN npm ci --omit=dev

FROM gcr.io/distroless/nodejs:18
FROM gcr.io/distroless/nodejs22-debian12
COPY --from=build-env /app /rotom
WORKDIR /rotom
CMD ["dist/packages/server/main.js"]
8 changes: 4 additions & 4 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getJestProjects } from '@nx/jest';
import { getJestProjectsAsync } from '@nx/jest';

export default {
projects: getJestProjects(),
};
export default async () => ({
projects: await getJestProjectsAsync(),
});
28 changes: 17 additions & 11 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"extends": "nx/presets/core.json",
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"affected": {
"defaultBase": "main"
},
"defaultProject": "server",
"generators": {
"@nx/react": {
Expand Down Expand Up @@ -38,17 +35,26 @@
"inputs": ["production", "^production"],
"cache": true
},
"lint": {
"@nx/jest:jest": {
"cache": true,
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"options": {
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
}
},
"test": {
"@nx/eslint:lint": {
"cache": true,
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
},
"e2e": {
"cache": true
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
}
},
"nxCloudAccessToken": "YzIxM2YxMDYtYTUzYi00MmI3LTg0YzAtMWI1NTNmNDVlODdmfHJlYWQtd3JpdGU="
"nxCloudAccessToken": "YzIxM2YxMDYtYTUzYi00MmI3LTg0YzAtMWI1NTNmNDVlODdmfHJlYWQtd3JpdGU=",
"useInferencePlugins": false,
"defaultBase": "main",
"useLegacyCache": true
}
Loading

0 comments on commit 51a9fdc

Please sign in to comment.