Merge conflicts and project restructure adaptations

Author: MRita443

.dockerignore

@@ -10,4 +10,5 @@ node_modules/
 docker-compose.yml
 Dockerfile*
 *.md
-*.sh
+*.sh
+storybook-static/

.eslintignore

@@ -6,6 +6,7 @@ node_modules
 .env
 .env.*
 !.env.example
+storybook-static
 
 # Ignore files for PNPM, NPM and YARN
 pnpm-lock.yaml

.eslintrc.cjs

@@ -1,51 +1,54 @@
+/** @type { import("eslint").Linter.Config } */
 module.exports = {
   root: true,
-  parser: '@typescript-eslint/parser',
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
-    'prettier',
-    'plugin:storybook/recommended'
+    'plugin:svelte/recommended',
+    'prettier'
   ],
-  plugins: ['svelte3', '@typescript-eslint', 'import'],
-  ignorePatterns: ['*.cjs'],
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint', 'import'],
   rules: {
-    'import/no-relative-parent-imports': 'error',
     'import/export': 'error',
     'import/no-empty-named-blocks': 'error',
-    'import/named': 'error',
     'import/no-absolute-path': 'error',
     'import/no-self-import': 'error',
     'import/no-useless-path-segments': 'error',
     'import/newline-after-import': 'error',
     'import/no-duplicates': 'error',
     'import/order': 'error'
   },
+
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 2020,
+    extraFileExtensions: ['.svelte']
+  },
+  env: {
+    browser: true,
+    es2017: true,
+    node: true
+  },
   overrides: [
     {
       files: ['*.svelte'],
-      processor: 'svelte3/svelte3',
+      parser: 'svelte-eslint-parser',
+      parserOptions: {
+        parser: '@typescript-eslint/parser'
+      },
       rules: {
         'no-undef': 'off'
       }
     }
   ],
   settings: {
-    'svelte3/typescript': () => require('typescript'),
+    'svelte/typescript': () => require('typescript'),
     'import/extensions': ['.js', '.ts', '.svelte', '.stories.ts'],
     'import/resolver': {
       typescript: {
         alwaysTryTypes: true
       }
     }
-  },
-  parserOptions: {
-    sourceType: 'module',
-    ecmaVersion: 2020
-  },
-  env: {
-    browser: true,
-    es2017: true,
-    node: true
   }
 };

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [19.x]
+        node-version: [21.x]
 
     steps:
       - name: Checkout repository
@@ -36,6 +36,9 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Build site
+        run: npm run build
+
       - name: Test
         run: CI=true npm run test-vite:coverage
 
@@ -48,7 +51,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [19.x]
+        node-version: [21.x]
 
     steps:
       - name: Checkout repository
@@ -67,20 +70,17 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Build site
+        run: npm run build
+
       - name: Install Playwright
         run: npx playwright install
 
-      - name: Wait for the Netlify Preview
-        uses: kamranayub/[email protected]
-        id: waitForNetlify
-        with:
-          site_name: 'niaefeup-frontend-storybook'
-          max_timeout: 300 # 5 minutes
-        env:
-          NETLIFY_TOKEN: ${{ secrets.NETLIFY_TOKEN }}
+      - name: Build storybook
+        run: npm run build-storybook
 
       - name: Test
-        run: npm run test-storybook:coverage -- --url ${{ steps.waitForNetlify.outputs.url }} --ci
+        run: npm run test-storybook:ci
 
       - name: Upload code coverage to Codecov
         uses: codecov/codecov-action@v3
@@ -91,7 +91,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [19.x]
+        node-version: [21.x]
 
     steps:
       - name: Checkout repository
@@ -110,5 +110,8 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Build site
+        run: npm run build
+
       - name: Lint Code
         run: npm run lint

.gitignore

@@ -14,3 +14,4 @@ vite.config.ts.timestamp-*
 
 # Test Reports
 /coverage
+storybook-static/

.prettierrc

@@ -4,7 +4,6 @@
   "trailingComma": "none",
   "printWidth": 100,
   "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
-  "pluginSearchDirs": ["."],
   "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }],
   "endOfLine": "auto"
 }

.tool-versions

@@ -0,0 +1 @@
+nodejs 21.6.2

components.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "https://shadcn-svelte.com/schema.json",
+  "style": "default",
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "src/app.css",
+    "baseColor": "slate"
+  },
+  "aliases": {
+    "components": "$lib/components",
+    "utils": "$lib/utils"
+  },
+  "typescript": true
+}