@nx/remix 18.0.0-beta.1 → 18.0.0-beta.3

package/generators.d.ts

@@ -1,15 +1,14 @@
-export * from './src/generators/action/action.impl';
-export * from './src/generators/application/application.impl';
-export * from './src/generators/cypress-component-configuration/cypress-component-configuration.impl';
-export * from './src/generators/cypress/cypress.impl';
-export * from './src/generators/error-boundary/error-boundary.impl';
-export * from './src/generators/library/library.impl';
-export * from './src/generators/loader/loader.impl';
-export * from './src/generators/meta/meta.impl';
-export * from './src/generators/preset/preset.impl';
-export * from './src/generators/resource-route/resource-route.impl';
-export * from './src/generators/route/route.impl';
-export * from './src/generators/setup-tailwind/setup-tailwind.impl';
-export * from './src/generators/storybook-configuration/storybook-configuration.impl';
-export * from './src/generators/style/style.impl';
-export * from './src/generators/init/init';
+export { default as actionGenerator } from './src/generators/action/action.impl';
+export { default as applicationGenerator } from './src/generators/application/application.impl';
+export { default as cypressComponentConfigurationGenerator } from './src/generators/cypress-component-configuration/cypress-component-configuration.impl';
+export { default as errorBoundaryGenerator } from './src/generators/error-boundary/error-boundary.impl';
+export { default as libraryGenerator } from './src/generators/library/library.impl';
+export { default as loaderGenerator } from './src/generators/loader/loader.impl';
+export { default as metaGenerator } from './src/generators/meta/meta.impl';
+export { default as presetGenerator } from './src/generators/preset/preset.impl';
+export { default as resourceRouteGenerator } from './src/generators/resource-route/resource-route.impl';
+export { default as routeGenerator } from './src/generators/route/route.impl';
+export { default as setupTailwindGenerator } from './src/generators/setup-tailwind/setup-tailwind.impl';
+export { default as storybookConfigurationGenerator } from './src/generators/storybook-configuration/storybook-configuration.impl';
+export { default as styleGenerator } from './src/generators/style/style.impl';
+export { default as initGenerator } from './src/generators/init/init';

package/generators.js

@@ -1,18 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./src/generators/action/action.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/application/application.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/cypress-component-configuration/cypress-component-configuration.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/cypress/cypress.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/error-boundary/error-boundary.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/library/library.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/loader/loader.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/meta/meta.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/preset/preset.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/resource-route/resource-route.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/route/route.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/setup-tailwind/setup-tailwind.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/storybook-configuration/storybook-configuration.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/style/style.impl"), exports);
-tslib_1.__exportStar(require("./src/generators/init/init"), exports);
+exports.initGenerator = exports.styleGenerator = exports.storybookConfigurationGenerator = exports.setupTailwindGenerator = exports.routeGenerator = exports.resourceRouteGenerator = exports.presetGenerator = exports.metaGenerator = exports.loaderGenerator = exports.libraryGenerator = exports.errorBoundaryGenerator = exports.cypressComponentConfigurationGenerator = exports.applicationGenerator = exports.actionGenerator = void 0;
+var action_impl_1 = require("./src/generators/action/action.impl");
+Object.defineProperty(exports, "actionGenerator", { enumerable: true, get: function () { return action_impl_1.default; } });
+var application_impl_1 = require("./src/generators/application/application.impl");
+Object.defineProperty(exports, "applicationGenerator", { enumerable: true, get: function () { return application_impl_1.default; } });
+var cypress_component_configuration_impl_1 = require("./src/generators/cypress-component-configuration/cypress-component-configuration.impl");
+Object.defineProperty(exports, "cypressComponentConfigurationGenerator", { enumerable: true, get: function () { return cypress_component_configuration_impl_1.default; } });
+var error_boundary_impl_1 = require("./src/generators/error-boundary/error-boundary.impl");
+Object.defineProperty(exports, "errorBoundaryGenerator", { enumerable: true, get: function () { return error_boundary_impl_1.default; } });
+var library_impl_1 = require("./src/generators/library/library.impl");
+Object.defineProperty(exports, "libraryGenerator", { enumerable: true, get: function () { return library_impl_1.default; } });
+var loader_impl_1 = require("./src/generators/loader/loader.impl");
+Object.defineProperty(exports, "loaderGenerator", { enumerable: true, get: function () { return loader_impl_1.default; } });
+var meta_impl_1 = require("./src/generators/meta/meta.impl");
+Object.defineProperty(exports, "metaGenerator", { enumerable: true, get: function () { return meta_impl_1.default; } });
+var preset_impl_1 = require("./src/generators/preset/preset.impl");
+Object.defineProperty(exports, "presetGenerator", { enumerable: true, get: function () { return preset_impl_1.default; } });
+var resource_route_impl_1 = require("./src/generators/resource-route/resource-route.impl");
+Object.defineProperty(exports, "resourceRouteGenerator", { enumerable: true, get: function () { return resource_route_impl_1.default; } });
+var route_impl_1 = require("./src/generators/route/route.impl");
+Object.defineProperty(exports, "routeGenerator", { enumerable: true, get: function () { return route_impl_1.default; } });
+var setup_tailwind_impl_1 = require("./src/generators/setup-tailwind/setup-tailwind.impl");
+Object.defineProperty(exports, "setupTailwindGenerator", { enumerable: true, get: function () { return setup_tailwind_impl_1.default; } });
+var storybook_configuration_impl_1 = require("./src/generators/storybook-configuration/storybook-configuration.impl");
+Object.defineProperty(exports, "storybookConfigurationGenerator", { enumerable: true, get: function () { return storybook_configuration_impl_1.default; } });
+var style_impl_1 = require("./src/generators/style/style.impl");
+Object.defineProperty(exports, "styleGenerator", { enumerable: true, get: function () { return style_impl_1.default; } });
+var init_1 = require("./src/generators/init/init");
+Object.defineProperty(exports, "initGenerator", { enumerable: true, get: function () { return init_1.default; } });

package/generators.json

@@ -17,26 +17,26 @@
       "hidden": true
     },
     "application": {
-      "implementation": "./src/generators/application/application.impl",
+      "implementation": "./src/generators/application/application.impl#remixApplicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
       "description": "Generate a new Remix application",
       "aliases": ["app"],
       "x-type": "application"
     },
     "cypress-component-configuration": {
-      "implementation": "./src/generators/cypress-component-configuration/cypress-component-configuration.impl",
+      "implementation": "./src/generators/cypress-component-configuration/cypress-component-configuration.impl#cypressComponentConfigurationGeneratorInternal",
       "schema": "./src/generators/cypress-component-configuration/schema.json",
       "description": "Generate a Cypress Component Testing configuration for a Remix project"
     },
     "library": {
-      "implementation": "./src/generators/library/library.impl",
+      "implementation": "./src/generators/library/library.impl#remixLibraryGeneratorInternal",
       "schema": "./src/generators/library/schema.json",
       "description": "Generate a new library",
       "aliases": ["lib"],
       "x-type": "library"
     },
     "init": {
-      "implementation": "./src/generators/init/init",
+      "implementation": "./src/generators/init/init#remixInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
       "description": "Initialize the `@nx/remix` plugin.",
       "hidden": true
@@ -72,7 +72,7 @@
       "description": "Generates a TailwindCSS configuration for the Remix application"
     },
     "storybook-configuration": {
-      "implementation": "./src/generators/storybook-configuration/storybook-configuration.impl",
+      "implementation": "./src/generators/storybook-configuration/storybook-configuration.impl#remixStorybookConfiguration",
       "schema": "./src/generators/storybook-configuration/schema.json",
       "description": "Generates a Storybook configuration for a Remix application"
     },
@@ -85,11 +85,6 @@
       "implementation": "./src/generators/error-boundary/error-boundary.impl",
       "schema": "./src/generators/error-boundary/schema.json",
       "description": "Add an ErrorBoundary to an existing route"
-    },
-    "cypress": {
-      "implementation": "./src/generators/cypress/cypress.impl",
-      "schema": "./src/generators/cypress/schema.json",
-      "description": "Generate a project for testing Remix apps using Cypress"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "18.0.0-beta.1",
+  "version": "18.0.0-beta.3",
   "description": "The Remix plugin for Nx contains executors and generators for managing Remix applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, routes, loaders, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -28,12 +28,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "18.0.0-beta.1",
-    "@nx/js": "18.0.0-beta.1",
-    "@nx/react": "18.0.0-beta.1",
+    "@nx/devkit": "18.0.0-beta.3",
+    "@nx/js": "18.0.0-beta.3",
+    "@nx/react": "18.0.0-beta.3",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/remix": "18.0.0-beta.1"
+    "@nrwl/remix": "18.0.0-beta.3"
   },
   "peerDependencies": {},
   "publishConfig": {

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

@@ -1,3 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NxRemixGeneratorSchema } from './schema';
-export default function (tree: Tree, _options: NxRemixGeneratorSchema): Promise<GeneratorCallback>;
+export declare function remixApplicationGenerator(tree: Tree, options: NxRemixGeneratorSchema): Promise<GeneratorCallback>;
+export declare function remixApplicationGeneratorInternal(tree: Tree, _options: NxRemixGeneratorSchema): Promise<GeneratorCallback>;
+export default remixApplicationGenerator;

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.remixApplicationGeneratorInternal = exports.remixApplicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const create_ts_config_1 = require("@nx/js/src/utils/typescript/create-ts-config");
 const versions_1 = require("../../utils/versions");
@@ -9,10 +10,20 @@ const init_1 = require("../init/init");
 const js_1 = require("@nx/js");
 const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-async function default_1(tree, _options) {
+function remixApplicationGenerator(tree, options) {
+    return remixApplicationGeneratorInternal(tree, {
+        addPlugin: false,
+        ...options,
+    });
+}
+exports.remixApplicationGenerator = remixApplicationGenerator;
+async function remixApplicationGeneratorInternal(tree, _options) {
     const options = await (0, lib_1.normalizeOptions)(tree, _options);
     const tasks = [
-        await (0, init_1.default)(tree, { skipFormat: true }),
+        await (0, init_1.default)(tree, {
+            skipFormat: true,
+            addPlugin: options.addPlugin,
+        }),
         await (0, js_1.initGenerator)(tree, { skipFormat: true }),
     ];
     (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, '@nx/remix:build');
@@ -21,36 +32,38 @@ async function default_1(tree, _options) {
         sourceRoot: `${options.projectRoot}`,
         projectType: 'application',
         tags: options.parsedTags,
-        targets: {
-            build: {
-                executor: '@nx/remix:build',
-                outputs: ['{options.outputPath}'],
-                options: {
-                    outputPath: (0, devkit_1.joinPathFragments)('dist', options.projectRoot),
+        targets: !options.addPlugin
+            ? {
+                build: {
+                    executor: '@nx/remix:build',
+                    outputs: ['{options.outputPath}'],
+                    options: {
+                        outputPath: (0, devkit_1.joinPathFragments)('dist', options.projectRoot),
+                    },
                 },
-            },
-            serve: {
-                executor: `@nx/remix:serve`,
-                options: {
-                    command: `${(0, devkit_1.getPackageManagerCommand)().exec} remix-serve build/index.js`,
-                    manual: true,
-                    port: 4200,
+                serve: {
+                    executor: `@nx/remix:serve`,
+                    options: {
+                        command: `${(0, devkit_1.getPackageManagerCommand)().exec} remix-serve build/index.js`,
+                        manual: true,
+                        port: 4200,
+                    },
                 },
-            },
-            start: {
-                dependsOn: ['build'],
-                command: `remix-serve build/index.js`,
-                options: {
-                    cwd: options.projectRoot,
+                start: {
+                    dependsOn: ['build'],
+                    command: `remix-serve build/index.js`,
+                    options: {
+                        cwd: options.projectRoot,
+                    },
                 },
-            },
-            typecheck: {
-                command: `tsc --project tsconfig.app.json`,
-                options: {
-                    cwd: options.projectRoot,
+                typecheck: {
+                    command: `tsc --project tsconfig.app.json`,
+                    options: {
+                        cwd: options.projectRoot,
+                    },
                 },
-            },
-        },
+            }
+            : {},
     });
     const installTask = (0, update_dependencies_1.updateDependencies)(tree);
     tasks.push(installTask);
@@ -86,6 +99,7 @@ async function default_1(tree, _options) {
                 skipFormat: true,
                 testEnvironment: 'jsdom',
                 skipViteConfig: true,
+                addPlugin: options.addPlugin,
             });
             createOrEditViteConfig(tree, {
                 project: options.projectName,
@@ -106,10 +120,13 @@ async function default_1(tree, _options) {
                 skipSerializers: false,
                 skipPackageJson: false,
                 skipFormat: true,
+                addPlugin: options.addPlugin,
             });
             const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-            projectConfig.targets['test'].options.passWithNoTests = true;
-            (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, projectConfig);
+            if (projectConfig.targets['test']?.options) {
+                projectConfig.targets['test'].options.passWithNoTests = true;
+                (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, projectConfig);
+            }
             tasks.push(jestTask);
         }
         const pkgInstallTask = (0, lib_1.updateUnitTestConfig)(tree, options.projectRoot, options.unitTestRunner);
@@ -129,8 +146,11 @@ async function default_1(tree, _options) {
             unitTestRunner: options.unitTestRunner,
             skipFormat: true,
             rootProject: options.rootProject,
+            addPlugin: options.addPlugin,
         });
         tasks.push(eslintTask);
+        tree.write((0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintignore'), (0, devkit_1.stripIndents) `build
+    public/build`);
     }
     if (options.js) {
         (0, devkit_1.toJS)(tree);
@@ -165,6 +185,7 @@ async function default_1(tree, _options) {
         // Otherwise, extract the tsconfig.base.json from tsconfig.json so we can share settings.
         (0, create_ts_config_1.extractTsConfigBase)(tree);
     }
+    // TODO(@columferry): add support for playwright?
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', (0, versions_1.getPackageVersion)(tree, 'nx'));
         addFileServerTarget(tree, options, 'serve-static');
@@ -182,6 +203,7 @@ async function default_1(tree, _options) {
             skipFormat: true,
             devServerTarget: `${options.projectName}:serve:development`,
             baseUrl: 'http://localhost:4200',
+            addPlugin: options.addPlugin,
         }));
     }
     if (!options.skipFormat) {
@@ -192,7 +214,7 @@ async function default_1(tree, _options) {
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.default = default_1;
+exports.remixApplicationGeneratorInternal = remixApplicationGeneratorInternal;
 function addFileServerTarget(tree, options, targetName) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
     projectConfig.targets[targetName] = {
@@ -204,3 +226,4 @@ function addFileServerTarget(tree, options, targetName) {
     };
     (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, projectConfig);
 }
+exports.default = remixApplicationGenerator;

package/src/generators/application/files/common/app/nx-welcome.tsx__tmpl__

@@ -795,6 +795,25 @@ export function NxWelcome({ title }: { title: string }) {
                 nx g @nx/react:component ui/src/lib/button
               </pre>
             </details>
+            <details>
+              <summary>
+                <svg
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+                  />
+                </svg>
+                View project details
+              </summary>
+              <pre>nx show project { title } --web</pre>
+            </details>
             <details>
               <summary>
                 <svg

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

@@ -14,6 +14,7 @@ async function normalizeOptions(tree, options) {
     });
     options.rootProject = projectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const e2eProjectName = options.rootProject ? 'e2e' : `${projectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${projectRoot}-e2e`;
     const parsedTags = options.tags

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

@@ -12,4 +12,5 @@ export interface NxRemixGeneratorSchema {
   e2eTestRunner?: 'cypress' | 'none';
   skipFormat?: boolean;
   rootProject?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/cypress-component-configuration/cypress-component-configuration.impl.d.ts

@@ -1,3 +1,5 @@
 import { type Tree } from '@nx/devkit';
 import { type CypressComponentConfigurationSchema } from './schema';
-export default function cypressComponentConfigurationGenerator(tree: Tree, options: CypressComponentConfigurationSchema): Promise<void>;
+export declare function cypressComponentConfigurationGenerator(tree: Tree, options: CypressComponentConfigurationSchema): Promise<void>;
+export declare function cypressComponentConfigurationGeneratorInternal(tree: Tree, options: CypressComponentConfigurationSchema): Promise<void>;
+export default cypressComponentConfigurationGenerator;

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

@@ -1,15 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cypressComponentConfigurationGeneratorInternal = exports.cypressComponentConfigurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const react_1 = require("@nx/react");
-async function cypressComponentConfigurationGenerator(tree, options) {
+function cypressComponentConfigurationGenerator(tree, options) {
+    return cypressComponentConfigurationGeneratorInternal(tree, {
+        addPlugin: false,
+        ...options,
+    });
+}
+exports.cypressComponentConfigurationGenerator = cypressComponentConfigurationGenerator;
+async function cypressComponentConfigurationGeneratorInternal(tree, options) {
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     await (0, react_1.cypressComponentConfigGenerator)(tree, {
         project: options.project,
         generateTests: options.generateTests,
         skipFormat: true,
         bundler: 'vite',
         buildTarget: '',
+        addPlugin: options.addPlugin,
     });
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), project.root, { tmpl: '' });
@@ -17,4 +27,5 @@ async function cypressComponentConfigurationGenerator(tree, options) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }
+exports.cypressComponentConfigurationGeneratorInternal = cypressComponentConfigurationGeneratorInternal;
 exports.default = cypressComponentConfigurationGenerator;

package/src/generators/cypress-component-configuration/schema.d.ts

@@ -2,4 +2,5 @@ export interface CypressComponentConfigurationSchema {
   project: string;
   generateTests?: boolean;
   skipFormat?: boolean;
+  addPlugin?: boolean;
 }

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

@@ -1,4 +1,5 @@
 import { type Tree, GeneratorCallback } 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>;
 export default remixInitGenerator;

package/src/generators/init/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remixInitGenerator = void 0;
+exports.remixInitGeneratorInternal = exports.remixInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const plugin_1 = require("../../plugins/plugin");
@@ -26,7 +26,11 @@ function addPlugin(tree) {
     });
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-async function remixInitGenerator(tree, options) {
+function remixInitGenerator(tree, options) {
+    return remixInitGeneratorInternal(tree, { addPlugin: false, ...options });
+}
+exports.remixInitGenerator = remixInitGenerator;
+async function remixInitGeneratorInternal(tree, options) {
     const tasks = [];
     if (!options.skipPackageJson) {
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
@@ -37,7 +41,7 @@ async function remixInitGenerator(tree, options) {
         }, undefined, options.keepExistingVersions);
         tasks.push(installTask);
     }
-    if (process.env.NX_PCV3 === 'true') {
+    if (options.addPlugin) {
         addPlugin(tree);
     }
     if (options.updatePackageScripts) {
@@ -48,5 +52,5 @@ async function remixInitGenerator(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.remixInitGenerator = remixInitGenerator;
+exports.remixInitGeneratorInternal = remixInitGeneratorInternal;
 exports.default = remixInitGenerator;

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

@@ -3,4 +3,5 @@ export interface Schema {
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
   updatePackageScripts?: boolean;
+  addPlugin?: boolean;
 }

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

@@ -11,6 +11,7 @@ async function normalizeOptions(tree, options) {
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         callingGenerator: '@nx/remix:library',
     });
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const importPath = options.importPath ?? (0, get_import_path_1.getImportPath)(tree, projectRoot);
     return {
         ...options,

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

@@ -1,4 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import { GeneratorCallback } from '@nx/devkit';
 import type { NxRemixGeneratorSchema } from './schema';
-export default function (tree: Tree, schema: NxRemixGeneratorSchema): Promise<GeneratorCallback>;
+export declare function remixLibraryGenerator(tree: Tree, schema: NxRemixGeneratorSchema): Promise<GeneratorCallback>;
+export declare function remixLibraryGeneratorInternal(tree: Tree, schema: NxRemixGeneratorSchema): Promise<GeneratorCallback>;
+export default remixLibraryGenerator;

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

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.remixLibraryGeneratorInternal = exports.remixLibraryGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const react_1 = require("@nx/react");
 const lib_1 = require("./lib");
-async function default_1(tree, schema) {
+async function remixLibraryGenerator(tree, schema) {
+    return remixLibraryGeneratorInternal(tree, { addPlugin: false, ...schema });
+}
+exports.remixLibraryGenerator = remixLibraryGenerator;
+async function remixLibraryGeneratorInternal(tree, schema) {
     const tasks = [];
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const libGenTask = await (0, react_1.libraryGenerator)(tree, {
@@ -20,6 +25,7 @@ async function default_1(tree, schema) {
         linter: eslint_1.Linter.EsLint,
         component: true,
         buildable: options.buildable,
+        addPlugin: options.addPlugin,
     });
     tasks.push(libGenTask);
     if (options.unitTestRunner && options.unitTestRunner !== 'none') {
@@ -35,4 +41,5 @@ async function default_1(tree, schema) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.default = default_1;
+exports.remixLibraryGeneratorInternal = remixLibraryGeneratorInternal;
+exports.default = remixLibraryGenerator;

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

@@ -12,4 +12,5 @@ export interface NxRemixGeneratorSchema {
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   js?: boolean;
   skipFormat?: boolean;
+  addPlugin?: boolean;
 }

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

@@ -18,6 +18,7 @@ async function default_1(tree, _options) {
         unitTestRunner: options.unitTestRunner ?? 'vitest',
         e2eTestRunner: options.e2eTestRunner ?? 'cypress',
         js: options.js ?? false,
+        addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
     });
     tasks.push(appGenTask);
     tree.delete('apps');

package/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap

@@ -10,7 +10,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'libs/storybook-test/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
@@ -34,7 +34,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'libs/storybook-test/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
@@ -58,7 +58,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'libs/storybook-test/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },

package/src/generators/storybook-configuration/schema.d.ts

@@ -12,4 +12,5 @@ export interface StorybookConfigurationSchema {
   ignorePaths?: string[];
   configureTestRunner?: boolean;
   configureStaticServe?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/storybook-configuration/storybook-configuration.impl.d.ts

@@ -1,3 +1,4 @@
 import { type Tree } from '@nx/devkit';
 import type { StorybookConfigurationSchema } from './schema';
-export default function remixStorybookConfiguration(tree: Tree, schema: StorybookConfigurationSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function remixStorybookConfiguration(tree: Tree, schema: StorybookConfigurationSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export default function remixStorybookConfigurationInternal(tree: Tree, schema: StorybookConfigurationSchema): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/generators/storybook-configuration/storybook-configuration.impl.js

@@ -1,9 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.remixStorybookConfiguration = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const react_1 = require("@nx/react");
-async function remixStorybookConfiguration(tree, schema) {
+function remixStorybookConfiguration(tree, schema) {
+    return remixStorybookConfigurationInternal(tree, {
+        addPlugin: false,
+        ...schema,
+    });
+}
+exports.remixStorybookConfiguration = remixStorybookConfiguration;
+async function remixStorybookConfigurationInternal(tree, schema) {
+    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     if (!tree.exists((0, devkit_1.joinPathFragments)(root, 'vite.config.ts'))) {
         (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), root, { tpl: '' });
@@ -11,4 +20,4 @@ async function remixStorybookConfiguration(tree, schema) {
     const task = await (0, react_1.storybookConfigurationGenerator)(tree, schema);
     return task;
 }
-exports.default = remixStorybookConfiguration;
+exports.default = remixStorybookConfigurationInternal;

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

@@ -17,7 +17,7 @@ exports[`@nx/remix/plugin non-root project should create nodes 1`] = `
             "^production",
           ],
           "options": {
-            "outputPath": "{workspaceRoot}/dist",
+            "outputPath": "{workspaceRoot}/dist/my-app",
           },
           "outputs": [
             "{options.outputPath}",

package/src/plugins/plugin.js

@@ -8,6 +8,7 @@ const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
 const fs_1 = require("fs");
+const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'remix.hash');
 const targetsCache = (0, fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
 const calculatedTargets = {};
@@ -39,7 +40,7 @@ exports.createNodes = [
         ]);
         const targets = targetsCache[hash]
             ? targetsCache[hash]
-            : await buildRemixTargets(configFilePath, projectRoot, options, context);
+            : await buildRemixTargets(configFilePath, projectRoot, options, context, siblingFiles);
         calculatedTargets[hash] = targets;
         return {
             projects: {
@@ -51,17 +52,18 @@ exports.createNodes = [
         };
     },
 ];
-async function buildRemixTargets(configFilePath, projectRoot, options, context) {
+async function buildRemixTargets(configFilePath, projectRoot, options, context, siblingFiles) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const serverBuildPath = await getServerBuildPath(configFilePath, context.workspaceRoot);
     const targets = {};
-    targets[options.buildTargetName] = buildTarget(options.buildTargetName, namedInputs);
+    targets[options.buildTargetName] = buildTarget(options.buildTargetName, projectRoot, namedInputs);
     targets[options.serveTargetName] = serveTarget(serverBuildPath);
     targets[options.startTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName);
-    targets[options.typecheckTargetName] = typecheckTarget(projectRoot, namedInputs);
+    targets[options.typecheckTargetName] = typecheckTarget(projectRoot, namedInputs, siblingFiles);
     return targets;
 }
-function buildTarget(buildTargetName, namedInputs) {
+function buildTarget(buildTargetName, projectRoot, namedInputs) {
+    const pathToOutput = projectRoot === '.' ? '' : `/${projectRoot}`;
     return {
         cache: true,
         dependsOn: [`^${buildTargetName}`],
@@ -73,7 +75,7 @@ function buildTarget(buildTargetName, namedInputs) {
         outputs: ['{options.outputPath}'],
         executor: '@nx/remix:build',
         options: {
-            outputPath: '{workspaceRoot}/dist',
+            outputPath: `{workspaceRoot}/dist${pathToOutput}`,
         },
     };
 }
@@ -94,15 +96,17 @@ function startTarget(projectRoot, serverBuildPath, buildTargetName) {
         },
     };
 }
-function typecheckTarget(projectRoot, namedInputs) {
+function typecheckTarget(projectRoot, namedInputs, siblingFiles) {
+    const hasTsConfigAppJson = siblingFiles.includes('tsconfig.app.json');
+    const command = `tsc${hasTsConfigAppJson ? ` --project tsconfig.app.json` : ``}`;
     return {
+        command,
         cache: true,
         inputs: [
             ...('production' in namedInputs
                 ? ['production', '^production']
                 : ['default', '^default']),
         ],
-        command: 'tsc',
         options: {
             cwd: projectRoot,
         },
@@ -110,20 +114,7 @@ function typecheckTarget(projectRoot, namedInputs) {
 }
 async function getServerBuildPath(configFilePath, workspaceRoot) {
     const configPath = (0, path_1.join)(workspaceRoot, configFilePath);
-    let appConfig = {};
-    try {
-        let appConfigModule;
-        try {
-            appConfigModule = await Function(`return import("${configPath}?t=${Date.now()}")`)();
-        }
-        catch {
-            appConfigModule = require(configPath);
-        }
-        appConfig = appConfigModule?.default || appConfigModule;
-    }
-    catch (error) {
-        throw new Error(`Error loading Remix config at ${configFilePath}\n${String(error)}`);
-    }
+    let appConfig = await (0, config_utils_1.loadConfigFile)(configPath);
     return appConfig.serverBuildPath ?? 'build/index.js';
 }
 function normalizeOptions(options) {

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

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

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

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-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}
-
-// from https://github.com/remix-run/indie-stack
-Cypress.on("uncaught:exception", (err) => {
-  // Cypress and React Hydrating the document don't get along
-  // for some unknown reason. Hopefully we figure out why eventually
-  // so we can remove this.
-  if (
-    /hydrat/i.test(err.message) ||
-    /Minified React error #418/.test(err.message) ||
-    /Minified React error #423/.test(err.message)
-  ) {
-    return false;
-  }
-});`);
-    return (0, devkit_1.runTasksInSerial)(installTask);
-}
-exports.default = default_1;
-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,14 +0,0 @@
-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;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  linter?: Linter;
-  js?: boolean;
-  skipFormat?: boolean;
-  setParserOptionsProject?: boolean;
-}

package/src/generators/cypress/schema.json

@@ -1,61 +0,0 @@
-{
-  "$schema": "https://json-schema.org/schema",
-  "$id": "NxRemixCypress",
-  "title": "",
-  "type": "object",
-  "description": "Generate a Cypress e2e project for a given application.",
-  "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the frontend project to test.",
-      "$default": {
-        "$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",
-      "default": "http://localhost:3000"
-    },
-    "name": {
-      "type": "string",
-      "description": "Name of the E2E Project",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "What name would you like to use for the e2e project?"
-    },
-    "directory": {
-      "type": "string",
-      "description": "A directory where the project is placed"
-    },
-    "linter": {
-      "description": "The tool to use for running lint checks.",
-      "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
-    },
-    "js": {
-      "description": "Generate JavaScript files rather than TypeScript files",
-      "type": "boolean",
-      "default": false
-    },
-    "skipFormat": {
-      "description": "Skip formatting files",
-      "type": "boolean",
-      "default": false
-    },
-    "setParserOptionsProject": {
-      "type": "boolean",
-      "description": "Whether or not to configure the ESLint \"parserOptions.project\" option. We do not do this by default for lint performance reasons.",
-      "default": false
-    }
-  },
-  "required": ["name"]
-}