@livx.cc/appwrap 0.56.0 → 0.57.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livx.cc/appwrap",
-  "version": "0.56.0",
+  "version": "0.57.0",
   "description": "Wrap any PWA into a native app with native capabilities (appwrap runtime + @livx.cc/native-kit).",
   "license": "MIT",
   "author": "Elya Livshitz",

package/templates/ci/fastlane/Fastfile

@@ -6,6 +6,21 @@ default_platform(:ios)
 APP_ID = '__APP_ID__'.freeze
 TEAM_ID = '__TEAM_ID__'.freeze
 
+# iOS app-extension targets discovered from the generated wrapper. Each dir under
+# App_Resources/iOS/extensions/ carrying an extension.json is a SEPARATE Xcode target (name = dir
+# name, e.g. AppwrapWidget / NotificationService). Its bundle id MUST be a child `<APP_ID>.<name>`
+# (Apple rejects an extension whose id equals the app's or has >1 extra period), and it needs its
+# OWN App Store profile. NS already stamps the correct child PRODUCT_BUNDLE_IDENTIFIER at prepare —
+# the per-target signing below must NOT clobber it (a single unscoped update_code_signing_settings
+# rewrites EVERY target's bundle id to APP_ID → collision at upload).
+def appwrap_ios_extensions
+  ext_root = File.expand_path('../App_Resources/iOS/extensions', __dir__)
+  return [] unless Dir.exist?(ext_root)
+  Dir.children(ext_root)
+     .select { |name| File.file?(File.join(ext_root, name, 'extension.json')) }
+     .sort
+end
+
 # Run `ns prepare` (which shells out to `pod install`) with a SANITIZED gem env.
 #
 # Why: fastlane runs under its own Ruby and exports GEM_HOME/GEM_PATH into every child process. On a
@@ -50,8 +65,12 @@ def appwrap_archive_and_sign_ios
     is_key_content_base64: true
   )
 
-  # readonly: certs/profiles must be seeded once via `fastlane match appstore` (see workflow header).
-  match(type: 'appstore', readonly: true, app_identifier: APP_ID,
+  # The app AND each extension sign with their OWN App Store profile — pull them all here.
+  # readonly: certs/profiles must be seeded once via `fastlane match appstore` (see workflow header);
+  # regenerate them (incl. per-extension) via the `regen_profiles` lane if capabilities changed.
+  extensions = appwrap_ios_extensions
+  ext_ids = extensions.map { |name| "#{APP_ID}.#{name}" }
+  match(type: 'appstore', readonly: true, app_identifier: [APP_ID, *ext_ids],
         git_url: ENV['MATCH_GIT_URL'], api_key: api_key)
 
   # NativeScript prepares the Xcode project inside the wrapper dir (native/ = parent of fastlane/).
@@ -59,22 +78,44 @@ def appwrap_archive_and_sign_ios
   appwrap_prepare_ios
 
   # NS defaults the project to automatic signing → archive can't find a profile. Pin manual signing
-  # to the match-provided App Store profile (name exported by match into ENV).
-  profile = ENV["sigh_#{APP_ID}_appstore_profile-name"] || "match AppStore #{APP_ID}"
+  # PER TARGET to the match-provided App Store profile (name exported by match into ENV). `targets:`
+  # is REQUIRED so each call scopes to ONE target — an unscoped call rewrites EVERY target's
+  # bundle_identifier to APP_ID, clobbering the extensions' child ids → CFBundleIdentifier collision.
+  provisioning = {}
+  resolve_profile = ->(bundle_id) { ENV["sigh_#{bundle_id}_appstore_profile-name"] || "match AppStore #{bundle_id}" }
+
+  app_profile = resolve_profile.call(APP_ID)
+  provisioning[APP_ID] = app_profile
   update_code_signing_settings(
     use_automatic_signing: false,
     path: 'platforms/ios/native.xcodeproj',
+    targets: ['native'], # main app target only — leave NS's child ids on the extensions untouched
     team_id: TEAM_ID,
     bundle_identifier: APP_ID,
     code_sign_identity: 'Apple Distribution',
-    profile_name: profile
+    profile_name: app_profile
   )
 
+  extensions.each do |name|
+    ext_id = "#{APP_ID}.#{name}"
+    ext_profile = resolve_profile.call(ext_id)
+    provisioning[ext_id] = ext_profile
+    update_code_signing_settings(
+      use_automatic_signing: false,
+      path: 'platforms/ios/native.xcodeproj',
+      targets: [name],
+      team_id: TEAM_ID,
+      bundle_identifier: ext_id,
+      code_sign_identity: 'Apple Distribution',
+      profile_name: ext_profile
+    )
+  end
+
   build_app(
     workspace: 'platforms/ios/native.xcworkspace',
     scheme: 'native',
     export_method: 'app-store',
-    export_options: { provisioningProfiles: { APP_ID => profile } }
+    export_options: { provisioningProfiles: provisioning }
   )
 
   api_key