@nx/remix 18.1.0-beta.2 → 18.1.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "18.1.0-beta.2",
+  "version": "18.1.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.1.0-beta.2",
-    "@nx/js": "18.1.0-beta.2",
-    "@nx/react": "18.1.0-beta.2",
+    "@nx/devkit": "18.1.0-beta.3",
+    "@nx/js": "18.1.0-beta.3",
+    "@nx/react": "18.1.0-beta.3",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/remix": "18.1.0-beta.2"
+    "@nrwl/remix": "18.1.0-beta.3"
   },
   "peerDependencies": {},
   "publishConfig": {
@@ -42,6 +42,7 @@
   "exports": {
     ".": "./index.js",
     "./plugin": "./plugin.js",
+    "./plugins/component-testing": "./plugins/component-testing/index.js",
     "./package.json": "./package.json",
     "./executors.json": "./executors.json",
     "./generators.json": "./generators.json",

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

@@ -151,7 +151,11 @@ import { defineConfig } from 'cypress';
 
 export default defineConfig({
   e2e: {
-    ...nxE2EPreset(__filename, { cypressDir: 'src' }),
+    ...nxE2EPreset(__filename, {
+      cypressDir: 'src',
+      webServerCommands: { default: 'nx run test:serve:development' },
+      ciWebServerCommand: 'nx run test:serve-static',
+    }),
     baseUrl: 'http://localhost:4200',
   },
 });
@@ -661,7 +665,11 @@ import { defineConfig } from 'cypress';
 
 export default defineConfig({
   e2e: {
-    ...nxE2EPreset(__filename, { cypressDir: 'src' }),
+    ...nxE2EPreset(__filename, {
+      cypressDir: 'src',
+      webServerCommands: { default: 'nx run test:serve:development' },
+      ciWebServerCommand: 'nx run test:serve-static',
+    }),
     baseUrl: 'http://localhost:4200',
   },
 });
@@ -1027,7 +1035,11 @@ import { defineConfig } from 'cypress';
 
 export default defineConfig({
   e2e: {
-    ...nxE2EPreset(__filename, { cypressDir: 'src' }),
+    ...nxE2EPreset(__filename, {
+      cypressDir: 'src',
+      webServerCommands: { default: 'nx run test:serve:development' },
+      ciWebServerCommand: 'nx run test:serve-static',
+    }),
     baseUrl: 'http://localhost:4200',
   },
 });

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
+const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const eslint_1 = require("@nx/eslint");
 async function normalizeOptions(tree, options) {
@@ -14,7 +15,10 @@ async function normalizeOptions(tree, options) {
     });
     options.rootProject = projectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     const e2eProjectName = options.rootProject ? 'e2e' : `${projectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${projectRoot}-e2e`;
     const parsedTags = options.tags

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

@@ -12,7 +12,10 @@ function cypressComponentConfigurationGenerator(tree, options) {
 }
 exports.cypressComponentConfigurationGenerator = cypressComponentConfigurationGenerator;
 async function cypressComponentConfigurationGeneratorInternal(tree, options) {
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     await (0, react_1.cypressComponentConfigGenerator)(tree, {
         project: options.project,
         generateTests: options.generateTests,

package/src/generators/init/init.js

@@ -41,7 +41,10 @@ async function remixInitGeneratorInternal(tree, options) {
         }, undefined, options.keepExistingVersions);
         tasks.push(installTask);
     }
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     if (options.addPlugin) {
         addPlugin(tree);
     }

package/src/generators/library/lib/normalize-options.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 import type { NxRemixGeneratorSchema } from '../schema';
 export interface RemixLibraryOptions extends NxRemixGeneratorSchema {
     projectName: string;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
+const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function normalizeOptions(tree, options) {
@@ -11,7 +12,10 @@ async function normalizeOptions(tree, options) {
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         callingGenerator: '@nx/remix:library',
     });
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     const importPath = options.importPath ?? (0, get_import_path_1.getImportPath)(tree, projectRoot);
     return {
         ...options,
@@ -19,6 +23,7 @@ async function normalizeOptions(tree, options) {
         importPath,
         projectName,
         projectRoot,
+        projectNameAndRootFormat,
     };
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -10,6 +10,9 @@ async function default_1(tree, _options) {
     const tasks = [];
     const setupGenTask = await (0, setup_impl_1.default)(tree);
     tasks.push(setupGenTask);
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
     const appGenTask = await (0, application_impl_1.default)(tree, {
         name: options.appName,
         tags: options.tags,
@@ -18,7 +21,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',
+        addPlugin: addPluginDefault,
     });
     tasks.push(appGenTask);
     tree.delete('apps');

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

@@ -12,7 +12,10 @@ function remixStorybookConfiguration(tree, schema) {
 }
 exports.remixStorybookConfiguration = remixStorybookConfiguration;
 async function remixStorybookConfigurationInternal(tree, schema) {
-    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    schema.addPlugin ??= addPluginDefault;
     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: '' });