@nx/react-native 0.0.0-pr-31936-35c1f02 → 0.0.0-pr-31936-1238995

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-31936-35c1f02",
+  "version": "0.0.0-pr-31936-1238995",
   "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": [
@@ -35,12 +35,12 @@
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-31936-35c1f02",
-    "@nx/jest": "0.0.0-pr-31936-35c1f02",
-    "@nx/js": "0.0.0-pr-31936-35c1f02",
-    "@nx/eslint": "0.0.0-pr-31936-35c1f02",
-    "@nx/react": "0.0.0-pr-31936-35c1f02",
-    "@nx/workspace": "0.0.0-pr-31936-35c1f02"
+    "@nx/devkit": "0.0.0-pr-31936-1238995",
+    "@nx/jest": "0.0.0-pr-31936-1238995",
+    "@nx/js": "0.0.0-pr-31936-1238995",
+    "@nx/eslint": "0.0.0-pr-31936-1238995",
+    "@nx/react": "0.0.0-pr-31936-1238995",
+    "@nx/workspace": "0.0.0-pr-31936-1238995"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/application.js

@@ -69,22 +69,8 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     tasks.push(e2eTask);
     const chmodTaskGradlewTask = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)((0, devkit_1.joinPathFragments)(host.root, options.androidProjectRoot));
     tasks.push(chmodTaskGradlewTask);
-    const podInstallTask = (0, pod_install_task_1.runPodInstall)((0, devkit_1.joinPathFragments)(host.root, options.iosProjectRoot));
-    if (options.install) {
-        const projectPackageJsonPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json');
-        const workspacePackageJson = (0, devkit_1.readJson)(host, 'package.json');
-        const projectPackageJson = (0, devkit_1.readJson)(host, projectPackageJsonPath);
-        await (0, sync_deps_impl_1.syncDeps)(options.name, projectPackageJson, projectPackageJsonPath, workspacePackageJson);
-        tasks.push(podInstallTask);
-    }
-    else {
-        devkit_1.output.log({
-            title: 'Skip `pod install`',
-            bodyLines: [
-                `run 'nx run ${options.name}:pod-install' to install native modules before running iOS app`,
-            ],
-        });
-    }
+    tasks.push(addSyncDepsTask(host, options));
+    tasks.push(addPodInstallTask(host, options));
     (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',
@@ -103,4 +89,25 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+function addSyncDepsTask(host, options) {
+    const projectPackageJsonPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json');
+    return async () => {
+        const workspacePackageJson = (0, devkit_1.readJson)(host, 'package.json');
+        const projectPackageJson = (0, devkit_1.readJson)(host, projectPackageJsonPath);
+        await (0, sync_deps_impl_1.syncDeps)(options.projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson);
+    };
+}
+function addPodInstallTask(host, options) {
+    const podInstallTask = (0, pod_install_task_1.runPodInstall)((0, devkit_1.joinPathFragments)(host.root, options.iosProjectRoot));
+    if (options.install) {
+        return podInstallTask;
+    }
+    devkit_1.output.log({
+        title: 'Skip `pod install`',
+        bodyLines: [
+            `run 'nx run ${options.name}:pod-install' to install native modules before running iOS app`,
+        ],
+    });
+    return () => { };
+}
 exports.default = reactNativeApplicationGenerator;

package/src/generators/web-configuration/lib/webpack-targets.d.ts

@@ -1,7 +1,8 @@
-import { TargetConfiguration } from '@nx/devkit';
+import { TargetConfiguration, Tree } from '@nx/devkit';
 import type { WithReactOptions } from '@nx/react';
 import type { WithNxOptions } from '@nx/webpack';
 import { NormalizedSchema } from './normalize-schema';
-export declare function createBuildTarget(options: NormalizedSchema): TargetConfiguration;
+export declare function createBuildTarget(tree: Tree, options: NormalizedSchema): TargetConfiguration;
 export declare function createServeTarget(options: NormalizedSchema): TargetConfiguration;
-export declare function createNxWebpackPluginOptions(options: NormalizedSchema): WithNxOptions & WithReactOptions;
+export declare function createNxWebpackPluginOptions(tree: Tree, options: NormalizedSchema): WithNxOptions & WithReactOptions;
+export declare function determineTsConfig(tree: Tree, options: NormalizedSchema): "tsconfig.app.json" | "tsconfig.lib.json" | "tsconfig.json";

package/src/generators/web-configuration/lib/webpack-targets.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBuildTarget = createBuildTarget;
 exports.createServeTarget = createServeTarget;
 exports.createNxWebpackPluginOptions = createNxWebpackPluginOptions;
+exports.determineTsConfig = determineTsConfig;
 const devkit_1 = require("@nx/devkit");
-function createBuildTarget(options) {
+function createBuildTarget(tree, options) {
     return {
         executor: '@nx/webpack:webpack',
         outputs: ['{options.outputPath}'],
@@ -15,7 +16,7 @@ function createBuildTarget(options) {
             index: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/index.html'),
             baseHref: '/',
             main: (0, devkit_1.joinPathFragments)(options.projectRoot, `src/main-web.tsx`),
-            tsConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
+            tsConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, determineTsConfig(tree, options)),
             assets: [
                 (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/favicon.ico'),
                 (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/assets'),
@@ -59,7 +60,7 @@ function createServeTarget(options) {
         },
     };
 }
-function createNxWebpackPluginOptions(options) {
+function createNxWebpackPluginOptions(tree, options) {
     return {
         target: 'web',
         compiler: 'babel',
@@ -67,8 +68,18 @@ function createNxWebpackPluginOptions(options) {
         index: './src/index.html',
         baseHref: '/',
         main: `./src/main-web.tsx`,
-        tsConfig: './tsconfig.app.json',
+        tsConfig: determineTsConfig(tree, options),
         assets: ['./src/favicon.ico', './src/assets'],
         styles: [],
     };
 }
+function determineTsConfig(tree, options) {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const appJson = (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.app.json');
+    if (tree.exists(appJson))
+        return 'tsconfig.app.json';
+    const libJson = (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.lib.json');
+    if (tree.exists(libJson))
+        return 'tsconfig.lib.json';
+    return 'tsconfig.json';
+}

package/src/generators/web-configuration/web-configuration.js

@@ -26,8 +26,8 @@ async function webConfigurationGenerator(tree, options) {
         tasks.push(installTask);
     }
     // apply webpack or vite init generator
-    const bundlerTask = await addBundlerConfiguration(tree, normalizedSchema);
-    tasks.push(bundlerTask);
+    const bundlerTasks = await addBundlerConfiguration(tree, normalizedSchema);
+    tasks.push(...bundlerTasks);
     // create files for webpack and vite config, index.html
     if (normalizedSchema.bundler === 'vite') {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/base-vite'), normalizedSchema.projectRoot, { ...normalizedSchema, tmpl: '' });
@@ -37,7 +37,7 @@ async function webConfigurationGenerator(tree, options) {
             ...normalizedSchema,
             tmpl: '',
             webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
-                ? (0, webpack_targets_1.createNxWebpackPluginOptions)(normalizedSchema)
+                ? (0, webpack_targets_1.createNxWebpackPluginOptions)(tree, normalizedSchema)
                 : null,
         });
     }
@@ -69,25 +69,31 @@ async function addBundlerConfiguration(tree, normalizedSchema) {
             compiler: 'babel',
             skipFormat: true,
         });
-        return viteTask;
+        return [viteTask];
     }
     else {
+        let tasks = [];
         const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
         const webpackInitTask = await webpackInitGenerator(tree, {
             ...normalizedSchema,
             skipFormat: true,
             skipPackageJson: normalizedSchema.skipPackageJson,
         });
+        tasks.push(webpackInitTask);
+        if (!normalizedSchema.skipPackageJson) {
+            const { ensureDependencies } = await Promise.resolve().then(() => require('@nx/webpack/src/utils/ensure-dependencies'));
+            tasks.push(ensureDependencies(tree, { uiFramework: 'react' }));
+        }
         if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) {
             const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, normalizedSchema.project);
             projectConfiguration.targets = {
                 ...projectConfiguration.targets,
-                build: (0, webpack_targets_1.createBuildTarget)(normalizedSchema),
+                build: (0, webpack_targets_1.createBuildTarget)(tree, normalizedSchema),
                 serve: (0, webpack_targets_1.createServeTarget)(normalizedSchema),
             };
             (0, devkit_1.updateProjectConfiguration)(tree, normalizedSchema.project, projectConfiguration);
         }
-        return webpackInitTask;
+        return tasks;
     }
 }
 exports.default = webConfigurationGenerator;