chore: updates transient dependencies and standardize demo package updates

Author: NathanWalker

package.json

@@ -49,12 +49,12 @@
     "@swc/core": "^1.2.173",
     "@types/jest": "28.1.8",
     "@types/node": "18.7.1",
-    "@typescript-eslint/eslint-plugin": "5.33.1",
-    "@typescript-eslint/parser": "5.33.1",
-    "conventional-changelog-cli": "~2.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.36.1",
+    "@typescript-eslint/parser": "^5.36.1",
+    "conventional-changelog-cli": "^2.2.0",
     "dotenv": "~10.0.0",
     "eslint": "8.15.0",
-    "eslint-config-prettier": "8.1.0",
+    "eslint-config-prettier": "^8.1.0",
     "github-contributors-list": "~1.2.3",
     "husky": "~8.0.0",
     "jest": "28.1.3",

packages/plugin-tools/package.json

@@ -27,17 +27,17 @@
   },
   "dependencies": {
     "xml2js": "~0.4.23",
-    "@nativescript/nx": "^4.0.1",
+    "@nativescript/nx": "^4.0.2",
     "@nrwl/angular": "14.7.5",
     "@nrwl/eslint-plugin-nx": "14.7.5",
     "@nrwl/node": "14.7.5",
     "@nrwl/nx-cloud": "14.6.2",
     "@nrwl/workspace": "14.7.5",
     "@nstudio/focus": "^14.3.0",
     "@nstudio/nps-i": "^2.0.0",
-    "@types/node": "18.0.0",
-    "@typescript-eslint/eslint-plugin": "5.24.0",
-    "@typescript-eslint/parser": "5.24.0",
+    "@types/node": "18.7.1",
+    "@typescript-eslint/eslint-plugin": "^5.36.1",
+    "@typescript-eslint/parser": "^5.36.1",
     "dotenv": "~10.0.0",
     "eslint": "~8.15.0",
     "eslint-config-prettier": "^8.1.0",
@@ -50,8 +50,8 @@
     "prettier": "^2.7.0",
     "pretty-data": "^0.40.0",
     "rimraf": "^3.0.2",
-    "ts-jest": "27.1.4",
-    "ts-node": "10.8.1",
+    "ts-jest": "28.0.8",
+    "ts-node": "10.9.1",
     "ts-patch": "^2.0.0"
   }
 }

packages/plugin-tools/src/migrations/update-3-0-0/update-3-0-0.ts

@@ -1,6 +1,7 @@
 import { formatFiles, generateFiles, getProjects, getWorkspaceLayout, joinPathFragments, readJson, readProjectConfiguration, readWorkspaceConfiguration, removeProjectConfiguration, TargetDependencyConfig, Tree, updateJson, updateProjectConfiguration } from '@nrwl/devkit';
 import { convertToNxProjectGenerator } from '@nrwl/workspace';
 import { relative } from 'path';
+import { updateDemoAppPackages } from '../../utils/migrations';
 
 export default async function (tree: Tree) {
   updateDependencies(tree);
@@ -14,7 +15,12 @@ export default async function (tree: Tree) {
   doNxMigrations(tree);
   migrateNgPackagr(tree);
 
-  updateDemoAppPackages(tree);
+  updateDemoAppPackages(tree, {
+    devDependencies: {
+      '@nativescript/android': '~8.2.0',
+      '@nativescript/ios': '~8.2.0',
+    },
+  });
 
   // Last Step, migrate plugin workspace to nx-project config style
   convertToNxProjectGenerator(tree, {
@@ -195,7 +201,7 @@ function updateProjectTargets(tree: Tree) {
       project.targets[target].dependsOn = project.targets[target].dependsOn || [];
       const hasBuildAll = project.targets[target].dependsOn.find((t: TargetDependencyConfig) => {
         return t.target === 'build.all';
-      })
+      });
       if (!hasBuildAll) {
         project.targets[target].dependsOn.push({
           target: 'build.all',
@@ -321,41 +327,3 @@ function migrateNgPackagr(tree: Tree) {
     tree.write(buildFinishPath, contents);
   }
 }
-
-function updateDemoAppPackages(tree: Tree) {
-  const appFolders = tree.children('apps');
-  for (const dir of appFolders) {
-    if (dir.indexOf('demo') > -1) {
-      const appDir = `apps/${dir}`;
-
-      // update demo app deps
-      const packagePath = `${appDir}/package.json`;
-      if (tree.exists(packagePath)) {
-        const packageJson = readJson(tree, packagePath);
-        if (packageJson.devDependencies) {
-          let hasNativeScriptRuntimes = false;
-          for (const d in packageJson.devDependencies) {
-            if (d.indexOf('@nativescript') > -1) {
-              hasNativeScriptRuntimes = true;
-              break;
-            }
-          }
-          if (hasNativeScriptRuntimes) {
-            updateJson(tree, packagePath, (packageJson) => {
-              packageJson.devDependencies = {
-                ...(packageJson.devDependencies || {}),
-                '@nativescript/android': '~8.2.0',
-                '@nativescript/ios': '~8.2.0',
-              };
-    
-              return packageJson;
-            });
-          }
-        } else {
-          // {N} demo app should have runtimes in devDependencies at least
-          break;
-        }
-      }
-    }
-  }
-}

packages/plugin-tools/src/migrations/update-4-1-0/update-4-1-0.ts

@@ -1,5 +1,6 @@
 import { formatFiles, Tree, updateJson } from '@nrwl/devkit';
 import { readModulePackageJson } from 'nx/src/utils/package-json';
+import { updateDemoAppPackages } from '../../utils/migrations';
 import { dirname } from 'path';
 const migrations = require('./migrations-to-run.json');
 
@@ -41,6 +42,12 @@ function readPackageMigrationConfig(packageName: string, dir?: string) {
 
 export default async function (tree: Tree) {
   updateDependencies(tree);
+  updateDemoAppPackages(tree, {
+    devDependencies: {
+      '@nativescript/android': '~8.3.0',
+      '@nativescript/ios': '~8.3.0',
+    },
+  });
   for (const migration of migrations.migrations) {
     const packageName = migration.package;
     const implRelativePath = migration.implementation || migration.factory;

packages/plugin-tools/src/utils/migrations.ts

@@ -0,0 +1,47 @@
+import { Tree, readJson, updateJson } from '@nrwl/devkit';
+export function updateDemoAppPackages(tree: Tree, updates: { dependencies?: any; devDependencies?: any }) {
+  const appFolders = tree.children('apps');
+  for (const dir of appFolders) {
+    if (dir.indexOf('demo') > -1) {
+      const appDir = `apps/${dir}`;
+
+      // update demo app deps
+      const packagePath = `${appDir}/package.json`;
+      if (tree.exists(packagePath)) {
+        const packageJson = readJson(tree, packagePath);
+        if (packageJson.devDependencies) {
+          let hasNativeScriptRuntimes = false;
+          for (const d in packageJson.devDependencies) {
+            if (d.indexOf('@nativescript') > -1) {
+              hasNativeScriptRuntimes = true;
+              break;
+            }
+          }
+          if (hasNativeScriptRuntimes) {
+            // only update {N} demos determined by if they have runtime deps
+            // some plugin authors may have server demos for other things
+            updateJson(tree, packagePath, (packageJson) => {
+              if (updates.dependencies) {
+                packageJson.dependencies = {
+                  ...(packageJson.dependencies || {}),
+                  ...updates.dependencies,
+                };
+              }
+              if (updates.devDependencies) {
+                packageJson.devDependencies = {
+                  ...(packageJson.devDependencies || {}),
+                  ...updates.devDependencies,
+                };
+              }
+
+              return packageJson;
+            });
+          }
+        } else {
+          // {N} demo app should have runtimes in devDependencies at least
+          break;
+        }
+      }
+    }
+  }
+}

packages/plugin-tools/src/utils/versions.ts

@@ -1,2 +1,2 @@
 export const toolsVersion = '*';
-export const nxVersion = '14.4.0';
+export const nxVersion = '14.7.5';