fix(ionic-react): fix build target + fix e2e tests

e2e/ionic-react-e2e/project.json

@@ -4,6 +4,7 @@
   "projectType": "application",
   "sourceRoot": "e2e/ionic-react-e2e/tests",
   "targets": {
+    "e2e": {},
     "lint": {
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]

e2e/ionic-react-e2e/tests/ionic-react.spec.ts

@@ -1,9 +1,7 @@
 import { runNxCommandAsync, uniq } from '@nx/plugin/testing';
-import { createTestProject, installPlugin } from '@nxext/e2e-utils';
+import { createTestProject, installPlugin, stripAnsi } from '@nxext/e2e-utils';
 import { rmSync } from 'fs';
 
-const ansiEscapeCodeRegex = /\x1B\[[0-?]*[ -/]*[@-~]/g;
-
 describe('ionic-react-project e2e', () => {
   let projectDirectory: string;
   const app = uniq('ionic-react');
@@ -13,7 +11,7 @@ describe('ionic-react-project e2e', () => {
     installPlugin(projectDirectory, 'ionic-react');
 
     await runNxCommandAsync(
-      `generate @nx/react:application ${app} --style=css --minimal --e2eTestRunner=none --linter=none --projectNameAndRootFormat=derived --skipFormat=true`
+      `generate @nx/react:application ${app} --style=css --bundler=vite --unitTestRunner=vitest --minimal --e2eTestRunner=none --linter=none --projectNameAndRootFormat=derived --skipFormat=true`
     );
     await runNxCommandAsync(
       `generate @nxext/ionic-react:configuration --project=${app} --appName=test --appId=test --skipFormat=true`
@@ -30,14 +28,14 @@ describe('ionic-react-project e2e', () => {
 
   it('should build successfully', async () => {
     const buildResults = await runNxCommandAsync(`build ${app}`);
-    expect(buildResults.stdout.replace(ansiEscapeCodeRegex, '')).toContain(
+    expect(stripAnsi(buildResults.stdout)).toContain(
       `Successfully ran target build for project ${app}`
     );
   });
 
   it('should run tests successfully', async () => {
     const testResults = await runNxCommandAsync(`test ${app}`);
-    expect(testResults.stdout.replace(ansiEscapeCodeRegex, '')).toContain(
+    expect(stripAnsi(testResults.stdout)).toContain(
       `Successfully ran target test for project ${app}`
     );
   });

nx.json

@@ -96,7 +96,7 @@
       "cache": true
     },
     "nx-release-publish": {
-      "dependsOn": ["build"],
+      "dependsOn": ["^build"],
       "options": {
         "packageRoot": "dist/{projectRoot}"
       }
@@ -116,11 +116,10 @@
     "projects": ["packages/*", "!common"],
     "projectsRelationship": "independent",
     "version": {
+      "conventionalCommits": true,
       "generatorOptions": {
-        "currentVersionResolver": "git-tag",
         "fallbackCurrentVersionResolver": "disk",
-        "updateDependents": "auto",
-        "specifierSource": "conventional-commits"
+        "updateDependents": "auto"
       }
     },
     "changelog": {

packages/capacitor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxext/capacitor",
-  "version": "19.1.1",
+  "version": "0.0.0-e2e",
   "description": "An Nx plugin for developing cross-platform applications using Capacitor",
   "homepage": "https://nxext.github.io/nx-extensions/docs/capacitor/getting-started.html",
   "repository": {
@@ -18,10 +18,11 @@
   "schematics": "./generators.json",
   "builders": "./executors.json",
   "dependencies": {
-    "@nx/devkit": "^19.0.0",
-    "nx": "^19.0.0",
     "ignore": "^5.3.1",
     "tslib": "^2.3.0"
   },
-  "peerDependencies": {}
+  "peerDependencies": {
+    "@nx/devkit": "^19.0.0",
+    "nx": "^19.0.0"
+  }
 }

packages/ionic-angular/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nxext/ionic-angular",
   "description": "An Nx plugin for developing Ionic Angular applications",
-  "version": "19.1.1",
+  "version": "0.0.0-e2e",
   "homepage": "https://nxext.github.io/nx-extensions/docs/ionic-angular/overview.html",
   "repository": {
     "type": "git",
@@ -20,12 +20,13 @@
   "schematics": "./generators.json",
   "builders": "./executors.json",
   "dependencies": {
-    "@nxext/capacitor": "^19.1.1",
-    "@nx/devkit": "^19.0.0",
-    "@nx/angular": "^19.0.0",
+    "@nxext/capacitor": "^0.0.0-e2e",
     "tslib": "^2.3.0",
     "typescript": "5.5.4",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
-  "peerDependencies": {}
+  "peerDependencies": {
+    "@nx/devkit": "^19.0.0",
+    "@nx/angular": "^19.0.0"
+  }
 }

packages/ionic-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxext/ionic-react",
-  "version": "19.1.1",
+  "version": "0.0.0-e2e",
   "description": "An Nx plugin for developing Ionic React applications and libraries",
   "homepage": "https://nxext.github.io/nx-extensions/docs/ionic-react/overview.html",
   "repository": {
@@ -20,9 +20,10 @@
   "schematics": "./generators.json",
   "builders": "./executors.json",
   "dependencies": {
-    "@nxext/capacitor": "^19.1.1",
-    "@nx/devkit": "^19.0.0",
+    "@nxext/capacitor": "^0.0.0-e2e",
     "tslib": "^2.3.0"
   },
-  "peerDependencies": {}
+  "peerDependencies": {
+    "@nx/devkit": "^19.0.0"
+  }
 }

packages/ionic-react/src/generators/configuration/lib/add-dependencies.ts

@@ -3,6 +3,10 @@ import {
   ionicReactRouterVersion,
   ionicReactVersion,
   ionIconsVersion,
+  reactRouterVersion,
+  capacitorPluginsVersion,
+  reactRouterDomTypesVersion,
+  reactRouterTypesVersion,
 } from '../../../utils/versions';
 
 export function addDependencies(host: Tree) {
@@ -12,7 +16,18 @@ export function addDependencies(host: Tree) {
       '@ionic/react': ionicReactVersion,
       '@ionic/react-router': ionicReactRouterVersion,
       ionicons: ionIconsVersion,
+      '@capacitor/haptics': capacitorPluginsVersion,
+      '@capacitor/keyboard': capacitorPluginsVersion,
+      '@capacitor/status-bar': capacitorPluginsVersion,
+      /**
+       * Following deps are overwrite because React Router v6 is not compatible with Ionic React Router
+       */
+      'react-router': reactRouterVersion,
+      'react-router-dom': reactRouterVersion,
     },
-    {}
+    {
+      '@types/react-router': reactRouterTypesVersion,
+      '@types/react-router-dom': reactRouterDomTypesVersion,
+    }
   );
 }

packages/ionic-react/src/utils/versions.ts

@@ -1,3 +1,11 @@
 export const ionicReactVersion = '^8.0.0';
 export const ionicReactRouterVersion = '^8.0.0';
 export const ionIconsVersion = '^7.0.0';
+export const capacitorPluginsVersion = '^6.0.0';
+/**
+ * React Router v6 is not compatible with Ionic React Router, so we force using the v5
+ * See: https://github.com/ionic-team/ionic-framework/issues/24177, https://github.com/ionic-team/ionic-framework/blob/main/packages/react-router/package.json#L46
+ */
+export const reactRouterVersion = '^5.3.4';
+export const reactRouterTypesVersion = '^5.1.20';
+export const reactRouterDomTypesVersion = '^5.3.3';

packages/preact/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxext/preact",
-  "version": "19.0.1",
+  "version": "0.0.0-e2e",
   "license": "MIT",
   "author": "Jordan Hall",
   "description": "Nx plugin for preact",

packages/solid/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxext/solid",
-  "version": "19.0.1",
+  "version": "0.0.0-e2e",
   "license": "MIT",
   "author": "Dominik Pieper",
   "description": "Nx plugin for solid",

packages/stencil/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxext/stencil",
-  "version": "19.0.1",
+  "version": "0.0.0-e2e",
   "license": "MIT",
   "author": "Dominik Pieper",
   "description": "Nx plugin for stenciljs",

packages/svelte/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxext/svelte",
-  "version": "19.0.1",
+  "version": "0.0.0-e2e",
   "license": "MIT",
   "author": "Dominik Pieper",
   "description": "Nx plugin for Svelte",

packages/sveltekit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxext/sveltekit",
-  "version": "19.0.1",
+  "version": "0.0.0-e2e",
   "license": "MIT",
   "author": "Dominik Pieper",
   "description": "Nx plugin for Sveltekit",

tools/scripts/start-local-registry.ts

@@ -3,6 +3,7 @@
  * It is meant to be called in jest's globalSetup.
  */
 import { startLocalRegistry } from '@nx/js/plugins/jest/local-registry';
+import { execFileSync } from 'child_process';
 import { releasePublish, releaseVersion } from 'nx/release';
 
 export default async () => {
@@ -30,6 +31,15 @@ export default async () => {
     },
   });
 
+  execFileSync('pnpm', [
+    'nx',
+    'run-many',
+    '-t',
+    'build',
+    '--exclude',
+    'docs,common',
+  ]);
+
   await releasePublish({
     tag: 'e2e',
     firstRelease: true,