@nx/remix 16.8.2 → 17.2.5

package/src/generators/cypress/cypress.impl.js

@@ -1,27 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const package_json_1 = require("nx/package.json");
-function default_1(tree, options) {
-    var _a, _b, _c, _d;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (_a = options.baseUrl) !== null && _a !== void 0 ? _a : (options.baseUrl = 'http://localhost:3000');
-        const { cypressInitGenerator, cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', package_json_1.version);
-        const initSideEffects = yield cypressInitGenerator(tree, {});
-        const projSideEffects = yield cypressProjectGenerator(tree, Object.assign(Object.assign({}, options), { standaloneConfig: true }));
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-        tree.delete((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'app.po.ts'));
-        tree.write((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'e2e', 'app.cy.ts'), `describe('webapp', () => {
+const cypress_1 = require("@nx/cypress");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const versions_1 = require("../../utils/versions");
+async function default_1(tree, options) {
+    const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        name: options.name,
+        projectType: 'application',
+        directory: options.directory,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/remix:cypress',
+    });
+    const rootProject = e2eProjectRoot === '.';
+    let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    options.baseUrl ??= `http://localhost:${projectConfig.targets['serve'].options.port}`;
+    addFileServerTarget(tree, options, 'serve-static');
+    (0, devkit_1.addProjectConfiguration)(tree, e2eProjectName, {
+        projectType: 'application',
+        root: e2eProjectRoot,
+        sourceRoot: (0, devkit_1.joinPathFragments)(e2eProjectRoot, 'src'),
+        targets: {},
+        tags: [],
+        implicitDependencies: [options.name],
+    });
+    const installTask = await (0, cypress_1.configurationGenerator)(tree, {
+        project: e2eProjectName,
+        directory: 'src',
+        linter: options.linter,
+        skipPackageJson: false,
+        skipFormat: true,
+        devServerTarget: `${options.project}:serve:development`,
+        baseUrl: options.baseUrl,
+        rootProject,
+    });
+    projectConfig = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
+    tree.delete((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'app.po.ts'));
+    tree.write((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'e2e', 'app.cy.ts'), `describe('webapp', () => {
   beforeEach(() => cy.visit('/'));
 
   it('should display welcome message', () => {
     cy.get('h1').contains('Welcome to Remix');
   });
 });`);
-        const supportFilePath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'e2e.ts');
-        const supportContent = tree.read(supportFilePath, 'utf-8');
-        tree.write(supportFilePath, `${supportContent}
+    const supportFilePath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'e2e.ts');
+    const supportContent = tree.read(supportFilePath, 'utf-8');
+    tree.write(supportFilePath, `${supportContent}
 
 // from https://github.com/remix-run/indie-stack
 Cypress.on("uncaught:exception", (err) => {
@@ -36,32 +60,18 @@ Cypress.on("uncaught:exception", (err) => {
     return false;
   }
 });`);
-        // run-commands won't emit { success: true, baseUrl: '...' } to Cypress executor.
-        // We'll wire it up manually and skip serve from Cypress.
-        projectConfig.targets.e2e.options.skipServe = true;
-        projectConfig.targets.e2e.options.baseUrl =
-            (_b = options.baseUrl) !== null && _b !== void 0 ? _b : 'http://localhost:3000';
-        projectConfig.targets.e2e.dependsOn = ['dev-server'];
-        delete projectConfig.targets.e2e.options.devServerTarget;
-        (_d = (_c = projectConfig.targets.e2e) === null || _c === void 0 ? void 0 : _c.configurations) === null || _d === void 0 ? true : delete _d.production.devServerTarget;
-        projectConfig.targets['dev-server'] = {
-            command: `nx serve ${options.project}`,
-            options: {
-                readyWhen: 'Server started',
-            },
-            configurations: {
-                production: {
-                    command: `nx serve ${options.project} --configuration=production`,
-                },
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfig);
-        // returning this in case the cypress generator has any side effects
-        return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield initSideEffects();
-            yield projSideEffects();
-        });
-    });
+    return (0, devkit_1.runTasksInSerial)(installTask);
 }
 exports.default = default_1;
-//# sourceMappingURL=cypress.impl.js.map
+function addFileServerTarget(tree, options, targetName) {
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': versions_1.nxVersion });
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    projectConfig.targets[targetName] = {
+        executor: '@nx/web:file-server',
+        options: {
+            buildTarget: `${options.project}:build`,
+            port: projectConfig.targets['serve'].options.port,
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+}

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

@@ -1,9 +1,13 @@
+import { type ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import { Linter } from '@nx/eslint';
+
 export interface CypressGeneratorSchema {
   project: string;
   name: string;
   baseUrl?: string;
   directory?: string;
-  linter?: 'none' | 'eslint';
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  linter?: Linter;
   js?: boolean;
   skipFormat?: boolean;
   setParserOptionsProject?: boolean;

package/src/generators/cypress/schema.json

@@ -3,6 +3,7 @@
   "$id": "NxRemixCypress",
   "title": "",
   "type": "object",
+  "description": "Generate a Cypress e2e project for a given application.",
   "properties": {
     "project": {
       "type": "string",
@@ -11,6 +12,11 @@
         "$source": "projectName"
       }
     },
+    "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"]
+    },
     "baseUrl": {
       "type": "string",
       "description": "URL to access the application on",

package/src/generators/cypress-component-configuration/cypress-component-configuration.impl.js

@@ -1,25 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const versions_1 = require("../../utils/versions");
-function cypressComponentConfigurationGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { cypressComponentConfigGenerator } = (0, devkit_1.ensurePackage)('@nx/react', (0, versions_1.getPackageVersion)(tree, 'nx'));
-        yield cypressComponentConfigGenerator(tree, {
-            project: options.project,
-            generateTests: options.generateTests,
-            skipFormat: true,
-            bundler: 'vite',
-            buildTarget: '',
-        });
-        const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), project.root, { tmpl: '' });
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
+const react_1 = require("@nx/react");
+async function cypressComponentConfigurationGenerator(tree, options) {
+    await (0, react_1.cypressComponentConfigGenerator)(tree, {
+        project: options.project,
+        generateTests: options.generateTests,
+        skipFormat: true,
+        bundler: 'vite',
+        buildTarget: '',
     });
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), project.root, { tmpl: '' });
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = cypressComponentConfigurationGenerator;
-//# sourceMappingURL=cypress-component-configuration.impl.js.map

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

@@ -1,21 +1,37 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ErrorBoundary --apiVersion=1 should correctly add the ErrorBoundary to the route file 1`] = `
-"export function ErrorBoundary({ error }) {
-  console.error(error);
-  return (
-    <div>
-      <h1>Uh oh ...</h1>
-      <p>Something went wrong</p>
-      <pre>{error.message || 'Unknown error'}</pre>
-    </div>
-  );
+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 --apiVersion=2 should correctly add the ErrorBoundary to the route file 1`] = `
-"import { isRouteErrorResponse, useRouteError } from '@remix-run/react';
+exports[`ErrorBoundary --nameAndDirectoryFormat=as-provided --apiVersion=2 should correctly add the ErrorBoundary to the route file 2`] = `
+"import { useRouteError, isRouteErrorResponse } from '@remix-run/react';
 export function ErrorBoundary() {
   const error = useRouteError();
 
@@ -28,22 +44,18 @@ export function ErrorBoundary() {
         <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>;
   }
-
-  // Don't forget to typecheck with your own logic.
-  // Any value can be thrown, not just errors!
-  let errorMessage = 'Unknown error';
-  // if (isDefinitelyAnError(error)) {
-  //    errorMessage = error.message;
-  // }
-
-  return (
-    <div>
-      <h1>Uh oh ...</h1>
-      <p>Something went wrong.</p>
-      <pre>{errorMessage}</pre>
-    </div>
-  );
 }
 "
 `;

package/src/generators/error-boundary/error-boundary.impl.js

@@ -1,21 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-function errorBoundaryGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(tree, schema);
-        if (options.apiVersion === 1) {
-            (0, lib_1.addV1ErrorBoundary)(tree, options);
-        }
-        else {
-            (0, lib_1.addV2ErrorBoundary)(tree, options);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-    });
+async function errorBoundaryGenerator(tree, schema) {
+    const options = await (0, lib_1.normalizeOptions)(tree, schema);
+    (0, lib_1.addV2ErrorBoundary)(tree, options);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = errorBoundaryGenerator;
-//# sourceMappingURL=error-boundary.impl.js.map

package/src/generators/error-boundary/lib/add-v2-error-boundary.js

@@ -20,24 +20,19 @@ function addV2ErrorBoundary(tree, options) {
                     <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>;
         }
-
-        // Don't forget to typecheck with your own logic.
-        // Any value can be thrown, not just errors!
-        let errorMessage = "Unknown error";
-        // if (isDefinitelyAnError(error)) {
-        //    errorMessage = error.message;
-        // }
-
-        return (
-            <div>
-                <h1>Uh oh ...</h1>
-                <p>Something went wrong.</p>
-                <pre>{errorMessage}</pre>
-            </div>
-        );
     }
   `);
 }
 exports.addV2ErrorBoundary = addV2ErrorBoundary;
-//# sourceMappingURL=add-v2-error-boundary.js.map

package/src/generators/error-boundary/lib/index.d.ts

@@ -1,3 +1,2 @@
-export * from './add-v1-error-boundary';
 export * from './add-v2-error-boundary';
 export * from './normalize-options';

package/src/generators/error-boundary/lib/index.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./add-v1-error-boundary"), exports);
 tslib_1.__exportStar(require("./add-v2-error-boundary"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
-//# sourceMappingURL=index.js.map

package/src/generators/error-boundary/lib/normalize-options.d.ts

@@ -1,3 +1,3 @@
 import { type Tree } from '@nx/devkit';
 import type { ErrorBoundarySchema } from '../schema';
-export declare function normalizeOptions(tree: Tree, schema: ErrorBoundarySchema): ErrorBoundarySchema;
+export declare function normalizeOptions(tree: Tree, schema: ErrorBoundarySchema): Promise<ErrorBoundarySchema>;

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

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const remix_route_utils_1 = require("../../../utils/remix-route-utils");
-function normalizeOptions(tree, schema) {
-    const pathToRouteFile = (0, remix_route_utils_1.resolveRemixRouteFile)(tree, schema.path, schema.project);
+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);
     if (!tree.exists(pathToRouteFile)) {
-        throw new Error(`Route file specified does not exist "${pathToRouteFile}". Please ensure you pass a correct path to the file, relative to the project root.`);
+        throw new Error(`Route file specified does not exist "${pathToRouteFile}". Please ensure you pass a correct path to the file.`);
     }
-    return Object.assign(Object.assign({}, schema), { path: pathToRouteFile });
+    return {
+        ...schema,
+        path: pathToRouteFile,
+    };
 }
 exports.normalizeOptions = normalizeOptions;
-//# sourceMappingURL=normalize-options.js.map

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

@@ -1,6 +1,11 @@
+import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+
 export interface ErrorBoundarySchema {
-  project: string;
   path: string;
-  apiVersion: number;
   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 v18.
+   */
+  project?: string;
 }

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

@@ -2,14 +2,24 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "NxRemixErrorBoundary",
   "title": "Create an ErrorBoundary for a Route",
+  "description": "Generate an ErrorBoundary for a given route.",
   "type": "object",
   "examples": [
     {
-      "command": "g error-boundary --project=myapp --routePath=app/routes/my-route.tsx",
+      "command": "g error-boundary --routePath=apps/demo/app/routes/my-route.tsx",
       "description": "Generate an ErrorBoundary for my-route.tsx"
     }
   ],
   "properties": {
+    "path": {
+      "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"]
+    },
     "project": {
       "type": "string",
       "description": "The name of the project.",
@@ -17,16 +27,8 @@
         "$source": "projectName"
       },
       "x-prompt": "What project contains the route file that this ErrorBoundary is for?",
-      "pattern": "^[a-zA-Z].*$"
-    },
-    "path": {
-      "type": "string",
-      "description": "The path to route file relative to the project root."
-    },
-    "apiVersion": {
-      "type": "number",
-      "description": "Which version of the ErrorBoundary convention to use for the route.",
-      "default": 1
+      "pattern": "^[a-zA-Z].*$",
+      "x-deprecated": "Provide the `path` option instead and use the `as-provided` format. The project will be determined from the path provided. It will be removed in Nx v18."
     },
     "skipFormat": {
       "type": "boolean",
@@ -35,5 +37,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["project", "path"]
+  "required": ["path"]
 }

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

@@ -0,0 +1,157 @@
+// 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`] = `
+"/* eslint-disable */
+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/test',
+};
+"
+`;
+
+exports[`Remix Library Generator -projectNameAndRootFormat=as-provided --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`] = `
+"import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: '../node_modules/.vite/test',
+
+  plugins: [react(), nxViteTsPaths()],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+
+  test: {
+    setupFiles: ['./src/test-setup.ts'],
+    globals: true,
+    cache: { dir: '../node_modules/.vitest' },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: { reportsDirectory: '../coverage/test', provider: 'v8' },
+  },
+});
+"
+`;
+
+exports[`Remix Library Generator -projectNameAndRootFormat=as-provided --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`] = `
+[
+  "test.module.css",
+  "test.spec.tsx",
+  "test.tsx",
+]
+`;
+
+exports[`Remix Library Generator -projectNameAndRootFormat=as-provided should generate a library correctly 2`] = `
+{
+  "@proj/test": [
+    "test/src/index.ts",
+  ],
+  "@proj/test/server": [
+    "test/src/server.ts",
+  ],
+}
+`;
+
+exports[`Remix Library Generator -projectNameAndRootFormat=derived --unitTestRunner should create the correct config files for testing with jest 1`] = `
+"/* eslint-disable */
+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';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: '../../node_modules/.vite/libs/test',
+
+  plugins: [react(), nxViteTsPaths()],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+
+  test: {
+    setupFiles: ['./src/test-setup.ts'],
+    globals: true,
+    cache: { dir: '../../node_modules/.vitest' },
+    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/add-tsconfig-entry-points.js

@@ -17,4 +17,3 @@ function addTsconfigEntryPoints(tree, options) {
     });
 }
 exports.addTsconfigEntryPoints = addTsconfigEntryPoints;
-//# sourceMappingURL=add-tsconfig-entry-points.js.map

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

@@ -5,22 +5,21 @@ const devkit_1 = require("@nx/devkit");
 const testing_config_utils_1 = require("../../../utils/testing-config-utils");
 const versions_1 = require("../../../utils/versions");
 function addUnitTestingSetup(tree, options) {
-    const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-    const pathToTestSetup = (0, devkit_1.joinPathFragments)(projectRoot, 'src/test-setup.ts');
+    const pathToTestSetup = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/test-setup.ts');
     let testSetupFileContents = '';
     if (tree.exists(pathToTestSetup)) {
         testSetupFileContents = tree.read(pathToTestSetup, 'utf-8');
     }
     tree.write(pathToTestSetup, (0, devkit_1.stripIndents) `${testSetupFileContents}
     import { installGlobals } from '@remix-run/node';
-    import "@testing-library/jest-dom/extend-expect";
+    import "@testing-library/jest-dom/matchers";
   installGlobals();`);
     if (options.unitTestRunner === 'vitest') {
-        const pathToVitestConfig = (0, devkit_1.joinPathFragments)(projectRoot, `vite.config.ts`);
+        const pathToVitestConfig = (0, devkit_1.joinPathFragments)(options.projectRoot, `vite.config.ts`);
         (0, testing_config_utils_1.updateViteTestSetup)(tree, pathToVitestConfig, './src/test-setup.ts');
     }
     else if (options.unitTestRunner === 'jest') {
-        const pathToJestConfig = (0, devkit_1.joinPathFragments)(projectRoot, `jest.config.ts`);
+        const pathToJestConfig = (0, devkit_1.joinPathFragments)(options.projectRoot, `jest.config.ts`);
         (0, testing_config_utils_1.updateJestTestSetup)(tree, pathToJestConfig, './src/test-setup.ts');
     }
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
@@ -31,4 +30,3 @@ function addUnitTestingSetup(tree, options) {
     });
 }
 exports.addUnitTestingSetup = addUnitTestingSetup;
-//# sourceMappingURL=add-unit-testing.js.map

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

@@ -5,4 +5,3 @@ tslib_1.__exportStar(require("./add-tsconfig-entry-points"), exports);
 tslib_1.__exportStar(require("./add-unit-testing"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./update-buildable-config"), exports);
-//# sourceMappingURL=index.js.map