kasy-cli 1.31.4 → 1.31.5

package/lib/commands/add.js

@@ -8,6 +8,7 @@ const kleur = require('kleur');
 const ui = require('../utils/ui');
 const { printCompactHeader, paintLime } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
+const { augmentedEnv } = require('../utils/env-tools');
 const {
   AVAILABLE_FEATURES,
   FEATURES_PATCH_DIR,
@@ -797,7 +798,7 @@ async function runAdd(module, options = {}) {
     const spinner = ui.spinner({ color: paintLime });
     spinner.start(t('add.pubGet'));
     try {
-      await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
+      await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000, env: augmentedEnv() });
       spinner.stop(t('add.pubGetDone'));
     } catch {
       spinner.stop(`⚠ ${t('add.pubGetFailed')}`);

package/lib/commands/remove.js

@@ -9,6 +9,7 @@ const kleur = require('kleur');
 const ui = require('../utils/ui');
 const { printCompactHeader } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
+const { augmentedEnv } = require('../utils/env-tools');
 const {
   AVAILABLE_FEATURES,
   normalizeFeature,
@@ -471,7 +472,7 @@ async function runRemove(module, options = {}) {
     const spinner = ui.spinner();
     spinner.start(t('remove.pubGet'));
     try {
-      await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
+      await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000, env: augmentedEnv() });
       spinner.stop(t('remove.pubGetDone'));
     } catch {
       spinner.stop(`⚠ ${t('remove.pubGetFailed')}`);

package/lib/commands/reset.js

@@ -7,6 +7,9 @@ const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { printCompactHeader } = require('../utils/brand');
 const { readBundleId, readPackageName } = require('../utils/mobile-identity');
 const { spawnFlutterWithSpinner } = require('../utils/flutter-run');
+const { augmentedEnv } = require('../utils/env-tools');
+
+const isWindows = process.platform === 'win32';
 
 function runCmd(cmd, args) {
   const res = spawnSync(cmd, args, { encoding: 'utf8' });
@@ -21,6 +24,8 @@ async function listFlutterDevices(projectDir) {
   const res = spawnSync('flutter', ['devices', '--machine'], {
     cwd: projectDir,
     encoding: 'utf8',
+    env: augmentedEnv(),
+    shell: isWindows,
   });
   if (res.status !== 0) return [];
   try {

package/lib/commands/run.js

@@ -6,11 +6,20 @@ const ui = require('../utils/ui');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { printCompactHeader, paintLime } = require('../utils/brand');
 const { spawnFlutterWithSpinner } = require('../utils/flutter-run');
+const { augmentedEnv } = require('../utils/env-tools');
+
+const isWindows = process.platform === 'win32';
 
 function listFlutterDevices(projectDir) {
+  // Same as `kasy run`'s launcher: expose a freshly-installed Flutter SDK via
+  // augmentedEnv() (the terminal's PATH may not have it yet), and use a shell on
+  // Windows so the flutter.bat is found. Without this, a machine that just ran
+  // `kasy new` reports "Flutter not found" here even though Flutter is installed.
   const res = spawnSync('flutter', ['devices', '--machine'], {
     cwd: projectDir,
     encoding: 'utf8',
+    env: augmentedEnv(),
+    shell: isWindows,
   });
   if (res.status !== 0) return [];
   try {

package/lib/commands/update.js

@@ -9,6 +9,7 @@ const kleur = require('kleur');
 const ui = require('../utils/ui');
 const { printCompactHeader, paintLime } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
+const { augmentedEnv } = require('../utils/env-tools');
 const {
   AVAILABLE_FEATURES,
   BASE_COMPONENT_FILES,
@@ -204,7 +205,7 @@ async function runUpdate(module, options = {}) {
         const spinnerPubGet = ui.spinner({ color: paintLime });
         spinnerPubGet.start(t('update.pubGet'));
         try {
-          await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
+          await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000, env: augmentedEnv() });
           spinnerPubGet.stop(t('update.pubGetDone'));
         } catch {
           spinnerPubGet.stop(`⚠ ${t('update.pubGetFailed')}`);
@@ -252,7 +253,7 @@ async function runUpdate(module, options = {}) {
         const spinnerPubGet = ui.spinner({ color: paintLime });
         spinnerPubGet.start(t('update.pubGet'));
         try {
-          await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
+          await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000, env: augmentedEnv() });
           spinnerPubGet.stop(t('update.pubGetDone'));
         } catch {
           spinnerPubGet.stop(`⚠ ${t('update.pubGetFailed')}`);
@@ -365,7 +366,7 @@ async function runUpdate(module, options = {}) {
       const spinner = ui.spinner({ color: paintLime });
       spinner.start(t('update.pubGet'));
       try {
-        await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
+        await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000, env: augmentedEnv() });
         spinner.stop(t('update.pubGetDone'));
       } catch {
         spinner.stop(`⚠ ${t('update.pubGetFailed')}`);

package/lib/utils/flutter-run.js

@@ -31,6 +31,26 @@ const fs = require('node:fs');
 const { spawn } = require('node:child_process');
 const kleur = require('kleur');
 const ui = require('./ui');
+const { augmentedEnv } = require('./env-tools');
+
+const isWindows = process.platform === 'win32';
+
+// `flutter` runs from an SDK that may have been installed by `kasy new` in this
+// same session — and Windows only refreshes PATH for NEW terminals, so the
+// current one doesn't see it yet. augmentedEnv() exposes %LOCALAPPDATA%\flutter\bin
+// (and the pub-cache bin) so `kasy run` finds flutter exactly like `kasy new` did.
+// On Windows `flutter` is a .bat, which Node's spawn() refuses to run without a
+// shell — hence shell:true there. With shell:true the args become a command line,
+// so any arg with a space must be quoted (our flutter args normally have none,
+// but a dart-define value could).
+function flutterSpawnOptions(extra = {}) {
+  return { env: augmentedEnv(), shell: isWindows, ...extra };
+}
+
+function safeArgs(args) {
+  if (!isWindows) return args;
+  return args.map((a) => (/\s/.test(a) ? `"${a}"` : a));
+}
 
 // Markers that tell us the initial build is done and the app is running.
 const FLUTTER_READY_RE = /Flutter run key commands\.|is listening on|VM Service|Dart VM service|To hot reload|Hot restart/i;
@@ -140,10 +160,10 @@ function spawnFlutterWithSpinner(args, projectDir, t, options = {}) {
  */
 function spawnRaw(args, projectDir, t, log, onReady) {
   return new Promise((resolve, reject) => {
-    const proc = spawn('flutter', args, {
+    const proc = spawn('flutter', safeArgs(args), flutterSpawnOptions({
       cwd: projectDir,
       stdio: ['inherit', 'pipe', 'pipe'],
-    });
+    }));
 
     let readyFired = false;
     const fireReady = () => {
@@ -192,10 +212,10 @@ function spawnRaw(args, projectDir, t, log, onReady) {
  */
 function spawnWithSpinner(args, projectDir, t, log, onReady) {
   return new Promise((resolve, reject) => {
-    const proc = spawn('flutter', args, {
+    const proc = spawn('flutter', safeArgs(args), flutterSpawnOptions({
       cwd: projectDir,
       stdio: ['pipe', 'pipe', 'pipe'],
-    });
+    }));
 
     const spinner = ui.spinner();
     const startTime = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.31.4",
+  "version": "1.31.5",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"

package/templates/firebase/lib/core/config/app_env.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart' show kReleaseMode;
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 const String _kEnvFromDefine = String.fromEnvironment(
@@ -16,6 +17,15 @@ const String _kRcAndroidApiKeyFromDefine = String.fromEnvironment(
 const String _kRcIosApiKeyFromDefine = String.fromEnvironment(
   'RC_IOS_API_KEY',
 );
+const String _kRcTestKeyFromDefine = String.fromEnvironment(
+  'RC_TEST_KEY',
+);
+const String _kRcIosProdKeyFromDefine = String.fromEnvironment(
+  'RC_IOS_PROD_KEY',
+);
+const String _kRcAndroidProdKeyFromDefine = String.fromEnvironment(
+  'RC_ANDROID_PROD_KEY',
+);
 const String _kMixpanelTokenFromDefine = String.fromEnvironment(
   'MIXPANEL_TOKEN',
 );
@@ -57,13 +67,43 @@ class AppEnv {
     dartDefineValue: _kSupabaseTokenFromDefine,
   );
 
-  static String get rcAndroidApiKey => _resolve(
-    key: 'RC_ANDROID_API_KEY',
-    dartDefineValue: _kRcAndroidApiKeyFromDefine,
+  /// RevenueCat "Test Store" public key (`test_…`). Works only against the
+  /// RevenueCat fake store (simulator/emulator); the native SDK rejects it in
+  /// release builds.
+  static String get rcTestKey =>
+      _resolve(key: 'RC_TEST_KEY', dartDefineValue: _kRcTestKeyFromDefine);
+
+  /// RevenueCat production/sandbox iOS key (`appl_…`) — the App Store key used
+  /// on physical devices, TestFlight and production.
+  static String get rcIosProdKey => _resolve(
+    key: 'RC_IOS_PROD_KEY',
+    dartDefineValue: _kRcIosProdKeyFromDefine,
   );
 
-  static String get rcIosApiKey =>
-      _resolve(key: 'RC_IOS_API_KEY', dartDefineValue: _kRcIosApiKeyFromDefine);
+  /// RevenueCat production/sandbox Android key (`goog_…`) — the Play Store key
+  /// used on physical devices, internal testing and production.
+  static String get rcAndroidProdKey => _resolve(
+    key: 'RC_ANDROID_PROD_KEY',
+    dartDefineValue: _kRcAndroidProdKeyFromDefine,
+  );
+
+  /// Effective RevenueCat key for Android, resolved for the current build.
+  static String get rcAndroidApiKey => _resolveRcKey(
+    explicit: _resolve(
+      key: 'RC_ANDROID_API_KEY',
+      dartDefineValue: _kRcAndroidApiKeyFromDefine,
+    ),
+    prodKey: rcAndroidProdKey,
+  );
+
+  /// Effective RevenueCat key for iOS, resolved for the current build.
+  static String get rcIosApiKey => _resolveRcKey(
+    explicit: _resolve(
+      key: 'RC_IOS_API_KEY',
+      dartDefineValue: _kRcIosApiKeyFromDefine,
+    ),
+    prodKey: rcIosProdKey,
+  );
 
   static String get mixpanelToken => _resolve(
     key: 'MIXPANEL_TOKEN',
@@ -91,4 +131,36 @@ class AppEnv {
     if (dartDefineValue.isNotEmpty) return dartDefineValue;
     return defaultValue;
   }
+
+  /// Resolve the RevenueCat key that actually works for the current build.
+  ///
+  /// A Test Store key (`test_…`) only works against RevenueCat's fake store
+  /// (simulator/emulator); the native SDK refuses it in release builds and the
+  /// paywall comes up empty. So:
+  ///
+  ///   - Release builds (TestFlight / App Store / Play Store) always use the
+  ///     production key (`appl_…` / `goog_…`), read from the bundled `.env`
+  ///     (`RC_IOS_PROD_KEY` / `RC_ANDROID_PROD_KEY`). Because `.env` ships as an
+  ///     asset, this holds no matter how the IPA/AAB was built (`kasy ios
+  ///     release`, Xcode archive, Codemagic, `flutter build …`). An explicit
+  ///     non-test key (injected by `kasy run` on a device, or by Codemagic
+  ///     variable groups) still wins.
+  ///   - Debug builds honor whatever `kasy run` injected (`test_` for
+  ///     simulators, the prod key for physical devices) and fall back to the
+  ///     Test Store key.
+  static String _resolveRcKey({
+    required String explicit,
+    required String prodKey,
+  }) {
+    final bool explicitIsTest = explicit.startsWith('test_');
+    if (kReleaseMode) {
+      if (explicit.isNotEmpty && !explicitIsTest) return explicit;
+      if (prodKey.isNotEmpty) return prodKey;
+      return explicit;
+    }
+    if (explicit.isNotEmpty) return explicit;
+    final String test = rcTestKey;
+    if (test.isNotEmpty) return test;
+    return prodKey;
+  }
 }

package/templates/firebase/pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+35
+version: 1.0.0+36
 
 environment:
   sdk: ^3.11.0