@nx/expo 20.1.2 → 20.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "20.1.2",
+  "version": "20.1.4",
   "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,13 +28,13 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "20.1.2",
-    "@nx/eslint": "20.1.2",
-    "@nx/jest": "20.1.2",
-    "@nx/js": "20.1.2",
-    "@nx/react": "20.1.2",
-    "@nx/web": "20.1.2",
-    "@nx/webpack": "20.1.2",
+    "@nx/devkit": "20.1.4",
+    "@nx/eslint": "20.1.4",
+    "@nx/jest": "20.1.4",
+    "@nx/js": "20.1.4",
+    "@nx/react": "20.1.4",
+    "@nx/web": "20.1.4",
+    "@nx/webpack": "20.1.4",
     "enhanced-resolve": "^5.8.3",
     "metro-config": "~0.80.4",
     "metro-resolver": "~0.80.4",

package/src/generators/application/schema.json

@@ -5,11 +5,11 @@
   "description": "Create an Expo Application for Nx.",
   "examples": [
     {
-      "command": "g @nx/expo:app myapp --directory=nested",
+      "command": "nx g @nx/expo:app myapp --directory=nested",
       "description": "Generate apps/nested/myapp"
     },
     {
-      "command": "g @nx/expo:app myapp --classComponent",
+      "command": "nx g @nx/expo:app myapp --classComponent",
       "description": "Use class components instead of functional components"
     }
   ],

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

@@ -4,7 +4,6 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 async function normalizeOptions(host, options) {
-    assertValidOptions(options);
     const { artifactName: name, fileName, filePath, directory, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: options.name,
         path: options.path,
@@ -19,6 +18,7 @@ async function normalizeOptions(host, options) {
     options.classComponent = options.classComponent ?? false;
     return {
         ...options,
+        name,
         directory,
         className,
         fileName,
@@ -27,16 +27,3 @@ async function normalizeOptions(host, options) {
         projectName,
     };
 }
-function assertValidOptions(options) {
-    const slashes = ['/', '\\'];
-    slashes.forEach((s) => {
-        if (options.name.indexOf(s) !== -1) {
-            const [name, ...rest] = options.name.split(s).reverse();
-            let suggestion = rest.map((x) => x.toLowerCase()).join(s);
-            if (options.path) {
-                suggestion = `${options.path}${s}${suggestion}`;
-            }
-            throw new Error(`Found "${s}" in the component name. Did you mean to use the --directory option (e.g. \`nx g c ${name} --directory ${suggestion}\`)?`);
-        }
-    });
-}

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

@@ -9,5 +9,4 @@ export interface Schema {
   export: boolean; // default is false
   classComponent: boolean; // default is false
   js: boolean; // default is false
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/component/schema.json

@@ -6,29 +6,31 @@
   "type": "object",
   "examples": [
     {
-      "command": "g @nx/expo:component mylib/my-component --name my-component",
-      "description": "Generate a component in the mylib library"
+      "description": "Generate a component with the exported symbol matching the file name. It results in the component `Foo` at `mylib/src/foo.tsx`",
+      "command": "nx g @nx/expo:component mylib/src/foo"
     },
     {
-      "command": "g @nx/expo:component mylib/my-component --name my-component --classComponent",
-      "description": "Generate a class component in the mylib library"
+      "description": "Generate a component with the exported symbol different from the file name. It results in the component `Custom` at `mylib/src/foo.tsx`",
+      "command": "nx g @nx/expo:component mylib/src/foo --name=custom"
+    },
+    {
+      "description": "Generate a class component at `mylib/src/foo.tsx`",
+      "command": "nx g @nx/expo:component mylib/src/foo --classComponent"
     }
   ],
   "properties": {
     "path": {
       "type": "string",
-      "description": "Path where the component will be generated.",
+      "description": "The file path to the component without the file extension. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "Where should the component be generated?",
-      "x-priority": "important"
+      "x-prompt": "What is the component file path?"
     },
     "name": {
       "type": "string",
-      "description": "The name of the component.",
-      "x-prompt": "What name would you like to use for the component?"
+      "description": "The component symbol name. Defaults to the last segment of the file path."
     },
     "js": {
       "type": "boolean",

package/src/generators/library/schema.json

@@ -6,7 +6,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "g @nx/expo:lib mylib --directory=myapp",
+      "command": "nx g @nx/expo:lib mylib --directory=myapp",
       "description": "Generate libs/myapp/mylib"
     }
   ],