@nx/remix 21.0.0-beta.1 → 21.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "21.0.0-beta.1",
+  "version": "21.0.0-beta.3",
   "description": "The Remix plugin for Nx contains executors and generators for managing Remix applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Jest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, routes, loaders, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -29,9 +29,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.0.0-beta.1",
-    "@nx/js": "21.0.0-beta.1",
-    "@nx/react": "21.0.0-beta.1",
+    "@nx/devkit": "21.0.0-beta.3",
+    "@nx/js": "21.0.0-beta.3",
+    "@nx/react": "21.0.0-beta.3",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },

package/src/generators/application/__snapshots__/application.impl.spec.ts.snap

@@ -182,7 +182,7 @@ export default defineConfig({
   webServer: {
     command: 'npx nx run test:serve-static',
     url: 'http://localhost:3000',
-    reuseExistingServer: !process.env.CI,
+    reuseExistingServer: true,
     cwd: workspaceRoot,
   },
   projects: [
@@ -252,7 +252,7 @@ import react from '@vitejs/plugin-react';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
-export default defineConfig({
+export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../node_modules/.vite/test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
@@ -269,10 +269,10 @@ export default defineConfig({
     reporters: ['default'],
     coverage: {
       reportsDirectory: '../coverage/test',
-      provider: 'v8',
+      provider: 'v8' as const,
     },
   },
-});
+}));
 "
 `;
 
@@ -429,7 +429,8 @@ installGlobals();
 
 exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using jest 3`] = `
 "import { createRemixStub } from '@remix-run/testing';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render } from '@testing-library/react';
+import { screen } from '@testing-library/dom';
 import Index from '../../app/routes/_index';
 
 test('renders loader data', async () => {
@@ -442,7 +443,7 @@ test('renders loader data', async () => {
 
   render(<RemixStub />);
 
-  await waitFor(() => screen.findByText('Hello there,'));
+  await screen.findByText('Hello there,');
 });
 "
 `;
@@ -454,7 +455,7 @@ import react from '@vitejs/plugin-react';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
-export default defineConfig({
+export default defineConfig(() => ({
   root: __dirname,
   cacheDir: './node_modules/.vite/test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
@@ -471,16 +472,17 @@ export default defineConfig({
     reporters: ['default'],
     coverage: {
       reportsDirectory: './coverage/test',
-      provider: 'v8',
+      provider: 'v8' as const,
     },
   },
-});
+}));
 "
 `;
 
 exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using vitest 2`] = `
 "import { createRemixStub } from '@remix-run/testing';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render } from '@testing-library/react';
+import { screen } from '@testing-library/dom';
 import Index from '../../app/routes/_index';
 
 test('renders loader data', async () => {
@@ -493,7 +495,7 @@ test('renders loader data', async () => {
 
   render(<RemixStub />);
 
-  await waitFor(() => screen.findByText('Hello there,'));
+  await screen.findByText('Hello there,');
 });
 "
 `;
@@ -606,7 +608,8 @@ export default function Index() {
 
 exports[`Remix Application Standalone Project Repo should create the application correctly 3`] = `
 "import { createRemixStub } from '@remix-run/testing';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render } from '@testing-library/react';
+import { screen } from '@testing-library/dom';
 import Index from '../../app/routes/_index';
 
 test('renders loader data', async () => {
@@ -619,7 +622,7 @@ test('renders loader data', async () => {
 
   render(<RemixStub />);
 
-  await waitFor(() => screen.findByText('Hello there,'));
+  await screen.findByText('Hello there,');
 });
 "
 `;
@@ -656,7 +659,13 @@ export default defineConfig({
 exports[`Remix Application Standalone Project Repo should create the application correctly 5`] = `
 "{
   "root": true,
-  "ignorePatterns": ["!**/*", "build", "public/build"],
+  "ignorePatterns": [
+    "!**/*",
+    "build",
+    "public/build",
+    "**/vite.config.*.timestamp*",
+    "**/vitest.config.*.timestamp*"
+  ],
   "plugins": ["@nx"],
   "overrides": [
     {
@@ -703,7 +712,7 @@ export default defineConfig({
   webServer: {
     command: 'npx nx run test:serve-static',
     url: 'http://localhost:3000',
-    reuseExistingServer: !process.env.CI,
+    reuseExistingServer: true,
     cwd: workspaceRoot,
   },
   projects: [

package/src/generators/application/application.impl.js

@@ -17,6 +17,7 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 function remixApplicationGenerator(tree, options) {
     return remixApplicationGeneratorInternal(tree, {
         addPlugin: true,
+        useProjectJson: true,
         ...options,
     });
 }
@@ -40,9 +41,9 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
-    if (!options.isUsingTsSolutionConfig) {
+    if (options.useProjectJson) {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
             root: options.projectRoot,
             sourceRoot: `${options.projectRoot}`,
@@ -82,6 +83,18 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/ts-solution'), options.projectRoot, vars);
     }
+    if (!options.useProjectJson) {
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
+            if (options.projectName !== options.importPath) {
+                json.nx = { name: options.projectName };
+            }
+            if (options.parsedTags?.length) {
+                json.nx ??= {};
+                json.nx.tags = options.parsedTags;
+            }
+            return json;
+        });
+    }
     if (options.unitTestRunner !== 'none') {
         if (options.unitTestRunner === 'vitest') {
             const { vitestGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', (0, versions_1.getPackageVersion)(tree, 'nx'));
@@ -193,7 +206,7 @@ export default {...nxPreset};
         }
     }
     tasks.push(await (0, lib_1.addE2E)(tree, options));
-    (0, lib_1.addViteTempFilesToGitIgnore)(tree);
+    await (0, lib_1.ignoreViteTempFiles)(tree, options.projectRoot);
     (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.projectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',

package/src/generators/application/files/common/tests/routes/_index.spec.tsx__tmpl__

@@ -1,5 +1,6 @@
 import { createRemixStub } from '@remix-run/testing';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render } from '@testing-library/react';
+import { screen } from '@testing-library/dom';
 import Index from '../../app/routes/_index';
 
 test('renders loader data', async () => {
@@ -12,5 +13,5 @@ test('renders loader data', async () => {
 
   render(<RemixStub />);
 
-  await waitFor(() => screen.findByText('Hello there,'));
+  await screen.findByText('Hello there,');
 });

package/src/generators/application/files/ts-solution/package.json__tmpl__

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "<%= projectName %>",
+  "name": "<%= importPath %>",
   "scripts": {},
   "type": "module",
   "dependencies": {
@@ -19,8 +19,5 @@
   "engines": {
     "node": ">=20"
   },
-  "sideEffects": false<% if (isUsingTsSolutionConfig && parsedTags?.length) { %>,
-  "nx": {
-    "tags": <%- JSON.stringify(parsedTags) %>
-  }<% } %>
+  "sideEffects": false
 }

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

@@ -6,7 +6,6 @@ const versions_1 = require("../../../utils/versions");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 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 hasRemixPlugin = (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
         ? p === '@nx/remix/plugin'
@@ -14,17 +13,15 @@ async function addE2E(tree, options) {
     let e2eWebsServerInfo = await getRemixE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.projectRoot, 'remix.config.js'), options.addPlugin ?? Boolean(hasRemixPlugin));
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', (0, versions_1.getPackageVersion)(tree, 'nx'));
-        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],
-                },
-            });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
         }
         else {
             (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -36,6 +33,9 @@ async function addE2E(tree, options) {
                 implicitDependencies: [options.projectName],
             });
         }
+        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const e2eTask = await configurationGenerator(tree, {
             project: options.e2eProjectName,
             directory: 'src',
@@ -71,17 +71,15 @@ async function addE2E(tree, options) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', (0, versions_1.getPackageVersion)(tree, 'nx'));
-        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],
-                },
-            });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
         }
         else {
             (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -93,6 +91,9 @@ async function addE2E(tree, options) {
                 implicitDependencies: [options.projectName],
             });
         }
+        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const e2eTask = await configurationGenerator(tree, {
             project: options.e2eProjectName,
             skipFormat: true,

package/src/generators/application/lib/ignore-vite-temp-files.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export declare function ignoreViteTempFiles(tree: Tree, projectRoot?: string | undefined): Promise<void>;
+export declare function isEslintInstalled(tree: Tree): boolean;

package/src/generators/application/lib/ignore-vite-temp-files.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ignoreViteTempFiles = ignoreViteTempFiles;
+exports.isEslintInstalled = isEslintInstalled;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../../utils/versions");
+async function ignoreViteTempFiles(tree, projectRoot) {
+    addViteTempFilesToGitIgnore(tree);
+    await ignoreViteTempFilesInEslintConfig(tree, projectRoot);
+}
+function addViteTempFilesToGitIgnore(tree) {
+    let gitIgnoreContents = tree.exists('.gitignore')
+        ? tree.read('.gitignore', 'utf-8')
+        : '';
+    if (!/^vite\.config\.\*\.timestamp\*$/m.test(gitIgnoreContents)) {
+        gitIgnoreContents = (0, devkit_1.stripIndents) `${gitIgnoreContents}
+      vite.config.*.timestamp*`;
+    }
+    if (!/^vitest\.config\.\*\.timestamp\*$/m.test(gitIgnoreContents)) {
+        gitIgnoreContents = (0, devkit_1.stripIndents) `${gitIgnoreContents}
+      vitest.config.*.timestamp*`;
+    }
+    tree.write('.gitignore', gitIgnoreContents);
+}
+async function ignoreViteTempFilesInEslintConfig(tree, projectRoot) {
+    if (!isEslintInstalled(tree)) {
+        return;
+    }
+    (0, devkit_1.ensurePackage)('@nx/eslint', (0, versions_1.getPackageVersion)(tree, 'nx'));
+    const { addIgnoresToLintConfig, isEslintConfigSupported } = await Promise.resolve().then(() => require('@nx/eslint/src/generators/utils/eslint-file'));
+    if (!isEslintConfigSupported(tree)) {
+        return;
+    }
+    const { useFlatConfig } = await Promise.resolve().then(() => require('@nx/eslint/src/utils/flat-config'));
+    const isUsingFlatConfig = useFlatConfig(tree);
+    if (!projectRoot && !isUsingFlatConfig) {
+        // root eslintrc files ignore all files and the root eslintrc files add
+        // back all the project files, so we only add the ignores to the project
+        // eslintrc files
+        return;
+    }
+    // for flat config, we update the root config file
+    const directory = isUsingFlatConfig ? '' : projectRoot ?? '';
+    addIgnoresToLintConfig(tree, directory, [
+        '**/vite.config.*.timestamp*',
+        '**/vitest.config.*.timestamp*',
+    ]);
+}
+function isEslintInstalled(tree) {
+    try {
+        require('eslint');
+        return true;
+    }
+    catch { }
+    // it might not be installed yet, but it might be in the tree pending install
+    const { devDependencies, dependencies } = tree.exists('package.json')
+        ? (0, devkit_1.readJson)(tree, 'package.json')
+        : {};
+    return !!devDependencies?.['eslint'] || !!dependencies?.['eslint'];
+}

package/src/generators/application/lib/index.d.ts

@@ -1,4 +1,4 @@
 export * from './normalize-options';
 export * from './update-unit-test-config';
 export * from './add-e2e';
-export * from './add-vite-temp-files-to-gitignore';
+export * from './ignore-vite-temp-files';

package/src/generators/application/lib/index.js

@@ -4,4 +4,4 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./update-unit-test-config"), exports);
 tslib_1.__exportStar(require("./add-e2e"), exports);
-tslib_1.__exportStar(require("./add-vite-temp-files-to-gitignore"), exports);
+tslib_1.__exportStar(require("./ignore-vite-temp-files"), exports);

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

@@ -3,6 +3,7 @@ import { type NxRemixGeneratorSchema } from '../schema';
 export interface NormalizedSchema extends NxRemixGeneratorSchema {
     projectName: string;
     projectRoot: string;
+    importPath: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
     parsedTags: string[];

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

@@ -5,10 +5,9 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const eslint_1 = require("@nx/eslint");
 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(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
-    const { projectName, projectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName, projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -19,23 +18,24 @@ async function normalizeOptions(tree, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const e2eProjectName = options.rootProject ? 'e2e' : `${projectName}-e2e`;
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
+    const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${projectRoot}-e2e`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     return {
         ...options,
         linter: options.linter ?? eslint_1.Linter.EsLint,
-        projectName: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(tree, projectName)
-            : projectName,
+        projectName: appProjectName,
         projectRoot,
+        importPath,
         e2eProjectName,
         e2eProjectRoot,
         parsedTags,
-        useTsSolution: options.useTsSolution ?? isUsingTsSolutionConfig,
+        useTsSolution: isUsingTsSolutionConfig,
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
 }

package/src/generators/application/lib/update-unit-test-config.js

@@ -46,6 +46,7 @@ function updateUnitTestConfig(tree, pathToRoot, unitTestRunner, rootProject) {
     });
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@testing-library/jest-dom': versions_1.testingLibraryJestDomVersion,
+        '@testing-library/dom': versions_1.testingLibraryDomVersion,
         '@testing-library/react': versions_1.testingLibraryReactVersion,
         '@testing-library/user-event': versions_1.testingLibraryUserEventsVersion,
         '@remix-run/node': (0, versions_1.getRemixVersion)(tree),

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

@@ -14,4 +14,5 @@ export interface NxRemixGeneratorSchema {
   nxCloudToken?: string;
   useTsSolution?: boolean;
   formatter?: 'prettier' | 'none';
+  useProjectJson?: boolean;
 }

package/src/generators/application/schema.json

@@ -57,6 +57,10 @@
       "type": "boolean",
       "x-priority": "internal",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]

package/src/generators/library/__snapshots__/library.impl.spec.ts.snap

@@ -28,7 +28,7 @@ import react from '@vitejs/plugin-react';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
-export default defineConfig({
+export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../node_modules/.vite/test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
@@ -43,9 +43,12 @@ export default defineConfig({
     environment: 'jsdom',
     include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
-    coverage: { reportsDirectory: '../coverage/test', provider: 'v8' },
+    coverage: {
+      reportsDirectory: '../coverage/test',
+      provider: 'v8' as const,
+    },
   },
-});
+}));
 "
 `;
 

package/src/generators/library/lib/add-tsconfig-entry-points.js

@@ -3,19 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTsconfigEntryPoints = addTsconfigEntryPoints;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-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");
 function addTsconfigEntryPoints(tree, options) {
     const { root: projectRoot, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-    const serverFilePath = (0, devkit_1.joinPathFragments)(...(sourceRoot ? [sourceRoot] : [projectRoot, 'src']), 'server.ts');
+    const projectSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(tree, sourceRoot, projectRoot);
+    const serverFilePath = (0, devkit_1.joinPathFragments)(projectSourceRoot, 'server.ts');
     tree.write(serverFilePath, `// This file should be used to export ONLY server-code from the library.`);
     const baseTsConfig = (0, js_1.getRootTsConfigPathInTree)(tree);
-    // Use same logic as `determineProjectNameAndRootOptions` to get the import path
-    const importPath = (0, project_name_and_root_utils_1.resolveImportPath)(tree, options.name, projectRoot);
     (0, devkit_1.updateJson)(tree, baseTsConfig, (json) => {
-        if (json.compilerOptions.paths && json.compilerOptions.paths[importPath]) {
-            json.compilerOptions.paths[(0, devkit_1.joinPathFragments)(importPath, 'server')] = [
-                serverFilePath,
-            ];
+        if (json.compilerOptions.paths &&
+            json.compilerOptions.paths[options.importPath]) {
+            json.compilerOptions.paths[(0, devkit_1.joinPathFragments)(options.importPath, 'server')] = [serverFilePath];
         }
         return json;
     });

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

@@ -4,10 +4,9 @@ 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(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
-    const { projectName, projectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName, projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
@@ -20,10 +19,10 @@ async function normalizeOptions(tree, options) {
     return {
         ...options,
         unitTestRunner: options.unitTestRunner ?? 'vitest',
-        projectName: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(tree, projectName)
-            : projectName,
+        projectName: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectRoot,
+        importPath,
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
 }

package/src/generators/library/lib/update-buildable-config.js

@@ -13,7 +13,7 @@ function updateBuildableConfig(tree, options) {
         format: ['cjs'],
         outputPath: (0, devkit_1.joinPathFragments)(project.root, 'dist'),
     };
-    (0, devkit_1.updateProjectConfiguration)(tree, options.name, project);
+    (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
     // Point to nested dist for yarn/npm/pnpm workspaces
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(project.root, 'package.json'), (json) => {
         json.main = './dist/index.cjs.js';

package/src/generators/library/library.impl.js

@@ -9,13 +9,17 @@ const lib_1 = require("./lib");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function remixLibraryGenerator(tree, schema) {
-    return remixLibraryGeneratorInternal(tree, { addPlugin: false, ...schema });
+    return remixLibraryGeneratorInternal(tree, {
+        addPlugin: false,
+        useProjectJson: true,
+        ...schema,
+    });
 }
 async function remixLibraryGeneratorInternal(tree, schema) {
     const tasks = [];
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         js: options.js,
@@ -36,6 +40,7 @@ async function remixLibraryGeneratorInternal(tree, schema) {
         buildable: options.buildable,
         bundler: options.bundler,
         addPlugin: options.addPlugin,
+        useProjectJson: options.useProjectJson,
     });
     tasks.push(libGenTask);
     if (options.unitTestRunner && options.unitTestRunner !== 'none') {

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

@@ -14,4 +14,5 @@ export interface NxRemixGeneratorSchema {
   js?: boolean;
   skipFormat?: boolean;
   addPlugin?: boolean;
+  useProjectJson?: boolean;
 }

package/src/generators/library/schema.json

@@ -81,6 +81,10 @@
       "default": false,
       "description": "Generate a buildable library that uses rollup to bundle.",
       "x-deprecated": "Use the `bundler` option for greater control (none, vite, rollup)."
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]

package/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap

@@ -92,7 +92,7 @@ import react from '@vitejs/plugin-react';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
-export default defineConfig({
+export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../../node_modules/.vite/libs/storybook-test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
@@ -109,10 +109,10 @@ export default defineConfig({
     reporters: ['default'],
     coverage: {
       reportsDirectory: '../../coverage/libs/storybook-test',
-      provider: 'v8',
+      provider: 'v8' as const,
     },
   },
-});
+}));
 "
 `;
 

package/src/plugins/__snapshots__/plugin.spec.ts.snap

@@ -40,12 +40,14 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should create
             },
             "dev": {
               "command": "remix dev --manual",
+              "continuous": true,
               "options": {
                 "cwd": "my-app",
               },
             },
             "serve-static": {
               "command": "remix-serve build/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -55,6 +57,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should create
             },
             "start": {
               "command": "remix-serve build/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -64,6 +67,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should create
             },
             "static-serve": {
               "command": "remix-serve build/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -103,6 +107,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should create
             },
             "watch-deps": {
               "command": "npx nx watch --projects my-app --includeDependentProjects -- npx nx build-deps my-app",
+              "continuous": true,
               "dependsOn": [
                 "build-deps",
               ],
@@ -155,12 +160,14 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should infer w
             },
             "dev": {
               "command": "remix dev --manual",
+              "continuous": true,
               "options": {
                 "cwd": "my-app",
               },
             },
             "serve-static": {
               "command": "remix-serve build/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -170,6 +177,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should infer w
             },
             "start": {
               "command": "remix-serve build/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -179,6 +187,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should infer w
             },
             "static-serve": {
               "command": "remix-serve build/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -218,6 +227,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should infer w
             },
             "watch-deps": {
               "command": "npx nx watch --projects my-app --includeDependentProjects -- npx nx build-deps my-app",
+              "continuous": true,
               "dependsOn": [
                 "build-deps",
               ],
@@ -265,12 +275,14 @@ exports[`@nx/remix/plugin Remix Classic Compiler root project should create node
             },
             "dev": {
               "command": "remix dev --manual",
+              "continuous": true,
               "options": {
                 "cwd": ".",
               },
             },
             "serve-static": {
               "command": "remix-serve build/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -280,6 +292,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler root project should create node
             },
             "start": {
               "command": "remix-serve build/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -289,6 +302,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler root project should create node
             },
             "static-serve": {
               "command": "remix-serve build/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -373,12 +387,14 @@ exports[`@nx/remix/plugin Remix Vite Compiler non-root project should create nod
             },
             "dev": {
               "command": "remix vite:dev",
+              "continuous": true,
               "options": {
                 "cwd": "my-app",
               },
             },
             "serve-static": {
               "command": "remix-serve build/server/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -388,6 +404,7 @@ exports[`@nx/remix/plugin Remix Vite Compiler non-root project should create nod
             },
             "start": {
               "command": "remix-serve build/server/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -397,6 +414,7 @@ exports[`@nx/remix/plugin Remix Vite Compiler non-root project should create nod
             },
             "static-serve": {
               "command": "remix-serve build/server/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -436,6 +454,7 @@ exports[`@nx/remix/plugin Remix Vite Compiler non-root project should create nod
             },
             "watch-deps": {
               "command": "npx nx watch --projects my-app --includeDependentProjects -- npx nx build-deps my-app",
+              "continuous": true,
               "dependsOn": [
                 "build-deps",
               ],
@@ -482,12 +501,14 @@ exports[`@nx/remix/plugin Remix Vite Compiler root project should create nodes 1
             },
             "dev": {
               "command": "remix vite:dev",
+              "continuous": true,
               "options": {
                 "cwd": ".",
               },
             },
             "serve-static": {
               "command": "remix-serve build/server/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -497,6 +518,7 @@ exports[`@nx/remix/plugin Remix Vite Compiler root project should create nodes 1
             },
             "start": {
               "command": "remix-serve build/server/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],
@@ -506,6 +528,7 @@ exports[`@nx/remix/plugin Remix Vite Compiler root project should create nodes 1
             },
             "static-serve": {
               "command": "remix-serve build/server/index.js",
+              "continuous": true,
               "dependsOn": [
                 "build",
               ],

package/src/plugins/plugin.js

@@ -127,6 +127,7 @@ function buildTarget(buildTargetName, projectRoot, buildDirectory, assetsBuildDi
 }
 function devTarget(serverBuildPath, projectRoot, remixCompiler, isUsingTsSolutionSetup) {
     const devTarget = {
+        continuous: true,
         command: remixCompiler === RemixCompiler.IsVte
             ? 'remix vite:dev'
             : 'remix dev --manual',
@@ -146,6 +147,7 @@ function startTarget(projectRoot, serverBuildPath, buildTargetName, remixCompile
     }
     const startTarget = {
         dependsOn: [buildTargetName],
+        continuous: true,
         command: `remix-serve ${serverPath}`,
         options: {
             cwd: projectRoot,

package/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 import { Tree } from '@nx/devkit';
 export declare const nxVersion: any;
-export declare const remixVersion = "^2.14.0";
+export declare const remixVersion = "^2.15.0";
 export declare const isbotVersion = "^4.4.0";
 export declare const reactVersion = "^18.2.0";
 export declare const reactDomVersion = "^18.2.0";
@@ -13,6 +13,7 @@ export declare const postcssVersion = "^8.4.38";
 export declare const autoprefixerVersion = "^10.4.19";
 export declare const testingLibraryReactVersion = "^14.1.2";
 export declare const testingLibraryJestDomVersion = "6.4.2";
+export declare const testingLibraryDomVersion = "^10.4.0";
 export declare const testingLibraryUserEventsVersion = "^14.5.2";
 export declare const viteVersion = "^5.0.0";
 export declare function getRemixVersion(tree: Tree): string;

package/src/utils/versions.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.viteVersion = exports.testingLibraryUserEventsVersion = exports.testingLibraryJestDomVersion = exports.testingLibraryReactVersion = exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptVersion = exports.eslintVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactDomVersion = exports.reactVersion = exports.isbotVersion = exports.remixVersion = exports.nxVersion = void 0;
+exports.viteVersion = exports.testingLibraryUserEventsVersion = exports.testingLibraryDomVersion = exports.testingLibraryJestDomVersion = exports.testingLibraryReactVersion = exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptVersion = exports.eslintVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactDomVersion = exports.reactVersion = exports.isbotVersion = exports.remixVersion = exports.nxVersion = void 0;
 exports.getRemixVersion = getRemixVersion;
 exports.getPackageVersion = getPackageVersion;
 const devkit_1 = require("@nx/devkit");
 exports.nxVersion = require('../../package.json').version;
-exports.remixVersion = '^2.14.0';
+exports.remixVersion = '^2.15.0';
 exports.isbotVersion = '^4.4.0';
 exports.reactVersion = '^18.2.0';
 exports.reactDomVersion = '^18.2.0';
@@ -19,6 +19,7 @@ exports.autoprefixerVersion = '^10.4.19';
 exports.testingLibraryReactVersion = '^14.1.2';
 // TODO(colum): Unpin this when @testing-library/jest-dom pushes a fix
 exports.testingLibraryJestDomVersion = '6.4.2';
+exports.testingLibraryDomVersion = '^10.4.0';
 exports.testingLibraryUserEventsVersion = '^14.5.2';
 exports.viteVersion = '^5.0.0';
 function getRemixVersion(tree) {

package/src/generators/application/lib/add-vite-temp-files-to-gitignore.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function addViteTempFilesToGitIgnore(tree: Tree): void;

package/src/generators/application/lib/add-vite-temp-files-to-gitignore.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addViteTempFilesToGitIgnore = addViteTempFilesToGitIgnore;
-const devkit_1 = require("@nx/devkit");
-function addViteTempFilesToGitIgnore(tree) {
-    let newGitIgnoreContents = `vite.config.*.timestamp*`;
-    if (tree.exists('.gitignore')) {
-        const gitIgnoreContents = tree.read('.gitignore', 'utf-8');
-        if (!gitIgnoreContents.includes(newGitIgnoreContents)) {
-            newGitIgnoreContents = (0, devkit_1.stripIndents) `${gitIgnoreContents}
-        ${newGitIgnoreContents}`;
-            tree.write('.gitignore', newGitIgnoreContents);
-        }
-    }
-    else {
-        tree.write('.gitignore', newGitIgnoreContents);
-    }
-}