diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 273b8f5..1d0a7fa 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -3,6 +3,7 @@ require('@rushstack/eslint-patch/modern-module-resolution') module.exports = { root: true, + 'ignorePatterns': ['*.config.js'], 'extends': ['plugin:vue/vue3-essential', 'eslint:recommended', '@vue/eslint-config-typescript', '@vue/eslint-config-prettier/skip-formatting', 'plugin:storybook/recommended'], parserOptions: { ecmaVersion: 'latest' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd1872b..da55009 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,8 @@ jobs: run: bun --version - name: Install dependencies run: bun install --frozen-lockfile + - name: lint + run: bun run lint && bun run eslint - name: unit test run: bun run test:unit # - name: e2e test diff --git a/.gitignore b/.gitignore index eb2e213..da1f845 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,8 @@ coverage test-results/ playwright-report/ vitest-result/ +storybook-static/ +e2e/*-snapshots/ *~ /public/v.js diff --git a/bun.lockb b/bun.lockb index 40a245b..6c9abd1 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index be2181e..ad10bab 100644 --- a/package.json +++ b/package.json @@ -21,10 +21,12 @@ "build-only": "vite build", "make404": "cp dist/index.html dist/404.html", "type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false", - "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore", + "lint": "oxlint", + "eslint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore", "format": "prettier --write src/", - "storybook": "storybook dev -p 6006", - "build-storybook": "storybook build" + "storybook": "storybook dev -h 0.0.0.0 -p 6006", + "storybook:build": "storybook build", + "storybook:preview-built": "vite preview --host 0.0.0.0 -p 8080 --outDir storybook-static" }, "dependencies": { "pinia": "^2.1.7", @@ -58,6 +60,7 @@ "eslint-plugin-vue": "^9.17.0", "jsdom": "^22.1.0", "npm-run-all2": "^6.1.1", + "oxlint": "^0.0.22", "postcss": "^8.4.31", "prettier": "^3.0.3", "react": "^18.2.0", diff --git a/src/stories/Button.stories.ts b/src/stories/SampleButton.stories.ts similarity index 96% rename from src/stories/Button.stories.ts rename to src/stories/SampleButton.stories.ts index 741ef60..d8f28f7 100644 --- a/src/stories/Button.stories.ts +++ b/src/stories/SampleButton.stories.ts @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from '@storybook/vue3' -import Button from './Button.vue' +import Button from './SampleButton.vue' // More on how to set up stories at: https://storybook.js.org/docs/writing-stories const meta = { diff --git a/src/stories/Button.vue b/src/stories/SampleButton.vue similarity index 97% rename from src/stories/Button.vue rename to src/stories/SampleButton.vue index 3fb0f8b..8f168d0 100644 --- a/src/stories/Button.vue +++ b/src/stories/SampleButton.vue @@ -3,7 +3,7 @@