lucy-cli 2.0.0-alpha.5 → 2.0.0-alpha.7

package/dist/init.js

@@ -163,12 +163,12 @@ const init_expo = () => {
         const terminal = yield* Terminal.Terminal;
         const fs = yield* FileSystem.FileSystem;
         const path = yield* Path.Path;
-        const resolutions = {
-            "@wix/sdk@1.15.24": "patch:@wix/sdk@npm:1.15.24#./patches/@wix-sdk-npm-1.15.24-1adbec98e9.patch",
-        };
         const yarn = Command.make("yarn", "add", "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").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
         Command.exitCode // Get the exit code
         );
+        const yarnVersion = Command.make("yarn", "set", "version", "berry").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+        );
         const yarnDev = Command.make("yarn", "add", "--dev", "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", "@styled/typescript-styled-plugin", "@stylelint/postcss-css-in-js", "@typescript-eslint/parser", "typescript-eslint", "typescript-eslint-language-service", "@total-typescript/ts-reset", "expo-doctor", "tsx").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
         Command.exitCode // Get the exit code
         );
@@ -207,13 +207,6 @@ const init_expo = () => {
             return yield* Effect.logError("Lucy is already initialized in this project. Please run this command in an empty directory.");
         const baseFiles = yield* fs.readDirectory(config.config.filesFolder + '/expo');
         yield* Effect.forEach(baseFiles, (file) => fs.copy(path.join(config.config.filesFolder, 'expo', file), path.join(config.config.cwd, file), { overwrite: true }));
-        let res = yield* yarn;
-        res = yield* yarnDev;
-        console.log("🐕 " + 'npx');
-        res = yield* npx;
-        if (res !== 0) {
-            return yield* Effect.logError("Failed to install Expo dependencies. Please check the error message above.");
-        }
         const newScripts = {
             "dev": "expo start",
             "start": "expo start",
@@ -223,7 +216,7 @@ const init_expo = () => {
             "reset": "tsx ./scripts/reset-project.ts",
             "format": "prettier --write \"./*.json\" \"**/*.{ts,tsx,md,json,jsonc,json5}\"",
             "prebuild": "expo prebuild",
-            "pods": "npx pod-install",
+            "pods": "npxpod-install",
             "build:dev": "eas build --local --profile development",
             "build:sim": "eas build --local --profile ios-simulator",
             "build:prev": "eas build --local --profile preview",
@@ -241,7 +234,6 @@ const init_expo = () => {
         };
         packageJson.resolutions = {
             ...packageJson.resolutions,
-            ...resolutions,
         };
         packageJson.expo = {
             doctor: {
@@ -252,9 +244,22 @@ const init_expo = () => {
         };
         yield* fs.writeFileString(path.join(config.config.cwd, 'package.json'), JSON.stringify(packageJson, null, 2));
         yield* fs.remove(path.join(config.config.cwd, "package-lock.json"), { force: true });
-        yield* Command.make("yarn").pipe(Command.stdout("inherit"), // Stream stdout to process.stdout
-        Command.exitCode // Get the exit code
-        );
+        let res = yield* yarnVersion;
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to set Yarn version. Please check the error message above.");
+        }
+        res = yield* yarn;
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to install dependencies. Please check the error message above.");
+        }
+        res = yield* yarnDev;
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to install dev dependencies. Please check the error message above.");
+        }
+        res = yield* npx;
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to install Expo dependencies. Please check the error message above.");
+        }
     });
 };
 export const init = () => {

package/files/expo/metro.config.js

@@ -3,7 +3,16 @@
 // @ts-nocheck
 const { getDefaultConfig } = require('expo/metro-config');
 const { withNativeWind } = require('nativewind/metro');
+const path = require('path');
 
+const ALIASES_WEB = {
+	'@wix/sdk': path.resolve(__dirname, './node_modules/@wix/sdk/cjs/build/index.js'),
+	// Example: redirect imports of 'some-native-library' to a web-compatible mock
+	// 'some-native-library': path.resolve(__dirname, 'src/mocks/some-native-library.web.js'),
+
+	// You can add your @wix/sdk aliases here if needed
+	// '@wix/sdk-something': path.resolve(__dirname, 'src/wix/sdk-something-web.js'),
+};
 const config = (() => {
 	let config = getDefaultConfig(__dirname);
 	const { transformer, resolver } = config;
@@ -15,6 +24,21 @@ const config = (() => {
 	};
 	
 	config.resolver.unstable_enablePackageExports = false;
+	// config.resolver.unstable_conditionsByPlatform = ['ios', 'android']
+config.resolver.resolveRequest = (context, moduleName, platform) => {
+	if (platform === 'web') {
+		console.log('Resolving for web:', moduleName);
+		// Check if the module name is in our alias map
+		const alias = ALIASES_WEB[moduleName];
+		if (alias) {
+			console.log(`Aliasing '${moduleName}' to '${alias}'`);
+			// If it is, resolve to the new path
+			return context.resolveRequest(context, alias, platform);
+		}
+	}
+	// Ensure you call the default resolver for everything else.
+	return context.resolveRequest(context, moduleName, platform);
+};
 
 	config.resolver.extraNodeModules = {
 		...config.resolver.extraNodeModules,
@@ -29,6 +53,6 @@ const config = (() => {
 	
 	return config;
 })();
-console.log('Using Metro config:', JSON.stringify(config, null, 2));
+// console.log('Using Metro config:', JSON.stringify(config, null, 2));
 module.exports = withNativeWind(config, { input: './global.css' });
 

package/files/expo/tsconfig.json

@@ -41,5 +41,6 @@
     "tailwind.config.js",
     "babel.config.js",
     ".prettierrc.js",
+    "expo-env.d.ts",
   ]
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "lucy-cli",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.7",
   "description": "Lucy Framework for WIX Studio Editor",
   "main": ".dist/index.js",
   "scripts": {
@@ -102,5 +102,6 @@
     "i": "^0.3.7",
     "npm": "^11.0.0",
     "ts-node": "^10.9.1"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }

package/src/init.ts

@@ -195,9 +195,6 @@ const init_expo = () => {
         const fs = yield* FileSystem.FileSystem;
         const path = yield* Path.Path;
 
-        const resolutions = {
-            "@wix/sdk@1.15.24": "patch:@wix/sdk@npm:1.15.24#./patches/@wix-sdk-npm-1.15.24-1adbec98e9.patch",
-        }
         const yarn = Command.make(
                 "yarn",
                 "add",
@@ -216,6 +213,15 @@ const init_expo = () => {
             Command.stdout("inherit"), // Stream stdout to process.stdout
             Command.exitCode // Get the exit code
         )
+        const yarnVersion = Command.make(
+                "yarn",
+                "set",
+                "version",
+                "berry"
+            ).pipe(
+            Command.stdout("inherit"), // Stream stdout to process.stdout
+            Command.exitCode // Get the exit code
+        )
 
         const yarnDev = Command.make(
                 "yarn",
@@ -310,19 +316,6 @@ const init_expo = () => {
             (file) => fs.copy(path.join(config.config.filesFolder, 'expo', file), path.join(config.config.cwd, file), { overwrite: true })
         )
 
-        let res = yield* yarn
-        if (res !== 0) {
-            return yield* Effect.logError("Failed to install dependencies. Please check the error message above.");
-        }
-        res = yield* yarnDev
-        if (res !== 0) {
-            return yield* Effect.logError("Failed to install dev dependencies. Please check the error message above.");
-        }
-        res = yield* npx
-        if (res !== 0) {
-            return yield* Effect.logError("Failed to install Expo dependencies. Please check the error message above.");
-        }
-
         const newScripts = {
             "dev": "expo start",
             "start": "expo start",
@@ -352,7 +345,6 @@ const init_expo = () => {
         };
         packageJson.resolutions = {
             ...packageJson.resolutions,
-            ...resolutions,
         };
         packageJson.expo = {
             doctor: {
@@ -365,11 +357,23 @@ const init_expo = () => {
         yield* fs.writeFileString(path.join(config.config.cwd, 'package.json'), JSON.stringify(packageJson, null, 2));
         yield* fs.remove(path.join(config.config.cwd, "package-lock.json"), { force: true })
 
-        yield* Command.make("yarn").pipe(
-            Command.stdout("inherit"), // Stream stdout to process.stdout
-            Command.exitCode // Get the exit code
-        )
 
+        let res = yield* yarnVersion;
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to set Yarn version. Please check the error message above.");
+        }
+        res = yield* yarn
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to install dependencies. Please check the error message above.");
+        }
+        res = yield* yarnDev
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to install dev dependencies. Please check the error message above.");
+        }
+        res = yield* npx
+        if (res !== 0) {
+            return yield* Effect.logError("Failed to install Expo dependencies. Please check the error message above.");
+        }
     })
 }
 

package/files/expo/patches/@wix-sdk-npm-1.15.24-1adbec98e9.patch

@@ -1,20 +0,0 @@
-diff --git a/build/auth/AppStrategy.js b/build/auth/AppStrategy.js
-index 36a3bbf1ef7c6e8e52f0eb3d7a20713c505ed483..1c59bf6eda0acf2a3d094a8f665a4c5f75709175 100644
---- a/build/auth/AppStrategy.js
-+++ b/build/auth/AppStrategy.js
-@@ -1,5 +1,7 @@
- import { parsePublicKeyIfEncoded } from '../helpers.js';
- import { getTokenInfo } from '../get-token-info.js';
-+import { jwtVerify, importSPKI } from 'jose';
-+
- /**
-  * Creates an authentication strategy for Wix Apps OAuth installation process.
-  * Use this authentication strategy when making requests to Wix APIs from your Wix App backend.
-@@ -212,7 +214,6 @@ export function AppStrategy(opts) {
-             if (!opts.publicKey) {
-                 throw new Error('Missing public key. Make sure to pass it to the AppStrategy');
-             }
--            const { jwtVerify, importSPKI } = await import('jose');
-             const publicKey = await importSPKI(parsePublicKeyIfEncoded(opts.publicKey), 'RS256');
-             const decoded = await jwtVerify(token, publicKey, verifyCallerClaims
-                 ? {