ann-flavor-flutter 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5477ea279ba2d984395d1d074ec8dc64b39bbeb2718d52263ac1582c39c2938
-  data.tar.gz: bd8c3a32d1b36cbdd3adf4fa80a8fd7effc73370b123acf62a97757623623447
+  metadata.gz: c130b0210def1ac340db96f188146dbef72a1550d914b77fa062cd25f7ccb279
+  data.tar.gz: 4688888ece3b6fa767225b16d644da23ea7f2762eb6a2b92c95742d309adcb09
 SHA512:
-  metadata.gz: dc194b3e7ecf42d90997396c1eca063fa17f83f9c0599dca24bccee6c82321816c4e7a28a8f16dfbbddbbbf1f7987e0d952e58f613491cb3e686247a290335ba
-  data.tar.gz: 736cf855b427890b45cac71020d6fede172d30b30c87b3235223cd011ebf025b598c29a8bba56c0fc1785b3cfb7a8b73173b3c6eee59ba28a49a701b9422ec69
+  metadata.gz: 8940badbe14a1fb8de04d6af4dcf58bba368c329d30434889b1d400703f5f9e1a5dfb6da075c7c677547bc35d699d4c0c775a51519aa72bded1a7a2b445d09db
+  data.tar.gz: 30052ccd783ff8f93533467423c3173f50799fd979e385ca56c599aaab8de67713a6eb11971d79c8d28c2e532fc2c93e0e779e1060d2e1a6e2689c0bcec5dc0d

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.4.0
+
+### Added
+- **Plan 027**: New `ann_upload_to_cloudflare` action — deploys web flavors to Cloudflare Pages (`wrangler pages deploy`) or Cloudflare Workers (`wrangler deploy --config`). Reads `cloudflare.{project_name, account_id, branch, mode}` from `annspec.yaml` with cascade: flavor → default → fallback (`main`, `pages`). `project_name` is flavor-only (never inherited from default). `account_id` falls back to `CLOUDFLARE_ACCOUNT_ID` env var.
+- `lanes_annai.rb` gains `upload_to_cloudflare` method and `web_output_dir` private helper.
+- `flutter build web` now appends `--output=build/web/<flavor>` when a flavor is specified, matching the output directory used by both Firebase and Cloudflare deploy steps.
+- `upload_to_firebase` uses `web_output_dir(flavor)` for the `public` dir in `firebase.json` so it matches the per-flavor build output.
+
+---
+
+## 0.3.0
+
+### Changed
+- **Plan 026**: `@isWeb` branch in `lanes_annai.rb` now calls `dart run ann_flutter_flavor sync-web --flavor <name>` before `flutter build web`. Zero Ruby copy logic — preprocessing fully delegated to the Flutter CLI.
+
+---
+
 ## 0.2.1
 
 ### Added

data/lib/ann_flavor_flutter/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorFlutter
-  VERSION = "0.2.2"
+  VERSION = "0.4.0"
 end

data/lib/fastlane/plugin/ann_flavor_flutter/actions/ann_upload_to_cloudflare_action.rb

@@ -0,0 +1,166 @@
+require 'fastlane/action'
+require 'fastlane/plugin/ann_flavor_flutter/helper/lanes_annai'
+require 'fastlane/plugin/ann_flavor_flutter/helper/utils_spec_loader'
+
+module Fastlane
+  module Actions
+    class AnnaiUploadToCloudflareAction < Action
+
+      def self.run(params)
+        platform = :web
+        spec_file = params[:spec_file]
+
+        annai_lanes = FastlaneFlutterFlavor::AnnaiLanes.new(
+          lane: self,
+          platform: platform,
+          spec_file: spec_file
+        )
+
+        status_manager = annai_lanes.instance_variable_get(:@statusManager)
+        spec_loader    = annai_lanes.instance_variable_get(:@specLoader)
+        UI.user_error!("Internal Error: AnnaiLanes failed to initialize specLoader") unless spec_loader
+
+        if params[:clean]
+          UI.header("🧹 Cleaning builds as requested...")
+          begin
+            annai_lanes.clean_build
+          rescue => e
+            UI.error("Failed to perform clean build: #{e.message}")
+            status_manager.logError("All", "annai_clean_build", platform, e.message)
+          end
+        end
+
+        flavors_hash = spec_loader.get_platform_flavors(platform)
+
+        if flavors_hash.empty?
+          UI.important("No flavors found for Web in the Annai spec. Nothing to deploy")
+          annai_lanes.finalize
+          return
+        end
+
+        all_flavor_names = flavors_hash.keys
+
+        requested_flavor = params[:flavor]
+        if requested_flavor && !requested_flavor.to_s.empty?
+          requested_flavors = requested_flavor.to_s.split(',').map(&:strip).reject(&:empty?)
+          invalid = requested_flavors.reject { |f| all_flavor_names.include?(f) }
+          if invalid.any?
+            UI.user_error!("Unknown flavor(s): #{invalid.join(', ')}. Available: #{all_flavor_names.join(', ')}")
+          end
+          flavors_to_deploy = requested_flavors
+        else
+          flavors_to_deploy = all_flavor_names
+        end
+
+        UI.header("Deploying to Cloudflare. Flavors: #{flavors_to_deploy.join(', ')}")
+
+        any_failed = false
+
+        flavors_to_deploy.each do |flavor_key|
+          flavor = flavor_key.to_s
+          final_main_file = spec_loader.get_main_file(platform, flavor) || params[:main_file]
+
+          UI.message("🚀 Deploying flavor: #{flavor}")
+
+          begin
+            success = annai_lanes.upload_to_cloudflare(
+              flavor: flavor,
+              main_file: final_main_file,
+              build_config: params[:build_config],
+              skip_compile: params[:skip_compile],
+              skip_sound_null_safety: params[:skip_sound_null_safety],
+              project_name: params[:project_name],
+              account_id: params[:account_id],
+              branch: params[:branch],
+              mode: params[:mode],
+            )
+
+            if success
+              UI.success("✅ Deployed #{flavor} to Cloudflare")
+            else
+              any_failed = true
+              UI.error("❌ Failed to deploy #{flavor}")
+            end
+
+          rescue => e
+            status_manager.logError(flavor, "upload_to_cloudflare", platform, e.message)
+            UI.error("❌ #{flavor}: #{e.message}")
+            any_failed = true
+          end
+        end
+
+        annai_lanes.finalize
+
+        if any_failed
+          UI.user_error!("Cloudflare deployment failed for one or more flavors")
+        else
+          UI.success("🎉 Successfully deployed #{flavors_to_deploy.count} flavor(s) to Cloudflare!")
+        end
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                       description: "Flavor(s) to deploy (comma-separated). Defaults to all Web flavors",
+                                       optional: true,
+                                       default_value: nil),
+          FastlaneCore::ConfigItem.new(key: :spec_file,
+                                       description: "Path to annspec.yaml (relative to Flutter root). Defaults to standard discovery",
+                                       optional: true,
+                                       default_value: nil),
+          FastlaneCore::ConfigItem.new(key: :clean,
+                                       description: "Run clean build before deploying",
+                                       type: Boolean,
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :main_file,
+                                       description: "Path to the main Dart file",
+                                       default_value: "lib/main.dart"),
+          FastlaneCore::ConfigItem.new(key: :build_config,
+                                       description: "Flutter build configuration ('release', 'profile', 'debug')",
+                                       optional: true,
+                                       default_value: "release"),
+          FastlaneCore::ConfigItem.new(key: :skip_compile,
+                                       description: "Skip compilation step",
+                                       type: Boolean,
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :skip_sound_null_safety,
+                                       description: "Skip sound null safety during compilation",
+                                       type: Boolean,
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :project_name,
+                                       description: "Cloudflare Pages project name (overrides annspec.yaml)",
+                                       optional: true,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :account_id,
+                                       description: "Cloudflare account ID (overrides annspec.yaml and CLOUDFLARE_ACCOUNT_ID env var)",
+                                       optional: true,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :branch,
+                                       description: "Cloudflare Pages branch (overrides annspec.yaml, default: 'main')",
+                                       optional: true,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :mode,
+                                       description: "Deployment mode: 'pages' or 'workers' (overrides annspec.yaml, default: 'pages')",
+                                       optional: true,
+                                       type: String),
+        ].compact
+      end
+
+      def self.description
+        "Deploy one or all Web flavors to Cloudflare Pages or Cloudflare Workers"
+      end
+
+      def self.is_supported?(platform)
+        platform == :web
+      end
+
+      def self.example_code
+        'ann_upload_to_cloudflare(
+          flavor: "ledger_in,ledger_us",
+          build_config: "release",
+          skip_compile: false
+        )'
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/ann_flavor_flutter/helper/lanes_annai.rb

@@ -105,6 +105,13 @@ module FastlaneFlutterFlavor
           Fastlane::UI.message("Web compilation detected. Omitting '--flavor' from Flutter build command, but using '#{flavor}' for logging.")
           cli_flavor = ""
           cli_flavor_option = ""
+          # Preprocess: copy per-flavor web assets into web/ before building
+          sh("dart run ann_flutter_flavor sync-web --flavor #{flavor} --project #{@spec_root_folder}")
+          # Append per-flavor output directory when a flavor is specified
+          unless flavor.empty?
+            output_flag = "--output=#{web_output_dir(flavor)}"
+            additional_parameter = additional_parameter.to_s.empty? ? output_flag : "#{additional_parameter} #{output_flag}"
+          end
         end
 
         # Base command parts
@@ -208,7 +215,7 @@ module FastlaneFlutterFlavor
 
         # 4. Update the hosting block
         config['hosting'] = {
-            "public" => "build/web",
+            "public" => web_output_dir(flavor),
             "ignore" => ["firebase.json", "**/.*", "**/node_modules/**"],
             "rewrites" => [{"source" => "**", "destination" => "/index.html"}]
         }
@@ -498,5 +505,84 @@ module FastlaneFlutterFlavor
         @setup_lanes.cleanup
     end
 
+    # Deploys a Flutter web build to Cloudflare Pages or Cloudflare Workers.
+    # Cascades: project_name (flavor-only), account_id/branch/mode (flavor → default → fallback).
+    def upload_to_cloudflare(flavor: "", main_file: "lib/main.dart", build_config: "release",
+                             skip_compile: false, skip_sound_null_safety: false,
+                             project_name: nil, account_id: nil, branch: nil, mode: nil)
+      begin
+        unless @isWeb
+          raise "upload_to_cloudflare is only supported for the :web platform (flavor: #{flavor})"
+        end
+
+        cf = @specLoader.get_cloudflare_config(@platform, flavor)
+
+        resolved_project_name = project_name || cf['project_name']
+        resolved_account_id   = account_id   || cf['account_id']
+        resolved_branch       = branch       || cf['branch']
+        resolved_mode         = mode         || cf['mode']
+
+        if resolved_project_name.nil? || resolved_project_name.empty?
+          raise "Missing cloudflare.project_name for web flavor '#{flavor}'. Set it in annspec.yaml."
+        end
+
+        unless skip_compile
+          unless compile_build(
+            flavor: flavor,
+            sub_command: "web",
+            build_config: build_config,
+            main_file: main_file,
+            skip_sound_null_safety: skip_sound_null_safety,
+            skip_code_sign: true,
+            export_options_plist: "",
+            platform: @platform,
+          )
+            raise "Compilation failed for web flavor '#{flavor}'"
+          end
+        end
+
+        output_dir = web_output_dir(flavor)
+
+        case resolved_mode
+        when 'pages'
+          command_parts = ["wrangler", "pages", "deploy", output_dir,
+                           "--project-name", resolved_project_name]
+          command_parts += ["--branch", resolved_branch] if resolved_branch && !resolved_branch.empty?
+          command_parts += ["--commit-dirty", "true"]
+        when 'workers'
+          config_path = File.join(@root_folder, "web_flavors", flavor, "wrangler.toml")
+          command_parts = ["wrangler", "deploy", "--config", config_path]
+        else
+          raise "Unknown cloudflare mode '#{resolved_mode}'. Use 'pages' or 'workers'."
+        end
+
+        env_overrides = {}
+        env_overrides['CLOUDFLARE_ACCOUNT_ID'] = resolved_account_id if resolved_account_id && !resolved_account_id.empty?
+
+        Fastlane::UI.message("Deploying to Cloudflare #{resolved_mode}: #{command_parts.join(' ')}")
+
+        Dir.chdir @root_folder do
+          env_overrides.each { |k, v| ENV[k] = v }
+          Fastlane::Actions::sh(*command_parts)
+          env_overrides.keys.each { |k| ENV.delete(k) }
+        end
+
+        @statusManager.logSuccess flavor, "upload_to_cloudflare", @platform
+        return true
+
+      rescue => e
+        Fastlane::UI.error "Error while deploying to Cloudflare for web flavor '#{flavor}'"
+        Fastlane::UI.error e
+        @statusManager.logError flavor, "upload_to_cloudflare", @platform, e
+        return false
+      end
+    end
+
+    private
+
+    def web_output_dir(flavor)
+      flavor.to_s.empty? ? "build/web" : "build/web/#{flavor}"
+    end
+
   end
 end

data/lib/fastlane/plugin/ann_flavor_flutter/helper/utils_spec_loader.rb

@@ -377,6 +377,28 @@ module FastlaneFlutterFlavor
       config&.dig('admob', 'gms_ads_id') || config&.dig('gms_ads_id')
     end
 
+    # Returns the resolved Cloudflare config for a web flavor as a Hash with keys:
+    # project_name, account_id, branch, mode — cascaded flavor → default → hardcoded fallback.
+    # project_name is flavor-only (never inherited from default).
+    # @return [Hash] Always returns a Hash; values may be nil if not configured.
+    def get_cloudflare_config(platform, flavor_name)
+      return {} unless @spec_data
+
+      platform_key = platform.to_s
+      platform_data = @spec_data.dig('app', platform_key)
+      return {} unless platform_data.is_a?(Hash)
+
+      flavor_cf  = platform_data.dig('flavor', flavor_name.to_s, 'cloudflare') || {}
+      default_cf = platform_data.dig('default', 'cloudflare') || {}
+
+      {
+        'project_name' => flavor_cf['project_name'],
+        'account_id'   => flavor_cf['account_id']   || default_cf['account_id'],
+        'branch'       => flavor_cf['branch']        || default_cf['branch'] || 'main',
+        'mode'         => flavor_cf['mode']          || default_cf['mode']   || 'pages',
+      }
+    end
+
     # For Google Sign-In (annai_auth)
     def get_auth_client_id(platform, flavor_name, build_config)
       config = get_merged_flavor_config(platform, flavor_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ann-flavor-flutter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - ANN Solutions
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-12 00:00:00.000000000 Z
+date: 2026-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -89,6 +89,7 @@ files:
 - lib/fastlane/plugin/ann_flavor_flutter/actions/ann_run_tests_action.rb
 - lib/fastlane/plugin/ann_flavor_flutter/actions/ann_setup_action.rb
 - lib/fastlane/plugin/ann_flavor_flutter/actions/ann_upload_to_app_store_action.rb
+- lib/fastlane/plugin/ann_flavor_flutter/actions/ann_upload_to_cloudflare_action.rb
 - lib/fastlane/plugin/ann_flavor_flutter/actions/ann_upload_to_firebase_action.rb
 - lib/fastlane/plugin/ann_flavor_flutter/actions/ann_upload_to_play_store_action.rb
 - lib/fastlane/plugin/ann_flavor_flutter/helper/lanes_android.rb