Skip to content

Commit

Permalink
Merge pull request #50 from sotatek-dev/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Sotatek-TanHoang authored Sep 19, 2024
2 parents 3923944 + 05a29d5 commit 1d68bbd
Show file tree
Hide file tree
Showing 95 changed files with 778 additions and 8,802 deletions.
5 changes: 1 addition & 4 deletions .eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ module.exports = {
sourceType: 'module',
},
plugins: ['@typescript-eslint/eslint-plugin'],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
],
extends: ['plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'],
root: true,
env: {
node: true,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-deploy-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ run-name: ${{ github.actor }} is deploying develop branch [dev] 🌏 🚀 🛰
on:
push:
branches:
- "develop"
- 'develop'
jobs:
DeployDevelop:
runs-on: [self-hosted, mina-bridge-dev]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: 18.15.0
node-version: v18.20.4
- run: |
echo "${{ vars.MINA_BRIDGE_BE_DEV }}" >> .env
docker build . -t mina-bridge:1.0.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-deploy-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ run-name: ${{ github.actor }} is deploying test branch [test] 🌏 🚀 🛰️
on:
push:
branches:
- "testing"
- 'testing'
jobs:
DeployTest:
runs-on: [self-hosted, mina-bridge-test]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: 16.15.0
node-version: v18.20.4
- run: |
echo "${{ vars.MINA_BRIDGE_BE_TEST }}" >> .env
docker build . -t mina-bridge:1.0.0
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,6 @@ postgresData

#Docker mounted volumes
/dumpData/*
.scannerwork/*
.scannerwork/*
src/coverage/*
yarn.lock
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM node:18-alpine As build
WORKDIR /app

COPY package*.json yarn.lock ./
RUN yarn
COPY package*.json ./
RUN npm i
COPY . .
RUN yarn build
RUN npm run build

FROM node:18-alpine
WORKDIR /app
Expand Down
23 changes: 23 additions & 0 deletions jest.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module.exports = {
// [...]
moduleFileExtensions: ['js', 'json', 'ts'],
rootDir: './',
modulePaths: ['<rootDir>'],
testRegex: 'spec.ts$',
coverageDirectory: './coverage',
testEnvironment: 'node',
testTimeout: 60 * 60 * 1000,
moduleNameMapper: {
'^(\\.{1,2}/.*)\\.js$': '$1',
},
extensionsToTreatAsEsm: ['.ts'],
transform: {
'^.+\\.(mt|t|cj|j)s$': [
'ts-jest',
{
useESM: true,
},
],
},
setupFiles: ['./test-setup.js'],
};
25 changes: 0 additions & 25 deletions jest.config.js

This file was deleted.

4 changes: 1 addition & 3 deletions nest-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"collection": "@nestjs/schematics",
"sourceRoot": "src",
"compilerOptions": {
"deleteOutDir": true,
"assets": ["src/modules/crawler/minaSc/*.js"],
"watchAssets": true
"deleteOutDir": true
}
}
Loading

0 comments on commit 1d68bbd

Please sign in to comment.