Extend capacitor plugin for android + ios configs (closes #604)

webpro-nl · May 2, 2024 · 4af5c86 · 4af5c86
1 parent 9d05b6a
commit 4af5c86
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 6 deletions.
diff --git a/packages/knip/fixtures/plugins/capacitor/android/capacitor.settings.gradle b/packages/knip/fixtures/plugins/capacitor/android/capacitor.settings.gradle
@@ -0,0 +1,15 @@
+// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
+include ':capacitor-android'
+project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
+
+include ':capacitor-app'
+project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
+
+include ':capacitor-haptics'
+project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
+
+include ':capacitor-keyboard'
+project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
+
+include ':capacitor-status-bar'
+project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
diff --git a/packages/knip/fixtures/plugins/capacitor/capacitor.config.json b/packages/knip/fixtures/plugins/capacitor/capacitor.config.json
@@ -3,7 +3,6 @@
   "appName": "name",
   "includePlugins": [
     "@capacitor-community/http",
-    "@capacitor/android",
     "@capacitor/app",
     "@capacitor/splash-screen",
     "@capacitor/status-bar",

diff --git a/packages/knip/fixtures/plugins/capacitor/capacitor.config.ts b/packages/knip/fixtures/plugins/capacitor/capacitor.config.ts
@@ -1,12 +1,11 @@
-import { CapacitorConfig } from '@capacitor/cli';
+import type { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = {
   appId: 'com.company.name',
   appName: 'name',
   includePlugins: [
     '@capacitor-community/http',
     '@capacitor/app',
-    '@capacitor/ios',
     '@capacitor/splash-screen',
     '@capacitor/status-bar',
     '@capacitor/storage',

diff --git a/packages/knip/fixtures/plugins/capacitor/ios/App/Podfile b/packages/knip/fixtures/plugins/capacitor/ios/App/Podfile
@@ -0,0 +1,27 @@
+require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
+
+platform :ios, '13.0'
+use_frameworks!
+
+# workaround to avoid Xcode caching of Pods that requires
+# Product -> Clean Build Folder after new Cordova plugins installed
+# Requires CocoaPods 1.6 or newer
+install! 'cocoapods', :disable_input_output_paths => true
+
+def capacitor_pods
+  pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
+  pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
+  pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
+  pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
+  pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
+end
+
+target 'App' do
+  capacitor_pods
+  # Add your Pods here
+end
+
+post_install do |installer|
+  assertDeploymentTarget(installer)
+end
diff --git a/packages/knip/src/plugins/capacitor/index.ts b/packages/knip/src/plugins/capacitor/index.ts
@@ -1,4 +1,6 @@
 import type { IsPluginEnabled, Plugin, ResolveConfig } from '#p/types/plugins.js';
+import { isFile } from '#p/util/fs.js';
+import { join } from '#p/util/path.js';
 import { hasDependency } from '#p/util/plugin.js';
 import type { CapacitorConfig } from './types.js';
 
@@ -12,8 +14,16 @@ const isEnabled: IsPluginEnabled = ({ dependencies }) => hasDependency(dependenc
 
 const config = ['capacitor.config.{json,ts}'];
 
-const resolveConfig: ResolveConfig<CapacitorConfig> = config => {
-  return config.includePlugins ?? [];
+const resolveConfig: ResolveConfig<CapacitorConfig> = async (config, { configFileDir }) => {
+  const exists = (filePath: string) => isFile(join(configFileDir, filePath));
+
+  const plugins = config.includePlugins ?? [];
+  const android = (await exists('android/capacitor.settings.gradle')) ? ['@capacitor/android'] : [];
+  const ios = (await exists('ios/App/Podfile')) ? ['@capacitor/ios'] : [];
+
+  console.log({ android, ios });
+
+  return [...plugins, ...android, ...ios];
 };
 
 export default {

diff --git a/packages/knip/test/plugins/capacitor.test.ts b/packages/knip/test/plugins/capacitor.test.ts
@@ -15,6 +15,7 @@ test('Find dependencies with the Capacitor plugin', async () => {
 
   assert(issues.unlisted['capacitor.config.json']['@capacitor-community/http']);
   assert(issues.unlisted['capacitor.config.json']['@capacitor/android']);
+  assert(issues.unlisted['capacitor.config.json']['@capacitor/ios']);
   assert(issues.unlisted['capacitor.config.json']['@capacitor/app']);
   assert(issues.unlisted['capacitor.config.json']['@capacitor/splash-screen']);
   assert(issues.unlisted['capacitor.config.json']['@capacitor/status-bar']);
@@ -23,6 +24,7 @@ test('Find dependencies with the Capacitor plugin', async () => {
 
   assert(issues.unlisted['capacitor.config.ts']['@capacitor-community/http']);
   assert(issues.unlisted['capacitor.config.ts']['@capacitor/app']);
+  assert(issues.unlisted['capacitor.config.ts']['@capacitor/android']);
   assert(issues.unlisted['capacitor.config.ts']['@capacitor/ios']);
   assert(issues.unlisted['capacitor.config.ts']['@capacitor/splash-screen']);
   assert(issues.unlisted['capacitor.config.ts']['@capacitor/status-bar']);
@@ -31,7 +33,7 @@ test('Find dependencies with the Capacitor plugin', async () => {
 
   assert.deepEqual(counters, {
     ...baseCounters,
-    unlisted: 14,
+    unlisted: 16,
     processed: 1,
     total: 1,
   });