@nx/expo 20.2.0-beta.2 → 20.2.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "20.2.0-beta.2",
+  "version": "20.2.0-beta.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.2.0-beta.2",
-    "@nx/eslint": "20.2.0-beta.2",
-    "@nx/jest": "20.2.0-beta.2",
-    "@nx/js": "20.2.0-beta.2",
-    "@nx/react": "20.2.0-beta.2",
-    "@nx/web": "20.2.0-beta.2",
-    "@nx/webpack": "20.2.0-beta.2",
+    "@nx/devkit": "20.2.0-beta.4",
+    "@nx/eslint": "20.2.0-beta.4",
+    "@nx/jest": "20.2.0-beta.4",
+    "@nx/js": "20.2.0-beta.4",
+    "@nx/react": "20.2.0-beta.4",
+    "@nx/web": "20.2.0-beta.4",
+    "@nx/webpack": "20.2.0-beta.4",
     "enhanced-resolve": "^5.8.3",
     "metro-config": "~0.80.4",
     "metro-resolver": "~0.80.4",

package/src/generators/application/application.js

@@ -23,13 +23,14 @@ async function expoApplicationGenerator(host, schema) {
     });
 }
 async function expoApplicationGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'expo', 'application');
-    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         skipFormat: true,
+        addTsPlugin: schema.useTsSolution,
+        formatter: schema.formatter,
     });
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     tasks.push(jsInitTask);
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
@@ -52,6 +53,14 @@ async function expoApplicationGeneratorInternal(host, schema) {
     const e2eTask = await (0, add_e2e_1.addE2e)(host, options);
     tasks.push(e2eTask);
     (0, add_eas_scripts_1.addEasScripts)(host);
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+        noUnusedLocals: false,
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/lib/add-e2e.js

@@ -8,6 +8,7 @@ const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function addE2e(tree, options) {
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(tree);
     if (!hasPlugin) {
@@ -20,14 +21,28 @@ async function addE2e(tree, options) {
     switch (options.e2eTestRunner) {
         case 'cypress': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
-                projectType: 'application',
-                root: options.e2eProjectRoot,
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                targets: {},
-                implicitDependencies: [options.projectName],
-                tags: [],
-            });
+            if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        projectType: 'application',
+                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                        implicitDependencies: [options.projectName],
+                    },
+                });
+            }
+            else {
+                (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                    projectType: 'application',
+                    root: options.e2eProjectRoot,
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    targets: {},
+                    implicitDependencies: [options.projectName],
+                    tags: [],
+                });
+            }
             const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
@@ -63,13 +78,27 @@ async function addE2e(tree, options) {
         }
         case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
-                projectType: 'application',
-                root: options.e2eProjectRoot,
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                targets: {},
-                implicitDependencies: [options.projectName],
-            });
+            if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        projectType: 'application',
+                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                        implicitDependencies: [options.projectName],
+                    },
+                });
+            }
+            else {
+                (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                    projectType: 'application',
+                    root: options.e2eProjectRoot,
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    targets: {},
+                    implicitDependencies: [options.projectName],
+                });
+            }
             const e2eTask = await configurationGenerator(tree, {
                 project: options.e2eProjectName,
                 skipFormat: true,

package/src/generators/application/lib/add-project.js

@@ -4,6 +4,8 @@ exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 function addProject(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(host);
@@ -17,7 +19,24 @@ function addProject(host, options) {
         targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
-    (0, devkit_1.addProjectConfiguration)(host, options.projectName, projectConfiguration, options.standaloneConfig);
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        const packageName = (0, get_import_path_1.getImportPath)(host, options.name);
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
+            name: packageName,
+            version: '0.0.1',
+            private: true,
+            nx: {
+                name: packageName === options.name ? undefined : options.name,
+                projectType: 'application',
+                sourceRoot: `${options.appProjectRoot}/src`,
+                targets: hasPlugin ? undefined : getTargets(options),
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(host, options.projectName, projectConfiguration, options.standaloneConfig);
+    }
 }
 function getTargets(options) {
     const architect = {};

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

@@ -15,6 +15,9 @@ export interface Schema {
   e2eTestRunner: 'cypress' | 'playwright' | 'detox' | 'none'; // default is none
   standaloneConfig?: boolean;
   skipPackageJson?: boolean; // default is false
+  // Internal options
   addPlugin?: boolean;
   nxCloudToken?: string;
+  useTsSolution?: boolean;
+  formatter?: 'prettier' | 'none';
 }

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"
     }
   ],
@@ -44,13 +44,15 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "none",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests",
-      "default": "jest"
+      "default": "none",
+      "x-priority": "important"
     },
     "tags": {
       "type": "string",
@@ -71,7 +73,8 @@
       "description": "Adds the specified e2e test runner",
       "type": "string",
       "enum": ["playwright", "cypress", "detox", "none"],
-      "default": "none"
+      "default": "none",
+      "x-priority": "important"
     },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",

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/init/init.js

@@ -5,7 +5,6 @@ exports.expoInitGeneratorInternal = expoInitGeneratorInternal;
 exports.updateDependencies = updateDependencies;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
@@ -13,7 +12,6 @@ function expoInitGenerator(tree, schema) {
     return expoInitGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function expoInitGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'expo', 'init');
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

package/src/generators/library/lib/normalize-options.d.ts

@@ -7,5 +7,6 @@ export interface NormalizedSchema extends Schema {
     routePath: string;
     parsedTags: string[];
     appMain: string;
+    isUsingTsSolutionConfig: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
     await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -28,6 +29,7 @@ async function normalizeOptions(host, options) {
         parsedTags,
         importPath,
         appMain,
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
     return normalized;
 }

package/src/generators/library/library.js

@@ -4,7 +4,6 @@ exports.expoLibraryGenerator = expoLibraryGenerator;
 exports.expoLibraryGeneratorInternal = expoLibraryGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = require("../init/init");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
@@ -14,6 +13,8 @@ const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const init_root_babel_config_1 = require("../../utils/init-root-babel-config");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function expoLibraryGenerator(host, schema) {
     return await expoLibraryGeneratorInternal(host, {
         addPlugin: false,
@@ -21,17 +22,16 @@ async function expoLibraryGenerator(host, schema) {
     });
 }
 async function expoLibraryGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'expo', 'library');
-    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
-    if (options.publishable === true && !schema.importPath) {
-        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
-    }
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         skipFormat: true,
     });
     tasks.push(jsInitTask);
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    if (options.publishable === true && !schema.importPath) {
+        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
+    }
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
     if (!options.skipPackageJson) {
@@ -61,9 +61,20 @@ async function expoLibraryGeneratorInternal(host, schema) {
             (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
         ]);
     }
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
+    // Always run install to link packages.
+    if (options.isUsingTsSolutionConfig) {
+        tasks.push(() => (0, devkit_1.installPackagesTask)(host));
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.name);
     });
@@ -77,7 +88,29 @@ async function addProject(host, options) {
         tags: options.parsedTags,
         targets: {},
     };
-    (0, devkit_1.addProjectConfiguration)(host, options.name, project);
+    if (options.isUsingTsSolutionConfig) {
+        const packageName = (0, get_import_path_1.getImportPath)(host, options.name);
+        const sourceEntry = !options.buildable
+            ? options.js
+                ? './src/index.js'
+                : './src/index.ts'
+            : undefined;
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
+            name: packageName,
+            version: '0.0.1',
+            main: sourceEntry,
+            types: sourceEntry,
+            nx: {
+                name: packageName === options.name ? undefined : options.name,
+                projectType: 'library',
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(host, options.name, project);
+    }
     if (!options.publishable && !options.buildable) {
         return () => { };
     }

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"
     }
   ],
@@ -29,13 +29,16 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "jest"
+      "default": "none",
+      "x-priority": "important"
     },
     "tags": {
       "type": "string",