Skip to content

Commit

Permalink
chore: update dependency to fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
bfritscher committed Jan 29, 2024
1 parent 27ec157 commit 346e5d1
Show file tree
Hide file tree
Showing 8 changed files with 3,925 additions and 3,986 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
build_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
name: Check out code

- uses: mr-smithers-excellent/docker-build-push@v5
- uses: mr-smithers-excellent/docker-build-push@v6
name: Build & push Docker image
with:
image: amcui-grademanager
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18 as builder
FROM node:20 as builder
WORKDIR /app
COPY package.json .
RUN yarn
Expand Down
75 changes: 0 additions & 75 deletions jest.config.js

This file was deleted.

26 changes: 26 additions & 0 deletions jest.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { quasarEsModulesPackageNames } from '@quasar/quasar-app-extension-testing-unit-jest/jest-preset.mjs';

/** @type {import('jest').Config} */
export default {
preset: '@quasar/quasar-app-extension-testing-unit-jest',
// collectCoverage: true,
// coverageThreshold: {
// global: {
// branches: 50,
// functions: 50,
// lines: 50,
// statements: 50
// },
// },
transform: {
[`^(${quasarEsModulesPackageNames}).+\\.js$`]: 'babel-jest',
'^.+\\.(ts|js|html)$': [
'ts-jest',
{
// Remove if using `const enums`
// See https://kulshekhar.github.io/ts-jest/docs/getting-started/options/isolatedModules/
isolatedModules: true,
},
],
},
};
75 changes: 40 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"test:e2e": "cross-env E2E_TEST=true start-test \"quasar dev\" http-get://localhost:8080 \"cypress open\"",
"test:e2e:ci": "cross-env E2E_TEST=true start-test \"quasar dev\" http-get://localhost:8080 \"cypress run\"",
"test:e2e:only": "cross-env E2E_TEST=true cypress open",
"test:unit": "jest --updateSnapshot",
"test:unit": "jest",
"test:unit:ci": "jest --ci",
"test:unit:coverage": "jest --coverage",
"test:unit:ui": "majestic",
Expand All @@ -31,56 +31,61 @@
"last 5 Opera versions"
],
"dependencies": {
"@quasar/extras": "1.15.10",
"@sentry/tracing": "7.35.0",
"@sentry/vue": "7.35.0",
"axios": "1.3.0",
"@quasar/extras": "1.16.9",
"@sentry/tracing": "7.98.0",
"@sentry/vue": "7.98.0",
"axios": "1.6.7",
"base64-arraybuffer": "1.0.2",
"codemirror": "5.65.6",
"core-js": "3.27.2",
"codemirror": "5.65.16",
"core-js": "3.35.1",
"diffsync": "2.1.2",
"lodash": "4.17.21",
"papaparse": "5.3.2",
"plotly.js-cartesian-dist-min": "2.18.0",
"quasar": "2.11.5",
"papaparse": "5.4.1",
"plotly.js-cartesian-dist-min": "2.28.0",
"quasar": "2.14.3",
"socket.io-client": "4.5.4",
"svg-pan-zoom": "3.6.1",
"tiny-emitter": "2.1.0",
"uuid": "9.0.0",
"vue": "^3.2.45",
"vue-router": "4.1.6",
"uuid": "9.0.1",
"vue": "3.4.15",
"vue-router": "4.2.5",
"vuedraggable": "4.1.0",
"vuex": "4.1.0"
},
"devDependencies": {
"@babel/eslint-parser": "7.19.1",
"@quasar/app": "3.3.3",
"@quasar/quasar-app-extension-testing": "2.0.6",
"@quasar/quasar-app-extension-testing-e2e-cypress": "4.2.2",
"@quasar/quasar-app-extension-testing-unit-jest": "3.0.0-alpha.10",
"@types/codemirror": "5.60.7",
"@types/lodash": "4.14.191",
"@types/node": "18.11",
"@types/papaparse": "5.3.7",
"@types/plotly.js": "2.12.13",
"@babel/eslint-parser": "7.23.9",
"@jest/globals": "29.7.0",
"@quasar/app-webpack": "3.12.3",
"@quasar/quasar-app-extension-testing": "2.2.0",
"@quasar/quasar-app-extension-testing-e2e-cypress": "5.2.0",
"@quasar/quasar-app-extension-testing-unit-jest": "3.0.0-beta.7",
"@types/codemirror": "5.60.15",
"@types/lodash": "4.14.202",
"@types/node": "20.11",
"@types/papaparse": "5.3.14",
"@types/plotly.js": "2.12.32",
"@types/socket.io-client": "3.0.0",
"@types/uuid": "9.0.0",
"@typescript-eslint/eslint-plugin": "5.50.0",
"@typescript-eslint/parser": "5.50.0",
"cypress-localstorage-commands": "2.2.2",
"dotenv": "16.0.3",
"eslint": "8.33.0",
"eslint-config-prettier": "8.6.0",
"eslint-plugin-cypress": "2.12.1",
"eslint-plugin-jest": "27.2.1",
"eslint-plugin-vue": "9.9.0",
"@types/uuid": "9.0.8",
"@typescript-eslint/eslint-plugin": "6.19.1",
"@typescript-eslint/parser": "6.19.1",
"@vue/test-utils": "2.3.0",
"@vue/vue3-jest": "29.2.6",
"cypress-localstorage-commands": "2.2.5",
"dotenv": "16.4.1",
"eslint": "8.56.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "2.15.1",
"eslint-plugin-jest": "27.6.3",
"eslint-plugin-vue": "9.20.1",
"git-revision-webpack-plugin": "5.0.0",
"majestic": "1.8.1"
"jest": "29.2.2",
"majestic": "1.8.1",
"ts-jest": "29.1.2"
},
"engines": {
"node": ">= 12.22.1",
"npm": ">= 6.13.4",
"yarn": ">= 1.21.1"
},
"productName": "Grade Manager (AMC-UI)"
}
}
7 changes: 1 addition & 6 deletions quasar.extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@
]
},
"@quasar/testing-unit-jest": {
"babel": "babelrc",
"options": [
"scripts",
"typescript",
"majestic"
]
"options": []
},
"@quasar/testing-e2e-cypress": {
"options": [
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@quasar/app/tsconfig-preset",
"extends": "@quasar/app-webpack/tsconfig-preset",
"compilerOptions": {
"baseUrl": ".",
"paths": {
Expand Down
Loading

0 comments on commit 346e5d1

Please sign in to comment.