feat(capacitor): add inference plugin

nxext · Dec 7, 2024 · 6f2d7a5 · 6f2d7a5
1 parent 9bf02a4
commit 6f2d7a5
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 80 deletions.
diff --git a/packages/capacitor/package.json b/packages/capacitor/package.json
@@ -19,7 +19,8 @@
   "builders": "./executors.json",
   "dependencies": {
     "ignore": "^5.3.1",
-    "tslib": "^2.3.0"
+    "tslib": "^2.3.0",
+    "@nxext/common": "^19.0.0"
   },
   "peerDependencies": {
     "@nx/devkit": "^20.0.0",

diff --git a/packages/capacitor/src/generators/configuration/generator.spec.ts b/packages/capacitor/src/generators/configuration/generator.spec.ts
@@ -2,6 +2,7 @@ import {
   addProjectConfiguration,
   normalizePath,
   readJson,
+  readNxJson,
   readProjectConfiguration,
   Tree,
   writeJson,
@@ -90,84 +91,10 @@ describe('capacitor-project', () => {
       );
     });
 
-    it('should update workspace.json', async () => {
+    it('should update nx.json', async () => {
       await generator(appTree, options);
-      const projectConfiguration = readProjectConfiguration(
-        appTree,
-        options.project
-      );
-
-      expect(projectConfiguration.targets.cap.executor).toEqual(
-        '@nxext/capacitor:cap'
-      );
-      expect(projectConfiguration.targets.cap.options).toEqual({
-        cmd: '--help',
-      });
-
-      expect(projectConfiguration.targets.add.executor).toEqual(
-        '@nxext/capacitor:cap'
-      );
-      expect(projectConfiguration.targets.add.options).toEqual({
-        cmd: 'add',
-      });
-      expect(
-        projectConfiguration.targets.add.configurations['ios'].cmd
-      ).toEqual('add ios');
-      expect(
-        projectConfiguration.targets.add.configurations['android'].cmd
-      ).toEqual('add android');
-
-      expect(projectConfiguration.targets.copy.executor).toEqual(
-        '@nxext/capacitor:cap'
-      );
-      expect(projectConfiguration.targets.copy.options).toEqual({
-        cmd: 'copy',
-      });
-      expect(
-        projectConfiguration.targets.copy.configurations['ios'].cmd
-      ).toEqual('copy ios');
-      expect(
-        projectConfiguration.targets.copy.configurations['android'].cmd
-      ).toEqual('copy android');
-
-      expect(projectConfiguration.targets.open.executor).toEqual(
-        '@nxext/capacitor:cap'
-      );
-      expect(projectConfiguration.targets.open.options).toEqual({
-        cmd: 'open',
-      });
-      expect(
-        projectConfiguration.targets.open.configurations['ios'].cmd
-      ).toEqual('open ios');
-      expect(
-        projectConfiguration.targets.open.configurations['android'].cmd
-      ).toEqual('open android');
-
-      expect(projectConfiguration.targets.sync.executor).toEqual(
-        '@nxext/capacitor:cap'
-      );
-      expect(projectConfiguration.targets.sync.options).toEqual({
-        cmd: 'sync',
-      });
-      expect(
-        projectConfiguration.targets.sync.configurations['ios'].cmd
-      ).toEqual('sync ios');
-      expect(
-        projectConfiguration.targets.sync.configurations['android'].cmd
-      ).toEqual('sync android');
-
-      expect(projectConfiguration.targets.update.executor).toEqual(
-        '@nxext/capacitor:cap'
-      );
-      expect(projectConfiguration.targets.update.options).toEqual({
-        cmd: 'update',
-      });
-      expect(
-        projectConfiguration.targets.update.configurations['ios'].cmd
-      ).toEqual('update ios');
-      expect(
-        projectConfiguration.targets.update.configurations['android'].cmd
-      ).toEqual('update android');
+      const nxJson = readNxJson(appTree);
+      expect(nxJson.plugins).toContain('@nxext/capacitor');
     });
 
     it('should not remove existing target configurations', async () => {

diff --git a/packages/capacitor/src/generators/configuration/generator.ts b/packages/capacitor/src/generators/configuration/generator.ts
@@ -1,12 +1,12 @@
 import { convertNxGenerator, formatFiles, Tree } from '@nx/devkit';
 import { addCapacitorConfig } from './lib/add-capacitor-config';
 import { addDependencies } from './lib/add-dependencies';
-import { addProject } from './lib/add-project';
 import { normalizeOptions } from './lib/normalize-options';
 import { updateProjectGitignore } from './lib/update-project-gitignore';
 import { updateProjectPackageJson } from './lib/update-project-package-json';
 import { CapacitorConfigurationSchema } from './schema';
 import { assertNotUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
+import { addPluginToNxJson } from '@nxext/common';
 
 export async function capacitorConfigurationGenerator(
   host: Tree,
@@ -18,8 +18,8 @@ export async function capacitorConfigurationGenerator(
   const installTask = addDependencies(host);
   addCapacitorConfig(host, normalizedOptions);
   updateProjectGitignore(host, normalizedOptions);
-  addProject(host, normalizedOptions);
   updateProjectPackageJson(host, normalizedOptions);
+  addPluginToNxJson('@nxext/capacitor', host);
 
   if (!options.skipFormat) {
     await formatFiles(host);

diff --git a/packages/capacitor/src/index.ts b/packages/capacitor/src/index.ts
@@ -1,2 +1,3 @@
 export { capacitorConfigurationGenerator } from './generators/configuration/generator';
 export { CapacitorConfigurationSchema } from './generators/configuration/schema';
+export { createNodes, CapacitorPluginOptions } from './plugins/plugin';
diff --git a/packages/capacitor/src/plugins/plugin.ts b/packages/capacitor/src/plugins/plugin.ts
@@ -0,0 +1,41 @@
+import {
+  CreateNodesV2,
+  getPackageManagerCommand,
+  ProjectConfiguration
+} from '@nx/devkit';
+import { dirname } from 'node:path';
+
+const pmc = getPackageManagerCommand();
+
+export interface CapacitorPluginOptions {}
+
+export const createNodes: CreateNodesV2<CapacitorPluginOptions> = [
+  '**/capacitor.config.ts',
+  (configFiles, options, context) => {
+    return configFiles.map((configFile) => {
+      const projectRoot = dirname(configFile);
+      return [
+        projectRoot,
+        {
+          projects: {
+            [projectRoot]: {
+              projectType: 'application',
+              targets: buildTargets(projectRoot),
+            },
+          },
+        },
+      ] as const;
+    });
+  },
+];
+
+function buildTargets(projectRoot: string): ProjectConfiguration['targets'] {
+  return {
+    cap: {
+      command: `${pmc.exec} cap {args.cmd}`,
+      options: {
+        cwd: projectRoot,
+      },
+    },
+  };
+}