@nx/react-native 0.0.0-pr-29703-8312c59 → 0.0.0-pr-29705-bc2a0dd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-29703-8312c59",
+  "version": "0.0.0-pr-29705-bc2a0dd",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -36,12 +36,12 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-29703-8312c59",
-    "@nx/jest": "0.0.0-pr-29703-8312c59",
-    "@nx/js": "0.0.0-pr-29703-8312c59",
-    "@nx/eslint": "0.0.0-pr-29703-8312c59",
-    "@nx/react": "0.0.0-pr-29703-8312c59",
-    "@nx/workspace": "0.0.0-pr-29703-8312c59"
+    "@nx/devkit": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/jest": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/js": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/eslint": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/react": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/workspace": "0.0.0-pr-29705-bc2a0dd"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/application.js

@@ -51,11 +51,11 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
         ],
     });
     tasks.push(lintTask);
-    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson, options.addPlugin);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson, options.addPlugin, 'tsconfig.app.json');
     tasks.push(jestTask);
     const webTask = await (0, web_configuration_1.webConfigurationGenerator)(host, {
         ...options,
-        project: options.name,
+        project: options.projectName,
         skipFormat: true,
     });
     tasks.push(webTask);

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 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 = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -18,13 +17,10 @@ function addProject(host, options) {
     };
     if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
-            name: (0, get_import_path_1.getImportPath)(host, options.name),
+            name: options.projectName,
             version: '0.0.1',
             private: true,
             nx: {
-                name: options.name,
-                projectType: 'application',
-                sourceRoot: `${options.appProjectRoot}/src`,
                 targets: hasPlugin ? {} : getTargets(options),
                 tags: options.parsedTags?.length ? options.parsedTags : undefined,
             },

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

@@ -4,6 +4,7 @@ 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");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function normalizeOptions(host, options) {
     await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
     const { projectName: appProjectName, names: projectNames, projectRoot: appProjectRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -25,6 +26,7 @@ async function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const entryFile = options.js ? 'src/main.js' : 'src/main.tsx';
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     return {
         ...options,
         name: projectNames.projectSimpleName,
@@ -32,7 +34,9 @@ async function normalizeOptions(host, options) {
         fileName,
         lowerCaseName: className.toLowerCase(),
         displayName: options.displayName || className,
-        projectName: appProjectName,
+        projectName: isTsSolutionSetup
+            ? (0, get_import_path_1.getImportPath)(host, appProjectName)
+            : appProjectName,
         appProjectRoot,
         iosProjectRoot,
         androidProjectRoot,
@@ -41,6 +45,6 @@ async function normalizeOptions(host, options) {
         rootProject,
         e2eProjectName,
         e2eProjectRoot,
-        isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isTsSolutionSetup,
     };
 }

package/src/generators/component/component.js

@@ -6,6 +6,7 @@ const normalize_options_1 = require("./lib/normalize-options");
 const add_import_1 = require("./lib/add-import");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const path_1 = require("path");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function reactNativeComponentGenerator(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
@@ -27,7 +28,8 @@ function addExportsToBarrel(host, options) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const workspace = (0, devkit_1.getProjects)(host);
-    const isApp = workspace.get(options.projectName).projectType === 'application';
+    const proj = workspace.get(options.projectName);
+    const isApp = (0, ts_solution_setup_1.getProjectType)(host, proj.root, proj.projectType) === 'application';
     if (options.export && !isApp) {
         const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
         if (!host.exists(indexFilePath)) {

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
     const { artifactName: name, directory, fileName, filePath, fileExtension, fileExtensionType, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         path: options.path,
@@ -13,8 +14,9 @@ async function normalizeOptions(host, options) {
     });
     const project = (0, devkit_1.getProjects)(host).get(projectName);
     const { className } = (0, devkit_1.names)(name);
-    const { sourceRoot: projectSourceRoot, projectType } = project;
-    if (options.export && projectType === 'application') {
+    const { root, sourceRoot: projectSourceRoot, projectType } = project;
+    if (options.export &&
+        (0, ts_solution_setup_1.getProjectType)(host, root, projectType) === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
     }
     options.classComponent = options.classComponent ?? false;

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

@@ -4,6 +4,7 @@ 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");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 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, {
@@ -19,15 +20,18 @@ async function normalizeOptions(host, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const normalized = {
         ...options,
         fileName: projectName,
         routePath: `/${projectNames.projectSimpleName}`,
-        name: projectName,
+        name: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(host, projectName)
+            : projectName,
         projectRoot,
         parsedTags,
         importPath,
-        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionConfig,
     };
     return normalized;
 }

package/src/generators/library/library.js

@@ -12,7 +12,6 @@ const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 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");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function reactNativeLibraryGenerator(host, schema) {
     return await reactNativeLibraryGeneratorInternal(host, {
@@ -49,7 +48,7 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
         ],
     });
     tasks.push(lintTask);
-    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin, 'tsconfig.lib.json');
     tasks.push(jestTask);
     if (options.publishable || options.buildable) {
         updateLibPackageNpmScope(host, options);
@@ -92,14 +91,11 @@ async function addProject(host, options) {
     };
     const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
     if (options.isUsingTsSolutionConfig) {
-        (0, devkit_1.writeJson)(host, packageJsonPath, {
-            name: (0, get_import_path_1.getImportPath)(host, options.name),
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
+            name: options.name,
             version: '0.0.1',
             ...determineEntryFields(options),
             nx: {
-                name: options.name,
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-                projectType: 'library',
                 tags: options.parsedTags?.length ? options.parsedTags : undefined,
             },
         });

package/src/utils/add-jest.d.ts

@@ -1,2 +1,2 @@
 import { Tree } from '@nx/devkit';
-export declare function addJest(host: Tree, unitTestRunner: 'jest' | 'none', projectName: string, appProjectRoot: string, js: boolean, skipPackageJson: boolean, addPlugin: boolean): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function addJest(host: Tree, unitTestRunner: 'jest' | 'none', projectName: string, appProjectRoot: string, js: boolean, skipPackageJson: boolean, addPlugin: boolean, runtimeTsconfigFileName: string): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/utils/add-jest.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = addJest;
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
-async function addJest(host, unitTestRunner, projectName, appProjectRoot, js, skipPackageJson, addPlugin) {
+async function addJest(host, unitTestRunner, projectName, appProjectRoot, js, skipPackageJson, addPlugin, runtimeTsconfigFileName) {
     if (unitTestRunner !== 'jest') {
         return () => { };
     }
@@ -17,6 +17,7 @@ async function addJest(host, unitTestRunner, projectName, appProjectRoot, js, sk
         skipPackageJson,
         skipFormat: true,
         addPlugin,
+        runtimeTsconfigFileName,
     });
     // overwrite the jest.config.ts file because react native needs to have special transform property
     const configPath = `${appProjectRoot}/jest.config.${js ? 'js' : 'ts'}`;