fix(ionic-angular): support --directory with Capacitor projects (#384)

nxtend-team · Jan 5, 2021 · 60a0db8 · 60a0db8
1 parent 59d174f
commit 60a0db8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/apps/docs/blog/draft/2020-12-02-nxtend-11.0.0.md b/apps/docs/blog/draft/2020-12-02-nxtend-11.0.0.md
@@ -56,6 +56,10 @@ I hope the users of this plugin will understand this decision. Removing function
 - add additional Ionic starter templates to application schematic
 - support `none` as a unit test and e2e config for the application schematic
 
+## Bug Fixes
+
+- fix generating an application in a sub-directory with Capacitor enabled
+
 # Capacitor
 
 ## Features

diff --git a/packages/ionic-angular/CHANGELOG.md b/packages/ionic-angular/CHANGELOG.md
@@ -9,6 +9,10 @@
 - add additional Ionic starter templates to application schematic
 - support `none` as a unit test and e2e config for the application schematic
 
+## Bug Fixes
+
+- fix generating an application in a sub-directory with Capacitor enabled
+
 # 1.1.0
 
 ## Features

diff --git a/packages/ionic-angular/src/schematics/application/lib/external-schematic.ts b/packages/ionic-angular/src/schematics/application/lib/external-schematic.ts
@@ -24,7 +24,7 @@ export function generateCapacitorProject(options: NormalizedSchema): Rule {
 
     return options.capacitor
       ? externalSchematic('@nxtend/capacitor', 'capacitor-project', {
-          project: options.name,
+          project: options.projectName,
           appName: options.appName,
           appId: 'io.ionic.starter',
           npmClient,

diff --git a/packages/ionic-angular/src/schematics/application/schematic.spec.ts b/packages/ionic-angular/src/schematics/application/schematic.spec.ts
@@ -222,6 +222,20 @@ describe('application schematic', () => {
 
       expect(tree.exists('apps/my-dir/my-app/src/main.ts'));
     });
+
+    it('should generate Capacitor project', async () => {
+      const tree = await testRunner
+        .runSchematicAsync(
+          'application',
+          { ...options, directory: 'my-dir', capacitor: true },
+          appTree
+        )
+        .toPromise();
+
+      expect(
+        readJsonInTree(tree, `apps/my-dir/my-app/capacitor.config.json`)
+      ).toBeDefined();
+    });
   });
 
   describe('--unitTestRunner', () => {