feat: add useFvm in the plugin options (nx.json) to control whether…

… to use `FVM`to run `flutter`
tinesoft · Jun 21, 2024 · a4e9878 · a4e9878
1 parent a1b7e03
commit a4e9878
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/nx-flutter/src/graph/plugin.ts b/packages/nx-flutter/src/graph/plugin.ts
@@ -1,4 +1,7 @@
+import { isFlutterInstalled } from '../utils/flutter-utils';
+
 export interface NxFlutterPluginOptions {
+  useFvm?: boolean;
   analyzeTargetName?: string;
   cleanTargetName?: string;
   formatTargetName?: string;
@@ -23,8 +26,11 @@ export function normalizePluginOptions(
   opts?: NxFlutterPluginOptions
 ): NxFlutterPluginOptions {
   const options = opts ?? {};
+  const isFvmInstalled = isFlutterInstalled(true);
+
   return {
     ...options,
+    useFvm: options.useFvm && isFvmInstalled,
     analyzeTargetName: options.analyzeTargetName ?? 'analyze',
     cleanTargetName: options.cleanTargetName ?? 'clean',
     formatTargetName: options.formatTargetName ?? 'format',

diff --git a/packages/nx-flutter/src/utils/plugin-utils.ts b/packages/nx-flutter/src/utils/plugin-utils.ts
@@ -23,7 +23,6 @@ export function getProjectTypeAndTargetsFromFile(
 
   const platforms: PlatformType[] = [];
   let template: TemplateType = 'app';
-  const useFvm = isFlutterInstalled(true);
 
   if (hasProjectFile({ root }, 'android')) platforms.push('android');
   if (hasProjectFile({ root }, 'ios')) platforms.push('ios');
@@ -43,7 +42,6 @@ export function getProjectTypeAndTargetsFromFile(
     root,
     template,
     platforms,
-    useFvm,
     normalizePluginOptions(pluginOptions)
   );
 }
@@ -53,16 +51,14 @@ export function getProjectTypeAndTargetsFromOptions(options: NormalizedSchema) {
     options.projectRoot,
     options.template,
     options.platforms,
-    options.useFvm,
-    normalizePluginOptions()
+    normalizePluginOptions({ useFvm: options.useFvm })
   );
 }
 
 function getProjectTypeAndTargets(
   projectRoot: string,
   template: TemplateType,
   platforms: PlatformType[],
-  useFvm: boolean,
   pluginOptions: NxFlutterPluginOptions
 ) {
   const targets = {};
@@ -115,7 +111,7 @@ function getProjectTypeAndTargets(
         command: `${
           command.key === pluginOptions.formatTargetName
             ? 'dart'
-            : `${useFvm === true ? 'fvm ' : ''}flutter`
+            : `${pluginOptions.useFvm === true ? 'fvm ' : ''}flutter`
         } ${command.value}`,
         cwd: projectRoot,
       },