@nx/remix 20.2.0-beta.2 → 20.2.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "20.2.0-beta.2",
+  "version": "20.2.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, 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": "20.2.0-beta.2",
-    "@nx/js": "20.2.0-beta.2",
-    "@nx/react": "20.2.0-beta.2",
+    "@nx/devkit": "20.2.0-beta.4",
+    "@nx/js": "20.2.0-beta.4",
+    "@nx/react": "20.2.0-beta.4",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },

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

@@ -1,6 +1,3 @@
-import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface LoaderSchema {
   path: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/action/schema.json

@@ -12,11 +12,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 action in the directory 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/application/application.impl.js

@@ -6,7 +6,6 @@ const devkit_1 = require("@nx/devkit");
 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");
@@ -14,6 +13,7 @@ const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const update_dependencies_1 = require("../utils/update-dependencies");
 const lib_1 = require("./lib");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function remixApplicationGenerator(tree, options) {
     return remixApplicationGeneratorInternal(tree, {
         addPlugin: true,
@@ -21,25 +21,31 @@ 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);
-    if (!options.addPlugin) {
-        throw new Error(`To generate a new Remix Vite application, you must use Inference Plugins. Check you do not have NX_ADD_PLUGINS=false or useInferencePlugins: false in your nx.json.`);
-    }
     const tasks = [
         await (0, init_1.default)(tree, {
             skipFormat: true,
             addPlugin: true,
         }),
-        await (0, js_1.initGenerator)(tree, { skipFormat: true }),
+        await (0, js_1.initGenerator)(tree, {
+            skipFormat: true,
+            addTsPlugin: _options.useTsSolution,
+            formatter: _options.formatter,
+        }),
     ];
-    (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
-        root: options.projectRoot,
-        sourceRoot: `${options.projectRoot}`,
-        projectType: 'application',
-        tags: options.parsedTags,
-        targets: {},
-    });
+    const options = await (0, lib_1.normalizeOptions)(tree, _options);
+    if (!options.addPlugin) {
+        throw new Error(`To generate a new Remix Vite application, you must use Inference Plugins. Check you do not have NX_ADD_PLUGINS=false or useInferencePlugins: false in your nx.json.`);
+    }
+    const isUsingTsSolution = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    if (!isUsingTsSolution) {
+        (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
+            root: options.projectRoot,
+            sourceRoot: `${options.projectRoot}`,
+            projectType: 'application',
+            tags: options.parsedTags,
+            targets: {},
+        });
+    }
     const installTask = (0, update_dependencies_1.updateDependencies)(tree);
     tasks.push(installTask);
     const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(tree, options.nxCloudToken);
@@ -58,6 +64,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
         eslintVersion: versions_1.eslintVersion,
         typescriptVersion: versions_1.typescriptVersion,
         viteVersion: versions_1.viteVersion,
+        isUsingTsSolution,
     };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/common'), options.projectRoot, vars);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/nx-welcome', onBoardingStatus), options.projectRoot, { ...vars, connectCloudUrl });
@@ -66,7 +73,10 @@ async function remixApplicationGeneratorInternal(tree, _options) {
         tree.write('.gitignore', `${gitignore}\n.cache\nbuild\npublic/build\n.env\n`);
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/integrated'), options.projectRoot, vars);
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/non-root'), options.projectRoot, vars);
+    }
+    if (isUsingTsSolution) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/ts-solution'), options.projectRoot, vars);
     }
     if (options.unitTestRunner !== 'none') {
         if (options.unitTestRunner === 'vitest') {
@@ -103,7 +113,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
                 addPlugin: true,
             });
             const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-            if (projectConfig.targets['test']?.options) {
+            if (projectConfig.targets?.['test']?.options) {
                 projectConfig.targets['test'].options.passWithNoTests = true;
                 (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, projectConfig);
             }
@@ -212,6 +222,13 @@ export default {...nxPreset};
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.projectRoot, 'tsconfig.app.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined, '.');
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
     });

package/src/generators/application/files/{integrated → non-root}/package.json__tmpl__

@@ -14,10 +14,7 @@
   "devDependencies": {
     "@remix-run/dev": "<%= remixVersion %>",
     "@types/react": "<%= typesReactVersion %>",
-    "@types/react-dom": "<%= typesReactDomVersion %>",
-    "eslint": "<%= eslintVersion %>",
-    "typescript": "<%= typescriptVersion %>",
-    "vite": "<%= viteVersion %>",
+    "@types/react-dom": "<%= typesReactDomVersion %>"
   },
   "engines": {
     "node": ">=20"

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

@@ -0,0 +1,32 @@
+{
+  "private": true,
+  "name": "<%= projectName %>",
+  "scripts": {},
+  "type": "module",
+  "dependencies": {
+    "@remix-run/node": "<%= remixVersion %>",
+    "@remix-run/react": "<%= remixVersion %>",
+    "@remix-run/serve": "<%= remixVersion %>",
+    "isbot": "<%= isbotVersion %>",
+    "react": "<%= reactVersion %>",
+    "react-dom": "<%= reactDomVersion %>"
+  },
+  "devDependencies": {
+    "@remix-run/dev": "<%= remixVersion %>",
+    "@types/react": "<%= typesReactVersion %>",
+    "@types/react-dom": "<%= typesReactDomVersion %>"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "sideEffects": false<% if (isUsingTsSolution) { %>,
+  "nx": {
+  <%_ if (name !== projectName) { _%>
+    "name": "<%= name %>",<%_ } _%>
+    "projectType": "application",
+    "sourceRoot": "<%- projectRoot %>",
+    <%_ if (parsedTags?.length) { _%>
+    "tags": <%- JSON.stringify(parsedTags) %>
+    <%_ } _%>
+  }<% } %>
+}

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

@@ -0,0 +1,39 @@
+{
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "lib": ["DOM", "DOM.Iterable", "ES2019"],
+    "types": ["@remix-run/node", "vite/client"],
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "jsx": "react-jsx",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "resolveJsonModule": true,
+    "target": "ES2022",
+    "strict": true,
+    "allowJs": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "app/**/*.ts",
+    "app/**/*.tsx",
+    "app/**/*.js",
+    "app/**/*.jsx",
+    "**/.server/**/*.ts",
+    "**/.server/**/*.tsx",
+    "**/.client/**/*.ts",
+    "**/.client/**/*.tsx"
+  ],
+  "exclude": [
+    "tests/**/*.spec.ts",
+    "tests/**/*.test.ts",
+    "tests/**/*.spec.tsx",
+    "tests/**/*.test.tsx",
+    "tests/**/*.spec.js",
+    "tests/**/*.test.js",
+    "tests/**/*.spec.jsx",
+    "tests/**/*.test.jsx"
+  ]
+}

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

@@ -0,0 +1,10 @@
+{
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+    "include": [],
+    "files": [],
+    "references": [
+      {
+        "path": "./tsconfig.app.json"
+      }
+    ]
+}

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

@@ -6,6 +6,7 @@ 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'
@@ -13,14 +14,28 @@ 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'));
-        (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
-            projectType: 'application',
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            targets: {},
-            tags: [],
-            implicitDependencies: [options.projectName],
-        });
+        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],
+                },
+            });
+        }
+        else {
+            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+        }
         const e2eTask = await configurationGenerator(tree, {
             project: options.e2eProjectName,
             directory: 'src',
@@ -56,14 +71,28 @@ async function addE2E(tree, options) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', (0, versions_1.getPackageVersion)(tree, 'nx'));
-        (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
-            projectType: 'application',
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            targets: {},
-            tags: [],
-            implicitDependencies: [options.projectName],
-        });
+        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],
+                },
+            });
+        }
+        else {
+            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+        }
         const e2eTask = await configurationGenerator(tree, {
             project: options.e2eProjectName,
             skipFormat: true,

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

@@ -8,7 +8,10 @@ export interface NxRemixGeneratorSchema {
   unitTestRunner?: 'vitest' | 'jest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   skipFormat?: boolean;
+  // Internal options
   rootProject?: boolean;
   addPlugin?: boolean;
   nxCloudToken?: string;
+  useTsSolution?: boolean;
+  formatter?: 'prettier' | 'none';
 }

package/src/generators/application/schema.json

@@ -24,19 +24,22 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "jest", "none"],
-      "default": "vitest",
+      "default": "none",
       "description": "Test runner to use for unit tests.",
-      "x-prompt": "What unit test runner should be used?"
+      "x-prompt": "What unit test runner should be used?",
+      "x-priority": "important"
     },
     "e2eTestRunner": {
       "type": "string",
       "enum": ["playwright", "cypress", "none"],
-      "default": "playwright",
+      "default": "none",
       "description": "Test runner to use for e2e tests",
       "x-prompt": "Which E2E test runner would you like to use?"
     },

package/src/generators/error-boundary/schema.d.ts

@@ -1,7 +1,4 @@
-import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface ErrorBoundarySchema {
   path: string;
   skipFormat?: false;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

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

@@ -15,11 +15,6 @@
       "type": "string",
       "description": "The path to route file relative to the project root."
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the error boundary 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"]
-    },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files after generation.",

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

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

package/src/generators/init/init.js

@@ -4,14 +4,12 @@ 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/library.impl.js

@@ -3,17 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 js_1 = require("@nx/js");
 const react_1 = require("@nx/react");
 const lib_1 = require("./lib");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 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 jsInitTask = await (0, js_1.initGenerator)(tree, {
+        js: options.js,
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const libGenTask = await (0, react_1.libraryGenerator)(tree, {
         name: options.projectName,
         style: options.style,
@@ -23,9 +27,10 @@ async function remixLibraryGeneratorInternal(tree, schema) {
         directory: options.projectRoot,
         skipFormat: true,
         skipTsConfig: false,
-        linter: eslint_1.Linter.EsLint,
+        linter: options.linter,
         component: true,
         buildable: options.buildable,
+        bundler: options.bundler,
         addPlugin: options.addPlugin,
     });
     tasks.push(libGenTask);
@@ -34,9 +39,16 @@ async function remixLibraryGeneratorInternal(tree, schema) {
         tasks.push(pkgInstallTask);
     }
     (0, lib_1.addTsconfigEntryPoints)(tree, options);
-    if (options.buildable) {
+    if (options.bundler === 'rollup' || options.buildable) {
         (0, lib_1.updateBuildableConfig)(tree, options.projectName);
     }
+    (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.projectRoot, 'tsconfig.lib.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -6,7 +6,10 @@ export interface NxRemixGeneratorSchema {
   style: SupportedStyles;
   tags?: string;
   importPath?: string;
+  /** @deprecated Use bundler instead. */
   buildable?: boolean;
+  bundler?: 'none' | 'vite' | 'rollup';
+  linter?: 'none' | 'eslint';
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   js?: boolean;
   skipFormat?: boolean;

package/src/generators/library/schema.json

@@ -37,17 +37,29 @@
       "enum": ["none", "css"],
       "default": "css"
     },
-    "buildable": {
-      "type": "boolean",
-      "description": "Should the library be buildable?",
-      "default": false
+    "bundler": {
+      "type": "string",
+      "description": "The bundler to use. Choosing 'none' means this library is not buildable.",
+      "enum": ["none", "vite", "rollup"],
+      "default": "none",
+      "x-prompt": "Which bundler would you like to use to build the library? Choose 'none' to skip build setup.",
+      "x-priority": "important"
+    },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "none"],
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "jest", "none"],
       "description": "Test Runner to use for Unit Tests",
       "x-prompt": "What test runner should be used?",
-      "default": "vitest"
+      "default": "none",
+      "x-priority": "important"
     },
     "importPath": {
       "type": "string",
@@ -63,6 +75,12 @@
       "description": "Skip formatting files after generator runs",
       "default": false,
       "x-priority": "internal"
+    },
+    "buildable": {
+      "type": "boolean",
+      "default": false,
+      "description": "Generate a buildable library that uses rollup to bundle.",
+      "x-deprecated": "Use the `bundler` option for greater control (none, vite, rollup)."
     }
   },
   "required": ["directory"]

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

@@ -1,6 +1,3 @@
-import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface LoaderSchema {
   path: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/loader/schema.json

@@ -12,11 +12,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 loader 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/meta/schema.d.ts

@@ -1,6 +1,3 @@
-import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface MetaSchema {
   path: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/meta/schema.json

@@ -12,11 +12,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 meta function 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/resource-route/__snapshots__/resource-route.impl.spec.ts.snap

@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`resource 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[`resource route 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[`resource 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[`resource route 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/resource-route/resource-route.impl.js

@@ -22,13 +22,11 @@ async function default_1(tree, options) {
     if (options.loader) {
         await (0, loader_impl_1.default)(tree, {
             path: routeFilePath,
-            nameAndDirectoryFormat: 'as-provided',
         });
     }
     if (options.action) {
         await (0, action_impl_1.default)(tree, {
             path: routeFilePath,
-            nameAndDirectoryFormat: 'as-provided',
         });
     }
     await (0, devkit_1.formatFiles)(tree);

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

@@ -1,5 +1,3 @@
-import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface RemixRouteSchema {
   path: string;
   action: boolean;

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`route --nameAndDirectoryFormat=apps/demo/app/routes/path/to/example should add route component 1`] = `
+exports[`route 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=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 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 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 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 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 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

@@ -44,19 +44,16 @@ async function default_1(tree, options) {
     if (options.loader) {
         await (0, loader_impl_1.default)(tree, {
             path: routeFilePath,
-            nameAndDirectoryFormat: 'as-provided',
         });
     }
     if (options.meta) {
         await (0, meta_impl_1.default)(tree, {
             path: routeFilePath,
-            nameAndDirectoryFormat: 'as-provided',
         });
     }
     if (options.action) {
         await (0, action_impl_1.default)(tree, {
             path: routeFilePath,
-            nameAndDirectoryFormat: 'as-provided',
         });
     }
     if (options.style === 'css') {

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

@@ -1,5 +1,3 @@
-import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface RemixRouteSchema {
   path: string;
   style: 'css' | 'none';

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

@@ -1,5 +1,3 @@
-import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface RemixStyleSchema {
   path: string;
 }