@nx/remix 20.0.0-beta.4 → 20.0.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "20.0.0-beta.4",
+  "version": "20.0.0-beta.6",
   "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,12 +29,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.0.0-beta.4",
-    "@nx/js": "20.0.0-beta.4",
-    "@nx/react": "20.0.0-beta.4",
+    "@nx/devkit": "20.0.0-beta.6",
+    "@nx/js": "20.0.0-beta.6",
+    "@nx/react": "20.0.0-beta.6",
     "tslib": "^2.3.1",
-    "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/remix": "20.0.0-beta.4"
+    "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "peerDependencies": {},
   "publishConfig": {

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --directory should create the application correctly 1`] = `
+exports[`Remix Application Integrated Repo --directory should create the application correctly 1`] = `
 "import { createWatchPaths } from '@nx/remix';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
@@ -21,7 +21,7 @@ export default {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --directory should create the application correctly 2`] = `
+exports[`Remix Application Integrated Repo --directory should create the application correctly 2`] = `
 "import type { MetaFunction } from '@remix-run/node';
 import {
   Links,
@@ -59,7 +59,7 @@ export default function App() {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --directory should create the application correctly 3`] = `
+exports[`Remix Application Integrated Repo --directory should create the application correctly 3`] = `
 "import NxWelcome from '../nx-welcome';
 
 export default function Index() {
@@ -72,7 +72,7 @@ export default function Index() {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --directory should extract the layout directory from the directory options if it exists 1`] = `
+exports[`Remix Application Integrated Repo --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';
@@ -93,7 +93,7 @@ export default {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --directory should extract the layout directory from the directory options if it exists 2`] = `
+exports[`Remix Application Integrated Repo --directory should extract the layout directory from the directory options if it exists 2`] = `
 "import type { MetaFunction } from '@remix-run/node';
 import {
   Links,
@@ -131,7 +131,7 @@ export default function App() {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --directory should extract the layout directory from the directory options if it exists 3`] = `
+exports[`Remix Application Integrated Repo --directory should extract the layout directory from the directory options if it exists 3`] = `
 "import NxWelcome from '../nx-welcome';
 
 export default function Index() {
@@ -144,7 +144,7 @@ export default function Index() {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --e2eTestRunner should generate a cypress e2e application for the app 1`] = `
+exports[`Remix Application Integrated Repo --e2eTestRunner should generate a cypress e2e application for the app 1`] = `
 "import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 
 import { defineConfig } from 'cypress';
@@ -166,7 +166,7 @@ export default defineConfig({
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --e2eTestRunner should generate a playwright e2e application for the app 1`] = `
+exports[`Remix Application Integrated Repo --e2eTestRunner should generate a playwright e2e application for the app 1`] = `
 "import { defineConfig, devices } from '@playwright/test';
 import { nxE2EPreset } from '@nx/playwright/preset';
 
@@ -239,7 +239,7 @@ export default defineConfig({
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --js should create the application correctly 1`] = `
+exports[`Remix Application Integrated Repo --js should create the application correctly 1`] = `
 "import { createWatchPaths } from '@nx/remix';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
@@ -260,7 +260,7 @@ export default {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --js should create the application correctly 2`] = `
+exports[`Remix Application Integrated Repo --js should create the application correctly 2`] = `
 "import {
   Links,
   LiveReload,
@@ -295,7 +295,7 @@ export default function App() {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --js should create the application correctly 3`] = `
+exports[`Remix Application Integrated Repo --js should create the application correctly 3`] = `
 "import NxWelcome from '../nx-welcome';
 export default function Index() {
   return (
@@ -307,7 +307,7 @@ export default function Index() {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using jest 1`] = `
+exports[`Remix Application Integrated 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';
@@ -328,7 +328,7 @@ export default {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using jest 2`] = `
+exports[`Remix Application Integrated Repo --unitTestRunner should generate the correct files for testing using jest 2`] = `
 "export default {
   displayName: 'test',
   preset: '../jest.preset.js',
@@ -341,14 +341,14 @@ 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 3`] = `
+exports[`Remix Application Integrated Repo --unitTestRunner should generate the correct files for testing using jest 3`] = `
 "import { installGlobals } from '@remix-run/node';
 import '@testing-library/jest-dom/matchers';
 installGlobals();
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using vitest 1`] = `
+exports[`Remix Application Integrated 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';
@@ -369,7 +369,7 @@ export default {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using vitest 2`] = `
+exports[`Remix Application Integrated Repo --unitTestRunner should generate the correct files for testing using vitest 2`] = `
 "/// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
@@ -400,14 +400,14 @@ export default defineConfig({
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using vitest 3`] = `
+exports[`Remix Application Integrated Repo --unitTestRunner should generate the correct files for testing using vitest 3`] = `
 "import { installGlobals } from '@remix-run/node';
 import '@testing-library/jest-dom/matchers';
 installGlobals();
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using vitest 4`] = `
+exports[`Remix Application Integrated Repo --unitTestRunner should generate the correct files for testing using vitest 4`] = `
 "{
   "extends": "./tsconfig.json",
   "compilerOptions": {
@@ -440,7 +440,7 @@ exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provide
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided should create the application correctly 1`] = `
+exports[`Remix Application Integrated Repo should create the application correctly 1`] = `
 "import { createWatchPaths } from '@nx/remix';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
@@ -461,7 +461,7 @@ export default {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided should create the application correctly 2`] = `
+exports[`Remix Application Integrated Repo should create the application correctly 2`] = `
 "import type { MetaFunction } from '@remix-run/node';
 import {
   Links,
@@ -499,7 +499,7 @@ export default function App() {
 "
 `;
 
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided should create the application correctly 3`] = `
+exports[`Remix Application Integrated Repo should create the application correctly 3`] = `
 "import NxWelcome from '../nx-welcome';
 
 export default function Index() {

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

@@ -7,6 +7,7 @@ const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaul
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
 const create_ts_config_1 = require("@nx/js/src/utils/typescript/create-ts-config");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const node_path_1 = require("node:path");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 const testing_config_utils_1 = require("../../utils/testing-config-utils");
@@ -21,6 +22,7 @@ function remixApplicationGenerator(tree, options) {
     });
 }
 async function remixApplicationGeneratorInternal(tree, _options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'remix', 'application');
     const options = await (0, lib_1.normalizeOptions)(tree, _options);
     const tasks = [
         await (0, init_1.default)(tree, {

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

@@ -5,15 +5,14 @@ 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");
 async function normalizeOptions(tree, options) {
-    const { projectName, projectRoot, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    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, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
     });
     options.rootProject = projectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

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

@@ -1,12 +1,10 @@
-import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface NxRemixGeneratorSchema {
-  name: string;
+  directory: string;
+  name?: string;
   tags?: string;
   js?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   linter?: Linter | LinterType;
   unitTestRunner?: 'vitest' | 'jest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';

package/src/generators/application/schema.json

@@ -5,31 +5,26 @@
   "description": "Generate a new Remix application.",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "",
+      "description": "A directory where the app is placed.",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What is the name of the application?"
+      "x-prompt": "Which directory do you want to create the application in?"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name of the application.",
+      "x-priority": "important"
     },
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript files rather than TypeScript files.",
       "default": false
     },
-    "directory": {
-      "type": "string",
-      "description": "A directory where the app is placed.",
-      "alias": "dir",
-      "x-priority": "important"
-    },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
@@ -65,5 +60,6 @@
       "x-priority": "internal",
       "default": false
     }
-  }
+  },
+  "required": ["directory"]
 }

package/src/generators/init/init.js

@@ -4,12 +4,14 @@ exports.remixInitGenerator = remixInitGenerator;
 exports.remixInitGeneratorInternal = remixInitGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function remixInitGenerator(tree, options) {
     return remixInitGeneratorInternal(tree, { addPlugin: false, ...options });
 }
 async function remixInitGeneratorInternal(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'remix', 'init');
     const tasks = [];
     if (!options.skipPackageJson) {
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Remix Library Generator -projectNameAndRootFormat=as-provided --unitTestRunner should create the correct config files for testing with jest 1`] = `
+exports[`Remix Library Generator --unitTestRunner should create the correct config files for testing with jest 1`] = `
 "export default {
   setupFilesAfterEnv: ['./src/test-setup.ts'],
   displayName: 'test',
@@ -15,14 +15,14 @@ exports[`Remix Library Generator -projectNameAndRootFormat=as-provided --unitTes
 "
 `;
 
-exports[`Remix Library Generator -projectNameAndRootFormat=as-provided --unitTestRunner should create the correct config files for testing with jest 2`] = `
+exports[`Remix Library Generator --unitTestRunner should create the correct config files for testing with jest 2`] = `
 "import { installGlobals } from '@remix-run/node';
 import '@testing-library/jest-dom/matchers';
 installGlobals();
 "
 `;
 
-exports[`Remix Library Generator -projectNameAndRootFormat=as-provided --unitTestRunner should create the correct config files for testing with vitest 1`] = `
+exports[`Remix Library Generator --unitTestRunner should create the correct config files for testing with vitest 1`] = `
 "import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
@@ -49,14 +49,14 @@ export default defineConfig({
 "
 `;
 
-exports[`Remix Library Generator -projectNameAndRootFormat=as-provided --unitTestRunner should create the correct config files for testing with vitest 2`] = `
+exports[`Remix Library Generator --unitTestRunner should create the correct config files for testing with vitest 2`] = `
 "import { installGlobals } from '@remix-run/node';
 import '@testing-library/jest-dom/matchers';
 installGlobals();
 "
 `;
 
-exports[`Remix Library Generator -projectNameAndRootFormat=as-provided should generate a library correctly 1`] = `
+exports[`Remix Library Generator should generate a library correctly 1`] = `
 [
   "test.module.css",
   "test.spec.tsx",
@@ -64,7 +64,7 @@ exports[`Remix Library Generator -projectNameAndRootFormat=as-provided should ge
 ]
 `;
 
-exports[`Remix Library Generator -projectNameAndRootFormat=as-provided should generate a library correctly 2`] = `
+exports[`Remix Library Generator should generate a library correctly 2`] = `
 {
   "@proj/test": [
     "test/src/index.ts",

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

@@ -5,11 +5,11 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function normalizeOptions(tree, options) {
-    const { projectName, projectRoot, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    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, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -22,6 +22,5 @@ async function normalizeOptions(tree, options) {
         importPath,
         projectName,
         projectRoot,
-        projectNameAndRootFormat,
     };
 }

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

@@ -4,12 +4,14 @@ exports.remixLibraryGenerator = remixLibraryGenerator;
 exports.remixLibraryGeneratorInternal = remixLibraryGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const react_1 = require("@nx/react");
 const lib_1 = require("./lib");
 async function remixLibraryGenerator(tree, schema) {
     return remixLibraryGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function remixLibraryGeneratorInternal(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'remix', 'library');
     const tasks = [];
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const libGenTask = await (0, react_1.libraryGenerator)(tree, {
@@ -19,7 +21,6 @@ async function remixLibraryGeneratorInternal(tree, schema) {
         tags: options.tags,
         importPath: options.importPath,
         directory: options.projectRoot,
-        projectNameAndRootFormat: 'as-provided',
         skipFormat: true,
         skipTsConfig: false,
         linter: eslint_1.Linter.EsLint,

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

@@ -1,11 +1,9 @@
-import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import { SupportedStyles } from '@nx/react';
 
 export interface NxRemixGeneratorSchema {
-  name: string;
+  directory: string;
+  name?: string;
   style: SupportedStyles;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   importPath?: string;
   buildable?: boolean;

package/src/generators/library/schema.json

@@ -11,27 +11,22 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Library name",
+      "description": "A directory where the lib is placed.",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the library?",
-      "pattern": "^[a-zA-Z].*$"
+      "x-prompt": "Which directory do you want to create the library in?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "A directory where the lib is placed.",
-      "alias": "dir",
+      "description": "Library name",
+      "pattern": "^[a-zA-Z].*$",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "tags": {
       "type": "string",
       "description": "Add tags to the library (used for linting)"
@@ -49,7 +44,7 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
+      "enum": ["vitest", "jest", "none"],
       "description": "Test Runner to use for Unit Tests",
       "x-prompt": "What test runner should be used?",
       "default": "vitest"
@@ -70,5 +65,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/preset/preset.impl.js

@@ -16,6 +16,7 @@ async function default_1(tree, _options) {
         nxJson.useInferencePlugins !== false;
     const appGenTask = await (0, application_impl_1.default)(tree, {
         name: options.appName,
+        directory: '.',
         tags: options.tags,
         skipFormat: true,
         rootProject: true,

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

@@ -8,8 +8,7 @@ const action_impl_1 = require("../action/action.impl");
 const loader_impl_1 = require("../loader/loader.impl");
 async function default_1(tree, options) {
     const { artifactName: name, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        name: options.path.replace(/^\//, '').replace(/\/$/, ''),
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path.replace(/^\//, '').replace(/\/$/, ''),
     });
     if (!options.skipChecks && (0, remix_route_utils_1.checkRoutePathForErrors)(options.path)) {
         throw new Error(`Your route path has an indicator of an un-escaped dollar sign for a route param. If this was intended, include the --skipChecks flag.`);

package/src/generators/resource-route/schema.d.ts

@@ -2,7 +2,6 @@ import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-
 
 export interface RemixRouteSchema {
   path: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
   action: boolean;
   loader: boolean;
   skipChecks: boolean;

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

@@ -20,11 +20,6 @@
       },
       "x-prompt": "What is the path of the route? (e.g. 'apps/demo/app/routes/foo/bar')"
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the styles in the path as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "action": {
       "type": "boolean",
       "description": "Generate an action function",

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`route --nameAndDirectoryFormat=as-provided should add route component 1`] = `
+exports[`route --nameAndDirectoryFormat=apps/demo/app/routes/path/to/example should add route component 1`] = `
 "import { useLoaderData, useActionData } from '@remix-run/react';
 import { json } from '@remix-run/node';
 import type {
@@ -41,8 +41,8 @@ export default function Example() {
 "
 `;
 
-exports[`route --nameAndDirectoryFormat=as-provided should error if it detects a possible missing route param because of un-escaped dollar sign 1`] = `[Error: Your route path has an indicator of an un-escaped dollar sign for a route param. If this was intended, include the --skipChecks flag.]`;
+exports[`route --nameAndDirectoryFormat=apps/demo/app/routes/path/to/example should error if it detects a possible missing route param because of un-escaped dollar sign 1`] = `[Error: Your route path has an indicator of an un-escaped dollar sign for a route param. If this was intended, include the --skipChecks flag.]`;
 
-exports[`route --nameAndDirectoryFormat=as-provided should error if it detects a possible missing route param because of un-escaped dollar sign 2`] = `[Error: Your route path has an indicator of an un-escaped dollar sign for a route param. If this was intended, include the --skipChecks flag.]`;
+exports[`route --nameAndDirectoryFormat=apps/demo/app/routes/path/to/example should error if it detects a possible missing route param because of un-escaped dollar sign 2`] = `[Error: Your route path has an indicator of an un-escaped dollar sign for a route param. If this was intended, include the --skipChecks flag.]`;
 
-exports[`route --nameAndDirectoryFormat=as-provided should error if it detects a possible missing route param because of un-escaped dollar sign 3`] = `[Error: Your route path has an indicator of an un-escaped dollar sign for a route param. If this was intended, include the --skipChecks flag.]`;
+exports[`route --nameAndDirectoryFormat=apps/demo/app/routes/path/to/example should error if it detects a possible missing route param because of un-escaped dollar sign 3`] = `[Error: Your route path has an indicator of an un-escaped dollar sign for a route param. If this was intended, include the --skipChecks flag.]`;

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

@@ -11,8 +11,7 @@ const meta_impl_1 = require("../meta/meta.impl");
 const style_impl_1 = require("../style/style.impl");
 async function default_1(tree, options) {
     const { artifactName: name, directory, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        name: options.path.replace(/^\//, '').replace(/\/$/, ''),
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path.replace(/^\//, '').replace(/\/$/, ''),
     });
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     if (!project)
@@ -63,7 +62,6 @@ async function default_1(tree, options) {
     if (options.style === 'css') {
         await (0, style_impl_1.default)(tree, {
             path: routeFilePath,
-            nameAndDirectoryFormat: 'as-provided',
         });
     }
     await (0, devkit_1.formatFiles)(tree);

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

@@ -2,7 +2,6 @@ import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-
 
 export interface RemixRouteSchema {
   path: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
   style: 'css' | 'none';
   action: boolean;
   meta: boolean;

package/src/generators/route/schema.json

@@ -13,18 +13,13 @@
   "properties": {
     "path": {
       "type": "string",
-      "description": "The route path or path to the filename of the route. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
+      "description": "The route path or path to the filename of the route.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
       "x-prompt": "What is the path of the route? (e.g. 'apps/demo/app/routes/foo/bar')"
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the route in the path as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and path relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "type": "string",
       "description": "Generate a stylesheet",

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

@@ -2,5 +2,4 @@ import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-
 
 export interface RemixStyleSchema {
   path: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/style/schema.json

@@ -19,11 +19,6 @@
         "index": 0
       },
       "x-prompt": "What is the path of the route? (e.g. 'apps/demo/app/routes/foo/bar.tsx')"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the styles in the path as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
     }
   },
   "required": ["path"]

package/src/generators/style/style.impl.js

@@ -9,8 +9,7 @@ const insert_statement_after_imports_1 = require("../../utils/insert-statement-a
 const remix_route_utils_1 = require("../../utils/remix-route-utils");
 async function default_1(tree, options) {
     const { project: projectName, artifactName: name } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        name: options.path,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat ?? 'as-provided',
+        path: options.path,
     });
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     if (!project)