update boilerplate

.devcontainer/Dockerfile

@@ -27,7 +27,7 @@ RUN curl https://get.volta.sh | bash
 WORKDIR /workspaces/boilerplate
 
 # and install node and pnpm
-RUN volta install node@18
+RUN volta install node@20
 RUN npm i -g pnpm
 
 RUN echo 

.eslintignore

@@ -5,4 +5,4 @@ node_modules/
 vitest.config.ts
 vitest.config.test.ts
 libs/
-_project/frontend-nuxt
+_project/frontend

.eslintrc.api.cjs

@@ -4,9 +4,4 @@ module.exports = {
   root: true,
   ...base,
   plugins: base.plugins.concat(["formatjs"]),
-  rules: {
-    ...base.rules,
-    'codegen/codegen': ['error', { presets: require('@effect-app/eslint-codegen-model') }],
-    "@typescript-eslint/no-empty-interface": "off"
-  },
 }

.eslintrc.base.js

@@ -81,12 +81,13 @@ module.exports = (dirName, forceTS = false, project = undefined) => {
       "@typescript-eslint/no-use-before-define": ["warn", { functions: false, classes: true, variables: true}],
       "@typescript-eslint/explicit-function-return-type": "off",
       "@typescript-eslint/interface-name-prefix": "off",
-      "@typescript-eslint/no-empty-interface": [
-        "error",
-        {
-          allowSingleExtends: true,
-        },
-      ],
+      "@typescript-eslint/no-empty-interface": "off",
+      // "@typescript-eslint/no-empty-interface": [
+      //   "error",
+      //   {
+      //     allowSingleExtends: true,
+      //   },
+      // ],
       // Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
       // e.g. "@typescript-eslint/explicit-function-return-type": "off",
       "sort-destructure-keys/sort-destructure-keys": "error", // Mainly to sort render props

.eslintrc.cjs

@@ -1,12 +1,11 @@
 const makeBase = require("./.eslintrc.base")
-const base = makeBase(__dirname, true, "tsconfig.all2.json")
+const base = makeBase(__dirname, undefined, "tsconfig.all2.json")
 module.exports = {
   root: true,
   ...base,
   plugins: base.plugins.concat(["formatjs"]),
   rules: {
     ...base.rules,
     'codegen/codegen': ['error', { presets: require('@effect-app/eslint-codegen-model') }],
-    "@typescript-eslint/no-empty-interface": "off"
   },
 }

.eslintrc.packages.base.cjs

@@ -0,0 +1,11 @@
+const makeBase = require("./.eslintrc.base")
+module.exports = (...args) => {
+  const base = makeBase(...args)
+  return {...base, 
+    plugins: base.plugins.concat(["formatjs"]),
+  rules: {
+    ...base.rules,
+    'codegen/codegen': ['error', { presets: require('@effect-app/eslint-codegen-model') }],
+    "@typescript-eslint/no-empty-interface": "off"
+  },}
+}

.eslintrc.packages.cjs

@@ -1,12 +1,6 @@
-const makeBase = require("./.eslintrc.base")
-const base = makeBase(__dirname, undefined, "tsconfig.packages.json")
+const makeBase = require("./.eslintrc.packages.base.cjs")
+const base = makeBase(__dirname, true, "tsconfig.packages.json")
 module.exports = {
   root: true,
-  ...base,
-  plugins: base.plugins.concat(["formatjs"]),
-  rules: {
-    ...base.rules,
-    'codegen/codegen': ['error', { presets: require('@effect-app/eslint-codegen-model') }],
-    "@typescript-eslint/no-empty-interface": "off"
-  },
+  ...base
 }

.gitignore

@@ -23,6 +23,9 @@ _cjs/
 _mjs/
 _esm/
 
+.data/
+.data.*/
+
 
 # CMake
 cmake-build-*/

.ncurc.json

@@ -2,8 +2,13 @@
   "reject": [
     "jwks-rsa",
     "applicationinsights",
+    "faker",
+    "@types/faker",
     "redis",
     "@types/redis",
-    "@formatjs/intl"
+    "next-auth",
+    "@formatjs/intl",
+    "@effect/language-service",
+    "eslint-plugin-codegen"
   ]
 }

.nvmrc

@@ -1 +1 @@
-v18.13.0
+20.10.0

.pnpmfile.cjs

@@ -1,10 +1,6 @@
 // TODO: Write a marker to package.json instead?
 const enforceSingleVersion = [
-    "@effect/io",
-    "@effect/stm",
-    // Language service currently depends on them
-    // "@fp-ts/core",
-    "@effect/data",
+    "effect",
     "@fp-ts/optic",
     "@effect-app/core",
     "@effect-app/infra-adapters",
@@ -47,6 +43,6 @@ function afterAllResolved(lockfile, context) {
 
 module.exports = {
     hooks: {
-        afterAllResolved,
+        afterAllResolved
     }
 }

.vscode/launch.json

@@ -16,7 +16,7 @@
     // {
     //   "name": "UI debug",
     //   "request": "launch",
-    //   "cwd": "${workspaceFolder}/_project/frontend-nuxt",
+    //   "cwd": "${workspaceFolder}/_project/frontend",
     //   "runtimeArgs": [
     //     "dev:debug"
     //   ],
@@ -40,13 +40,13 @@
     {
       "name": "UI Debug Attach",
       "port": 9230,
-      "cwd": "${workspaceFolder}/_project/frontend-nuxt",
+      "cwd": "${workspaceFolder}/_project/frontend",
       "request": "attach",
       "skipFiles": [
         "<node_internals>/**"
       ],
       "type": "pwa-node",
-      "webRoot": "${workspaceFolder}/_project/frontend-nuxt",
+      "webRoot": "${workspaceFolder}/_project/frontend",
       "sourceMaps": true
     },
   ]

.vscode/model.code-snippets

@@ -17,7 +17,7 @@
         "body": [
             "/** @tsplus type $1 */",
             "@useClassFeaturesForSchema",
-            "export class $1 extends Model<$1>()({ // TODO MNModel<$1, $1.ConstructorInput, $1.Encoded, $1.Props> ()({",
+            "export class $1 extends ExtendedClass<$1, $1.ConstructorInput, $1.From, $1.Fields> ()({",
             "$2",
             "}) {}"
         ],
@@ -28,7 +28,7 @@
         "body": [
             "/** @tsplus type $1 */",
             "@useClassFeaturesForSchema",
-            "export class $1 extends Model<$1>()({$2}) {}",
+            "export class $1 extends Class<$1>()({$2}) {}",
             ""
         ],
         "description": "Defines a Model signature"
@@ -37,12 +37,12 @@
         "prefix": "un",
         "body": [
             "const $1__ = union({ $2 })",
-            "const $1_ = enhanceClassUnion(OpaqueSchema<$1, $1.Encoded>()($1__))",
-            "export type $1 = ParsedShapeOfCustom<typeof $1__> & UnionBrand",
+            "const $1_ = enhanceClassUnion(OpaqueSchema<$1, $1.From>()($1__))",
+            "export type $1 = To<typeof $1__> & UnionBrand",
             "export interface $1Schema extends Identity<typeof $1_> {}",
             "export const $1: $1Schema = $1_",
             "export namespace $1 {",
-            "  export type Encoded = EncodedOf<typeof $1__> & UnionBrand",
+            "  export type From = From<typeof $1__> & UnionBrand",
             "}"
         ]
     },
@@ -89,19 +89,19 @@
     "Response": {
         "prefix": "res",
         "body": [
-            "export class Response extends Model<Response()({$1}) {}",
+            "export class Response extends Class<Response()({$1}) {}",
             ""
         ],
         "description": "Defines a Response signature"
     },
     "controller": {
         "prefix": "controller",
         "body": [
-            "const { controllers, matchWithServices } = matchFor($1Rsc)",
+            "const ${1/(.*)/${1:/camelcase}/} = matchFor($1Rsc)",
             "",
-            "const $2 = matchWithServices(\"$2\")($3)",
+            "const $2 = ${1/(.*)/${1:/camelcase}/}.$2($3)",
             "",
-            "export const $1Controllers = controllers({ $2 })"
+            "export default ${1/(.*)/${1:/camelcase}/}.controllers({ $2 })"
         ]
     }
 }

.vscode/settings.json

@@ -43,6 +43,9 @@
       "source.addMissingImports"
     ]
   },
+  "[json]": {
+    "editor.defaultFormatter": "vscode.json-language-features"
+  },
   "[typescript]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
     "editor.codeActionsOnSave": [

.vscode/tasks.json

@@ -10,7 +10,7 @@
 		{
 			"label": "Watch API, Models, Resources",
 			"type": "shell",
-			"command": "pnpm watch",
+			"command": "pnpm watch-src",
 			// "options": {
 			// 	"cwd": "${workspaceRoot}/_project/api/_test",
 			// },
@@ -90,7 +90,7 @@
 			"type": "shell",
 			"command": "pnpm watch",
 			"options": {
-				"cwd": "${workspaceRoot}/_project/frontend-nuxt"
+				"cwd": "${workspaceRoot}/_project/frontend"
 			},
 			"dependsOn": [
 				"Watch API, Models, Resources"
@@ -108,7 +108,7 @@
 					"base": "$tsc-watch",
 					"fileLocation": [
 						"relative",
-						"${workspaceRoot}/_project/frontend-nuxt",
+						"${workspaceRoot}/_project/frontend",
 					],
 				}
 			]
@@ -147,7 +147,7 @@
 			"type": "shell",
 			"command": "pnpm dev",
 			"options": {
-				"cwd": "${workspaceRoot}/_project/frontend-nuxt"
+				"cwd": "${workspaceRoot}/_project/frontend"
 			},
 			"dependsOrder": "sequence",
 			"dependsOn": [
@@ -171,8 +171,8 @@
 				],
 				"background": {
 					"activeOnStart": true,
-					"beginsPattern": "building",
-					"endsPattern": "Vite client warmed up"
+					"beginsPattern": "Nuxi",
+					"endsPattern": "Vite client warmed up in",
 				}
 			},
 			"presentation": {
@@ -244,7 +244,7 @@
 			"type": "shell",
 			"command": "pnpm build",
 			"options": {
-				"cwd": "${workspaceRoot}/_project/frontend-nuxt"
+				"cwd": "${workspaceRoot}/_project/frontend"
 			},
 			"group": "build",
 			"dependsOrder": "sequence",

Dockerfile

@@ -0,0 +1,45 @@
+FROM node:20-alpine
+
+RUN npm i -g pnpm
+
+# Install CUPS/AVAHI
+RUN apk update --no-cache && apk add --no-cache cups cups-filters avahi inotify-tools
+
+WORKDIR /app
+
+# pnpm fetch does require only lockfile
+COPY patches ./patches
+COPY pnpm-lock.yaml .npmrc ./
+RUN pnpm fetch --prod
+
+COPY package.json pnpm-workspace.yaml ./
+
+COPY _project/models/package.json ./_project/models/
+COPY _project/resources/package.json ./_project/resources/
+COPY _project/messages/package.json ./_project/messages/
+#COPY _project/core/package.json ./_project/core/
+COPY _project/api/package.json ./_project/api/
+
+# As we're going to deploy, we want only the minimal production dependencies.
+# TODO
+RUN pnpm install --frozen-lockfile --prod
+#RUN --mount=type=cache,target=/root/.pnpm pnpm_CACHE_FOLDER=/root/.pnpm pnpm install --frozen-lockfile --prod
+
+COPY _project/models/dist ./_project/models/dist
+COPY _project/resources/dist ./_project/resources/dist
+COPY _project/messages/dist ./_project/messages/dist
+#COPY _project/core/dist ./_project/core/dist
+COPY _project/api/dist ./_project/api/dist
+
+#COPY data ./data
+
+WORKDIR /app/_project/api
+ENV NODE_ENV production
+EXPOSE 3610
+ENV PORT=3610
+ENV TZ=Europe/Berlin
+ARG API_VERSION
+ENV API_VERSION=${API_VERSION:-docker_default}
+ENV SENTRY_RELEASE=${API_VERSION:-docker_default}
+
+CMD ["pnpm", "start"]

Dockerfile.dockerignore

@@ -0,0 +1,14 @@
+.github
+.data
+.git
+.vscode
+.idea
+Dockerfile
+Dockerfile.*
+node_modules
+**/node_modules
+*.log
+docs
+#**/dist
+**/.env.local
+_project/frontend