merge from main

Author: SKairinos

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [2.6.12](https://github.com/ocadotechnology/codeforlife-package-javascript/compare/v2.6.11...v2.6.12) (2025-03-20)
+
+
+### Bug Fixes
+
+* monitor release ([4bb40e1](https://github.com/ocadotechnology/codeforlife-package-javascript/commit/4bb40e1c0021c5371c64b3fb894b4fddccf19374))
+* Portal frontend 48 ([#82](https://github.com/ocadotechnology/codeforlife-package-javascript/issues/82)) ([b76b4b8](https://github.com/ocadotechnology/codeforlife-package-javascript/commit/b76b4b8dd4b5822820577a149d13992468c1cc0c))
+
 ## [2.6.11](https://github.com/ocadotechnology/codeforlife-package-javascript/compare/v2.6.10...v2.6.11) (2025-02-25)
 
 

package.json

@@ -2,21 +2,10 @@
   "name": "codeforlife",
   "description": "Common frontend code",
   "private": false,
-  "version": "2.6.11",
+  "version": "2.6.12",
   "type": "module",
   "scripts": {
-    "dev": "vite",
-    "build": "tsc && vite build",
-    "preview": "vite preview",
-    "test": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "test:verbose": "vitest run --reporter=verbose --coverage.thresholds.lines=90 --coverage.thresholds.functions=90 --coverage.thresholds.branches=90 --coverage.thresholds.statements=90",
-    "test:ui": "vitest --ui",
-    "format": "prettier --write .",
-    "format:check": "prettier --check --write=false .",
-    "lint": "eslint --max-warnings=0 .",
-    "lint:fix": "eslint --fix .",
-    "type-check": "tsc --noEmit"
+    "cli": "VITE_CONFIG=./vite.config.ts ../scripts/frontend/cli $@"
   },
   "repository": {
     "type": "git",

src/settings/index.ts

@@ -1,5 +1,10 @@
 // Shorthand to access environment variables.
-export default import.meta.env as Record<string, string>
+export default Object.defineProperty(import.meta.env, "vite", {
+  writable: false,
+  value: new Proxy(import.meta.env, {
+    get: (target, name: string) => target[`VITE_${name}`],
+  }),
+}) as ImportMetaEnv & { vite: Record<string, string> }
 
 export * from "./custom"
 export * from "./vite"

src/vite.config.ts

@@ -0,0 +1,49 @@
+/**
+ * Shared Vite configuration for all frontend services.
+ *
+ * Vite: https://vitest.dev/config/
+ * Vitest: https://vitest.dev/config/
+ *
+ * NOTE: This doesn't belong in codeforlife-workspace/configs/frontend as it's
+ * still and a script which needs to be included in a Node.js runtime.
+ */
+
+import { defineConfig } from "vitest/config"
+import react from "@vitejs/plugin-react"
+
+export default defineConfig({
+  plugins: [react()],
+  resolve: {
+    alias: {
+      codeforlife: "codeforlife/src",
+    },
+  },
+  envDir: "env",
+  server: {
+    open: true,
+    host: true,
+  },
+  test: {
+    globals: true,
+    environment: "jsdom",
+    setupFiles: "src/setupTests",
+    mockReset: true,
+    coverage: {
+      enabled: true,
+      provider: "istanbul",
+      reporter: ["html", "cobertura"],
+    },
+  },
+  optimizeDeps: {
+    // TODO: investigate which of these are needed
+    include: [
+      "@mui/x-date-pickers",
+      "@mui/x-date-pickers/AdapterDayjs",
+      "dayjs",
+      "dayjs/locale/en-gb",
+      "@mui/icons-material",
+      "yup",
+      "formik",
+    ],
+  },
+})

vite.config.ts

@@ -2,6 +2,8 @@ import react from "@vitejs/plugin-react"
 import { defineConfig } from "vitest/config"
 
 // https://vitejs.dev/config/
+// TODO: https://vite.dev/guide/build.html#library-mode
+// TODO: import common configs from src/vite.config.ts
 export default defineConfig({
   plugins: [react()],
   server: {