@nx/expo 18.0.4 → 18.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "18.0.4",
+  "version": "18.0.5",
   "private": false,
   "description": "The Expo Plugin for Nx contains executors and generators for managing and developing an expo application within your workspace. For example, you can directly build for different target platforms as well as generate projects and publish your code.",
   "keywords": [
@@ -26,7 +26,7 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "18.0.4",
+    "@nx/devkit": "18.0.5",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
@@ -36,13 +36,13 @@
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "@nx/jest": "18.0.4",
-    "@nx/js": "18.0.4",
-    "@nx/eslint": "18.0.4",
-    "@nx/react": "18.0.4",
-    "@nx/web": "18.0.4",
-    "@nx/webpack": "18.0.4",
-    "@nrwl/expo": "18.0.4"
+    "@nx/jest": "18.0.5",
+    "@nx/js": "18.0.5",
+    "@nx/eslint": "18.0.5",
+    "@nx/react": "18.0.5",
+    "@nx/web": "18.0.5",
+    "@nx/webpack": "18.0.5",
+    "@nrwl/expo": "18.0.5"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/executors/sync-deps/schema.d.ts

@@ -1,4 +1,5 @@
 export interface ExpoSyncDepsOptions {
   include: string[] | string; // default is an empty array []
   exclude: string[] | string; // default is an empty array []
+  all: boolean; // default is false
 }

package/src/executors/sync-deps/schema.json

@@ -23,6 +23,11 @@
       },
       "default": [],
       "description": "An array of npm packages to exclude."
+    },
+    "all": {
+      "type": "boolean",
+      "description": "Copy all dependencies and devDependencies from the workspace root package.json.",
+      "default": false
     }
   }
 }

package/src/executors/sync-deps/sync-deps.impl.d.ts

@@ -1,8 +1,9 @@
-import { ExecutorContext } from '@nx/devkit';
+import { ExecutorContext, ProjectGraph } from '@nx/devkit';
 import { ExpoSyncDepsOptions } from './schema';
+import { PackageJson } from 'nx/src/utils/package-json';
 export interface ReactNativeSyncDepsOutput {
     success: boolean;
 }
 export default function syncDepsExecutor(options: ExpoSyncDepsOptions, context: ExecutorContext): AsyncGenerator<ReactNativeSyncDepsOutput>;
-export declare function syncDeps(projectRoot: string, workspaceRoot: string, include?: string[], exclude?: string[]): Promise<string[]>;
+export declare function syncDeps(projectName: string, projectPackageJson: PackageJson, projectPackageJsonPath: string, workspacePackageJson: PackageJson, projectGraph?: ProjectGraph, include?: string[], exclude?: string[], all?: boolean): Promise<string[]>;
 export declare function displayNewlyAddedDepsMessage(projectName: string, deps: string[]): void;

package/src/executors/sync-deps/sync-deps.impl.js

@@ -4,27 +4,32 @@ exports.displayNewlyAddedDepsMessage = exports.syncDeps = void 0;
 const path_1 = require("path");
 const chalk = require("chalk");
 const devkit_1 = require("@nx/devkit");
+const find_all_npm_dependencies_1 = require("../../utils/find-all-npm-dependencies");
 async function* syncDepsExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(projectRoot, context.root, typeof options.include === 'string'
+    const workspacePackageJsonPath = (0, path_1.join)(context.root, 'package.json');
+    const projectPackageJsonPath = (0, path_1.join)(context.root, projectRoot, 'package.json');
+    const workspacePackageJson = (0, devkit_1.readJsonFile)(workspacePackageJsonPath);
+    const projectPackageJson = (0, devkit_1.readJsonFile)(projectPackageJsonPath);
+    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(context.projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson, context.projectGraph, typeof options.include === 'string'
         ? options.include.split(',')
         : options.include, typeof options.exclude === 'string'
         ? options.exclude.split(',')
-        : options.exclude));
+        : options.exclude, options.all));
     yield { success: true };
 }
 exports.default = syncDepsExecutor;
-async function syncDeps(projectRoot, workspaceRoot, include = [], exclude = []) {
-    const workspacePackageJsonPath = (0, path_1.join)(workspaceRoot, 'package.json');
-    const workspacePackageJson = (0, devkit_1.readJsonFile)(workspacePackageJsonPath);
-    let npmDeps = Object.keys(workspacePackageJson.dependencies || {});
-    let npmDevdeps = Object.keys(workspacePackageJson.devDependencies || {});
-    const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
-    const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
+async function syncDeps(projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson, projectGraph = (0, devkit_1.readCachedProjectGraph)(), include = [], exclude = [], all = false) {
+    let npmDeps = all
+        ? Object.keys(workspacePackageJson.dependencies || {})
+        : (0, find_all_npm_dependencies_1.findAllNpmDependencies)(projectGraph, projectName);
+    let npmDevdeps = all
+        ? Object.keys(workspacePackageJson.devDependencies || {})
+        : [];
     const newDeps = [];
     let updated = false;
-    if (!packageJson.dependencies) {
-        packageJson.dependencies = {};
+    if (!projectPackageJson.dependencies) {
+        projectPackageJson.dependencies = {};
         updated = true;
     }
     if (include && include.length) {
@@ -33,28 +38,30 @@ async function syncDeps(projectRoot, workspaceRoot, include = [], exclude = [])
     if (exclude && exclude.length) {
         npmDeps = npmDeps.filter((dep) => !exclude.includes(dep));
     }
-    if (!packageJson.devDependencies) {
-        packageJson.devDependencies = {};
+    if (!projectPackageJson.devDependencies) {
+        projectPackageJson.devDependencies = {};
     }
-    if (!packageJson.dependencies) {
-        packageJson.dependencies = {};
+    if (!projectPackageJson.dependencies) {
+        projectPackageJson.dependencies = {};
     }
     npmDeps.forEach((dep) => {
-        if (!packageJson.dependencies[dep] && !packageJson.devDependencies[dep]) {
-            packageJson.dependencies[dep] = '*';
+        if (!projectPackageJson.dependencies[dep] &&
+            !projectPackageJson.devDependencies[dep]) {
+            projectPackageJson.dependencies[dep] = '*';
             newDeps.push(dep);
             updated = true;
         }
     });
     npmDevdeps.forEach((dep) => {
-        if (!packageJson.dependencies[dep] && !packageJson.devDependencies[dep]) {
-            packageJson.devDependencies[dep] = '*';
+        if (!projectPackageJson.dependencies[dep] &&
+            !projectPackageJson.devDependencies[dep]) {
+            projectPackageJson.devDependencies[dep] = '*';
             newDeps.push(dep);
             updated = true;
         }
     });
     if (updated) {
-        (0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
+        (0, devkit_1.writeJsonFile)(projectPackageJsonPath, projectPackageJson);
     }
     return newDeps;
 }

package/src/executors/update/update.impl.js

@@ -9,8 +9,12 @@ const install_impl_1 = require("../install/install.impl");
 let childProcess;
 async function* buildExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    const workspacePackageJsonPath = (0, path_1.join)(context.root, 'package.json');
+    const projectPackageJsonPath = (0, path_1.join)(context.root, projectRoot, 'package.json');
+    const workspacePackageJson = (0, devkit_1.readJsonFile)(workspacePackageJsonPath);
+    const projectPackageJson = (0, devkit_1.readJsonFile)(projectPackageJsonPath);
     await (0, install_impl_1.installAsync)(context.root, { packages: ['expo-updates'] });
-    (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, await (0, sync_deps_impl_1.syncDeps)(projectRoot, context.root, ['expo-updates']));
+    (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, await (0, sync_deps_impl_1.syncDeps)(context.projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson, context.projectGraph, ['expo-updates']));
     try {
         await runCliUpdate(context.root, projectRoot, options);
         yield { success: true };

package/src/generators/application/files/src/app/App.tsx.template

@@ -387,7 +387,7 @@ export const App = () => {
                   </View>
                 </View>
                 <View style={styles.codeBlock}>
-                  <Text style={[styles.monospace]}>nx connect-to-nx-cloud</Text>
+                  <Text style={[styles.monospace]}>nx connect</Text>
                 </View>
               </View>
             </TouchableOpacity>

package/src/utils/find-all-npm-dependencies.d.ts

@@ -0,0 +1,2 @@
+import { ProjectGraph } from '@nx/devkit';
+export declare function findAllNpmDependencies(graph: ProjectGraph, projectName: string, list?: string[], seen?: Set<string>): string[];

package/src/utils/find-all-npm-dependencies.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findAllNpmDependencies = void 0;
+function findAllNpmDependencies(graph, projectName, list = [], seen = new Set()) {
+    // In case of bad circular dependencies
+    if (seen.has(projectName)) {
+        return list;
+    }
+    seen.add(projectName);
+    const node = graph.externalNodes[projectName];
+    // Don't want to include '@nx/react-native' and '@nx/expo' because React Native
+    // autolink will warn that the package has no podspec file for iOS.
+    if (node) {
+        if (node.name !== `npm:@nx/react-native` &&
+            node.name !== `npm:@nrwl/react-native` &&
+            node.name !== `npm:@nx/expo` &&
+            node.name !== `npm:@nrwl/expo`) {
+            list.push(node.data.packageName);
+        }
+    }
+    else {
+        // it's workspace project, search for it's dependencies
+        graph.dependencies[projectName]?.forEach((dep) => findAllNpmDependencies(graph, dep.target, list, seen));
+    }
+    return list;
+}
+exports.findAllNpmDependencies = findAllNpmDependencies;