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

🛠️ [Dependency] Update packages and switch to eslint-config-love #82

Merged
merged 7 commits into from
Apr 28, 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
6 changes: 6 additions & 0 deletions .changeset/chatty-pugs-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"website": minor
"earwurm": minor
---

Switched from local utilities package to beeftools.
10 changes: 5 additions & 5 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"env": {
"browser": true,
"es2022": true
"es2022": true,
},
"extends": ["standard-with-typescript", "plugin:prettier/recommended"],
"extends": ["love", "plugin:prettier/recommended"],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module",
"project": "./tsconfig.json"
"project": "./tsconfig.json",
},
"rules": {
"no-console": "error",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/strict-boolean-expressions": "off"
}
"@typescript-eslint/strict-boolean-expressions": "off",
},
}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.10
20.12
3 changes: 1 addition & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"DavidAnson.vscode-markdownlint",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"Vue.volar",
"Vue.vscode-typescript-vue-plugin",
"vue.volar",
"csstools.postcss",
"stylelint.vscode-stylelint"
]
Expand Down
22 changes: 11 additions & 11 deletions app/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"private": true,
"type": "module",
"engines": {
"node": ">=20.10.0",
"pnpm": ">=8.15.0"
"node": ">=20.12.0",
"pnpm": ">=9.0.0"
},
"scripts": {
"clean": "rm -rf dist && rm -rf *.tsbuildinfo",
Expand All @@ -26,21 +26,21 @@
"type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false"
},
"dependencies": {
"@earwurm/utilities": "workspace:*",
"beeftools": "^0.0.5",
"earwurm": "workspace:*",
"vue": "^3.4.15"
"vue": "^3.4.25"
},
"devDependencies": {
"@earwurm/types": "workspace:*",
"@rushstack/eslint-patch": "^1.7.2",
"@tsconfig/node20": "^20.1.2",
"@vitejs/plugin-vue": "^5.0.3",
"@rushstack/eslint-patch": "^1.10.2",
"@tsconfig/node20": "^20.1.4",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/tsconfig": "^0.5.1",
"eslint-plugin-vue": "^9.20.1",
"lightningcss": "^1.23.0",
"eslint-plugin-vue": "^9.25.0",
"lightningcss": "^1.24.1",
"vite-plugin-svg-sprite": "^0.5.1",
"vue-tsc": "^1.8.27"
"vue-tsc": "^2.0.14"
}
}
4 changes: 2 additions & 2 deletions app/website/src/components/DragHandle.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {classNames} from '@/helpers';
import {clx} from 'beeftools';

export interface DragHandleProps {
invert?: boolean;
Expand All @@ -9,7 +9,7 @@ defineProps<DragHandleProps>();
</script>

<template>
<div :class="classNames('DragHandle', {invert})">
<div :class="clx('DragHandle', {invert})">
<div class="Column">
<div class="Dot" />
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/website/src/components/IconAction.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {classNames} from '@/helpers';
import {clx} from 'beeftools';
import {
MotionFadeScale,
SquareAction,
Expand Down Expand Up @@ -29,7 +29,7 @@ defineEmits<IconActionEmits>();
<template>
<SquareAction
:classes="
classNames('IconAction', {
clx('IconAction', {
hasLabel: label?.length,
disabled,
filledLabel,
Expand Down
5 changes: 2 additions & 3 deletions app/website/src/components/MuteBar.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script setup lang="ts">
import {computed} from 'vue';
import {arrayOfLength} from '@earwurm/utilities';
import {classNames} from '@/helpers';
import {arrayOfLength, clx} from 'beeftools';

export interface MuteBarProps {
count?: number;
Expand All @@ -16,7 +15,7 @@ const barItems = computed(() => arrayOfLength(Math.max(count + 1, 1)));
</script>

<template>
<ul :class="classNames('MuteBar', {collapsed})">
<ul :class="clx('MuteBar', {collapsed})">
<li v-for="bar in barItems" :key="`MuteBar-Item-${bar}`" class="Item" />
</ul>
</template>
Expand Down
5 changes: 2 additions & 3 deletions app/website/src/components/SpeedSlider.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<script setup lang="ts">
import {computed} from 'vue';
import {calcProgress, clx} from 'beeftools';
import {tokens} from 'earwurm';
import {calcProgress} from '@earwurm/utilities';

import {classNames} from '@/helpers';
import {InputRange, type InputRangeProps} from '@/primitives';
import {MuteBar} from '@/components';

Expand Down Expand Up @@ -37,7 +36,7 @@ const stripes = computed(() => {

<template>
<div
:class="classNames('SpeedSlider', {disabled})"
:class="clx('SpeedSlider', {disabled})"
:style="{'--slider-progress': progress}"
>
<div class="BackgroundStripes">
Expand Down
6 changes: 3 additions & 3 deletions app/website/src/components/StackLabel.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {classNames} from '@/helpers';
import {clx} from 'beeftools';

export interface StackLabelProps {
label: string;
Expand All @@ -11,8 +11,8 @@ defineProps<StackLabelProps>();
</script>

<template>
<div :class="classNames('StackLabel', {populated})">
<p :class="classNames('Text', {truncate})">{{ label }}</p>
<div :class="clx('StackLabel', {populated})">
<p :class="clx('Text', {truncate})">{{ label }}</p>
</div>
</template>

Expand Down
5 changes: 2 additions & 3 deletions app/website/src/components/VolumeManager.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<script setup lang="ts">
import {computed} from 'vue';
import {calcProgress} from '@earwurm/utilities';
import {calcProgress, clx} from 'beeftools';

import {classNames} from '@/helpers';
import {InputRange, type InputRangeProps} from '@/primitives';
import {DragHandle, MuteBar} from '@/components';

Expand All @@ -27,7 +26,7 @@ const progress = computed(() => {

<template>
<div class="VolumeManager" :style="{'--slider-progress': progress}">
<div :class="classNames('MuteBarWrapper', {show: disabled})">
<div :class="clx('MuteBarWrapper', {show: disabled})">
<MuteBar :count="MUTE_BAR_COUNT" />
</div>

Expand Down
9 changes: 4 additions & 5 deletions app/website/src/components/VolumeSound.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<script setup lang="ts">
import {computed, ref} from 'vue';
import {arrayOfLength, clamp, roundNumber} from '@earwurm/utilities';
import {arrayOfLength, clamp, clx, roundNumber} from 'beeftools';

import {classNames} from '@/helpers';
import {MuteBar} from '@/components';

export interface VolumeSoundProps {
Expand Down Expand Up @@ -52,8 +51,8 @@ function handleChange(volume: number) {
</script>

<template>
<div :class="classNames('VolumeSound', {disabled})">
<div :class="classNames('MuteBarWrapper', {show: disabled})">
<div :class="clx('VolumeSound', {disabled})">
<div :class="clx('MuteBarWrapper', {show: disabled})">
<MuteBar :count="TICK_LENGTH" />
</div>

Expand All @@ -66,7 +65,7 @@ function handleChange(volume: number) {
<button
type="button"
:class="
classNames(
clx(
'Action',
interactIndex !== undefined
? {
Expand Down
3 changes: 1 addition & 2 deletions app/website/src/components/VolumeStack.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script setup lang="ts">
import {computed} from 'vue';

import {calcProgress} from '@earwurm/utilities';
import {calcProgress} from 'beeftools';

import {InputRange, type InputRangeProps} from '@/primitives';
import {MuteBar} from '@/components';
Expand Down
36 changes: 0 additions & 36 deletions app/website/src/helpers/classNames.ts

This file was deleted.

3 changes: 0 additions & 3 deletions app/website/src/helpers/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
export {assertSynthType, assertSynthValues, filterSynthValues} from './app';

export {classNames, variationName} from './classNames';

export {toValue, tryOnScopeDispose} from './vue';
2 changes: 1 addition & 1 deletion app/website/src/hooks/useMediaQuery.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ref, watchEffect} from 'vue';
import {supportMatchMedia} from '@earwurm/utilities';
import {supportMatchMedia} from 'beeftools';

import type {MaybeRefOrGetter} from '@/types';
import {toValue, tryOnScopeDispose} from '@/helpers';
Expand Down
2 changes: 1 addition & 1 deletion app/website/src/hooks/useMetronome.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {computed, ref} from 'vue';
import {clamp} from '@earwurm/utilities';
import {clamp} from 'beeftools';

// TODO: `volume` range may actually need to be `0-100`.
const INITIAL_VOLUME = 1;
Expand Down
5 changes: 2 additions & 3 deletions app/website/src/primitives/ProgressBar.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script setup lang="ts">
import {computed} from 'vue';
import {clamp, calcProgress} from '@earwurm/utilities';
import {classNames} from '@/helpers';
import {calcProgress, clamp, clx} from 'beeftools';

export interface ProgressBarProps {
id: string;
Expand All @@ -19,7 +18,7 @@ const progress = computed(() => calcProgress(value, {min, max, round: true}));
<template>
<div
:class="
classNames('ProgressBar', 'pattern-diagonal', {
clx('ProgressBar', 'pattern-diagonal', {
'pattern-diagonal--animated': speed,
disabled,
})
Expand Down
6 changes: 3 additions & 3 deletions app/website/src/primitives/SquareAction.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {classNames} from '@/helpers';
import {clx} from 'beeftools';

export interface SquareActionProps {
classes?: string;
Expand All @@ -24,7 +24,7 @@ defineEmits<SquareActionEmits>();
<a
v-if="url?.length"
:href="url"
:class="classNames('SquareAction', 'link', {disabled}, classes)"
:class="clx('SquareAction', 'link', {disabled}, classes)"
:target="external ? '_blank' : undefined"
:rel="external ? 'noopener noreferrer' : undefined"
>
Expand All @@ -34,7 +34,7 @@ defineEmits<SquareActionEmits>();
<button
v-else
type="button"
:class="classNames('SquareAction', 'button', classes)"
:class="clx('SquareAction', 'button', classes)"
:aria-label="a11y"
:aria-pressed="pressed ? true : undefined"
:disabled="disabled"
Expand Down
2 changes: 1 addition & 1 deletion app/website/src/store/useDebugManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ type ErrorResponse = Parameters<ManagerEventMap['error']>[0];
const MAX_HISTORY_LENGTH = 44;

// TODO: Consider enabling a auto-suspension option.
// import {clamp, timeMeasurement} from '@earwurm/utilities';
// import {clamp, timeMeasurement} from 'beeftools';
// const safeAutoSuspend = clamp(0, autoSuspend, timeMeasurement.msPerMin);

const {manager, activeStacks} = useEarwurmStore();
Expand Down
27 changes: 11 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
},
"private": true,
"engines": {
"node": ">=20.10.0",
"pnpm": ">=8.15.0"
"node": ">=20.12.0",
"pnpm": ">=9.0.0"
},
"packageManager": "pnpm@8.15.0",
"packageManager": "pnpm@9.0.6",
"scripts": {
"clean": "pnpm -r clean && rm -rf coverage",
"nuke": "pnpm clean && ./scripts/nuke.sh",
Expand All @@ -39,21 +39,16 @@
"devDependencies": {
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.1",
"@types/node": "^20.11.8",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@vitest/coverage-v8": "^1.2.2",
"@vitest/ui": "^1.2.2",
"eslint": "^8.56.0",
"@types/node": "^20.12.7",
"@vitest/coverage-v8": "^1.5.2",
"@vitest/ui": "^1.5.2",
"eslint-config-love": "^47.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard-with-typescript": "^43.0.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"happy-dom": "^13.3.1",
"prettier": "^3.2.4",
"typescript": "^5.3.3",
"vite": "^5.0.12",
"vitest": "^1.2.2"
"happy-dom": "^14.7.1",
"prettier": "^3.2.5",
"vite": "^5.2.10",
"vitest": "^1.5.2"
}
}
Loading
Loading