lucy-cli 2.0.0-beta.3 → 2.0.0-beta.6

package/files/templates/expo verse[D]/lucy.json

@@ -0,0 +1,86 @@
+{
+  "modules": {},
+  "devDependencies": {
+    "tailwindcss": "^3.4.17",
+    "prettier-plugin-tailwindcss": "^0.5.11",
+    "@styled/typescript-styled-plugin": "",
+    "typescript-eslint-language-service": "",
+    "eslint-config-prettier": "",
+    "eslint-plugin-jsdoc": "",
+    "eslint-plugin-named-import-spacing": "",
+    "eslint-plugin-only-warn": "",
+    "eslint-plugin-react": "",
+    "eslint-plugin-react-hooks": "",
+    "eslint-plugin-simple-import-sort": "",
+    "@next/eslint-plugin-next": "",
+    "@stylelint/postcss-css-in-js": "",
+    "@typescript-eslint/parser": "",
+    "typescript-eslint": "",
+    "@total-typescript/ts-reset": "",
+    "expo-doctor": "",
+    "tsx": ""
+  },
+  "dependencies": {
+    "nativewind": "",
+    "react-native-reanimated": "~3.17.4",
+    "react-native-safe-area-context": "5.4.0",
+    "@wix/sdk": "1.15.24",
+    "@wix/data": "",
+    "expo-standard-web-crypto": "",
+    "effect": "",
+    "node-libs-react-native": "",
+    "util": "",
+    "events": "",
+    "tailwindcss-animate": "",
+    "papaparse": ""
+  },
+  "additionalCommands": [
+    [
+      "npx",
+      "expo",
+      "install",
+      "tailwindcss-animate",
+      "class-variance-authority",
+      "clsx",
+      "tailwind-merge",
+      "expo-crypto",
+      "react-dom",
+      "react-native-web",
+      "@expo/metro-runtime",
+      "expo-system-ui",
+      "expo-localization",
+      "expo-file-system",
+      "expo-asset"
+    ]
+  ],
+  "scripts": {
+    "dev": "expo start",
+    "start": "expo start",
+    "android": "expo start --android",
+    "ios": "expo start --ios",
+    "web": "expo start --web",
+    "reset": "tsx ./scripts/reset-project.ts",
+    "format": "prettier --write \"./*.json\" \"**/*.{ts,tsx,md,json,jsonc,json5}\"",
+    "prebuild": "expo prebuild",
+    "pods": "npx pod-install",
+    "build:dev": "eas build --local --profile development",
+    "build:sim": "eas build --local --profile ios-simulator",
+    "build:prev": "eas build --local --profile preview",
+    "build:prod": "eas build --local --profile production",
+    "build:web": "expo export --platform web",
+    "doctor": "expo-doctor",
+    "eas-build-pre-install": "corepack enable && yarn set version 4"
+  },
+  "initialized": false,
+  "type": "expo",
+  "packageManager": "pnpm",
+  "additionalPkgProps": {
+    "expo": {
+      "doctor": {
+        "reactNativeDirectoryCheck": {
+          "listUnknownPackages": false
+        }
+      }
+    }
+  }
+}

package/files/templates/expo[D]/files/app.config.ts

@@ -0,0 +1,69 @@
+import { ExpoConfig, ConfigContext } from 'expo/config';
+
+export default ({ config }: ConfigContext): ExpoConfig => ({
+	...config,
+	slug: 'daily-verse',
+	name: 'Daily Verse',
+	owner: 'sunnyside-up',
+	version: '1.0.0',
+	orientation: 'portrait',
+	userInterfaceStyle: 'automatic',
+	icon: './assets/images/icon.png',
+	newArchEnabled: true,
+	ios: {
+		supportsTablet: true,
+		bundleIdentifier: 'so.sunnysideup.daily-verse',
+		config: {
+			usesNonExemptEncryption: false,
+		},
+		icon: {
+			dark: './assets/images/ios-dark.png',
+			light: './assets/images/ios-light.png',
+			tinted: './assets/images/ios-tinted.png',
+		},
+	},
+	android: {
+		adaptiveIcon: {
+			foregroundImage: './assets/images/adaptive-icon.png',
+			monochromeImage: './assets/images/adaptive-icon.png',
+			// backgroundImage: "./assets/images/adaptive-icon.png",
+			backgroundColor: '#ffffff',
+		},
+		edgeToEdgeEnabled: true,
+		package: 'so.sunnysideup.daily_verse',
+	},
+	web: {
+		favicon: './assets/favicon.png',
+		bundler: 'metro',
+	},
+	extra: {
+		eas: {
+			projectId: 'ce2e3d56-e924-46a0-a880-f9f9911558eb',
+		},
+	},
+	plugins: [
+		'expo-localization',
+		'expo-asset',
+		'expo-font',
+		[
+			'expo-splash-screen',
+			{
+				image: './assets/images/splash-icon-dark.png',
+				imageWith: 200,
+				resizeMode: 'contain',
+				backgroundColor: '#ffffff',
+                dark: {
+                    image: './assets/images/splash-icon-light.png',
+                    backgroundColor: '#000000',
+                },
+			},
+		],
+	],
+	sdkVersion: '53.0.0',
+	runtimeVersion: {
+		policy: 'appVersion',
+	},
+	updates: {
+		url: 'https://u.expo.dev/314ea1f7-8fd3-4748-8c27-c8b04616f6c2',
+	},
+});

package/files/templates/velo[D]/files/.yarnrc.yml

@@ -1,3 +1,2 @@
 nodeLinker: node-modules
-npmRegistryServer: "https://registry.npmjs.org/"
-yarnPath: .yarn/releases/yarn-3.7.0.cjs
+npmRegistryServer: "https://registry.npmjs.org/"

package/files/templates/velo[D]/lucy.json

@@ -133,5 +133,5 @@
     "e2e": "cypress-cloud run --parallel --record"
   },
   "type": "velo",
-  "packageManager": "pnpm"
+  "packageManager": "yarn"
 }

package/mitarbeiter-login.html

@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Mitarbeiter Login</title>
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Barlow+Semi+Condensed&display=swap');
+        
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+        
+        body {
+            font-family: 'Barlow Semi Condensed', sans-serif;
+            height: 100vh;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            background-color: #f0f0f0;
+        }
+        
+        .login-container {
+            position: relative;
+            width: 1200px;
+            height: 1920px;
+            border-radius: 20px;
+            overflow: hidden;
+            background: radial-gradient(ellipse at center, 
+                rgba(122,206,255,1) 0%,
+                rgba(92,187,243,1) 10.677%,
+                rgba(61,168,231,1) 21.354%,
+                rgba(31,148,218,1) 32.031%,
+                rgba(15,139,212,1) 37.37%,
+                rgba(0,129,206,1) 42.708%,
+                rgba(14,111,169,1) 51.563%,
+                rgba(28,93,132,1) 60.417%,
+                rgba(41,74,94,1) 69.271%,
+                rgba(55,56,57,1) 78.125%);
+        }
+        
+        .login-button {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            width: 440px;
+            height: 440px;
+            background-color: #ffffff;
+            border-radius: 9999px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding: 10px 24px;
+            box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
+        }
+        
+        .login-text {
+            font-family: 'Barlow Semi Condensed', sans-serif;
+            font-size: 56px;
+            font-weight: 400;
+            color: #363839;
+            text-align: center;
+            line-height: 1;
+        }
+        
+        .instruction-text {
+            position: absolute;
+            top: 608px;
+            left: 50%;
+            transform: translateX(-50%);
+            width: 1030px;
+            height: 102px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-family: 'Barlow Semi Condensed', sans-serif;
+            font-size: 56px;
+            font-weight: 400;
+            color: #ffffff;
+            text-align: center;
+            line-height: 1;
+        }
+        
+        .icon-button {
+            position: absolute;
+            bottom: 20px;
+            left: 14px;
+            width: 80px;
+            height: 80px;
+            background-color: #363839;
+            border-radius: 100px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border: 4px solid #ffffff;
+        }
+        
+        .icon {
+            width: 50px;
+            height: 50px;
+            position: relative;
+        }
+        
+        .icon-inner {
+            position: absolute;
+            top: 16.667%;
+            left: 16.667%;
+            width: 66.666%;
+            height: 66.666%;
+            background-color: #ffffff;
+            border-radius: 8px;
+        }
+        
+        .logo {
+            position: absolute;
+            bottom: 95px;
+            right: 98px;
+            width: 600px;
+            height: 125px;
+            background-color: rgba(255, 255, 255, 0.1);
+            border-radius: 10px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            color: #ffffff;
+            font-size: 24px;
+        }
+        
+        /* Responsive adjustments */
+        @media (max-width: 1200px) {
+            .login-container {
+                width: 100vw;
+                height: 100vh;
+                border-radius: 0;
+            }
+            
+            .login-button {
+                width: 300px;
+                height: 300px;
+            }
+            
+            .login-text {
+                font-size: 40px;
+            }
+            
+            .instruction-text {
+                width: 90%;
+                font-size: 40px;
+            }
+            
+            .logo {
+                width: 400px;
+                height: 80px;
+                right: 20px;
+                bottom: 60px;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="login-container">
+        <!-- Main Login Button -->
+        <div class="login-button">
+            <div class="login-text">LOGIN</div>
+        </div>
+        
+        <!-- Instruction Text -->
+        <div class="instruction-text">
+            <p>Mitarbeiterausweis an das Gerät halten.</p>
+        </div>
+        
+        <!-- Icon Button -->
+        <div class="icon-button">
+            <div class="icon">
+                <div class="icon-inner"></div>
+            </div>
+        </div>
+        
+        <!-- Logo Placeholder -->
+        <div class="logo">
+            [Logo Placeholder]
+        </div>
+    </div>
+</body>
+</html>

package/package.json

@@ -1,15 +1,9 @@
 {
   "type": "module",
   "name": "lucy-cli",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.6",
   "description": "Lucy Framework for WIX Studio Editor",
   "main": ".dist/index.js",
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsc -w",
-    "postinstall": "patch-package",
-    "start": "NODE_OPTIONS='--no-warnings' node dist/index.js"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Sunnyside-UP-GmbH/lucy-cli.git"
@@ -33,8 +27,8 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@effect/platform": "^0.90.0",
-    "@effect/platform-node": "^0.94.0",
+    "@effect/platform": "0.92.1",
+    "@effect/platform-node": "0.98.3",
     "@swc/core": "^1.9.3",
     "@wix/cli": "^1.0.83",
     "@wix/data": "^1.0.270",
@@ -99,9 +93,15 @@
     "@typescript-eslint/utils": "8.39.0",
     "eslint": "9.32.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "52.0.4",
+    "eslint-plugin-jsdoc": "60.8.2",
     "eslint-plugin-named-import-spacing": "^1.0.3",
     "eslint-plugin-simple-import-sort": "12.1.1",
     "ts-node": "10.9.2"
+  },
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc -w",
+    "postinstall": "patch-package",
+    "start": "NODE_OPTIONS='--no-warnings' node dist/index.js"
   }
-}
+}

package/pnpm-workspace.yaml

@@ -0,0 +1,6 @@
+onlyBuiltDependencies:
+  - '@parcel/watcher'
+  - '@swc/core'
+  - msgpackr-extract
+  - sqlite3
+  - unrs-resolver

package/src/args.ts

@@ -109,7 +109,6 @@ export async function get_args(): Promise<LucyArgs> {
   monorepo           Monorepo setup
   tauri              Tauri desktop app
   cargo              Rust project
-  submodules         Git submodules
   wix-sdk            Wix SDK setup
 
 For more information, visit https://github.com/Sunnyside-UP-GmbH/lucy-cli

package/src/commands/exec.ts

@@ -5,6 +5,7 @@ import { logger } from "../utils/logger.js";
 import { FileSystem } from "@effect/platform"
 import Enquirer from "enquirer";
 import { AppError } from "../error.js";
+import { editors } from "../schemas/index.js";
 
 export const execCommand = Effect.gen(function*() {
     const config = yield* Config;
@@ -38,22 +39,16 @@ export const open = Effect.scoped(Effect.gen(function*() {
     yield* command.pipe().pipe(Command.stdout("inherit"), Command.stderr("inherit"), Command.exitCode);
 }))
 
-export const openVSCode = Effect.gen(function*() {
+export const openEditor = Effect.gen(function*() {
     const config = yield* Config;
-    const open = Command.make(
-        "code", 
-        config.config.cwd,
-        ).pipe(
-        Command.stdout("inherit"), // Stream stdout to process.stdout
-        Command.stderr("inherit"), // Stream stderr to process.stderr
-        Command.exitCode // Get the exit code
-    )
-    const overwriteQuestion = new Enquirer();
-    const openVScodeQuestion = yield* Effect.tryPromise({
-        try: () => overwriteQuestion.prompt({
-            type: 'confirm',
-            name: 'openVSCode',
-            message: `Do you want to open the project in VSCode?`,
+
+    const editorQuestion = new Enquirer();
+    const openEditorQuestion = yield* Effect.tryPromise({
+        try: () => editorQuestion.prompt({
+            type: 'select',
+            name: 'openEditor',
+            message: `Do you want to open the project in a supported editor?`,
+            choices: [...editors, 'No'],
         }),
         catch: (e) => {
             return new AppError({
@@ -62,8 +57,17 @@ export const openVSCode = Effect.gen(function*() {
             });
         }
     })
-    const choice = yield* Schema.decodeUnknown(Schema.Struct({ openVSCode: Schema.Boolean }))(openVScodeQuestion);
-    if (choice.openVSCode) {
+    const choice = yield* Schema.decodeUnknown(Schema.Struct({ openEditor: Schema.Literal(...editors, 'No') }))(openEditorQuestion);
+
+    const open = Command.make(
+        choice.openEditor, 
+        config.config.cwd,
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.stderr("inherit"), // Stream stderr to process.stderr
+        Command.exitCode // Get the exit code
+    )
+    if (choice.openEditor !== 'No') {
         yield* open
     }
-})
+})

package/src/commands/home.ts

@@ -1,6 +1,6 @@
 import { Effect } from "effect/index";
 import { Config } from "../config.js";
-import { FileSystem } from "@effect/platform"
+import { FileSystem, Path } from "@effect/platform"
 import { logger, orange } from "../utils/logger.js";
 import path, { join } from 'path';
 
@@ -8,15 +8,49 @@ export const createLucyHome = () => {
     return Effect.gen(function*() {
         const config = yield* Config
         const fs = yield* FileSystem.FileSystem
+        const p = yield* Path.Path
 
         if(!(yield* fs.exists(config.config.lucyHome))) {
             logger.action(`Creating Lucy home directory at ${orange(config.config.lucyHome)}`);
             yield* fs.makeDirectory(config.config.lucyHome, { recursive: true });
         }
         const templateFiles = yield* fs.readDirectory(config.config.filesFolder)
+
+        const shouldExclude = (relativePath: string): boolean => {
+            const segments = relativePath.split(/[/\\]/)
+            return segments.includes("node_modules") || segments.includes("Pods")
+        }
+
+        const copyDirFiltered = (src: string, dest: string, base?: string): Effect.Effect<void, any> =>
+            Effect.gen(function*() {
+                const entries = yield* fs.readDirectory(src)
+                yield* fs.makeDirectory(dest, { recursive: true })
+                yield* Effect.forEach(
+                    entries,
+                    (entry) => Effect.gen(function*() {
+                        const from = p.join(src, entry)
+                        const to = p.join(dest, entry)
+                        const rel = base ? p.relative(base, from) : entry
+
+                        if (shouldExclude(rel)) {
+                            return
+                        }
+
+                        const stat = yield* fs.stat(from)
+                        if (stat.type === "Directory") {
+                            yield* copyDirFiltered(from, to, base ?? src)
+                            return
+                        }
+                        yield* fs.copyFile(from, to)
+                    }),
+                    { discard: true }
+                )
+            })
+
         yield* Effect.forEach(
             templateFiles,
-            (file) => fs.copy(path.join(config.config.filesFolder, file), path.join(config.config.lucyHome, file), { overwrite: true })
+            (file) => copyDirFiltered(path.join(config.config.filesFolder, file), path.join(config.config.lucyHome, file)),
+            { discard: true }
         )
     });
 }

package/src/commands/install.ts

@@ -105,18 +105,19 @@ export const runInstall = Effect.gen(function*() {
     yield* install;
 })
 
-// export const yarnSetVersion = Effect.gen(function*() {
-//         const yarnDev = Command.make(
-//             "yarn",
-//             "set",
-//             "version",
-//             "berry",
-//         ).pipe(
-//         Command.stdout("inherit"), // Stream stdout to process.stdout
-//         Command.exitCode // Get the exit code
-//     )
-//     yield* yarnDev;
-// })
+export const yarnSetVersion = Effect.gen(function*() {
+        const set = Command.make(
+            "yarn",
+            "set",
+            "version",
+            "berry",
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+    )
+    yield* set;
+})
+
 export const installVeloPackages = Effect.gen(function*() {
     const config = yield* Config;
         const simpleSchedule = Schedule.tapOutput(
@@ -192,18 +193,37 @@ export const installVeloPackages = Effect.gen(function*() {
         devPkgs.push(key);
     }
 
-    const yarn = Command.make(
-            "yarn",
-            "add",
+    const manager = config.config.lucySettings.packageManager;
+    function pkgMgrParamsInstall():string[] {
+        if (manager === "npm") {
+            return ["install"];
+        }
+        if (manager === "pnpm") {
+            return ["install"];
+        }
+        return ["add"];
+    }
+    function pkgMgrParamsInstallDev():string[] {
+        if (manager === "npm") {
+            return ["install", "-D"];
+        }
+        if (manager === "pnpm") {
+            return ["install", "-D"];
+        }
+        return ["add", "-D"];
+    }
+
+    const install = Command.make(
+        manager,
+        ...pkgMgrParamsInstall(),
             ...pkgs,
         ).pipe(
         Command.stdout("inherit"), // Stream stdout to process.stdout
         Command.exitCode // Get the exit code
     )
-    const yarnDev = Command.make(
-            "yarn",
-            "add",
-            "-D",
+    const installDev = Command.make(
+            manager,
+            ...pkgMgrParamsInstallDev(),
             ...devPkgs,
         ).pipe(
         Command.stdout("inherit"), // Stream stdout to process.stdout
@@ -217,12 +237,12 @@ export const installVeloPackages = Effect.gen(function*() {
     }
 
     logger.info("Installing dependencies");
-    if ((yield* yarn) !== 0) {
+    if ((yield* install) !== 0) {
         return logger.error("Failed to install dependencies. Please check the error message above.");
     }
 
     logger.info("Installing dev dependencies");
-    if ((yield* yarnDev) !== 0) {
+    if ((yield* installDev) !== 0) {
         return logger.error("Failed to install dev dependencies. Please check the error message above.");
     }
 

package/src/init/blocks.ts

@@ -7,7 +7,7 @@ import { mergeAdditions, mergeLucySettings2PackageJson, setInitialized } from ".
 import { writeLucySettings, writePackageJson } from "../commands/write.js";
 import { copyTemplateFiles } from "../commands/copy.js";
 import { readPackageJson } from "../commands/read.js";
-import { execCommand, openVSCode } from "../commands/exec.js";
+import { execCommand, openEditor } from "../commands/exec.js";
 import { approveBuilds, installPackages } from "../commands/install.js";
 import { AppError } from "../error.js";
 import { cleanup } from "../commands/cleanup.js";
@@ -80,6 +80,6 @@ export const init_blocks = () => {
 
         logger.success("Blocks project initialized successfully!");
 
-        yield* openVSCode;
+        yield* openEditor;
     })
 }

package/src/init/cargo.ts

@@ -5,7 +5,7 @@ import { copyTemplateFiles } from "../commands/copy.js";
 import { gitInit } from "../commands/git.js";
 import { checkForDirty } from "../commands/checks.js";
 import { setInitialized } from "../commands/edit.js";
-import { openVSCode } from "../commands/exec.js";
+import { openEditor } from "../commands/exec.js";
 
 export const init_cargo = () => {
     return Effect.gen(function*() {
@@ -20,6 +20,6 @@ export const init_cargo = () => {
         
         logger.success("Cargo project initialized successfully!");
 
-        yield* openVSCode;
+        yield* openEditor;
     })
 }