use workspaces

bastipnt · Dec 10, 2024 · c1d3bbc · c1d3bbc
1 parent fa076af
commit c1d3bbc
Show file tree

Hide file tree

Showing 27 changed files with 68 additions and 39 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -24,6 +24,9 @@ jobs:
     environment:
       name: github-pages
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/frontend
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -57,6 +60,9 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     needs: build
+    defaults:
+      run:
+        working-directory: packages/frontend
     steps:
       - name: Deploy to GitHub Pages
         id: deployment

diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -3,34 +3,10 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
+  "workspaces": [
+    "packages/*"
+  ],
   "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview",
-    "check": "svelte-check --tsconfig ./tsconfig.json && tsc -p tsconfig.node.json",
     "format": "prettier --write ."
-  },
-  "devDependencies": {
-    "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
-    "@skeletonlabs/skeleton": "^2.10.3",
-    "@skeletonlabs/tw-plugin": "^0.4.0",
-    "@sveltejs/vite-plugin-svelte": "^5.0.0",
-    "@tailwindcss/forms": "^0.5.9",
-    "@tsconfig/svelte": "^5.0.4",
-    "@types/node": "^22.10.1",
-    "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.49",
-    "prettier": "^3.4.2",
-    "prettier-plugin-svelte": "^3.3.2",
-    "prettier-plugin-tailwindcss": "^0.6.9",
-    "svelte": "^5.2.7",
-    "svelte-check": "^4.1.0",
-    "tailwindcss": "^3.4.16",
-    "tslib": "^2.8.1",
-    "typescript": "~5.6.2",
-    "vite": "^6.0.1"
-  },
-  "dependencies": {
-    "@fingerprintjs/fingerprintjs": "^4.5.1"
   }
 }
diff --git a/index.html → packages/frontend/index.html b/index.html → packages/frontend/index.html
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "tracking-survey-frontend",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview",
+    "check": "svelte-check --tsconfig ./tsconfig.json && tsc -p tsconfig.node.json",
+    "format": "prettier --write ."
+  },
+  "devDependencies": {
+    "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
+    "@skeletonlabs/skeleton": "^2.10.3",
+    "@skeletonlabs/tw-plugin": "^0.4.0",
+    "@sveltejs/vite-plugin-svelte": "^5.0.0",
+    "@tailwindcss/forms": "^0.5.9",
+    "@tsconfig/svelte": "^5.0.4",
+    "@types/node": "^22.10.1",
+    "autoprefixer": "^10.4.20",
+    "postcss": "^8.4.49",
+    "prettier": "^3.4.2",
+    "prettier-plugin-svelte": "^3.3.2",
+    "prettier-plugin-tailwindcss": "^0.6.9",
+    "svelte": "^5.2.7",
+    "svelte-check": "^4.1.0",
+    "tailwindcss": "^3.4.16",
+    "tslib": "^2.8.1",
+    "typescript": "~5.6.2",
+    "vite": "^6.0.1"
+  },
+  "dependencies": {
+    "@fingerprintjs/fingerprintjs": "^4.5.1"
+  }
+}
diff --git a/postcss.config.js → packages/frontend/postcss.config.js b/postcss.config.js → packages/frontend/postcss.config.js
diff --git a/public/vite.svg → packages/frontend/public/vite.svg b/public/vite.svg → packages/frontend/public/vite.svg
diff --git a/src/App.svelte → packages/frontend/src/App.svelte b/src/App.svelte → packages/frontend/src/App.svelte
diff --git a/src/Pages/Fingerprint.svelte → ...ges/frontend/src/Pages/Fingerprint.svelte b/src/Pages/Fingerprint.svelte → ...ges/frontend/src/Pages/Fingerprint.svelte
diff --git a/src/Pages/Questions.svelte → packages/frontend/src/Pages/Questions.svelte b/src/Pages/Questions.svelte → packages/frontend/src/Pages/Questions.svelte
diff --git a/src/Pages/Questions2.svelte → ...ages/frontend/src/Pages/Questions2.svelte b/src/Pages/Questions2.svelte → ...ages/frontend/src/Pages/Questions2.svelte
diff --git a/src/Pages/Thanks.svelte → packages/frontend/src/Pages/Thanks.svelte b/src/Pages/Thanks.svelte → packages/frontend/src/Pages/Thanks.svelte
diff --git a/src/Pages/Welcome.svelte → packages/frontend/src/Pages/Welcome.svelte b/src/Pages/Welcome.svelte → packages/frontend/src/Pages/Welcome.svelte
diff --git a/src/app.css → packages/frontend/src/app.css b/src/app.css → packages/frontend/src/app.css
diff --git a/src/assets/svelte.svg → packages/frontend/src/assets/svelte.svg b/src/assets/svelte.svg → packages/frontend/src/assets/svelte.svg
diff --git a/src/main.ts → packages/frontend/src/main.ts b/src/main.ts → packages/frontend/src/main.ts
diff --git a/src/tsconfig.json → packages/frontend/src/tsconfig.json b/src/tsconfig.json → packages/frontend/src/tsconfig.json
diff --git a/src/utils/Fingerprinter.ts → packages/frontend/src/utils/Fingerprinter.ts b/src/utils/Fingerprinter.ts → packages/frontend/src/utils/Fingerprinter.ts
diff --git a/src/utils/VPNDetection.ts → packages/frontend/src/utils/VPNDetection.ts b/src/utils/VPNDetection.ts → packages/frontend/src/utils/VPNDetection.ts
diff --git a/src/vite-env.d.ts → packages/frontend/src/vite-env.d.ts b/src/vite-env.d.ts → packages/frontend/src/vite-env.d.ts
diff --git a/svelte.config.js → packages/frontend/svelte.config.js b/svelte.config.js → packages/frontend/svelte.config.js
diff --git a/tailwind.config.ts → packages/frontend/tailwind.config.ts b/tailwind.config.ts → packages/frontend/tailwind.config.ts
diff --git a/packages/frontend/tsconfig.json b/packages/frontend/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    },
+    {
+      "path": "src/tsconfig.json"
+    }
+  ]
+}
diff --git a/tsconfig.node.json → packages/frontend/tsconfig.node.json b/tsconfig.node.json → packages/frontend/tsconfig.node.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "composite": true,
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "tsBuildInfoFile": "../node_modules/.tmp/tsconfig.node.tsbuildinfo",
     "skipLibCheck": true,
     "module": "ESNext",
     "moduleResolution": "bundler",

diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
@@ -0,0 +1,10 @@
+import { svelte } from "@sveltejs/vite-plugin-svelte";
+import { defineConfig } from "vite";
+
+// https://vite.dev/config/
+export default defineConfig({
+  plugins: [svelte()],
+  resolve: {
+    preserveSymlinks: true,
+  },
+});
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,10 +2,7 @@
   "include": [],
   "references": [
     {
-      "path": "./tsconfig.node.json"
+      "path": "packages/frontend/tsconfig.json"
     },
-    {
-      "path": "src/tsconfig.json"
-    }
   ]
 }
diff --git a/vite.config.ts b/vite.config.ts