catalyst-core 0.0.3-canary.3 → 0.0.3-canary.5

package/README.md

@@ -9,7 +9,7 @@
 
 -   Overview
 -   Installation
-  
+
 ## Overview
 
 Catalyst offers a comprehensive suite of features designed for modern web development. It includes isomorphic rendering for optimal performance, an extendable server with full-stack capabilities, and configurable state management. The framework employs smart prefetching of data and chunks, allows easy configuration of global styles and layouts, and provides SEO optimization at both global and page levels.
@@ -38,7 +38,7 @@ You will see some prompts to configure your application.
 cd <name-of-your-project> && npm run start
 ```
 
-The development server will start at ```http://localhost:3005```
+The development server will start at `http://localhost:3005`
 
 ## Documentation
 

package/changelog.md

@@ -1,19 +1,20 @@
 # Changelog
 
-## [0.0.3-canary.3] - 06-03-2025
 
-## Cache Management Updates
+## [0.0.3-canary.5] - 12-06-2025
 
-## Overview
-This PR introduces native WebView implementations for Android, along with significant cache management improvements and bug fixes.
-
-## Changes
-
-- Increased buffer size for `BufferedInputStream` in `WebCacheManager.kt` to 32KB (32 * 1024) for optimized cache file reading
-- Refactored `MainActivity.kt` to use `properties.getProperty` instead of `jsonObject.optString` for configuration values
+### Features
+- Production project creation functionality implemented
+- Android App Bundle (.aab) file generation capability
+- Project name replacement functionality
 
 ### Fixed
-- Corrected prompt string in `utils.js` from "CSS pattern" to "Cache pattern"
+- Production deployment issues resolved
+- Merge conflicts fixed
+- Branch integration improvements
 
+### Changes
+- Enhanced production deployment workflow for Android
+- Improved build process for production releases
 ## Version
-- Target version: 0.0.3-canary.3
+- Target version: 0.0.3-canary.5

package/dist/native/androidProject/.idea/AndroidProjectSystem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>

package/dist/native/androidProject/app/build.gradle.kts

@@ -3,6 +3,9 @@ import java.io.File
 import java.util.Properties
 
 val configPath: String? by project.properties
+val keystorePassword: String? by project.properties  // Changed from keyStorePassword to keystorePassword
+val keyAlias: String? by project.properties
+val keyPassword: String? by project.properties
 
 fun getLocalIpAddress(): String {
     return NetworkInterface.getNetworkInterfaces().toList()
@@ -18,35 +21,73 @@ plugins {
 }
 
 android {
-    namespace = "com.example.androidProject"
+    namespace = "io.yourname.androidproject"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.example.androidProject"
+        applicationId = "io.yourname.androidproject"
         minSdk = 24
         targetSdk = 34
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "LOCAL_IP", "\"${getLocalIpAddress()}\"")
     }
 
+    // Add signing configuration for app bundle
+    signingConfigs {
+        create("release") {
+            // Make sure the keystore file exists before referencing it
+            val keystoreFile = file("../keystore/release-key.jks")
+            if (keystoreFile.exists()) {
+               storeFile = file("../keystore/release-key.jks")
+                storePassword = "test@123"
+                keyAlias = "release"
+                keyPassword = "test@123"
+            } else {
+                // Log a warning if the keystore doesn't exist yet
+                logger.warn("Keystore file not found at ${keystoreFile.absolutePath}. Run the generateKeystore task first.")
+            }
+        }
+    }
+
     buildTypes {
         debug {
             manifestPlaceholders += mapOf("allowCleartextTraffic" to true)
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
             isMinifyEnabled = false
             buildConfigField("Boolean", "ALLOW_MIXED_CONTENT", "true")
             buildConfigField("String", "LOCAL_IP", "\"${getLocalIpAddress()}\"")
         }
         release {
             manifestPlaceholders += mapOf("allowCleartextTraffic" to false)
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
             buildConfigField("Boolean", "ALLOW_MIXED_CONTENT", "false")
             buildConfigField("String", "LOCAL_IP", "\"127.0.0.1\"")
+
+            // Only apply signing config if the keystore exists
+            if (file("../keystore/release-key.jks").exists()) {
+                signingConfig = signingConfigs.getByName("release")
+            }
+        }
+    }
+
+    // Configure App Bundle settings
+    bundle {
+        language {
+            enableSplit = true
+        }
+        density {
+            enableSplit = true
+        }
+        abi {
+            enableSplit = true
         }
     }
 
@@ -63,6 +104,21 @@ android {
         viewBinding = true
         buildConfig = true
     }
+
+    packaging {
+        resources {
+            excludes.add("**/route-manifest.json.gz")
+            excludes.add("**/route-manifest.json.br")
+            excludes.add("META-INF/LICENSE")
+            excludes.add("META-INF/NOTICE")
+        }
+    }
+
+    // Configure lint options
+    lint {
+        checkReleaseBuilds = true
+        abortOnError = true
+    }
 }
 
 dependencies {
@@ -136,7 +192,17 @@ tasks.register("generateWebViewConfig") {
         val webviewConfigContent = webviewConfigMatch?.groupValues?.get(1)
 
         val properties = Properties()
-        properties.setProperty("LOCAL_IP", getLocalIpAddress())
+
+        // Set different IP based on build type
+        if (gradle.startParameter.taskNames.any { it.contains("Release") || it.contains("release") }) {
+            properties.setProperty("LOCAL_IP", "127.0.0.1") // Production
+            properties.setProperty("buildType", "release")
+            properties.setProperty("buildOptimisation", "true")
+        } else {
+            properties.setProperty("LOCAL_IP", getLocalIpAddress()) // Debug
+            properties.setProperty("buildType", "debug")
+            properties.setProperty("buildOptimisation", "false")
+        }
 
         // Parse top-level properties
         val topLevelRegex = """"([^"]+)"\s*:\s*"([^"]+)"""".toRegex()
@@ -163,6 +229,12 @@ tasks.register("generateWebViewConfig") {
             }
         }
 
+        // Set production-specific properties for release builds
+        if (gradle.startParameter.taskNames.any { it.contains("Release") || it.contains("release") }) {
+            properties.setProperty("PRODUCTION_URL", "https://yourwebapp.com") // Replace with your domain
+            properties.setProperty("apiBaseUrl", "https://api.yourdomain.com/") // Replace with your API URL
+        }
+
         // Create the assets directory if it doesn't exist
         val assetsDir = File("${project.projectDir}/src/main/assets")
         if (!assetsDir.exists()) {
@@ -177,4 +249,60 @@ tasks.register("generateWebViewConfig") {
 
         println("WebView config generated at ${assetsDir.absolutePath}/webview_config.properties")
     }
+}
+
+// Task to create key store if it doesn't exist
+// Add this task to your build.gradle.kts
+tasks.register("generateKeystore") {
+    doLast {
+        val keystoreDir = File(project.rootDir, "keystore")
+        if (!keystoreDir.exists()) {
+            keystoreDir.mkdirs()
+        }
+
+        val keystoreFile = File(keystoreDir, "release-key.jks")
+        if (!keystoreFile.exists()) {
+            val storePass = project.properties["keystorePassword"] as? String ?: System.getenv("KEYSTORE_PASSWORD") ?: "android"
+            val keyPass = project.properties["keyPassword"] as? String ?: System.getenv("KEY_PASSWORD") ?: "android"
+            val alias = project.properties["keyAlias"] as? String ?: System.getenv("KEY_ALIAS") ?: "release"
+
+            exec {
+                commandLine = listOf(
+                    "keytool",
+                    "-genkey",
+                    "-v",
+                    "-keystore", keystoreFile.absolutePath,
+                    "-alias", alias,
+                    "-keyalg", "RSA",
+                    "-keysize", "2048",
+                    "-validity", "10000",
+                    "-storepass", storePass,
+                    "-keypass", keyPass,
+                    "-dname", "CN=YourCompany, OU=YourDepartment, O=YourOrganization, L=YourCity, ST=YourState, C=US"
+                )
+            }
+            println("Generated keystore at: ${keystoreFile.absolutePath}")
+        } else {
+            println("Keystore already exists at: ${keystoreFile.absolutePath}")
+        }
+    }
+}
+// Task to build app bundle
+tasks.register("createAppBundle") {
+    dependsOn("generateKeystore", "bundleRelease")
+    doLast {
+        println("""
+            =======================================================
+            App Bundle created successfully!
+            
+            Location: ${project.buildDir}/outputs/bundle/release/app-release.aab
+            
+            Next steps:
+            1. Test your bundle with: 
+               bundletool build-apks --bundle=app/build/outputs/bundle/release/app-release.aab --output=test.apks
+            
+            2. Upload to Play Console: https://play.google.com/console
+            =======================================================
+        """.trimIndent())
+    }
 }

package/dist/native/androidProject/app/src/main/AndroidManifest.xml

@@ -3,6 +3,14 @@
     xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -16,7 +24,7 @@
         android:usesCleartextTraffic="${allowCleartextTraffic}"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name="io.yourname.androidproject.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -24,6 +32,15 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="io.yourname.androidproject.release.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
 </manifest>

package/dist/native/androidProject/app/src/main/assets/webview_config.properties

@@ -1,4 +1,8 @@
-LOCAL_IP=192.168.3.84
-android={\n      "buildType"\: "debug",\n      "sdkPath"\: "/Users/mayankmahavar/Android",\n      "emulatorName"\: "testMediumPhone",\n      "cachePattern"\: "*.css,*.js"\n    }
+LOCAL_IP=192.168.3.209
+buildType=Release
+emulatorName=testMediumPhone
 port=3005
-.
+sdkPath=/Users/mayankmahavar/Android
+cachePattern=*.css
+PRODUCTION_URL=https://catalyst.1mg.com/public_docs/
+