ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Throw out obsolete dependencies, or replace with newer solutions

This commit is contained in:
Ramon Wenger 2022-10-20 15:54:00 +02:00
parent 44ba6715fd
commit ca7663e5f0
17 changed files with 9465 additions and 19054 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/.babelrc
View File

@ -9,7 +9,6 @@
}]
],
"plugins": [
"transform-vue-jsx",
"@babel/plugin-transform-runtime"
]
}

4
client/.eslintrc.js
View File

@ -17,10 +17,8 @@ module.exports = {
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
'plugin:vue/recommended',
// 'plugin:vue/recommended',
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
//'standard'
'eslint:recommended',
'plugin:@typescript-eslint/eslint-recommended'
'plugin:@typescript-eslint/eslint-recommended',
],
// required to lint *.vue files
plugins: [

22
client/build/webpack.base.conf.js
View File

@ -1,9 +1,10 @@
'use strict';
const path = require('path');
const config = require('../config');
var MiniCssExtractPlugin = require('mini-css-extract-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const {VueLoaderPlugin} = require('vue-loader');
const ESLintPlugin = require('eslint-webpack-plugin');
const {isDev, assetsPath} = require('./utils');
@ -11,17 +12,11 @@ function resolve(dir) {
return path.join(__dirname, '..', dir);
}
const createLintingRule = () => ({
test: /\.(js|vue)$/,
loader: 'eslint-loader',
enforce: 'pre',
include: [resolve('src'), resolve('test')],
options: {
formatter: require('eslint-friendly-formatter'),
emitWarning: !config.dev.showEslintErrorsInOverlay,
},
});
const eslintOptions = {
formatter: require('eslint-formatter-friendly'),
emitWarning: !config.dev.showEslintErrorsInOverlay,
extensions: ['js', 'ts', 'vue']
};
//todo: mini-css-extract-plugin? upgrade to webpack 4, then use this
//https://github.com/webpack-contrib/mini-css-extract-plugin
@ -54,7 +49,7 @@ module.exports = {
},
module: {
rules: [
...(config.dev.useEslint ? [createLintingRule()] : []),
// ...(config.dev.useEslint ? [createLintingRule()] : []),
{
test: /\.vue$/,
loader: 'vue-loader',
@ -138,6 +133,7 @@ module.exports = {
},
plugins: [
new VueLoaderPlugin(),
new ESLintPlugin(eslintOptions),
],
// node: {

8
client/cypress/.eslintrc.js
View File

@ -1,5 +1,5 @@
module.exports = {
"extends": [
"plugin:cypress/recommended"
]
}
'extends': [
'plugin:cypress/recommended',
],
};

28420
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

41
client/package.json
View File

@ -34,6 +34,7 @@
"@babel/preset-stage-2": "^7.0.0",
"@babel/preset-typescript": "^7.16.7",
"@babel/runtime": "^7.5.4",
"@graphql-tools/jest-transform": "^1.2.2",
"@graphql-tools/mock": "^8.6.5",
"@graphql-tools/schema": "^8.3.7",
"@tiptap/core": "^2.0.0-beta.174",
@ -47,15 +48,10 @@
"@typescript-eslint/parser": "^5.10.0",
"@vue/composition-api": "^1.4.2",
"@vue/test-utils": "^1.3.0",
"appolo": "^6.0.19",
"autoprefixer": "^10.4.12",
"babel-bridge": "^1.12.11",
"babel-core": "^7.0.0-bridge.0",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-jest": "^24.8.0",
"babel-jest": "^25.5.1",
"babel-loader": "^8.0.6",
"babel-plugin-syntax-jsx": "^6.18.0",
"babel-plugin-transform-vue-jsx": "^3.5.0",
"chalk": "^2.0.1",
"copy-webpack-plugin": "^10.1.0",
"css-loader": "^3.6.0",
@ -63,16 +59,9 @@
"cy2": "^1.2.1",
"cypress": "^10",
"dayjs": "^1.10.7",
"debounce": "^1.2.0",
"eslint": "^7.32.0",
"eslint-config-standard": "^16.0.3",
"eslint-friendly-formatter": "^4.0.1",
"eslint-loader": "^4.0.2",
"eslint-formatter-friendly": "^7.0.0",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.2.0",
"eslint-plugin-standard": "^5.0.0",
"eslint-plugin-vue": "^8.6.0",
"file-loader": "^6.2.0",
"graphql": "^16.1.0",
@ -80,16 +69,15 @@
"graphql-tag": "^2.10.1",
"graphql-tools": "^8.2.5",
"html-webpack-plugin": "^5.5.0",
"jest": "^24.8.0",
"jest": "^25.5.4",
"jest-serializer-vue": "^2.0.2",
"jest-transform-graphql": "^2.1.0",
"jest-transform-stub": "^2.0.0",
"jest-watch-typeahead": "^0.3.1",
"jest-watch-typeahead": "^2.1.2",
"lodash": "^4.17.10",
"mini-css-extract-plugin": "^2.4.5",
"mock-apollo-client": "^1.2.0",
"node-notifier": "^5.1.2",
"node-sass": "^4.13.1",
"node-sass": "^7.0.3",
"ora": "^1.2.0",
"portfinder": "^1.0.13",
"postcss-import": "^15.0.0",
@ -98,27 +86,22 @@
"rimraf": "^2.6.0",
"sass-loader": "^12.6.0",
"semver": "^5.3.0",
"shelljs": "^0.7.6",
"shelljs": "^0.8.5",
"survey-vue": "^1.9.2",
"ts-loader": "^8.3.0",
"typescript": "^4.5.4",
"typescript-tslint-plugin": "^1.0.1",
"unfetch": "^3.1.1",
"uploadcare-widget": "^3.6.0",
"url-loader": "^4.1.1",
"uuid": "^3.2.1",
"vee-validate": "^3.4.14",
"vue": "2.6.14",
"vue-analytics": "^5.16.2",
"vue-apollo": "^3.1.0",
"vue-jest": "^3.0.4",
"vue-jest": "^4.0.1",
"vue-loader": "^15.9.8",
"vue-matomo": "^4.1.0",
"vue-router": "^3.5.3",
"vue-scrollto": "^2.11.0",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "2.6.14",
"vue-toast-notification": "^0.4.1",
"vue-vimeo-player": "^0.2.2",
"vuejs-logger": "1.5.5",
"vuex": "^3.0.1",
@ -126,12 +109,11 @@
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.9.1",
"webpack-dev-server": "^4.6.0",
"webpack-merge": "^5.8.0",
"whatwg-fetch": "^3.0.0"
"webpack-merge": "^5.8.0"
},
"engines": {
"node": ">= 14.x",
"npm": ">= 6.x"
"npm": ">= 8.x"
},
"browserslist": [
"> 1%",
@ -140,5 +122,8 @@
],
"resolutions": {
"vue": "2.6.14"
},
"devDependencies": {
"eslint-webpack-plugin": "^3.2.0"
}
}

2
client/src/components/profile/ProfileWidget.vue
View File

@ -38,7 +38,7 @@
.profile-widget {
display: flex;
flex-direction: column;
align-items: start;
align-items: flex-start;
&__name {
@include heading-4;

2
client/src/components/school-class/ClassSelectionWidget.vue
View File

@ -136,7 +136,7 @@
display: flex;
align-items: center;
justify-content: start;
justify-content: flex-start;
&__text {
line-height: $large-spacing;

2
client/src/graphql/client.js
View File

@ -4,7 +4,6 @@ import {
ApolloLink,
createHttpLink,
} from '@apollo/client/core';
import fetch from 'unfetch';
import {typeDefs} from '@/graphql/typedefs';
import {resolvers} from '@/graphql/resolvers';
import cache from './cache';
@ -16,7 +15,6 @@ export default function (uri, networkErrorCallback) {
// uri: process.env.NODE_ENV !== 'production' ? 'http://localhost:8000/api/graphql/' : '/api/graphql/',
uri,
credentials: 'include',
fetch: fetch,
headers: {
'X-CSRFToken': document.cookie.replace(/(?:(?:^|.*;\s*)csrftoken\s*=\s*([^;]*).*$)|^.*$/, '$1'),
},

2
client/src/layouts/FullScreenLayout.vue
View File

@ -46,7 +46,7 @@
cursor: pointer;
display:flex;
justify-content:end;
justify-content:flex-end;
}
</style>

2
client/src/layouts/SimpleLayout.vue
View File

@ -90,7 +90,7 @@
cursor: pointer;
display:flex;
justify-content:end;
justify-content:flex-end;
margin-right: $small-spacing;
margin-top: $small-spacing;

2
client/src/main.js
View File

@ -13,7 +13,6 @@ import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
import VueModal from '@/plugins/modal';
import VueRemoveEdges from '@/plugins/edges';
import VueMatomo from 'vue-matomo';
import VueToast from 'vue-toast-notification';
import VueLogger from 'vuejs-logger';
import { joiningClass, loginRequired, unauthorizedAccess } from '@/router/guards';
import flavorPlugin from '@/plugins/flavor';
@ -25,7 +24,6 @@ Vue.use(VueModal);
Vue.use(VueRemoveEdges);
Vue.use(VueApollo);
Vue.use(VueVimeoPlayer);
Vue.use(VueToast);
Vue.use(VueLogger, {
isEnabled: true,
logLevel: isProduction ? 'error' : 'debug',

4
client/src/pages/portfolio/project.vue
View File

@ -205,7 +205,7 @@
@include desktop {
flex-direction: row-reverse;
}
justify-content: start;
justify-content: flex-start;
position: relative;
align-items: center;
@ -224,7 +224,7 @@
/*max-width: 840px;*/
width: 100%;
min-height: 75vh;
align-content: start;
align-content: flex-start;
margin: 0 auto;
@supports (display: grid) {
display: grid;

2
client/src/pages/rooms/rooms.vue
View File

@ -84,7 +84,7 @@
.rooms-page {
display: flex;
flex-wrap: wrap;
align-content: start;
align-content: flex-start;
@supports (display: grid) {
display: grid;

2
client/src/styles/_room.scss
View File

@ -41,7 +41,7 @@
@include desktop {
flex-direction: row-reverse;
}
justify-content: start;
justify-content: flex-start;
position: relative;
& > :first-child {

1
client/src/styles/_typography.scss
View File

@ -15,6 +15,7 @@ h1, h2, h3, h4, h5 {
}
p, a, li {
font-family: $serif-font-family;
font-size: toRem(18px);
font-weight: 300;

2
client/tsconfig.json
View File

@ -12,8 +12,6 @@
"paths": {
"@/*": ["./*"],
},
"plugins": [{"name": "typescript-tslint-plugin"}]
},
"exclude": ["./cypress"]
}