@nx/remix 19.8.0 → 20.0.0-beta.0

package/package.json

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

package/src/generators/action/action.impl.js

@@ -5,11 +5,8 @@ const devkit_1 = require("@nx/devkit");
 const insert_import_1 = require("../../utils/insert-import");
 const insert_statement_after_imports_1 = require("../../utils/insert-statement-after-imports");
 const insert_statement_in_default_function_1 = require("../../utils/insert-statement-in-default-function");
-const remix_route_utils_1 = require("../../utils/remix-route-utils");
 async function default_1(tree, schema) {
-    const routeFilePath = schema.nameAndDirectoryFormat === 'as-provided'
-        ? schema.path
-        : await (0, remix_route_utils_1.resolveRemixRouteFile)(tree, schema.path, schema.project);
+    const routeFilePath = schema.path;
     if (!tree.exists(routeFilePath)) {
         throw new Error(`Route path does not exist: ${routeFilePath}. Please generate a Remix route first.`);
     }

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

@@ -3,8 +3,4 @@ import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-
 export interface LoaderSchema {
   path: string;
   nameAndDirectoryFormat?: NameAndDirectoryFormat;
-  /**
-   * @deprecated Provide the `path` option instead. The project will be determined from the path provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

package/src/generators/action/schema.json

@@ -17,12 +17,6 @@
       "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"]
-    },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "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 v20."
     }
   },
   "required": ["path"]

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

@@ -516,522 +516,6 @@ export default function Index() {
 "
 `;
 
-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}
- */
-export default {
-  ignoredRouteFiles: ['**/.*'],
-  // appDirectory: "app",
-  // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
-  // publicPath: "/build/",
-  watchPaths: () => createWatchPaths(__dirname),
-};
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --directory should create the application correctly 2`] = `
-"import type { MetaFunction } from '@remix-run/node';
-import {
-  Links,
-  LiveReload,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from '@remix-run/react';
-
-export const meta: MetaFunction = () => [
-  {
-    title: 'New Remix App',
-  },
-];
-
-export default function App() {
-  return (
-    <html lang="en">
-      <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        <Outlet />
-        <ScrollRestoration />
-        <Scripts />
-        <LiveReload />
-      </body>
-    </html>
-  );
-}
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --directory should create the application correctly 3`] = `
-"import NxWelcome from '../nx-welcome';
-
-export default function Index() {
-  return (
-    <div>
-      <NxWelcome title={'demo-test'} />
-    </div>
-  );
-}
-"
-`;
-
-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}
- */
-export default {
-  ignoredRouteFiles: ['**/.*'],
-  // appDirectory: "app",
-  // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
-  // publicPath: "/build/",
-  watchPaths: () => createWatchPaths(__dirname),
-};
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --directory should extract the layout directory from the directory options if it exists 2`] = `
-"import type { MetaFunction } from '@remix-run/node';
-import {
-  Links,
-  LiveReload,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from '@remix-run/react';
-
-export const meta: MetaFunction = () => [
-  {
-    title: 'New Remix App',
-  },
-];
-
-export default function App() {
-  return (
-    <html lang="en">
-      <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        <Outlet />
-        <ScrollRestoration />
-        <Scripts />
-        <LiveReload />
-      </body>
-    </html>
-  );
-}
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --directory should extract the layout directory from the directory options if it exists 3`] = `
-"import NxWelcome from '../nx-welcome';
-
-export default function Index() {
-  return (
-    <div>
-      <NxWelcome title={'demo-test'} />
-    </div>
-  );
-}
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --e2eTestRunner should generate a cypress e2e application for the app 1`] = `
-"import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
-
-import { defineConfig } from 'cypress';
-
-export default defineConfig({
-  e2e: {
-    ...nxE2EPreset(__filename, {
-      cypressDir: 'src',
-      webServerCommands: {
-        default: 'npx nx run test:dev',
-        production: 'npx nx run test:serve-static',
-      },
-      ciWebServerCommand: 'npx nx run test:serve-static',
-      ciBaseUrl: 'http://localhost:3000',
-    }),
-    baseUrl: 'http://localhost:3000',
-  },
-});
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --e2eTestRunner should generate a playwright e2e application for the app 1`] = `
-"import { defineConfig, devices } from '@playwright/test';
-import { nxE2EPreset } from '@nx/playwright/preset';
-
-import { workspaceRoot } from '@nx/devkit';
-
-// For CI, you may want to set BASE_URL to the deployed application.
-const baseURL = process.env['BASE_URL'] || 'http://localhost:3000';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// require('dotenv').config();
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  ...nxE2EPreset(__filename, { testDir: './src' }),
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    baseURL,
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-  /* Run your local dev server before starting the tests */
-  webServer: {
-    command: 'npx nx run test:serve-static',
-    url: 'http://localhost:3000',
-    reuseExistingServer: !process.env.CI,
-    cwd: workspaceRoot,
-  },
-  projects: [
-    {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    // Uncomment for mobile browsers support
-    /* {
-      name: 'Mobile Chrome',
-      use: { ...devices['Pixel 5'] },
-    },
-    {
-      name: 'Mobile Safari',
-      use: { ...devices['iPhone 12'] },
-    }, */
-
-    // Uncomment for branded browsers
-    /* {
-      name: 'Microsoft Edge',
-      use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    },
-    {
-      name: 'Google Chrome',
-      use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    } */
-  ],
-});
-"
-`;
-
-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}
- */
-export default {
-  ignoredRouteFiles: ['**/.*'],
-  // appDirectory: "app",
-  // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
-  // publicPath: "/build/",
-  watchPaths: () => createWatchPaths(__dirname),
-};
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --js should create the application correctly 2`] = `
-"import {
-  Links,
-  LiveReload,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from '@remix-run/react';
-export const meta = () => [
-  {
-    title: 'New Remix App',
-  },
-];
-export default function App() {
-  return (
-    <html lang="en">
-      <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        <Outlet />
-        <ScrollRestoration />
-        <Scripts />
-        <LiveReload />
-      </body>
-    </html>
-  );
-}
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --js should create the application correctly 3`] = `
-"import NxWelcome from '../nx-welcome';
-export default function Index() {
-  return (
-    <div>
-      <NxWelcome title={'test'} />
-    </div>
-  );
-}
-"
-`;
-
-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}
- */
-export default {
-  ignoredRouteFiles: ['**/.*'],
-  // appDirectory: "app",
-  // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
-  // publicPath: "/build/",
-  watchPaths: () => createWatchPaths(__dirname),
-};
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --unitTestRunner should generate the correct files for testing using jest 2`] = `
-"export default {
-  displayName: 'test',
-  preset: '../../jest.preset.js',
-  transform: {
-    '^.+\\\\.[tj]sx?$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
-  },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/apps/test',
-};
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --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=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}
- */
-export default {
-  ignoredRouteFiles: ['**/.*'],
-  // appDirectory: "app",
-  // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
-  // publicPath: "/build/",
-  watchPaths: () => createWatchPaths(__dirname),
-};
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --unitTestRunner should generate the correct files for testing using vitest 2`] = `
-"/// <reference types='vitest' />
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
-import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
-import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
-
-export default defineConfig({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/apps/test',
-
-  plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
-
-  // Uncomment this if you are using workers.
-  // worker: {
-  //  plugins: [ nxViteTsPaths() ],
-  // },
-
-  test: {
-    setupFiles: ['test-setup.ts'],
-    watch: false,
-    globals: true,
-    environment: 'jsdom',
-    include: ['./tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: '../../coverage/apps/test',
-      provider: 'v8',
-    },
-  },
-});
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --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=derived --unitTestRunner should generate the correct files for testing using vitest 4`] = `
-"{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ]
-  },
-  "include": [
-    "vite.config.ts",
-    "vitest.config.ts",
-    "app/**/*.ts",
-    "app/**/*.tsx",
-    "app/**/*.js",
-    "app/**/*.jsx",
-    "tests/**/*.spec.ts",
-    "tests/**/*.test.ts",
-    "tests/**/*.spec.tsx",
-    "tests/**/*.test.tsx",
-    "tests/**/*.spec.js",
-    "tests/**/*.test.js",
-    "tests/**/*.spec.jsx",
-    "tests/**/*.test.jsx"
-  ]
-}
-"
-`;
-
-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}
- */
-export default {
-  ignoredRouteFiles: ['**/.*'],
-  // appDirectory: "app",
-  // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
-  // publicPath: "/build/",
-  watchPaths: () => createWatchPaths(__dirname),
-};
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived should create the application correctly 2`] = `
-"import type { MetaFunction } from '@remix-run/node';
-import {
-  Links,
-  LiveReload,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from '@remix-run/react';
-
-export const meta: MetaFunction = () => [
-  {
-    title: 'New Remix App',
-  },
-];
-
-export default function App() {
-  return (
-    <html lang="en">
-      <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        <Outlet />
-        <ScrollRestoration />
-        <Scripts />
-        <LiveReload />
-      </body>
-    </html>
-  );
-}
-"
-`;
-
-exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived should create the application correctly 3`] = `
-"import NxWelcome from '../nx-welcome';
-
-export default function Index() {
-  return (
-    <div>
-      <NxWelcome title={'test'} />
-    </div>
-  );
-}
-"
-`;
-
 exports[`Remix Application Standalone Project Repo --e2eTestRunner should generate a cypress e2e application for the app 1`] = `
 "import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 

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

@@ -11,7 +11,6 @@ async function normalizeOptions(tree, options) {
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator: '@nx/remix:application',
     });
     options.rootProject = projectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;

package/src/generators/error-boundary/__snapshots__/error-boundary.impl.spec.ts.snap

@@ -1,36 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ErrorBoundary --nameAndDirectoryFormat=as-provided --apiVersion=2 should correctly add the ErrorBoundary to the route file 1`] = `
-"import { useRouteError, isRouteErrorResponse } from '@remix-run/react';
-export function ErrorBoundary() {
-  const error = useRouteError();
-
-  // when true, this is what used to go to 'CatchBoundary'
-  if (isRouteErrorResponse(error)) {
-    return (
-      <div>
-        <h1>Oops</h1>
-        <p>Status: {error.status}</p>
-        <p>{error.data.message}</p>
-      </div>
-    );
-  } else if (error instanceof Error) {
-    return (
-      <div>
-        <h1>Error</h1>
-        <p>{error.message}</p>
-        <p>The stack trace is:</p>
-        <pre>{error.stack}</pre>
-      </div>
-    );
-  } else {
-    return <h1>Unknown Error</h1>;
-  }
-}
-"
-`;
-
-exports[`ErrorBoundary --nameAndDirectoryFormat=as-provided --apiVersion=2 should correctly add the ErrorBoundary to the route file 2`] = `
+exports[`ErrorBoundary --apiVersion=2 should correctly add the ErrorBoundary to the route file 1`] = `
 "import { useRouteError, isRouteErrorResponse } from '@remix-run/react';
 export function ErrorBoundary() {
   const error = useRouteError();

package/src/generators/error-boundary/lib/normalize-options.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const remix_route_utils_1 = require("../../../utils/remix-route-utils");
 async function normalizeOptions(tree, schema) {
-    const pathToRouteFile = schema.nameAndDirectoryFormat === 'as-provided'
-        ? schema.path
-        : await (0, remix_route_utils_1.resolveRemixRouteFile)(tree, schema.path, schema.project);
+    const pathToRouteFile = schema.path;
     if (!tree.exists(pathToRouteFile)) {
         throw new Error(`Route file specified does not exist "${pathToRouteFile}". Please ensure you pass a correct path to the file.`);
     }

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

@@ -4,8 +4,4 @@ export interface ErrorBoundarySchema {
   path: string;
   skipFormat?: false;
   nameAndDirectoryFormat?: NameAndDirectoryFormat;
-  /**
-   * @deprecated Provide the `path` option instead. The project will be determined from the path provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

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

@@ -20,12 +20,6 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "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 v20."
-    },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files after generation.",

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

@@ -77,81 +77,3 @@ exports[`Remix Library Generator -projectNameAndRootFormat=as-provided should ge
   ],
 }
 `;
-
-exports[`Remix Library Generator -projectNameAndRootFormat=derived --unitTestRunner should create the correct config files for testing with jest 1`] = `
-"export default {
-  setupFilesAfterEnv: ['./src/test-setup.ts'],
-  displayName: 'test',
-  preset: '../../jest.preset.js',
-  transform: {
-    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
-    '^.+\\\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
-  },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/libs/test',
-};
-"
-`;
-
-exports[`Remix Library Generator -projectNameAndRootFormat=derived --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=derived --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';
-import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
-
-export default defineConfig({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/libs/test',
-
-  plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
-
-  // Uncomment this if you are using workers.
-  // worker: {
-  //  plugins: [ nxViteTsPaths() ],
-  // },
-
-  test: {
-    setupFiles: ['./src/test-setup.ts'],
-    watch: false,
-    globals: true,
-    environment: 'jsdom',
-    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: { reportsDirectory: '../../coverage/libs/test', provider: 'v8' },
-  },
-});
-"
-`;
-
-exports[`Remix Library Generator -projectNameAndRootFormat=derived --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=derived should generate a library correctly 1`] = `
-[
-  "test.module.css",
-  "test.spec.tsx",
-  "test.tsx",
-]
-`;
-
-exports[`Remix Library Generator -projectNameAndRootFormat=derived should generate a library correctly 2`] = `
-{
-  "@proj/libs/test": [
-    "libs/test/src/index.ts",
-  ],
-  "@proj/libs/test/server": [
-    "libs/test/src/server.ts",
-  ],
-}
-`;

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

@@ -10,7 +10,6 @@ async function normalizeOptions(tree, options) {
         projectType: 'library',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/remix:library',
     });
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/generators/loader/loader.impl.js

@@ -5,11 +5,8 @@ const devkit_1 = require("@nx/devkit");
 const insert_import_1 = require("../../utils/insert-import");
 const insert_statement_after_imports_1 = require("../../utils/insert-statement-after-imports");
 const insert_statement_in_default_function_1 = require("../../utils/insert-statement-in-default-function");
-const remix_route_utils_1 = require("../../utils/remix-route-utils");
 async function default_1(tree, schema) {
-    const routeFilePath = schema.nameAndDirectoryFormat === 'as-provided'
-        ? schema.path
-        : await (0, remix_route_utils_1.resolveRemixRouteFile)(tree, schema.path, schema.project);
+    const routeFilePath = schema.path;
     if (!tree.exists(routeFilePath)) {
         throw new Error(`Route path does not exist: ${routeFilePath}. Please generate a Remix route first.`);
     }

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

@@ -3,8 +3,4 @@ import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-
 export interface LoaderSchema {
   path: string;
   nameAndDirectoryFormat?: NameAndDirectoryFormat;
-  /**
-   * @deprecated Provide the `path` option instead. The project will be determined from the path provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

package/src/generators/loader/schema.json

@@ -17,12 +17,6 @@
       "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"]
-    },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "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 v20."
     }
   },
   "required": ["path"]

package/src/generators/meta/lib/v2.impl.js

@@ -5,11 +5,8 @@ const devkit_1 = require("@nx/devkit");
 const get_default_export_name_1 = require("../../../utils/get-default-export-name");
 const insert_import_1 = require("../../../utils/insert-import");
 const insert_statement_after_imports_1 = require("../../../utils/insert-statement-after-imports");
-const remix_route_utils_1 = require("../../../utils/remix-route-utils");
 async function v2MetaGenerator(tree, schema) {
-    const routeFilePath = schema.nameAndDirectoryFormat === 'as-provided'
-        ? schema.path
-        : await (0, remix_route_utils_1.resolveRemixRouteFile)(tree, schema.path, schema.project);
+    const routeFilePath = schema.path;
     if (!tree.exists(routeFilePath)) {
         throw new Error(`Route path does not exist: ${routeFilePath}. Please generate a Remix route first.`);
     }

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

@@ -3,8 +3,4 @@ import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-
 export interface MetaSchema {
   path: string;
   nameAndDirectoryFormat?: NameAndDirectoryFormat;
-  /**
-   * @deprecated Provide the `path` option instead. The project will be determined from the path provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

package/src/generators/meta/schema.json

@@ -17,12 +17,6 @@
       "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"]
-    },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "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 v20."
     }
   },
   "required": ["path"]

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

@@ -3,19 +3,3 @@
 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 --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 --nameAndDirectoryFormat=as-provided should error if it detects a possible missing route param because of un-escaped dollar sign 4`] = `[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 6`] = `[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=derived 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=derived 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 --nameAndDirectoryFormat=derived should error if it detects a possible missing route param because of un-escaped dollar sign 4`] = `[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=derived should error if it detects a possible missing route param because of un-escaped dollar sign 6`] = `[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=derived should error if it detects a possible missing route param because of un-escaped dollar sign 7`] = `[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=derived should error if it detects a possible missing route param because of un-escaped dollar sign 9`] = `[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

@@ -7,19 +7,14 @@ const remix_route_utils_1 = require("../../utils/remix-route-utils");
 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, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'resource-route',
-        callingGenerator: '@nx/remix:resource-route',
+    const { artifactName: name, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.path.replace(/^\//, '').replace(/\/$/, ''),
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
     });
     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.`);
     }
-    const routeFilePath = await (0, remix_route_utils_1.resolveRemixRouteFile)(tree, options.nameAndDirectoryFormat === 'as-provided'
-        ? (0, devkit_1.joinPathFragments)(directory, name)
-        : options.path, options.nameAndDirectoryFormat === 'as-provided' ? undefined : projectName, '.ts');
+    const routeFilePath = await (0, remix_route_utils_1.resolveRemixRouteFile)(tree, (0, devkit_1.joinPathFragments)(directory, name), undefined);
     if (tree.exists(routeFilePath))
         throw new Error(`Path already exists: ${options.path}`);
     if (!options.loader && !options.action)

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

@@ -6,8 +6,4 @@ export interface RemixRouteSchema {
   action: boolean;
   loader: boolean;
   skipChecks: boolean;
-  /**
-   * @deprecated Provide the `path` option instead. The project will be determined from the path provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

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

@@ -25,12 +25,6 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "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 v20."
-    },
     "action": {
       "type": "boolean",
       "description": "Generate an action function",

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

@@ -46,50 +46,3 @@ exports[`route --nameAndDirectoryFormat=as-provided should error if it detects a
 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=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=derived should add route component 1`] = `
-"import { useLoaderData, useActionData } from '@remix-run/react';
-import { json } from '@remix-run/node';
-import type {
-  LoaderFunctionArgs,
-  MetaFunction,
-  ActionFunctionArgs,
-  LinksFunction,
-} from '@remix-run/node';
-
-import stylesUrl from '../../../styles/path/to/example.css';
-
-export const links: LinksFunction = () => {
-  return [{ rel: 'stylesheet', href: stylesUrl }];
-};
-
-export const action = async ({ request }: ActionFunctionArgs) => {
-  let formData = await request.formData();
-
-  return json({ message: formData.toString() }, { status: 200 });
-};
-
-export const meta: MetaFunction = () => {
-  return [{ title: 'PathToExample Route' }];
-};
-
-export const loader = async ({ request }: LoaderFunctionArgs) => {
-  return json({
-    message: 'Hello, world!',
-  });
-};
-
-export default function PathToExample() {
-  const actionMessage = useActionData<typeof action>();
-  const data = useLoaderData<typeof loader>();
-
-  return <p>Message: {data.message}</p>;
-}
-"
-`;
-
-exports[`route --nameAndDirectoryFormat=derived 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=derived 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=derived 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,11 +11,8 @@ 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, {
-        artifactType: 'route',
-        callingGenerator: '@nx/remix:route',
         name: options.path.replace(/^\//, '').replace(/\/$/, ''),
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
     });
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     if (!project)
@@ -23,12 +20,8 @@ async function default_1(tree, options) {
     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.`);
     }
-    const routeFilePath = await (0, remix_route_utils_1.resolveRemixRouteFile)(tree, options.nameAndDirectoryFormat === 'as-provided'
-        ? (0, devkit_1.joinPathFragments)(directory, name)
-        : options.path, options.nameAndDirectoryFormat === 'as-provided' ? undefined : projectName, '.tsx');
-    const nameToUseForComponent = options.nameAndDirectoryFormat === 'as-provided'
-        ? name.replace('.tsx', '')
-        : options.path.replace(/^\//, '').replace(/\/$/, '').replace('.tsx', '');
+    const routeFilePath = await (0, remix_route_utils_1.resolveRemixRouteFile)(tree, (0, devkit_1.joinPathFragments)(directory, name), undefined);
+    const nameToUseForComponent = name.replace('.tsx', '');
     const { className: componentName } = (0, devkit_1.names)(nameToUseForComponent === '.' || nameToUseForComponent === ''
         ? (0, path_1.basename)((0, path_1.dirname)(routeFilePath))
         : nameToUseForComponent);
@@ -69,7 +62,6 @@ async function default_1(tree, options) {
     }
     if (options.style === 'css') {
         await (0, style_impl_1.default)(tree, {
-            project: projectName,
             path: routeFilePath,
             nameAndDirectoryFormat: 'as-provided',
         });

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

@@ -8,8 +8,4 @@ export interface RemixRouteSchema {
   meta: boolean;
   loader: boolean;
   skipChecks: boolean;
-  /**
-   * @deprecated Provide the `path` option instead. The project will be determined from the path provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

package/src/generators/route/schema.json

@@ -25,12 +25,6 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "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 v20."
-    },
     "style": {
       "type": "string",
       "description": "Generate a stylesheet",

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

@@ -3,8 +3,4 @@ import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-
 export interface RemixStyleSchema {
   path: string;
   nameAndDirectoryFormat?: NameAndDirectoryFormat;
-  /**
-   * @deprecated Provide the `path` option instead. The project will be determined from the path provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

package/src/generators/style/schema.json

@@ -24,12 +24,6 @@
       "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"]
-    },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "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 v20."
     }
   },
   "required": ["path"]

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

@@ -9,11 +9,8 @@ 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, {
-        artifactType: 'style',
-        callingGenerator: '@nx/remix:style',
         name: options.path,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
+        nameAndDirectoryFormat: options.nameAndDirectoryFormat ?? 'as-provided',
     });
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     if (!project)
@@ -33,9 +30,7 @@ async function default_1(tree, options) {
           Liberation Mono, Courier New, monospace;
       }
     `);
-    const routeFilePath = options.nameAndDirectoryFormat
-        ? options.path
-        : await (0, remix_route_utils_1.resolveRemixRouteFile)(tree, options.path, options.project, '.tsx');
+    const routeFilePath = options.path;
     (0, insert_import_1.insertImport)(tree, routeFilePath, 'LinksFunction', '@remix-run/node', {
         typeOnly: true,
     });