Skip to content

Commit 77ef0c5

Browse files
committed
fix: merge conflict.
2 parents d8cf8a9 + ddd40be commit 77ef0c5

File tree

207 files changed

+20737
-336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+20737
-336
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727
"source.organizeImports.biome": "explicit",
2828
"source.fixAll.biome": "explicit"
2929
}
30-
}
30+
},
31+
"editor.formatOnSave": true
3132
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
node_modules
2+
3+
# Output
4+
.output
5+
.vercel
6+
.netlify
7+
.wrangler
8+
/.svelte-kit
9+
/build
10+
11+
# OS
12+
.DS_Store
13+
Thumbs.db
14+
15+
# Env
16+
.env
17+
.env.*
18+
!.env.example
19+
!.env.test
20+
21+
# Vite
22+
vite.config.js.timestamp-*
23+
vite.config.ts.timestamp-*
24+
25+
# Paraglide
26+
src/lib/paraglide
27+
28+
*storybook.log
29+
storybook-static
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
engine-strict=true
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Package Managers
2+
package-lock.json
3+
pnpm-lock.yaml
4+
yarn.lock
5+
bun.lock
6+
bun.lockb
7+
8+
# Miscellaneous
9+
/static/
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"useTabs": true,
3+
"singleQuote": true,
4+
"trailingComma": "none",
5+
"printWidth": 100,
6+
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
7+
"overrides": [
8+
{
9+
"files": "*.svelte",
10+
"options": {
11+
"parser": "svelte"
12+
}
13+
}
14+
]
15+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import type { StorybookConfig } from '@storybook/sveltekit';
2+
3+
import { join, dirname } from "path"
4+
5+
/**
6+
* This function is used to resolve the absolute path of a package.
7+
* It is needed in projects that use Yarn PnP or are set up within a monorepo.
8+
*/
9+
function getAbsolutePath(value: string): any {
10+
return dirname(require.resolve(join(value, 'package.json')))
11+
}
12+
const config: StorybookConfig = {
13+
"stories": [
14+
"../src/**/*.mdx",
15+
"../src/**/*.stories.@(js|ts|svelte)"
16+
],
17+
"addons": [
18+
getAbsolutePath('@storybook/addon-svelte-csf')
19+
],
20+
"framework": {
21+
"name": getAbsolutePath('@storybook/sveltekit'),
22+
"options": {}
23+
}
24+
};
25+
export default config;
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import type { Preview } from '@storybook/sveltekit'
2+
import "../src/app.css";
3+
4+
const preview: Preview = {
5+
parameters: {
6+
controls: {
7+
matchers: {
8+
color: /(background|color)$/i,
9+
date: /Date$/i,
10+
},
11+
},
12+
},
13+
};
14+
15+
export default preview;
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# sv
2+
3+
Everything you need to build a Svelte project, powered by [`sv`](https://github.com/sveltejs/cli).
4+
5+
## Creating a project
6+
7+
If you're seeing this, you've probably already done this step. Congrats!
8+
9+
```bash
10+
# create a new project in the current directory
11+
npx sv create
12+
13+
# create a new project in my-app
14+
npx sv create my-app
15+
```
16+
17+
## Developing
18+
19+
Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
20+
21+
```bash
22+
npm run dev
23+
24+
# or start the server and open the app in a new browser tab
25+
npm run dev -- --open
26+
```
27+
28+
## Building
29+
30+
To create a production version of your app:
31+
32+
```bash
33+
npm run build
34+
```
35+
36+
You can preview the production build with `npm run preview`.
37+
38+
> To deploy your app, you may need to install an [adapter](https://svelte.dev/docs/kit/adapters) for your target environment.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// For more info, see https://github.com/storybookjs/eslint-plugin-storybook#configuration-flat-config-format
2+
import storybook from 'eslint-plugin-storybook';
3+
4+
import prettier from 'eslint-config-prettier';
5+
import { includeIgnoreFile } from '@eslint/compat';
6+
import js from '@eslint/js';
7+
import svelte from 'eslint-plugin-svelte';
8+
import globals from 'globals';
9+
import { fileURLToPath } from 'node:url';
10+
import ts from 'typescript-eslint';
11+
import svelteConfig from './svelte.config.js';
12+
13+
const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url));
14+
15+
export default ts.config(
16+
includeIgnoreFile(gitignorePath),
17+
js.configs.recommended,
18+
...ts.configs.recommended,
19+
...svelte.configs.recommended,
20+
prettier,
21+
...svelte.configs.prettier,
22+
{
23+
languageOptions: {
24+
globals: { ...globals.browser, ...globals.node }
25+
},
26+
rules: {
27+
// typescript-eslint strongly recommend that you do not use the no-undef lint rule on TypeScript projects.
28+
// see: https://typescript-eslint.io/troubleshooting/faqs/eslint/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
29+
'no-undef': 'off'
30+
}
31+
},
32+
{
33+
files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'],
34+
languageOptions: {
35+
parserOptions: {
36+
projectService: true,
37+
extraFileExtensions: ['.svelte'],
38+
parser: ts.parser,
39+
svelteConfig
40+
}
41+
}
42+
},
43+
storybook.configs['flat/recommended']
44+
);
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "https://inlang.com/schema/inlang-message-format",
3+
"hello_world": "Hello, {name} from en!"
4+
}

0 commit comments

Comments
 (0)