Merge branch 'main' into main

paulmojicatech · Mar 12, 2024 · d8f2a24 · d8f2a24
2 parents dfba692 + 725b302
commit d8f2a24
Show file tree

Hide file tree

Showing 22 changed files with 95 additions and 21,015 deletions.
diff --git a/e2e/capacitor-e2e/project.json b/e2e/capacitor-e2e/project.json
@@ -15,10 +15,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["e2e/capacitor-e2e/**/*.ts"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/e2e/ionic-angular-e2e/project.json b/e2e/ionic-angular-e2e/project.json
@@ -15,10 +15,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["e2e/ionic-angular-e2e/**/*.ts"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/e2e/ionic-react-e2e/project.json b/e2e/ionic-react-e2e/project.json
@@ -15,10 +15,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["e2e/ionic-react-e2e/**/*.ts"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/e2e/utils/index.ts b/e2e/utils/index.ts
@@ -22,7 +22,7 @@ export function createTestProject() {
   });
 
   execSync(
-    `npx --yes create-nx-workspace@latest ${projectName} --preset empty --no-nxCloud --no-interactive`,
+    `npx --yes create-nx-workspace@latest ${projectName} --preset empty --nxCloud skip --no-interactive`,
     {
       cwd: dirname(projectDirectory),
       stdio: 'inherit',

diff --git a/migrations.json b/migrations.json
diff --git a/nx.json b/nx.json
@@ -77,14 +77,6 @@
       "inputs": ["production", "^production"],
       "cache": true
     },
-    "lint": {
-      "inputs": [
-        "default",
-        "{workspaceRoot}/.eslintrc.json",
-        "{workspaceRoot}/eslint.config.js"
-      ],
-      "cache": true
-    },
     "@nx/jest:jest": {
       "cache": true,
       "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
@@ -97,6 +89,14 @@
           "codeCoverage": true
         }
       }
+    },
+    "@nx/eslint:lint": {
+      "inputs": [
+        "default",
+        "{workspaceRoot}/.eslintrc.json",
+        "{workspaceRoot}/eslint.config.js"
+      ],
+      "cache": true
     }
   },
   "$schema": "./node_modules/nx/schemas/nx-schema.json",

diff --git a/package.json b/package.json
@@ -49,31 +49,31 @@
   "private": true,
   "packageManager": "pnpm@8.7.0",
   "devDependencies": {
-    "@angular-devkit/core": "16.0.0",
-    "@angular-devkit/schematics": "16.0.0",
+    "@angular-devkit/core": "17.2.1",
+    "@angular-devkit/schematics": "17.2.1",
     "@eslint/eslintrc": "^2.1.1",
     "@eslint/js": "8.49.0",
-    "@nuxt/kit": "3.6.5",
-    "@nx/angular": "17.1.2",
-    "@nx/cypress": "17.1.2",
-    "@nx/devkit": "17.1.2",
-    "@nx/eslint": "17.1.2",
-    "@nx/eslint-plugin": "17.1.2",
-    "@nx/jest": "17.1.2",
-    "@nx/js": "17.1.2",
-    "@nx/node": "17.1.2",
-    "@nx/playwright": "17.1.2",
-    "@nx/plugin": "17.1.2",
-    "@nx/react": "17.1.2",
-    "@nx/storybook": "17.1.2",
-    "@nx/vite": "17.1.2",
-    "@nx/web": "17.1.2",
-    "@nx/workspace": "17.1.2",
-    "@nxext/svelte": "^16.7.0",
+    "@nuxt/kit": "3.10.3",
+    "@nx/angular": "18.0.4",
+    "@nx/cypress": "18.0.4",
+    "@nx/devkit": "18.0.4",
+    "@nx/eslint": "18.0.4",
+    "@nx/eslint-plugin": "18.0.4",
+    "@nx/jest": "18.0.4",
+    "@nx/js": "18.0.4",
+    "@nx/node": "18.0.4",
+    "@nx/playwright": "18.0.4",
+    "@nx/plugin": "18.0.4",
+    "@nx/react": "18.0.4",
+    "@nx/storybook": "18.0.4",
+    "@nx/vite": "18.0.4",
+    "@nx/web": "18.0.4",
+    "@nx/workspace": "18.0.4",
+    "@nxext/svelte": "^17.0.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@schematics/angular": "16.0.0",
+    "@schematics/angular": "17.2.1",
     "@stencil/core": "3.4.0",
-    "@swc-node/register": "1.6.8",
+    "@swc-node/register": "1.8.0",
     "@swc/cli": "0.1.62",
     "@swc/core": "1.3.91",
     "@swc/helpers": "0.5.2",
@@ -82,49 +82,49 @@
     "@types/globrex": "^0.1.2",
     "@types/is-ci": "^3.0.1",
     "@types/jest": "29.5.5",
-    "@types/node": "18.15.3",
+    "@types/node": "18.19.18",
     "@types/yargs": "^17.0.26",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
     "ajv": "6.12.6",
     "all-contributors-cli": "^6.26.1",
     "chalk": "4.1.0",
     "commitizen": "^4.3.0",
-    "cz-customizable": "^6.9.1",
+    "cz-customizable": "^7.0.0",
     "dotenv": "16.3.1",
-    "eslint": "8.46.0",
+    "eslint": "8.48.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-cypress": "2.14.0",
     "file-type": "^18.5.0",
     "fs-extra": "^10.1.0",
     "globrex": "^0.1.2",
-    "husky": "^6.0.0",
-    "ignore": "^5.2.4",
+    "husky": "^9.0.11",
+    "ignore": "^5.3.1",
     "is-ci": "^3.0.1",
-    "jest": "29.4.3",
-    "jest-environment-jsdom": "29.5.0",
-    "jest-environment-node": "^29.4.1",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "jest-environment-node": "^29.7.0",
     "jsonc-eslint-parser": "^2.3.0",
     "jsonc-parser": "^3.2.0",
     "kill-port": "^2.0.1",
     "lint-staged": "13.2.3",
-    "nx": "17.1.2",
+    "nx": "18.0.4",
     "prettier": "2.7.1",
     "pretty-quick": "^3.1.3",
     "tcp-port-used": "^1.0.2",
-    "ts-jest": "29.1.1",
+    "ts-jest": "29.1.2",
     "ts-node": "10.9.1",
     "tslib": "^2.3.0",
     "tslint": "6.1.3",
-    "typescript": "5.2.2",
-    "verdaccio": "5.18.0",
+    "typescript": "5.3.3",
+    "verdaccio": "5.29.2",
     "verdaccio-auth-memory": "^10.2.2",
-    "vitepress": "^1.0.0-rc.20",
+    "vitepress": "^1.0.0-rc.44",
     "yargs": "^17.7.2",
     "yargs-parser": "^21.1.1"
   },
   "peerDependencies": {
-    "rxjs": "^7.4.0"
+    "rxjs": "^7.5.0"
   },
   "lint-staged": {
     "nx.json": [

diff --git a/packages/capacitor/migrations.json b/packages/capacitor/migrations.json
@@ -1,23 +1,23 @@
 {
   "generators": {},
   "packageJsonUpdates": {
-    "16.2.0": {
-      "version": "16.2.0",
+    "18.0.4": {
+      "version": "18.0.4",
       "packages": {
         "@capacitor/core": {
-          "version": "^5.0.3",
+          "version": "^5.7.0",
           "alwaysAddToPackageJson": true
         },
         "@capacitor/cli": {
-          "version": "^5.0.3",
+          "version": "^5.7.0",
           "alwaysAddToPackageJson": true
         },
         "@capacitor/ios": {
-          "version": "^5.0.3",
+          "version": "^5.7.0",
           "alwaysAddToPackageJson": false
         },
         "@capacitor/android": {
-          "version": "^5.0.3",
+          "version": "^5.7.0",
           "alwaysAddToPackageJson": false
         }
       }

diff --git a/packages/capacitor/package.json b/packages/capacitor/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@nxext/capacitor",
-  "version": "17.1.2",
+  "version": "18.0.4",
   "description": "An Nx plugin for developing cross-platform applications using Capacitor",
   "author": {
     "name": "Devin Shoemaker",
     "email": "devinshoe@gmail.com"
   },
-  "homepage": "https://nxext.dev/docs/capacitor/getting-started.html",
+  "homepage": "https://nxext.github.io/nx-extensions-ionic/docs/capacitor/getting-started.html",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nxext/nx-extensions",
+    "url": "https://github.com/nxext/nx-extensions-ionic",
     "directory": "packages/capacitor"
   },
   "license": "MIT",
@@ -24,10 +24,10 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "ignore": "^5.2.4",
-    "@nx/devkit": "^17.1.2",
-    "nx": "^17.1.2"    
+    "@nx/devkit": "18.0.4",
+    "nx": "18.0.4"
   },
   "peerDependencies": {
-    "@nx/web": "17.1.2"
+    "@nx/web": "18.0.4"
   }
 }
diff --git a/packages/capacitor/project.json b/packages/capacitor/project.json
@@ -44,17 +44,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/capacitor/**/*.ts",
-          "packages/capacitor/generators.json",
-          "packages/capacitor/executors.json",
-          "packages/capacitor/package.json",
-          "packages/capacitor/project.json",
-          "packages/capacitor/migrations.json"
-        ]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",

diff --git a/packages/ionic-angular/README.md b/packages/ionic-angular/README.md
@@ -4,8 +4,8 @@
 
 An Nx plugin for developing [Ionic](https://ionicframework.com/docs) Angular applications and libraries.
 
-For more complete documentation, visit [nxext.dev](https://nxext.dev/docs/ionic-angular/overview.html).
+For more complete documentation, visit [nxext.github.io](https://nxext.github.io/nx-extensions-ionic/docs/ionic-angular/overview.html).
 
 ## Usage
 
-Visit the official [Getting Started](https://nxext.dev/docs/ionic-angular/getting-started.html) documentation.
+Visit the official [Getting Started](https://nxext.github.io/nx-extensions-ionic/docs/ionic-angular/getting-started.html) documentation.
diff --git a/packages/ionic-angular/package.json b/packages/ionic-angular/package.json
@@ -1,19 +1,19 @@
 {
   "name": "@nxext/ionic-angular",
-  "version": "17.0.0",
+  "version": "18.0.4",
   "description": "An Nx plugin for developing Ionic React applications and libraries",
   "author": {
     "name": "Devin Shoemaker",
     "email": "devinshoe@gmail.com"
   },
-  "homepage": "https://nxext.dev/docs/ionic-angular/overview.html",
+  "homepage": "https://nxext.github.io/nx-extensions-ionic/docs/ionic-angular/overview.html",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nxext/nx-extensions",
+    "url": "https://github.com/nxext/nx-extensions-ionic",
     "directory": "packages/ionic-angular"
   },
   "bugs": {
-    "url": "https://github.com/nxext/nx-extensions/issues"
+    "url": "https://github.com/nxext/nx-extensions-ionic/issues"
   },
   "license": "MIT",
   "main": "src/index.js",
@@ -26,14 +26,14 @@
   "builders": "./executors.json",
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nxext/capacitor": "^17.0.0",
+    "@nxext/capacitor": "^18.0.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nx/devkit": "^17.1.2",
-    "typescript": "^5.2.2",
-    "@nx/js": "^17.1.2"
+    "@nx/devkit": "18.0.4",
+    "typescript": "5.3.3",
+    "@nx/js": "18.0.4"
   },
   "peerDependencies": {
-    "@nx/angular": "^17.1.2",
-    "@nx/eslint": "^17.1.2"
+    "@nx/angular": "18.0.4",
+    "@nx/eslint": "18.0.4"
   }
 }
diff --git a/packages/ionic-angular/project.json b/packages/ionic-angular/project.json
@@ -39,17 +39,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/ionic-angular/**/*.ts",
-          "packages/ionic-angular/generators.json",
-          "packages/ionic-angular/executors.json",
-          "packages/ionic-angular/package.json",
-          "packages/ionic-angular/project.json",
-          "packages/ionic-angular/migrations.json"
-        ]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",

diff --git a/...nic-angular/src/generators/application/files/sidemenu/src/app/app.component.html.template b/...nic-angular/src/generators/application/files/sidemenu/src/app/app.component.html.template
@@ -4,7 +4,7 @@
       <ion-content>
         <ion-list id="inbox-list">
           <ion-list-header>Inbox</ion-list-header>
-          <ion-note>hi@ionicframework.com</ion-note>
+          <ion-note>hi&#64;ionicframework.com</ion-note>
 
           <ion-menu-toggle auto-hide="false" *ngFor="let p of appPages; let i = index">
             <ion-item routerDirection="root" [routerLink]="[p.url]" lines="none" detail="false" routerLinkActive="selected">

diff --git a/packages/ionic-angular/src/utils/versions.ts b/packages/ionic-angular/src/utils/versions.ts
@@ -1,3 +1,3 @@
 export const ionicAngularVersion = '^7.0.0';
 export const ioniconsVersion = '^7.0.0';
-export const capacitorPluginVersion = '5.0.2';
+export const capacitorPluginVersion = '^5.0.0';