Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade yarn dependencies #7219

Merged
merged 2 commits into from
Apr 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/postCreate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ composer_install() {
}

yarn_install() {
yarn install --cwd $ROOT --immutable
yarn run --cwd $ROOT build
yarn --cwd $ROOT install --immutable
yarn --cwd $ROOT run build
}

setup() {
Expand Down
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

56 changes: 0 additions & 56 deletions .eslintrc.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .styleci.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
php 8.2.0
nodejs 18.16.0
yarn 1.22.19
nodejs 21.7.1
yarn 4.1.1
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.0.1.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.1.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ checksumBehavior: update

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.1.cjs
yarnPath: .yarn/releases/yarn-4.1.1.cjs
8 changes: 8 additions & 0 deletions app/Http/Middleware/HandleInertiaRequests.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ public function share(Request $request)
'short' => substr(config('monica.commit'), 0, 7),
'url' => Str::finish(config('monica.repository', 'https://github.com/monicahq/monica/'), '/').'commit/'.config('monica.commit'),
]), 'underline text-xs dark:text-gray-100 hover:text-gray-900 hover:dark:text-gray-200'),
'sentry' => fn () => [
'dsn' => config('sentry.dsn'),
'tunnel' => config('sentry-tunnel.tunnel-url'),
'release' => config('sentry.release'),
'environment' => config('sentry.environment'),
'sendDefaultPii' => config('sentry.send_default_pii'),
'tracesSampleRate' => config('sentry.traces_sample_rate'),
],
]);
}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"socialiteproviders/microsoft-azure": "^5.1",
"stevebauman/location": "^7.0",
"thecodingmachine/safe": "^2.5",
"tightenco/ziggy": "1.8.1",
"tightenco/ziggy": "2.1.0",
"uploadcare/uploadcare-php": "^4.1"
},
"require-dev": {
Expand Down
29 changes: 15 additions & 14 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import js from '@eslint/js';
import globals from 'globals';
import vue from 'eslint-plugin-vue';
import prettier from 'eslint-config-prettier';

export default [
js.configs.recommended,
...vue.configs['flat/essential'],
...vue.configs['flat/strongly-recommended'],
...vue.configs['flat/recommended'],
prettier,
{
languageOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
globals: globals.browser,
},
files: ['**/*.js', '**/*.vue'],
plugins: {
vue: vue,
},
rules: {
'array-bracket-spacing': ['error', 'never'],
indent: ['error', 2],
'linebreak-style': ['error', 'unix'],
'no-undef': 0,
'no-trailing-spaces': [
'error',
{
ignoreComments: true,
skipBlankLines: true,
},
],
semi: ['error', 'always'],
'semi-spacing': [
'error',
{
before: false,
after: true,
},
],
'semi-style': ['error', 'last'],
'vue/component-name-in-template-casing': 0,
'vue/html-end-tags': 'error',
'vue/html-self-closing': 0,
'vue/no-v-model-argument': 0,
'vue/no-v-html': 0,
'vue/multi-word-component-names': 0,
'vue/max-attributes-per-line': [
'error',
{
singleline: 6,
multiline: 6,
},
],
'vue/singleline-html-element-content-newline': 0,
'vue/no-deprecated-events-api': 0,
'vue/require-default-prop': 0,
'vue/attributes-order': 0,
'vue/next-tick-style': [
// https://eslint.vuejs.org/rules/next-tick-style.html
'error',
'promise',
],
},
},
];
61 changes: 31 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,53 @@
{
"private": true,
"type": "module",
"scripts": {
"dev": "vite --https",
"build": "vite build",
"lint": "eslint --ext .js,.vue *.js resources",
"lint": "eslint *.js resources",
"format": "prettier --write '**/*.{js,vue,css,scss,json,yml,md}'",
"postinstall": "husky install",
"test": "php artisan migrate:fresh --database=testing && php artisan db:seed --database=testing && vendor/bin/phpunit && vendor/bin/phpstan && vendor/bin/psalm",
"docker:build": "docker build --cache-from monica-next -t monica-next -f scripts/docker/Dockerfile . && docker image prune -f",
"docker:run": "docker run --name monica -p 8080:80 monica-next"
},
"devDependencies": {
"@inertiajs/vue3": "^1.0.11",
"@inertiajs/vue3": "^1.0.15",
"@popperjs/core": "^2.11.8",
"@sentry/tracing": "^7.65.0",
"@sentry/vue": "^7.65.0",
"@simplewebauthn/browser": "^8.0.2",
"@tailwindcss/forms": "^0.5.6",
"@tailwindcss/typography": "^0.5.9",
"@vitejs/plugin-basic-ssl": "^1.0.1",
"@vitejs/plugin-vue": "^4.3.4",
"ant-design-vue": "^4.0.1",
"autoprefixer": "^10.4.15",
"axios": "^1.5.0",
"charts.css": "^0.9.0",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-vue": "^9.17.0",
"husky": "^8.0.3",
"laravel-vite-plugin": "^0.8.0",
"laravel-vue-i18n": "^2.7.1",
"lint-staged": "^14.0.1",
"@sentry/tracing": "^7.109.0",
"@sentry/vue": "^7.109.0",
"@simplewebauthn/browser": "^9.0.1",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.12",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-vue": "^5.0.4",
"ant-design-vue": "^4.1.2",
"autoprefixer": "^10.4.19",
"axios": "^1.6.8",
"charts.css": "^1.1.0",
"eslint": "^9.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-vue": "^9.24.0",
"husky": "^9.0.11",
"laravel-vite-plugin": "^1.0.2",
"laravel-vue-i18n": "^2.7.6",
"lint-staged": "^15.2.2",
"lodash": "^4.17.21",
"mitt": "^3.0.1",
"postcss": "^8.4.28",
"postcss-import": "^15.1.0",
"prettier": "^3.0.2",
"prettier-plugin-tailwindcss": "^0.5.3",
"sass": "^1.66.1",
"tailwindcss": "^3.3.3",
"postcss": "^8.4.38",
"postcss-import": "^16.1.0",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.13",
"sass": "^1.74.1",
"tailwindcss": "^3.4.3",
"tiny-emitter": "^2.1.0",
"uploadcare-vue": "^1.0.0",
"v-calendar": "^3.0.3",
"vite": "^4.4.9",
"vue": "^3.3.4",
"vite": "^5.2.8",
"vue": "^3.4.21",
"vue-clipboard3": "^2.0.0",
"vuedraggable": "^4.1.0",
"ziggy-js": "1.8.1"
"ziggy-js": "2.1.0"
},
"lint-staged": {
"*.js|resources/**/*.{vue,js}": [
Expand All @@ -60,5 +61,5 @@
"vendor/bin/pint"
]
},
"packageManager": "yarn@4.0.1"
"packageManager": "yarn@4.1.1"
}
2 changes: 1 addition & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
Expand Down
1 change: 0 additions & 1 deletion resources/css/app.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import 'charts.css';
@import 'ant-design-vue/dist/reset.css';
@import 'v-calendar/dist/style.css';

@tailwind base;
@tailwind components;
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Pages/Vault/Contact/Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const download = () => {
try {
document.body.appendChild(link);
link.click();
} catch (e) {
} catch {
document.body.removeChild(link);
}
}
Expand Down
Loading