Skip to content

Commit

Permalink
feat: updates (#312)
Browse files Browse the repository at this point in the history
* updates

- bump dependencies
- use yarn
- update jest config
- update prettier config

* update CI
  • Loading branch information
hugoArregui authored Mar 18, 2024
1 parent 6334afe commit 49ad57c
Show file tree
Hide file tree
Showing 11 changed files with 2,543 additions and 7,335 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
# -
# name: Login to DockerHub
# uses: docker/login-action@v1
Expand All @@ -19,7 +19,7 @@ jobs:
# password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
# push: true
tags: well-known-components/template-server:latest
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Use Node.js 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 16.x
cache: npm
node-version: 18.x
cache: yarn
- name: install
run: npm ci
run: yarn
- name: build
run: npm run build
run: yarn build
- name: test
run: npm run test
run: yarn test
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ RUN chmod +x /tini

# install dependencies
COPY package.json /app/package.json
COPY package-lock.json /app/package-lock.json
RUN npm ci
COPY yarn.lock /app/yarn.lock
RUN yarn

# build the app
COPY . /app
RUN npm run build
RUN npm run test
RUN yarn build
RUN yarn test

# remove devDependencies, keep only used dependencies
RUN npm ci --only=production
RUN yarn install --frozen-lockfile

########################## END OF BUILD STAGE ##########################

Expand Down
9 changes: 2 additions & 7 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
module.exports = {
globals: {
"ts-jest": {
tsconfig: "test/tsconfig.json",
},
},
moduleFileExtensions: ["ts", "js"],
transform: {
"^.+\\.(ts|tsx)$": "ts-jest",
"^.+\\.(ts|tsx)$": ["ts-jest", {tsconfig: "test/tsconfig.json"}]
},
moduleFileExtensions: ["ts", "js"],
coverageDirectory: "coverage",
collectCoverageFrom: ["src/**/*.ts", "src/**/*.js"],
testMatch: ["**/*.spec.(ts)"],
Expand Down
Loading

0 comments on commit 49ad57c

Please sign in to comment.