@nx/remix 17.3.0-beta.3 → 17.3.0-beta.4

package/generators.d.ts

@@ -12,3 +12,4 @@ export * from './src/generators/route/route.impl';
 export * from './src/generators/setup-tailwind/setup-tailwind.impl';
 export * from './src/generators/storybook-configuration/storybook-configuration.impl';
 export * from './src/generators/style/style.impl';
+export * from './src/generators/init/init';

package/generators.js

@@ -15,3 +15,4 @@ tslib_1.__exportStar(require("./src/generators/route/route.impl"), exports);
 tslib_1.__exportStar(require("./src/generators/setup-tailwind/setup-tailwind.impl"), exports);
 tslib_1.__exportStar(require("./src/generators/storybook-configuration/storybook-configuration.impl"), exports);
 tslib_1.__exportStar(require("./src/generators/style/style.impl"), exports);
+tslib_1.__exportStar(require("./src/generators/init/init"), exports);

package/generators.json

@@ -35,6 +35,12 @@
       "aliases": ["lib"],
       "x-type": "library"
     },
+    "init": {
+      "implementation": "./src/generators/init/init",
+      "schema": "./src/generators/init/schema.json",
+      "description": "Initialize the `@nx/remix` plugin.",
+      "hidden": true
+    },
     "route": {
       "implementation": "./src/generators/route/route.impl",
       "schema": "./src/generators/route/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.4",
   "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, 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",
@@ -28,20 +28,21 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-beta.3",
-    "@nx/js": "17.3.0-beta.3",
-    "@nx/react": "17.3.0-beta.3",
+    "@nx/devkit": "17.3.0-beta.4",
+    "@nx/js": "17.3.0-beta.4",
+    "@nx/react": "17.3.0-beta.4",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/remix": "17.3.0-beta.3"
+    "@nrwl/remix": "17.3.0-beta.4"
   },
   "peerDependencies": {},
   "publishConfig": {
     "access": "public"
   },
   "exports": {
-    "./package.json": "./package.json",
     ".": "./index.js",
+    "./plugin": "./plugin.js",
+    "./package.json": "./package.json",
     "./executors.json": "./executors.json",
     "./generators.json": "./generators.json",
     "./migrations.json": "./migrations.json",

package/plugin.d.ts

@@ -0,0 +1 @@
+export { createNodes, createDependencies, RemixPluginOptions, } from './src/plugins/plugin';

package/plugin.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDependencies = exports.createNodes = void 0;
+var plugin_1 = require("./src/plugins/plugin");
+Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });
+Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return plugin_1.createDependencies; } });

package/src/generators/action/schema.json

@@ -21,10 +21,6 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-prompt": "What project is this route for?",
       "pattern": "^[a-zA-Z].*$",
       "x-deprecated": "Provide the `path` option instead and use the `as-provided` format. The project will be determined from the path provided. It will be removed in Nx v18."
     }

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

@@ -1,16 +1,22 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --directory should create the application correctly 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -90,16 +96,22 @@ exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provide
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --directory should extract the layout directory from the directory options if it exists 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -193,16 +205,22 @@ export default defineConfig({
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --js should create the application correctly 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -279,16 +297,22 @@ exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provide
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using jest 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -316,16 +340,22 @@ installGlobals();
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using vitest 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -374,16 +404,22 @@ installGlobals();
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided should create the application correctly 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -463,16 +499,22 @@ exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provide
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --directory should create the application correctly 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -552,16 +594,22 @@ exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --directory should extract the layout directory from the directory options if it exists 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -655,16 +703,22 @@ export default defineConfig({
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --js should create the application correctly 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -741,16 +795,22 @@ exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --unitTestRunner should generate the correct files for testing using jest 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -778,16 +838,22 @@ installGlobals();
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --unitTestRunner should generate the correct files for testing using vitest 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -836,16 +902,22 @@ installGlobals();
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived should create the application correctly 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -939,16 +1011,22 @@ export default defineConfig({
 `;
 
 exports[`Remix Application Standalone Project Repo --js should create the application correctly 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -1025,16 +1103,22 @@ exports[`Remix Application Standalone Project Repo --js should create the applic
 `;
 
 exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using jest 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -1086,16 +1170,22 @@ test('renders loader data', async () => {
 `;
 
 exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using vitest 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -1164,16 +1254,22 @@ installGlobals();
 `;
 
 exports[`Remix Application Standalone Project Repo should create the application correctly 1`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;

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

@@ -4,9 +4,15 @@ const devkit_1 = require("@nx/devkit");
 const create_ts_config_1 = require("@nx/js/src/utils/typescript/create-ts-config");
 const versions_1 = require("../../utils/versions");
 const lib_1 = require("./lib");
+const update_dependencies_1 = require("../utils/update-dependencies");
+const init_1 = require("../init/init");
+const js_1 = require("@nx/js");
 async function default_1(tree, _options) {
     const options = await (0, lib_1.normalizeOptions)(tree, _options);
-    const tasks = [];
+    const tasks = [
+        await (0, init_1.default)(tree, { skipFormat: true }),
+        await (0, js_1.initGenerator)(tree, { skipFormat: true }),
+    ];
     (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
         root: options.projectRoot,
         sourceRoot: `${options.projectRoot}`,
@@ -43,21 +49,7 @@ async function default_1(tree, _options) {
             },
         },
     });
-    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        '@remix-run/node': versions_1.remixVersion,
-        '@remix-run/react': versions_1.remixVersion,
-        '@remix-run/serve': versions_1.remixVersion,
-        isbot: versions_1.isbotVersion,
-        react: versions_1.reactVersion,
-        'react-dom': versions_1.reactDomVersion,
-    }, {
-        '@remix-run/dev': versions_1.remixVersion,
-        '@remix-run/eslint-config': versions_1.remixVersion,
-        '@types/react': versions_1.typesReactVersion,
-        '@types/react-dom': versions_1.typesReactDomVersion,
-        eslint: versions_1.eslintVersion,
-        typescript: versions_1.typescriptVersion,
-    });
+    const installTask = (0, update_dependencies_1.updateDependencies)(tree);
     tasks.push(installTask);
     const vars = {
         ...options,
@@ -82,7 +74,7 @@ async function default_1(tree, _options) {
     }
     if (options.unitTestRunner !== 'none') {
         if (options.unitTestRunner === 'vitest') {
-            const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', (0, versions_1.getPackageVersion)(tree, 'nx'));
+            const { vitestGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', (0, versions_1.getPackageVersion)(tree, 'nx'));
             const vitestTask = await vitestGenerator(tree, {
                 uiFramework: 'react',
                 project: options.projectName,
@@ -90,7 +82,16 @@ async function default_1(tree, _options) {
                 inSourceTests: false,
                 skipFormat: true,
                 testEnvironment: 'jsdom',
+                skipViteConfig: true,
             });
+            createOrEditViteConfig(tree, {
+                project: options.projectName,
+                includeLib: false,
+                includeVitest: true,
+                testEnvironment: 'jsdom',
+                imports: [`import react from '@vitejs/plugin-react';`],
+                plugins: [`react()`],
+            }, true, undefined, true);
             tasks.push(vitestTask);
         }
         else {

package/src/generators/application/files/common/remix.config.js__tmpl__

@@ -0,0 +1,17 @@
+import {createWatchPaths} from '@nx/remix';
+import {dirname} from 'path';
+import {fileURLToPath} from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
+ * @type {import('@remix-run/dev').AppConfig}
+ */
+export default {
+    ignoredRouteFiles: ["**/.*"],
+    // appDirectory: "app",
+    // assetsBuildDirectory: "public/build",
+    // serverBuildPath: "build/index.js",
+    // publicPath: "/build/",
+    watchPaths: () => createWatchPaths(__dirname),
+};

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

@@ -11,10 +11,10 @@ function updateUnitTestConfig(tree, pathToRoot, unitTestRunner) {
   import '@testing-library/jest-dom/matchers';
   installGlobals();`);
     if (unitTestRunner === 'vitest') {
-        const pathToViteConfig = (0, devkit_1.joinPathFragments)(pathToRoot, 'vite.config.ts');
-        (0, testing_config_utils_1.updateViteTestIncludes)(tree, pathToViteConfig, './app/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
-        (0, testing_config_utils_1.updateViteTestIncludes)(tree, pathToViteConfig, './tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
-        (0, testing_config_utils_1.updateViteTestSetup)(tree, pathToViteConfig, 'test-setup.ts');
+        const pathToViteConfig = (0, devkit_1.joinPathFragments)(pathToRoot, 'vitest.config.ts');
+        (0, testing_config_utils_1.updateVitestTestIncludes)(tree, pathToViteConfig, './app/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
+        (0, testing_config_utils_1.updateVitestTestIncludes)(tree, pathToViteConfig, './tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
+        (0, testing_config_utils_1.updateVitestTestSetup)(tree, pathToViteConfig, 'test-setup.ts');
     }
     else if (unitTestRunner === 'jest') {
         const pathToJestConfig = (0, devkit_1.joinPathFragments)(pathToRoot, 'jest.config.ts');

package/src/generators/error-boundary/schema.json

@@ -23,10 +23,6 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-prompt": "What project contains the route file that this ErrorBoundary is for?",
       "pattern": "^[a-zA-Z].*$",
       "x-deprecated": "Provide the `path` option instead and use the `as-provided` format. The project will be determined from the path provided. It will be removed in Nx v18."
     },

package/src/generators/init/init.d.ts

@@ -0,0 +1,4 @@
+import { type Tree, GeneratorCallback } from '@nx/devkit';
+import { type Schema } from './schema';
+export declare function remixInitGenerator(tree: Tree, options: Schema): Promise<GeneratorCallback>;
+export default remixInitGenerator;

package/src/generators/init/init.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.remixInitGenerator = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+function addPlugin(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    nxJson.plugins ??= [];
+    for (const plugin of nxJson.plugins) {
+        if (typeof plugin === 'string'
+            ? plugin === '@nx/remix/plugin'
+            : plugin.plugin === '@nx/remix/plugin') {
+            return;
+        }
+    }
+    nxJson.plugins.push({
+        plugin: '@nx/remix/plugin',
+        options: {
+            buildTargetName: 'build',
+            serveTargetName: 'serve',
+            startTargetName: 'start',
+            typecheckTargetName: 'typecheck',
+        },
+    });
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}
+async function remixInitGenerator(tree, options) {
+    const tasks = [];
+    if (!options.skipPackageJson) {
+        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
+            '@remix-run/serve': versions_1.remixVersion,
+        }, {
+            '@remix-run/dev': versions_1.remixVersion,
+        });
+        tasks.push(installTask);
+    }
+    if (process.env.NX_PCV3 === 'true') {
+        addPlugin(tree);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
+}
+exports.remixInitGenerator = remixInitGenerator;
+exports.default = remixInitGenerator;

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

@@ -0,0 +1,4 @@
+export interface Schema {
+  skipFormat?: boolean;
+  skipPackageJson?: boolean;
+}

package/src/generators/init/schema.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxRemixInit",
+  "title": "Init Remix Plugin",
+  "description": "Initialize the Remix Plugin.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false
+    },
+    "skipPackageJson": {
+      "description": "Do not add dependencies to `package.json`.",
+      "type": "boolean",
+      "default": false
+    }
+  },
+  "required": []
+}

package/src/generators/library/lib/add-unit-testing.js

@@ -16,7 +16,7 @@ function addUnitTestingSetup(tree, options) {
   installGlobals();`);
     if (options.unitTestRunner === 'vitest') {
         const pathToVitestConfig = (0, devkit_1.joinPathFragments)(options.projectRoot, `vite.config.ts`);
-        (0, testing_config_utils_1.updateViteTestSetup)(tree, pathToVitestConfig, './src/test-setup.ts');
+        (0, testing_config_utils_1.updateVitestTestSetup)(tree, pathToVitestConfig, './src/test-setup.ts');
     }
     else if (options.unitTestRunner === 'jest') {
         const pathToJestConfig = (0, devkit_1.joinPathFragments)(options.projectRoot, `jest.config.ts`);

package/src/generators/loader/schema.json

@@ -21,10 +21,6 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-prompt": "What project is this route for?",
       "pattern": "^[a-zA-Z].*$",
       "x-deprecated": "Provide the `path` option instead and use the `as-provided` format. The project will be determined from the path provided. It will be removed in Nx v18."
     }

package/src/generators/meta/schema.json

@@ -21,10 +21,6 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-prompt": "What project is this route for?",
       "pattern": "^[a-zA-Z].*$",
       "x-deprecated": "Provide the `path` option instead and use the `as-provided` format. The project will be determined from the path provided. It will be removed in Nx v18."
     }

package/src/generators/resource-route/schema.json

@@ -28,10 +28,6 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-prompt": "What project is this route for?",
       "pattern": "^[a-zA-Z].*$",
       "x-deprecated": "Provide the `path` option instead and use the `as-provided` format. The project will be determined from the path provided. It will be removed in Nx v18."
     },

package/src/generators/route/route.impl.js

@@ -70,6 +70,7 @@ async function default_1(tree, options) {
         await (0, style_impl_1.default)(tree, {
             project: projectName,
             path: routeFilePath,
+            nameAndDirectoryFormat: 'as-provided',
         });
     }
     await (0, devkit_1.formatFiles)(tree);

package/src/generators/route/schema.json

@@ -28,10 +28,6 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-prompt": "What project is this route for?",
       "pattern": "^[a-zA-Z].*$",
       "x-deprecated": "Provide the `path` option instead and use the `as-provided` format. The project will be determined from the path provided. It will be removed in Nx v18."
     },

package/src/generators/setup-tailwind/__snapshots__/setup-tailwind.impl.spec.ts.snap

@@ -60,17 +60,23 @@ export default function App() {
 `;
 
 exports[`setup-tailwind generator should add a js tailwind config to an application correctly 4`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   tailwind: true,
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;
@@ -140,17 +146,23 @@ export default function App() {
 `;
 
 exports[`setup-tailwind generator should add a tailwind config to an application correctly 4`] = `
-"/**
+"import { createWatchPaths } from '@nx/remix';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
  * @type {import('@remix-run/dev').AppConfig}
  */
-module.exports = {
+export default {
   tailwind: true,
   ignoredRouteFiles: ['**/.*'],
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
-  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+  watchPaths: () => createWatchPaths(__dirname),
 };
 "
 `;

package/src/generators/setup-tailwind/lib/update-remix-config.js

@@ -1,15 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateRemixConfig = void 0;
-const devkit_1 = require("@nx/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
+const remix_config_1 = require("../../../utils/remix-config");
 function updateRemixConfig(tree, projectRoot) {
-    const pathToRemixConfig = (0, devkit_1.joinPathFragments)(projectRoot, 'remix.config.cjs');
-    if (!tree.exists(pathToRemixConfig)) {
-        throw new Error(`Could not find "${pathToRemixConfig}". Please ensure a "remix.config.cjs" exists at the root of your project.`);
-    }
+    const pathToRemixConfig = (0, remix_config_1.getRemixConfigPathFromProjectRoot)(tree, projectRoot);
     const fileContents = tree.read(pathToRemixConfig, 'utf-8');
-    const REMIX_CONFIG_OBJECT_SELECTOR = 'PropertyAccessExpression:has(Identifier[name=module], Identifier[name=exports])~ObjectLiteralExpression';
+    const REMIX_CONFIG_OBJECT_SELECTOR = 'ObjectLiteralExpression';
     const ast = tsquery_1.tsquery.ast(fileContents);
     const nodes = (0, tsquery_1.tsquery)(ast, REMIX_CONFIG_OBJECT_SELECTOR, {
         visitAllChildren: true,

package/src/generators/style/schema.json

@@ -28,10 +28,6 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-prompt": "What project is this route in?",
       "pattern": "^[a-zA-Z].*$",
       "x-deprecated": "Provide the `path` option instead and use the `as-provided` format. The project will be determined from the path provided. It will be removed in Nx v18."
     }

package/src/generators/utils/update-dependencies.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function updateDependencies(tree: Tree): import("@nx/devkit").GeneratorCallback;

package/src/generators/utils/update-dependencies.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+function updateDependencies(tree) {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        '@remix-run/node': versions_1.remixVersion,
+        '@remix-run/react': versions_1.remixVersion,
+        isbot: versions_1.isbotVersion,
+        react: versions_1.reactVersion,
+        'react-dom': versions_1.reactDomVersion,
+    }, {
+        '@remix-run/eslint-config': versions_1.remixVersion,
+        '@types/react': versions_1.typesReactVersion,
+        '@types/react-dom': versions_1.typesReactDomVersion,
+        eslint: versions_1.eslintVersion,
+        typescript: versions_1.typescriptVersion,
+    });
+}
+exports.updateDependencies = updateDependencies;

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

@@ -0,0 +1,111 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`@nx/remix/plugin non-root project should create nodes 1`] = `
+{
+  "projects": {
+    "my-app": {
+      "root": "my-app",
+      "targets": {
+        "build": {
+          "cache": true,
+          "dependsOn": [
+            "^build",
+          ],
+          "executor": "@nx/remix:build",
+          "inputs": [
+            "production",
+            "^production",
+          ],
+          "options": {
+            "outputPath": "{workspaceRoot}/dist",
+          },
+          "outputs": [
+            "{options.outputPath}",
+          ],
+        },
+        "serve": {
+          "executor": "@nx/remix:serve",
+          "options": {
+            "command": "npx remix-serve build/index.js",
+          },
+        },
+        "start": {
+          "command": "npx remix-serve build/index.js",
+          "dependsOn": [
+            "build",
+          ],
+          "options": {
+            "cwd": "my-app",
+          },
+        },
+        "tsc": {
+          "cache": true,
+          "command": "tsc",
+          "inputs": [
+            "production",
+            "^production",
+          ],
+          "options": {
+            "cwd": "my-app",
+          },
+        },
+      },
+    },
+  },
+}
+`;
+
+exports[`@nx/remix/plugin root project should create nodes 1`] = `
+{
+  "projects": {
+    ".": {
+      "root": ".",
+      "targets": {
+        "build": {
+          "cache": true,
+          "dependsOn": [
+            "^build",
+          ],
+          "executor": "@nx/remix:build",
+          "inputs": [
+            "production",
+            "^production",
+          ],
+          "options": {
+            "outputPath": "{workspaceRoot}/dist",
+          },
+          "outputs": [
+            "{options.outputPath}",
+          ],
+        },
+        "serve": {
+          "executor": "@nx/remix:serve",
+          "options": {
+            "command": "npx remix-serve build/index.js",
+          },
+        },
+        "start": {
+          "command": "npx remix-serve build/index.js",
+          "dependsOn": [
+            "build",
+          ],
+          "options": {
+            "cwd": ".",
+          },
+        },
+        "typecheck": {
+          "cache": true,
+          "command": "tsc",
+          "inputs": [
+            "production",
+            "^production",
+          ],
+          "options": {
+            "cwd": ".",
+          },
+        },
+      },
+    },
+  },
+}
+`;

package/src/plugins/plugin.d.ts

@@ -0,0 +1,9 @@
+import { type CreateDependencies, type CreateNodes } from '@nx/devkit';
+export declare const createDependencies: CreateDependencies;
+export interface RemixPluginOptions {
+    buildTargetName?: string;
+    serveTargetName?: string;
+    startTargetName?: string;
+    typecheckTargetName?: string;
+}
+export declare const createNodes: CreateNodes<RemixPluginOptions>;

package/src/plugins/plugin.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNodes = exports.createDependencies = void 0;
+const cache_directory_1 = require("nx/src/utils/cache-directory");
+const devkit_1 = require("@nx/devkit");
+const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const js_1 = require("@nx/js");
+const path_1 = require("path");
+const fs_1 = require("fs");
+const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'remix.hash');
+const targetsCache = (0, fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
+const calculatedTargets = {};
+function readTargetsCache() {
+    return (0, devkit_1.readJsonFile)(cachePath);
+}
+function writeTargetsToCache(targets) {
+    (0, devkit_1.writeJsonFile)(cachePath, targets);
+}
+const createDependencies = () => {
+    writeTargetsToCache(calculatedTargets);
+    return [];
+};
+exports.createDependencies = createDependencies;
+exports.createNodes = [
+    '**/remix.config.{js,cjs,mjs}',
+    async (configFilePath, options, context) => {
+        const projectRoot = (0, path_1.dirname)(configFilePath);
+        const fullyQualifiedProjectRoot = (0, path_1.join)(context.workspaceRoot, projectRoot);
+        // Do not create a project if package.json and project.json isn't there
+        const siblingFiles = (0, fs_1.readdirSync)(fullyQualifiedProjectRoot);
+        if (!siblingFiles.includes('package.json') &&
+            !siblingFiles.includes('project.json')) {
+            return {};
+        }
+        options = normalizeOptions(options);
+        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
+            (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
+        ]);
+        const targets = targetsCache[hash]
+            ? targetsCache[hash]
+            : await buildRemixTargets(configFilePath, projectRoot, options, context);
+        calculatedTargets[hash] = targets;
+        return {
+            projects: {
+                [projectRoot]: {
+                    root: projectRoot,
+                    targets,
+                },
+            },
+        };
+    },
+];
+async function buildRemixTargets(configFilePath, projectRoot, options, context) {
+    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const serverBuildPath = await getServerBuildPath(configFilePath, context.workspaceRoot);
+    const targets = {};
+    targets[options.buildTargetName] = buildTarget(options.buildTargetName, namedInputs);
+    targets[options.serveTargetName] = serveTarget(serverBuildPath);
+    targets[options.startTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName);
+    targets[options.typecheckTargetName] = typecheckTarget(projectRoot, namedInputs);
+    return targets;
+}
+function buildTarget(buildTargetName, namedInputs) {
+    return {
+        cache: true,
+        dependsOn: [`^${buildTargetName}`],
+        inputs: [
+            ...('production' in namedInputs
+                ? ['production', '^production']
+                : ['default', '^default']),
+        ],
+        outputs: ['{options.outputPath}'],
+        executor: '@nx/remix:build',
+        options: {
+            outputPath: '{workspaceRoot}/dist',
+        },
+    };
+}
+function serveTarget(serverBuildPath) {
+    return {
+        executor: '@nx/remix:serve',
+        options: {
+            command: `npx remix-serve ${serverBuildPath}`,
+        },
+    };
+}
+function startTarget(projectRoot, serverBuildPath, buildTargetName) {
+    return {
+        dependsOn: [buildTargetName],
+        command: `npx remix-serve ${serverBuildPath}`,
+        options: {
+            cwd: projectRoot,
+        },
+    };
+}
+function typecheckTarget(projectRoot, namedInputs) {
+    return {
+        cache: true,
+        inputs: [
+            ...('production' in namedInputs
+                ? ['production', '^production']
+                : ['default', '^default']),
+        ],
+        command: 'tsc',
+        options: {
+            cwd: projectRoot,
+        },
+    };
+}
+async function getServerBuildPath(configFilePath, workspaceRoot) {
+    const configPath = (0, path_1.join)(workspaceRoot, configFilePath);
+    let appConfig = {};
+    try {
+        let appConfigModule;
+        try {
+            appConfigModule = await Function(`return import("${configPath}?t=${Date.now()}")`)();
+        }
+        catch {
+            appConfigModule = require(configPath);
+        }
+        appConfig = appConfigModule?.default || appConfigModule;
+    }
+    catch (error) {
+        throw new Error(`Error loading Remix config at ${configFilePath}\n${String(error)}`);
+    }
+    return appConfig.serverBuildPath ?? 'build/index.js';
+}
+function normalizeOptions(options) {
+    options ??= {};
+    options.buildTargetName ??= 'build';
+    options.serveTargetName ??= 'serve';
+    options.startTargetName ??= 'start';
+    options.typecheckTargetName ??= 'typecheck';
+    return options;
+}

package/src/utils/remix-config.d.ts

@@ -1,4 +1,5 @@
 import { Tree } from '@nx/devkit';
 import type { AppConfig } from '@remix-run/dev';
 export declare function getRemixConfigPath(tree: Tree, projectName: string): string;
+export declare function getRemixConfigPathFromProjectRoot(tree: Tree, projectRoot: string): string;
 export declare function getRemixConfigValues(tree: Tree, projectName: string): Promise<AppConfig>;

package/src/utils/remix-config.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRemixConfigValues = exports.getRemixConfigPath = void 0;
+exports.getRemixConfigValues = exports.getRemixConfigPathFromProjectRoot = exports.getRemixConfigPath = void 0;
 const devkit_1 = require("@nx/devkit");
 function getRemixConfigPath(tree, projectName) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     if (!project)
         throw new Error(`Project does not exist: ${projectName}`);
-    for (const ext of ['.cjs', '.js']) {
+    for (const ext of ['.mjs', '.cjs', '.js']) {
         const configPath = (0, devkit_1.joinPathFragments)(project.root, `remix.config${ext}`);
         if (tree.exists(configPath)) {
             return configPath;
@@ -14,8 +14,32 @@ function getRemixConfigPath(tree, projectName) {
     }
 }
 exports.getRemixConfigPath = getRemixConfigPath;
+function getRemixConfigPathFromProjectRoot(tree, projectRoot) {
+    let pathToRemixConfig;
+    for (const ext of ['.js', '.mjs', '.cjs']) {
+        pathToRemixConfig = (0, devkit_1.joinPathFragments)(projectRoot, `remix.config${ext}`);
+        if (tree.exists(pathToRemixConfig)) {
+            return pathToRemixConfig;
+        }
+    }
+    throw new Error(`Could not find a Remix Config File. Please ensure a "remix.config.js" file exists at the root of your project.`);
+}
+exports.getRemixConfigPathFromProjectRoot = getRemixConfigPathFromProjectRoot;
+const _remixConfigCache = {};
 async function getRemixConfigValues(tree, projectName) {
-    const remixConfigPath = getRemixConfigPath(tree, projectName);
-    return eval(tree.read(remixConfigPath, 'utf-8'));
+    const remixConfigPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, getRemixConfigPath(tree, projectName));
+    const cacheKey = `${projectName}/${remixConfigPath}`;
+    let appConfig = _remixConfigCache[cacheKey];
+    if (!appConfig) {
+        try {
+            const importedConfig = await Function(`return import("${remixConfigPath}?t=${Date.now()}")`)();
+            appConfig = (importedConfig?.default || importedConfig);
+        }
+        catch {
+            appConfig = require(remixConfigPath);
+        }
+        _remixConfigCache[cacheKey] = appConfig;
+    }
+    return appConfig;
 }
 exports.getRemixConfigValues = getRemixConfigValues;

package/src/utils/testing-config-utils.d.ts

@@ -1,4 +1,4 @@
 import { type Tree } from '@nx/devkit';
-export declare function updateViteTestSetup(tree: Tree, pathToViteConfig: string, pathToTestSetup: string): void;
+export declare function updateVitestTestSetup(tree: Tree, pathToVitestConfig: string, pathToTestSetup: string): void;
 export declare function updateJestTestSetup(tree: Tree, pathToJestConfig: string, pathToTestSetup: string): void;
-export declare function updateViteTestIncludes(tree: Tree, pathToViteConfig: string, includesString: string): void;
+export declare function updateVitestTestIncludes(tree: Tree, pathToVitestConfig: string, includesString: string): void;

package/src/utils/testing-config-utils.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateViteTestIncludes = exports.updateJestTestSetup = exports.updateViteTestSetup = void 0;
+exports.updateVitestTestIncludes = exports.updateJestTestSetup = exports.updateVitestTestSetup = void 0;
 const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
-function updateViteTestSetup(tree, pathToViteConfig, pathToTestSetup) {
+function updateVitestTestSetup(tree, pathToVitestConfig, pathToTestSetup) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const { tsquery } = require('@phenomnomnominal/tsquery');
-    const fileContents = tree.read(pathToViteConfig, 'utf-8');
+    const fileContents = tree.read(pathToVitestConfig, 'utf-8');
     const ast = tsquery.ast(fileContents);
     const TEST_SETUPFILES_SELECTOR = 'PropertyAssignment:has(Identifier[name=test]) PropertyAssignment:has(Identifier[name=setupFiles])';
     const nodes = tsquery(ast, TEST_SETUPFILES_SELECTOR, {
@@ -31,9 +31,9 @@ function updateViteTestSetup(tree, pathToViteConfig, pathToTestSetup) {
             updatedFileContents = (0, devkit_1.stripIndents) `${fileContents.slice(0, arrayNodes[0].getStart() + 1)}'${pathToTestSetup}',${fileContents.slice(arrayNodes[0].getStart() + 1)}`;
         }
     }
-    tree.write(pathToViteConfig, updatedFileContents);
+    tree.write(pathToVitestConfig, updatedFileContents);
 }
-exports.updateViteTestSetup = updateViteTestSetup;
+exports.updateVitestTestSetup = updateVitestTestSetup;
 function updateJestTestSetup(tree, pathToJestConfig, pathToTestSetup) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
@@ -62,18 +62,18 @@ function updateJestTestSetup(tree, pathToJestConfig, pathToTestSetup) {
     }
 }
 exports.updateJestTestSetup = updateJestTestSetup;
-function updateViteTestIncludes(tree, pathToViteConfig, includesString) {
+function updateVitestTestIncludes(tree, pathToVitestConfig, includesString) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const { tsquery } = require('@phenomnomnominal/tsquery');
-    const fileContents = tree.read(pathToViteConfig, 'utf-8');
+    const fileContents = tree.read(pathToVitestConfig, 'utf-8');
     const ast = tsquery.ast(fileContents);
     const TEST_INCLUDE_SELECTOR = 'PropertyAssignment:has(Identifier[name=test]) PropertyAssignment:has(Identifier[name=include])';
     const nodes = tsquery(ast, TEST_INCLUDE_SELECTOR, { visitAllChildren: true });
     if (nodes.length !== 0) {
         const updatedFileContents = (0, devkit_1.stripIndents) `${fileContents.slice(0, nodes[0].getStart())}include: ["${includesString}"]${fileContents.slice(nodes[0].getEnd())}`;
-        tree.write(pathToViteConfig, updatedFileContents);
+        tree.write(pathToVitestConfig, updatedFileContents);
     }
 }
-exports.updateViteTestIncludes = updateViteTestIncludes;
+exports.updateVitestTestIncludes = updateVitestTestIncludes;

package/src/generators/application/files/common/remix.config.cjs__tmpl__

@@ -1,11 +0,0 @@
-/**
- * @type {import('@remix-run/dev').AppConfig}
- */
-module.exports = {
-  ignoredRouteFiles: ["**/.*"],
-  // appDirectory: "app",
-  // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
-  // publicPath: "/build/",
-  watchPaths: () => require("@nx/remix").createWatchPaths(__dirname),
-};