Skip to content

Commit b9e4465

Browse files
committed
fix: eslint.config.js
1 parent ef050d4 commit b9e4465

File tree

4 files changed

+19
-40
lines changed

4 files changed

+19
-40
lines changed

.changeset/lemon-hounds-suffer.md

-5
This file was deleted.

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 0.47.0
4+
5+
### Minor Changes
6+
7+
- feat: datepicker
8+
39
## 0.46.23
410

511
### Patch Changes

eslint.config.js

+12-34
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
1-
<<<<<<< HEAD
2-
import js from '@eslint/js';
3-
import ts from 'typescript-eslint';
4-
import svelte from 'eslint-plugin-svelte';
5-
import prettier from 'eslint-config-prettier';
6-
import globals from 'globals';
1+
import js from "@eslint/js";
2+
import ts from "typescript-eslint";
3+
import svelte from "eslint-plugin-svelte";
4+
import prettier from "eslint-config-prettier";
5+
import globals from "globals";
76

87
/** @type {import('eslint').Linter.Config[]} */
98
export default [
109
js.configs.recommended,
1110
...ts.configs.recommended,
12-
=======
13-
import eslint from '@eslint/js';
14-
import prettier from 'eslint-config-prettier';
15-
import svelte from 'eslint-plugin-svelte';
16-
import globals from 'globals';
17-
import tseslint from 'typescript-eslint';
18-
19-
export default tseslint.config(
20-
eslint.configs.recommended,
21-
...tseslint.configs.recommended,
22-
>>>>>>> Chizaruu-update-datepicker
23-
...svelte.configs['flat/recommended'],
11+
...svelte.configs["flat/recommended"],
2412
prettier,
25-
...svelte.configs['flat/prettier'],
13+
...svelte.configs["flat/prettier"],
2614
{
2715
languageOptions: {
2816
globals: {
@@ -32,35 +20,25 @@ export default tseslint.config(
3220
}
3321
},
3422
{
35-
files: ['**/*.svelte'],
23+
files: ["**/*.svelte"],
3624
languageOptions: {
3725
parserOptions: {
38-
<<<<<<< HEAD
3926
parser: ts.parser,
4027
svelteFeatures: {
4128
experimentalGenerics: true
4229
}
43-
=======
44-
parser: tseslint.parser
45-
>>>>>>> Chizaruu-update-datepicker
4630
}
4731
}
4832
},
4933
{
50-
<<<<<<< HEAD
51-
ignores: ['build/', '.svelte-kit/', 'dist/', 'test-results/', '*.md', '.vercel/', '.github/', 'node_modules/']
34+
ignores: ["build/", ".svelte-kit/", "dist/", "test-results/", "*.md"]
5235
},
5336
{
5437
rules: {
5538
// Note: you must disable the base rule as it can report incorrect errors
56-
'no-unused-vars': 'off',
57-
'@typescript-eslint/no-unused-vars': 'off',
58-
'svelte/no-at-html-tags': 'off'
39+
"no-unused-vars": "off",
40+
"@typescript-eslint/no-unused-vars": "off",
41+
"svelte/no-at-html-tags": "off"
5942
}
6043
}
6144
];
62-
=======
63-
ignores: ['build/', '.svelte-kit/', 'dist/', '.vercel/', 'node_modules/']
64-
}
65-
);
66-
>>>>>>> Chizaruu-update-datepicker

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flowbite-svelte",
3-
"version": "0.46.23",
3+
"version": "0.47.0",
44
"description": "Flowbite components for Svelte",
55
"main": "dist/index.js",
66
"packageManager": "[email protected]",

0 commit comments

Comments
 (0)