Skip to content

Commit

Permalink
Merge pull request #444 from MORE-Platform/MORE_update_dependencies
Browse files Browse the repository at this point in the history
Update package dependencies
  • Loading branch information
benitsch authored May 22, 2024
2 parents 0ef669c + 604d896 commit 3feb1f6
Show file tree
Hide file tree
Showing 47 changed files with 7,452 additions and 15,075 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.15.0
v18.18.0
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ First-party plugins needed for Tailwind UI:

- [tailwindcss/forms](https://github.com/tailwindlabs/tailwindcss-forms)
- [tailwindcss/typography](https://tailwindcss.com/docs/typography-plugin)
- [tailwindcss/line-clamp](https://github.com/tailwindlabs/tailwindcss-line-clamp)
- [tailwindcss/aspect-ratio](https://github.com/tailwindlabs/tailwindcss-aspect-ratio)


Expand Down
21,797 changes: 7,079 additions & 14,718 deletions package-lock.json

Large diffs are not rendered by default.

96 changes: 48 additions & 48 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "more-studymanager-frontend",
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"dev:local": "VITE_LOCAL_BACKEND=true vite",
Expand All @@ -18,67 +19,66 @@
"license:list": "licensee --production || true"
},
"engines": {
"node": "18.13.0",
"npm": "9.4.0"
"node": "18.18.0",
"npm": "9.8.1"
},
"dependencies": {
"@vuepic/vue-datepicker": "3.6.7",
"axios": "1.3.2",
"@vuepic/vue-datepicker": "8.6.0",
"axios": "1.7.1",
"cron-validate": "1.4.5",
"dayjs": "1.11.9",
"jsdom": "21.1.0",
"keycloak-js": "20.0.3",
"licensee": "10.0.0",
"dayjs": "1.11.11",
"jsdom": "24.0.0",
"keycloak-js": "24.0.4",
"normalize.css": "8.0.1",
"pg": "8.9.0",
"pinia": "2.0.30",
"pg": "8.11.5",
"pinia": "2.1.7",
"primeicons": "5.0.0",
"primevue": "3.17.0",
"quill": "^1.3.7",
"quill": "^2.0.2",
"starwars-names": "1.6.0",
"vue": "3.2.47",
"vue-i18n": "9.2.2",
"vue-router": "4.1.6"
"vue": "3.4.27",
"vue-i18n": "9.13.1",
"vue-router": "4.3.2"
},
"devDependencies": {
"@babel/core": "7.20.12",
"@headlessui/vue": "1.7.14",
"@heroicons/vue": "1.0.6",
"@intlify/vite-plugin-vue-i18n": "7.0.0",
"@openapitools/openapi-generator-cli": "2.6.0",
"@babel/core": "7.24.5",
"@headlessui/vue": "1.7.22",
"@heroicons/vue": "2.1.3",
"@intlify/unplugin-vue-i18n": "^4.0.0",
"@openapitools/openapi-generator-cli": "2.13.4",
"@tailwindcss/aspect-ratio": "0.4.2",
"@tailwindcss/forms": "0.5.3",
"@tailwindcss/line-clamp": "0.4.2",
"@tailwindcss/typography": "0.5.9",
"@testing-library/vue": "7.0.0",
"@types/node": "18.11.19",
"@types/starwars-names": "1.6.0",
"@tailwindcss/forms": "0.5.7",
"@tailwindcss/typography": "0.5.13",
"@testing-library/vue": "8.1.0",
"@types/node": "20.12.12",
"@types/starwars-names": "1.6.2",
"@types/tailwindcss": "3.0.11",
"@typescript-eslint/eslint-plugin": "5.50.0",
"@typescript-eslint/parser": "5.50.0",
"@vitejs/plugin-vue": "3.2.0",
"@vue/eslint-config-prettier": "7.0.0",
"@vue/eslint-config-typescript": "11.0.3",
"@vue/test-utils": "2.2.10",
"autoprefixer": "10.4.14",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"@vitejs/plugin-vue": "5.0.4",
"@vue/eslint-config-prettier": "9.0.0",
"@vue/eslint-config-typescript": "13.0.0",
"@vue/test-utils": "2.4.6",
"autoprefixer": "10.4.19",
"babel-loader": "9.1.3",
"eslint": "8.33.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-vue": "9.9.0",
"postcss": "8.4.25",
"postcss-css-variables": "0.18.0",
"postcss-import": "15.1.0",
"eslint": "8.56.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-vue": "9.26.0",
"licensee": "10.0.0",
"postcss": "8.4.38",
"postcss-css-variables": "0.19.0",
"postcss-import": "16.1.0",
"postcss-nested": "6.0.1",
"postcss-nesting": "11.1.0",
"postcss-nesting": "12.1.4",
"postcss-simple-vars": "7.0.1",
"prettier": "2.8.3",
"prettier-plugin-svelte": "2.9.0",
"prettier-plugin-tailwindcss": "0.2.2",
"tailwindcss": "3.2.4",
"typescript": "4.9.5",
"vite": "3.2.7",
"vitest": "0.28.4",
"vue-loader": "17.0.1",
"vue-tsc": "1.0.24"
"prettier": "3.2.5",
"prettier-plugin-svelte": "3.2.3",
"prettier-plugin-tailwindcss": "0.5.14",
"tailwindcss": "3.4.3",
"typescript": "5.4.5",
"vite": "5.2.11",
"vitest": "1.6.0",
"vue-loader": "17.4.2",
"vue-tsc": "2.0.19"
}
}
17 changes: 7 additions & 10 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
const fs = require('fs');
const postcss = require('postcss');
const atImport = require('postcss-import');
import fs from 'fs';
import postcss from 'postcss';
import atImport from 'postcss-import';
import tailwindcssNesting from 'tailwindcss/nesting/index.js';
import tailwindCss from 'tailwindcss';
const pcss = fs.readFileSync('./src/style.pcss', 'utf8');

postcss().use(atImport()).process(pcss, {
from: './src/style.pcss',
});

module.exports = {
plugins: [
require('postcss-import'),
require('tailwindcss/nesting'),
require('tailwindcss'),
//require('autoprefixer')
],
export default {
plugins: [atImport, tailwindcssNesting, tailwindCss],
};
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Licensed under the Elastic License 2.0. */
const router = useRouter();
router.beforeEach((to) => {
document.title = (to.meta?.title as string) + ' (More)' ?? 'More';
document.title = to.meta?.title ? to.meta.title + ' (More)' : 'More';
});
</script>

Expand Down
16 changes: 8 additions & 8 deletions src/components/IntegrationList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Licensed under the Elastic License 2.0. */
observationList.value = response.data;
})
.catch((e: AxiosError) =>
handleIndividualError(e, 'cannot list observations')
handleIndividualError(e, 'cannot list observations'),
);
}
async function listIntegrations(): Promise<void> {
Expand Down Expand Up @@ -115,16 +115,16 @@ Licensed under the Elastic License 2.0. */
handleIndividualError(
e,
'Could not get the integration tokens for: ' +
observation.observationId
observation.observationId,
);
});
})
}),
);
})
.catch((e: AxiosError) => {
handleIndividualError(
e,
'Could not get observation list: ' + props.studyId
'Could not get observation list: ' + props.studyId,
);
});
}
Expand Down Expand Up @@ -241,7 +241,7 @@ Licensed under the Elastic License 2.0. */
.deleteToken(
props.studyId,
integration.observationId,
integration.tokenId
integration.tokenId,
)
.then(listIntegrations)
.catch((e: AxiosError) => {
Expand All @@ -251,7 +251,7 @@ Licensed under the Elastic License 2.0. */
integration.tokenId +
'), Observation Id: (' +
integration.observationId +
')'
')',
);
});
}
Expand All @@ -269,7 +269,7 @@ Licensed under the Elastic License 2.0. */
.createToken(
props.studyId,
integrationCreate.observationId,
integrationCreate.tokenLabel
integrationCreate.tokenLabel,
)
.then((response) => {
openInfoDialog(response.data);
Expand All @@ -282,7 +282,7 @@ Licensed under the Elastic License 2.0. */
integrationCreate.observationId +
'(' +
integrationCreate.tokenLabel +
')'
')',
);
});
}
Expand Down
Loading

0 comments on commit 3feb1f6

Please sign in to comment.