@nx/react 0.0.0-pr-28808-bceb02f → 0.0.0-pr-28808-ae8ea8d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-28808-bceb02f",
+  "version": "0.0.0-pr-28808-ae8ea8d",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -39,10 +39,10 @@
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
     "@module-federation/enhanced": "0.6.9",
-    "@nx/devkit": "0.0.0-pr-28808-bceb02f",
-    "@nx/js": "0.0.0-pr-28808-bceb02f",
-    "@nx/eslint": "0.0.0-pr-28808-bceb02f",
-    "@nx/web": "0.0.0-pr-28808-bceb02f",
+    "@nx/devkit": "0.0.0-pr-28808-ae8ea8d",
+    "@nx/js": "0.0.0-pr-28808-ae8ea8d",
+    "@nx/eslint": "0.0.0-pr-28808-ae8ea8d",
+    "@nx/web": "0.0.0-pr-28808-ae8ea8d",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.3"
   },

package/src/generators/application/application.js

@@ -257,7 +257,6 @@ async function applicationGeneratorInternal(host, schema) {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
-        // outDir: 'dist/app',
     });
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

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

@@ -36,14 +36,26 @@ 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 (options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        name: options.e2eProjectName,
+                    },
+                });
+            }
+            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,
@@ -88,13 +100,25 @@ 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 (options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        name: options.e2eProjectName,
+                    },
+                });
+            }
+            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/component/component.js

@@ -67,7 +67,10 @@ function addExportsToBarrel(host, options) {
     const workspace = (0, devkit_1.getProjects)(host);
     const isApp = workspace.get(options.projectName).projectType === 'application';
     if (options.export && !isApp) {
-        const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
+        let indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
+        if (!host.exists(indexFilePath)) {
+            indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, 'src', options.js ? 'index.js' : 'index.ts');
+        }
         const indexSource = host.read(indexFilePath, 'utf-8');
         if (indexSource !== null) {
             const indexSourceFile = tsModule.createSourceFile(indexFilePath, indexSource, tsModule.ScriptTarget.Latest, true);

package/src/generators/host/lib/update-module-federation-tsconfig.js

@@ -8,15 +8,10 @@ function updateModuleFederationTsconfig(host, options) {
     const tsconfigRuntimePath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json');
     if (!host.exists(tsconfigPath) || !host.exists(tsconfigRuntimePath))
         return;
-    // Using `composite: true` and not setting `baseUrl` currently does not work with MF.
-    // In integrated setup, `baseUrl` was set in `tsconfig.base.json` and we did not set `composite: true`.
+    // Not setting `baseUrl` does not work with MF.
     if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        (0, devkit_1.updateJson)(host, tsconfigRuntimePath, (json) => {
-            json.compilerOptions = {
-                ...json.compilerOptions,
-                composite: false,
-                baseUrl: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
-            };
+        (0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
+            json.compilerOptions.baseUrl = '.';
             return json;
         });
         // Update references to match what `nx sync` does.

package/src/generators/library/files/vite/package.json__tmpl__

@@ -1,12 +1,12 @@
 {
   "name": "<%= name %>",
   "version": "0.0.1",
-  "main": "./index.js",
-  "types": "./index.d.ts",
+  "main": "./<%= isUsingTsSolutionConfig ? 'dist/' : '' %>index.js",
+  "types": "./<%= isUsingTsSolutionConfig ? 'dist/' : '' %>index.d.ts",
   "exports": {
     ".": {
-      "import": "./index.mjs",
-      "require": "./index.js"
+      "import": "./<%= isUsingTsSolutionConfig ? 'dist/' : '' %>index.mjs",
+      "require": "./<%= isUsingTsSolutionConfig ? 'dist/' : '' %>index.js"
     }
   }
 }

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

@@ -5,7 +5,27 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const assertion_1 = require("../../../utils/assertion");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const prompt_1 = require("@nx/devkit/src/generators/prompt");
 async function normalizeOptions(host, options) {
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    if (isUsingTsSolutionConfig) {
+        options.bundler ??= await (0, prompt_1.promptWhenInteractive)({
+            type: 'autocomplete',
+            name: 'bundler',
+            message: `Which bundler would you like to use to build the library? Choose 'none' to skip build setup.`,
+            choices: [{ name: 'vite' }, { name: 'rollup' }, { name: 'none' }],
+            initial: 0,
+        }, { bundler: 'none' }).then(({ bundler }) => bundler);
+    }
+    else {
+        options.bundler ??= await (0, prompt_1.promptWhenInteractive)({
+            type: 'autocomplete',
+            name: 'bundler',
+            message: `Which bundler would you like to use to build the library? Choose 'none' to skip build setup.`,
+            choices: [{ name: 'none' }, { name: 'vite' }, { name: 'rollup' }],
+            initial: 0,
+        }, { bundler: undefined }).then(({ bundler }) => bundler);
+    }
     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, {
         name: options.name,
@@ -63,7 +83,7 @@ async function normalizeOptions(host, options) {
         }
     }
     (0, assertion_1.assertValidStyle)(normalized.style);
-    normalized.isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    normalized.isUsingTsSolutionConfig = isUsingTsSolutionConfig;
     return normalized;
 }
 function findMainEntry(tree, projectRoot) {

package/src/generators/library/schema.json

@@ -160,10 +160,7 @@
     "bundler": {
       "type": "string",
       "description": "The bundler to use. Choosing 'none' means this library is not buildable.",
-      "enum": ["none", "vite", "rollup"],
-      "default": "none",
-      "x-prompt": "Which bundler would you like to use to build the library? Choose 'none' to skip build setup.",
-      "x-priority": "important"
+      "enum": ["none", "vite", "rollup"]
     },
     "compiler": {
       "type": "string",

package/src/rules/update-module-federation-project.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleFederationProject = updateModuleFederationProject;
 const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../utils/maybe-js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function updateModuleFederationProject(host, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (options.bundler === 'rspack') {
@@ -76,5 +77,10 @@ function updateModuleFederationProject(host, options) {
             },
         },
     };
+    // Typechecks must be performed first before build and serve to generate remote d.ts files.
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        projectConfig.targets.build.dependsOn = ['^build', 'typecheck'];
+        projectConfig.targets.serve.dependsOn = ['typecheck'];
+    }
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
 }