Skip to content

Commit

Permalink
Merge branch 'release-0.2.34'
Browse files Browse the repository at this point in the history
  • Loading branch information
entrotech committed Dec 23, 2021
2 parents 2aad553 + b090526 commit c8af475
Show file tree
Hide file tree
Showing 74 changed files with 15,000 additions and 14,429 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/new-issue-create-card.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Create card for new issues
on:
issues:
types: [opened]
jobs:
createCard:
runs-on: ubuntu-latest
steps:
- name: Create or Update Project Card
uses: peter-evans/create-or-update-project-card@v1
with:
project-name: Project Management
column-name: New Issue Approval
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14-alpine as clientBuilder
FROM node:lts-alpine as clientBuilder

RUN mkdir /app
WORKDIR /app
Expand All @@ -10,7 +10,7 @@ COPY /client .
RUN npm run build
RUN echo package.json

FROM node:14-alpine
FROM node:lts-alpine

WORKDIR /

Expand Down
19,522 changes: 9,580 additions & 9,942 deletions client/package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tdm-calculator-client",
"version": "0.2.33",
"version": "0.2.34",
"private": true,
"proxy": "http://localhost:5000",
"scripts": {
Expand Down Expand Up @@ -31,41 +31,41 @@
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-solid-svg-icons": "^5.15.2",
"@fortawesome/react-fontawesome": "^0.1.14",
"@fortawesome/react-fontawesome": "^0.1.16",
"@microsoft/applicationinsights-react-js": "^3.0.5",
"@microsoft/applicationinsights-web": "^2.5.11",
"@storybook/preset-create-react-app": "^3.1.5",
"axios": "^0.21.4",
"axios": "^0.24.0",
"clsx": "^1.1.1",
"formik": "^2.2.9",
"moment": "^2.29.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-gtm-module": "^2.0.11",
"react-input-mask": "^2.0.4",
"react-jss": "^10.7.1",
"react-jss": "^10.8.2",
"react-loader": "^2.4.7",
"react-modal": "^3.14.3",
"react-router-dom": "^5.3.0",
"react-scripts": "^4.0.2",
"react-scripts": "^4.0.3",
"react-string-replace": "^0.4.4",
"react-tooltip": "^4.2.21",
"yup": "^0.32.9"
"yup": "^0.32.11"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.1.0",
"@testing-library/user-event": "^13.2.1",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.5.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-jest": "^24.1.3",
"eslint-plugin-jest": "^25.2.2",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.22.0",
"lint-staged": "^11.1.2",
"nock": "^13.1.3",
"eslint-plugin-react-hooks": "^4.2.0",
"lint-staged": "^11.2.6",
"nock": "^13.1.4",
"prettier": "^2.4.0",
"react-test-renderer": "^17.0.1",
"react-test-renderer": "^17.0.2",
"require-context.macro": "^1.2.2",
"sass": "^1.32.6"
"sass": "^1.43.4"
},
"lint-staged": {
"*.{js,css,md}": "prettier --write",
Expand Down
Loading

0 comments on commit c8af475

Please sign in to comment.