@nx/expo 19.8.0 → 20.0.0-beta.0

package/.eslintrc.json

@@ -41,6 +41,18 @@
           }
         ]
       }
+    },
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "name": "chalk",
+            "message": "Please use `picocolors` in place of `chalk` for rendering terminal colors"
+          }
+        ]
+      }
     }
   ]
 }

package/generators.json

@@ -24,7 +24,7 @@
       "description": "Create a library"
     },
     "component": {
-      "factory": "./src/generators/component/component#expoComponentGeneratorInternal",
+      "factory": "./src/generators/component/component",
       "schema": "./src/generators/component/schema.json",
       "description": "Create a component",
       "aliases": ["c"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "19.8.0",
+  "version": "20.0.0-beta.0",
   "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": [
@@ -28,22 +28,22 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "19.8.0",
-    "chalk": "^4.1.0",
+    "@nx/devkit": "20.0.0-beta.0",
+    "@nx/eslint": "20.0.0-beta.0",
+    "@nx/jest": "20.0.0-beta.0",
+    "@nx/js": "20.0.0-beta.0",
+    "@nx/react": "20.0.0-beta.0",
+    "@nx/web": "20.0.0-beta.0",
+    "@nx/webpack": "20.0.0-beta.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
     "metro-config": "~0.80.4",
     "metro-resolver": "~0.80.4",
     "node-fetch": "^2.6.7",
-    "tslib": "^2.3.0",
+    "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
-    "@nx/jest": "19.8.0",
-    "@nx/js": "19.8.0",
-    "@nx/eslint": "19.8.0",
-    "@nx/react": "19.8.0",
-    "@nx/web": "19.8.0",
-    "@nx/webpack": "19.8.0",
-    "@nrwl/expo": "19.8.0"
+    "tslib": "^2.3.0",
+    "@nrwl/expo": "20.0.0-beta.0"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/metro-resolver.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResolveRequest = getResolveRequest;
 const metroResolver = require("metro-resolver");
 const tsconfig_paths_1 = require("tsconfig-paths");
-const chalk = require("chalk");
+const pc = require("picocolors");
 const enhanced_resolve_1 = require("enhanced-resolve");
 const path_1 = require("path");
 const fs = require("fs");
@@ -26,9 +26,9 @@ function getResolveRequest(extensions, exportsConditionNames = [], mainFields =
             return resolvedPath;
         }
         if (debug) {
-            console.log(chalk.red(`[Nx] Unable to resolve with any resolver: ${realModuleName}`));
+            console.log(pc.red(`[Nx] Unable to resolve with any resolver: ${realModuleName}`));
         }
-        throw new Error(`Cannot resolve ${chalk.bold(realModuleName)}`);
+        throw new Error(`Cannot resolve ${pc.bold(realModuleName)}`);
     };
 }
 function resolveRequestFromContext(resolveRequest, context, realModuleName, platform, debug) {
@@ -37,7 +37,7 @@ function resolveRequestFromContext(resolveRequest, context, realModuleName, plat
     }
     catch {
         if (debug)
-            console.log(chalk.cyan(`[Nx] Unable to resolve with default resolveRequest: ${realModuleName}`));
+            console.log(pc.cyan(`[Nx] Unable to resolve with default resolveRequest: ${realModuleName}`));
     }
 }
 /**
@@ -50,7 +50,7 @@ function defaultMetroResolver(context, realModuleName, platform, debug) {
     }
     catch {
         if (debug)
-            console.log(chalk.cyan(`[Nx] Unable to resolve with default Metro resolver: ${realModuleName}`));
+            console.log(pc.cyan(`[Nx] Unable to resolve with default Metro resolver: ${realModuleName}`));
     }
 }
 /**
@@ -69,7 +69,7 @@ function pnpmResolver(extensions, context, realModuleName, debug, exportsConditi
     }
     catch {
         if (debug)
-            console.log(chalk.cyan(`[Nx] Unable to resolve with default PNPM resolver: ${realModuleName}`));
+            console.log(pc.cyan(`[Nx] Unable to resolve with default PNPM resolver: ${realModuleName}`));
     }
 }
 /**
@@ -84,8 +84,8 @@ function tsconfigPathsResolver(context, extensions, realModuleName, platform, de
     }
     catch {
         if (debug) {
-            console.log(chalk.cyan(`[Nx] Failed to resolve ${chalk.bold(realModuleName)}`));
-            console.log(chalk.cyan(`[Nx] The following tsconfig paths was used:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
+            console.log(pc.cyan(`[Nx] Failed to resolve ${pc.bold(realModuleName)}`));
+            console.log(pc.cyan(`[Nx] The following tsconfig paths was used:\n:${pc.bold(JSON.stringify(paths, null, 2))}`));
         }
     }
 }
@@ -99,13 +99,13 @@ function getMatcher(debug) {
             absoluteBaseUrl = result.absoluteBaseUrl;
             paths = result.paths;
             if (debug) {
-                console.log(chalk.cyan(`[Nx] Located tsconfig at ${chalk.bold(absoluteBaseUrl)}`));
-                console.log(chalk.cyan(`[Nx] Found the following paths:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
+                console.log(pc.cyan(`[Nx] Located tsconfig at ${pc.bold(absoluteBaseUrl)}`));
+                console.log(pc.cyan(`[Nx] Found the following paths:\n:${pc.bold(JSON.stringify(paths, null, 2))}`));
             }
             matcher = (0, tsconfig_paths_1.createMatchPath)(absoluteBaseUrl, paths);
         }
         else {
-            console.log(chalk.cyan(`[Nx] Failed to locate tsconfig}`));
+            console.log(pc.cyan(`[Nx] Failed to locate tsconfig}`));
             throw new Error(`Could not load tsconfig for project`);
         }
     }

package/src/executors/start/start.impl.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = startExecutor;
-const chalk = require("chalk");
+const pc = require("picocolors");
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
 const path_1 = require("path");
@@ -10,7 +10,7 @@ async function* startExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     try {
         const baseUrl = `http://localhost:${options.port}`;
-        devkit_1.logger.info(chalk.cyan(`Packager is ready at ${baseUrl}`));
+        devkit_1.logger.info(pc.cyan(`Packager is ready at ${baseUrl}`));
         await startAsync(context.root, projectRoot, options);
         yield {
             baseUrl,

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

@@ -4,7 +4,7 @@ exports.default = syncDepsExecutor;
 exports.syncDeps = syncDeps;
 exports.displayNewlyAddedDepsMessage = displayNewlyAddedDepsMessage;
 const path_1 = require("path");
-const chalk = require("chalk");
+const pc = require("picocolors");
 const devkit_1 = require("@nx/devkit");
 const find_all_npm_dependencies_1 = require("../../utils/find-all-npm-dependencies");
 async function* syncDepsExecutor(options, context) {
@@ -68,10 +68,10 @@ async function syncDeps(projectName, projectPackageJson, projectPackageJsonPath,
 }
 function displayNewlyAddedDepsMessage(projectName, deps) {
     if (deps.length > 0) {
-        devkit_1.logger.info(`${chalk.bold.cyan('info')} Added entries to 'package.json' for '${projectName}' (for autolink):
-  ${deps.map((d) => chalk.bold.cyan(`"${d}": "*"`)).join('\n  ')}`);
+        devkit_1.logger.info(`${pc.bold(pc.cyan('info'))} Added entries to 'package.json' for '${projectName}' (for autolink):
+  ${deps.map((d) => pc.bold(pc.cyan(`"${d}": "*"`))).join('\n  ')}`);
     }
     else {
-        devkit_1.logger.info(`${chalk.bold.cyan('info')} Dependencies for '${projectName}' are up to date! No changes made.`);
+        devkit_1.logger.info(`${pc.bold(pc.cyan('info'))} Dependencies for '${projectName}' are up to date! No changes made.`);
     }
 }

package/src/generators/application/application.js

@@ -18,7 +18,6 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 async function expoApplicationGenerator(host, schema) {
     return await expoApplicationGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }

package/src/generators/application/lib/normalize-options.js

@@ -9,7 +9,6 @@ async function normalizeOptions(host, options) {
         projectType: 'application',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/expo:application',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);

package/src/generators/application/schema.d.ts

@@ -10,7 +10,6 @@ export interface Schema {
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner: 'jest' | 'none'; // default is jest
-  pascalCaseFiles?: boolean;
   classComponent?: boolean;
   js: boolean; // default is false
   linter: Linter | LinterType; // default is eslint

package/src/generators/component/component.d.ts

@@ -1,5 +1,4 @@
 import { Schema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function expoComponentGenerator(host: Tree, schema: Schema): Promise<void>;
-export declare function expoComponentGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
 export default expoComponentGenerator;

package/src/generators/component/component.js

@@ -1,19 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoComponentGenerator = expoComponentGenerator;
-exports.expoComponentGeneratorInternal = expoComponentGeneratorInternal;
 const ts = require("typescript");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_import_1 = require("./lib/add-import");
 const path_1 = require("path");
 async function expoComponentGenerator(host, schema) {
-    return expoComponentGeneratorInternal(host, {
-        nameAndDirectoryFormat: 'derived',
-        ...schema,
-    });
-}
-async function expoComponentGeneratorInternal(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
     addExportsToBarrel(host, options);

package/src/generators/component/lib/normalize-options.js

@@ -6,16 +6,10 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 async function normalizeOptions(host, options) {
     assertValidOptions(options);
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-        artifactType: 'component',
-        callingGenerator: '@nx/expo:component',
         name: options.name,
         directory: options.directory,
-        derivedDirectory: options.directory,
-        flat: options.flat,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         fileExtension: 'tsx',
-        pascalCaseFile: options.pascalCaseFiles,
     });
     const project = (0, devkit_1.getProjects)(host).get(projectName);
     const { className } = (0, devkit_1.names)(name);

package/src/generators/component/schema.d.ts

@@ -1,25 +1,15 @@
+import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+
 /**
  * Same as the @nx/react library schema, except it removes keys: style, routing, globalCss
  */
 export interface Schema {
   name: string;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project: string;
   directory?: string;
   skipFormat: boolean; // default is false
   skipTests: boolean; // default is false
-  /**
-   * @deprecated Provide the name in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
-   */
   export: boolean; // default is false
-  pascalCaseFiles: boolean; // default is false
   classComponent: boolean; // default is false
   js: boolean; // default is false
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  flat: boolean; // default is false
-  nameAndDirectoryFormat?: 'as-provided' | 'derived';
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/component/schema.json

@@ -6,24 +6,15 @@
   "type": "object",
   "examples": [
     {
-      "command": "g @nx/expo:component my-component --project=mylib",
+      "command": "g @nx/expo:component my-component --directory=mylib/my-component",
       "description": "Generate a component in the mylib library"
     },
     {
-      "command": "g @nx/expo:component my-component --project=mylib --classComponent",
+      "command": "g @nx/expo:component my-component --directory=mylib/my-component --classComponent",
       "description": "Generate a class component in the mylib library"
     }
   ],
   "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "name": {
       "type": "string",
       "description": "The name of the component.",
@@ -59,12 +50,6 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create component at the source root rather than its own directory.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19."
-    },
     "export": {
       "type": "boolean",
       "description": "When true, the component is exported from the project index.ts (if it exists).",
@@ -72,13 +57,6 @@
       "default": false,
       "x-prompt": "Should this component be exported in the project?"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. App.tsx).",
-      "alias": "P",
-      "default": false,
-      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
-    },
     "classComponent": {
       "type": "boolean",
       "alias": "C",

package/src/generators/library/lib/normalize-options.js

@@ -10,7 +10,6 @@ async function normalizeOptions(host, options) {
         directory: options.directory,
         importPath: options.importPath,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/expo:library',
     });
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/generators/library/library.js

@@ -16,7 +16,6 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 async function expoLibraryGenerator(host, schema) {
     return await expoLibraryGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }

package/src/generators/library/schema.d.ts

@@ -11,7 +11,6 @@ export interface Schema {
   skipTsConfig: boolean; // default is false
   skipFormat: boolean; // default is false
   tags?: string;
-  pascalCaseFiles?: boolean;
   unitTestRunner: 'jest' | 'none';
   linter: Linter | LinterType; // default is eslint
   publishable?: boolean;

package/src/generators/library/schema.json

@@ -60,12 +60,6 @@
       "description": "Do not update tsconfig.json for development experience.",
       "x-priority": "internal"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. App.tsx).",
-      "alias": "P",
-      "default": false
-    },
     "publishable": {
       "type": "boolean",
       "description": "Create a publishable library."

package/src/utils/pod-install-task.js

@@ -4,19 +4,19 @@ exports.runPodInstall = runPodInstall;
 exports.podInstall = podInstall;
 const child_process_1 = require("child_process");
 const os_1 = require("os");
-const chalk = require("chalk");
+const pc = require("picocolors");
 const devkit_1 = require("@nx/devkit");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const podInstallErrorMessage = `
-Running ${chalk.bold('pod install')} failed, see above.
+Running ${pc.bold('pod install')} failed, see above.
 Do you have CocoaPods (https://cocoapods.org/) installed?
 
 Check that your XCode path is correct:
-${chalk.bold('sudo xcode-select --print-path')}
+${pc.bold('sudo xcode-select --print-path')}
 
 If the path is wrong, switch the path: (your path may be different)
-${chalk.bold('sudo xcode-select --switch /Applications/Xcode.app')}
+${pc.bold('sudo xcode-select --switch /Applications/Xcode.app')}
 `;
 /**
  * Run pod install on ios directory