@nx/remix 20.4.3 → 20.5.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "20.4.3",
+  "version": "20.5.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,9 +29,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.4.3",
-    "@nx/js": "20.4.3",
-    "@nx/react": "20.4.3",
+    "@nx/devkit": "20.5.0-beta.0",
+    "@nx/js": "20.5.0-beta.0",
+    "@nx/react": "20.5.0-beta.0",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },

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

@@ -115,6 +115,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
                 skipPackageJson: false,
                 skipFormat: true,
                 addPlugin: true,
+                compiler: options.useTsSolution ? 'swc' : undefined,
             });
             const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
             if (projectConfig.targets?.['test']?.options) {

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

@@ -73,7 +73,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should create
             },
             "tsc": {
               "cache": true,
-              "command": "tsc --noEmit",
+              "command": "tsc",
               "inputs": [
                 "production",
                 "^production",
@@ -83,20 +83,6 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should create
                   ],
                 },
               ],
-              "metadata": {
-                "description": "Runs type-checking for the project.",
-                "help": {
-                  "command": "npx tsc --help",
-                  "example": {
-                    "options": {
-                      "noEmit": true,
-                    },
-                  },
-                },
-                "technologies": [
-                  "typescript",
-                ],
-              },
               "options": {
                 "cwd": "my-app",
               },
@@ -188,7 +174,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should infer w
             },
             "tsc": {
               "cache": true,
-              "command": "tsc --noEmit",
+              "command": "tsc",
               "inputs": [
                 "production",
                 "^production",
@@ -198,20 +184,6 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should infer w
                   ],
                 },
               ],
-              "metadata": {
-                "description": "Runs type-checking for the project.",
-                "help": {
-                  "command": "npx tsc --help",
-                  "example": {
-                    "options": {
-                      "noEmit": true,
-                    },
-                  },
-                },
-                "technologies": [
-                  "typescript",
-                ],
-              },
               "options": {
                 "cwd": "my-app",
               },
@@ -298,7 +270,7 @@ exports[`@nx/remix/plugin Remix Classic Compiler root project should create node
             },
             "typecheck": {
               "cache": true,
-              "command": "tsc --noEmit",
+              "command": "tsc",
               "inputs": [
                 "production",
                 "^production",
@@ -308,20 +280,6 @@ exports[`@nx/remix/plugin Remix Classic Compiler root project should create node
                   ],
                 },
               ],
-              "metadata": {
-                "description": "Runs type-checking for the project.",
-                "help": {
-                  "command": "npx tsc --help",
-                  "example": {
-                    "options": {
-                      "noEmit": true,
-                    },
-                  },
-                },
-                "technologies": [
-                  "typescript",
-                ],
-              },
               "options": {
                 "cwd": ".",
               },
@@ -406,7 +364,7 @@ exports[`@nx/remix/plugin Remix Vite Compiler non-root project should create nod
             },
             "tsc": {
               "cache": true,
-              "command": "tsc --noEmit",
+              "command": "tsc",
               "inputs": [
                 "production",
                 "^production",
@@ -416,20 +374,6 @@ exports[`@nx/remix/plugin Remix Vite Compiler non-root project should create nod
                   ],
                 },
               ],
-              "metadata": {
-                "description": "Runs type-checking for the project.",
-                "help": {
-                  "command": "npx tsc --help",
-                  "example": {
-                    "options": {
-                      "noEmit": true,
-                    },
-                  },
-                },
-                "technologies": [
-                  "typescript",
-                ],
-              },
               "options": {
                 "cwd": "my-app",
               },
@@ -515,7 +459,7 @@ exports[`@nx/remix/plugin Remix Vite Compiler root project should create nodes 1
             },
             "typecheck": {
               "cache": true,
-              "command": "tsc --noEmit",
+              "command": "tsc",
               "inputs": [
                 "production",
                 "^production",
@@ -525,20 +469,6 @@ exports[`@nx/remix/plugin Remix Vite Compiler root project should create nodes 1
                   ],
                 },
               ],
-              "metadata": {
-                "description": "Runs type-checking for the project.",
-                "help": {
-                  "command": "npx tsc --help",
-                  "example": {
-                    "options": {
-                      "noEmit": true,
-                    },
-                  },
-                },
-                "technologies": [
-                  "typescript",
-                ],
-              },
               "options": {
                 "cwd": ".",
               },

package/src/plugins/plugin.js

@@ -12,7 +12,6 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 const executor_utils_1 = require("../utils/executor-utils");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
@@ -35,7 +34,7 @@ exports.createNodesV2 = [
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `remix-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, (0, ts_solution_setup_1.isUsingTsSolutionSetup)()), configFilePaths, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFilePaths, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -46,10 +45,10 @@ exports.createNodes = [
     remixConfigGlob,
     async (configFilePath, options, context) => {
         devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
-        return createNodesInternal(configFilePath, options, context, {}, (0, ts_solution_setup_1.isUsingTsSolutionSetup)());
+        return createNodesInternal(configFilePath, options, context, {});
     },
 ];
-async function createNodesInternal(configFilePath, options, context, targetsCache, isUsingTsSolutionSetup) {
+async function createNodesInternal(configFilePath, options, context, targetsCache) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
     const fullyQualifiedProjectRoot = (0, path_1.join)(context.workspaceRoot, projectRoot);
     // Do not create a project if package.json and project.json isn't there
@@ -63,8 +62,10 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     if (remixCompiler === RemixCompiler.IsNotRemix) {
         return {};
     }
-    const hash = (await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, { ...options, isUsingTsSolutionSetup }, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))])) + configFilePath;
-    targetsCache[hash] ??= await buildRemixTargets(configFilePath, projectRoot, options, context, siblingFiles, remixCompiler, isUsingTsSolutionSetup);
+    const hash = (await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
+        (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
+    ])) + configFilePath;
+    targetsCache[hash] ??= await buildRemixTargets(configFilePath, projectRoot, options, context, siblingFiles, remixCompiler);
     const { targets, metadata } = targetsCache[hash];
     const project = {
         root: projectRoot,
@@ -77,21 +78,21 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function buildRemixTargets(configFilePath, projectRoot, options, context, siblingFiles, remixCompiler, isUsingTsSolutionSetup) {
+async function buildRemixTargets(configFilePath, projectRoot, options, context, siblingFiles, remixCompiler) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const { buildDirectory, assetsBuildDirectory, serverBuildPath } = await getBuildPaths(configFilePath, projectRoot, context.workspaceRoot, remixCompiler);
     const targets = {};
-    targets[options.buildTargetName] = buildTarget(options.buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs, remixCompiler, isUsingTsSolutionSetup);
-    targets[options.devTargetName] = devTarget(serverBuildPath, projectRoot, remixCompiler, isUsingTsSolutionSetup);
-    targets[options.startTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName, remixCompiler, isUsingTsSolutionSetup);
+    targets[options.buildTargetName] = buildTarget(options.buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs, remixCompiler);
+    targets[options.devTargetName] = devTarget(serverBuildPath, projectRoot, remixCompiler);
+    targets[options.startTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName, remixCompiler);
     // TODO(colum): Remove for Nx 21
-    targets[options.staticServeTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName, remixCompiler, isUsingTsSolutionSetup);
-    targets[options.serveStaticTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName, remixCompiler, isUsingTsSolutionSetup);
-    targets[options.typecheckTargetName] = typecheckTarget(options.typecheckTargetName, projectRoot, namedInputs, siblingFiles, isUsingTsSolutionSetup);
+    targets[options.staticServeTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName, remixCompiler);
+    targets[options.serveStaticTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName, remixCompiler);
+    targets[options.typecheckTargetName] = typecheckTarget(projectRoot, namedInputs, siblingFiles);
     (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return { targets, metadata: {} };
 }
-function buildTarget(buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs, remixCompiler, isUsingTsSolutionSetup) {
+function buildTarget(buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs, remixCompiler) {
     const serverBuildOutputPath = projectRoot === '.'
         ? (0, devkit_1.joinPathFragments)(`{workspaceRoot}`, buildDirectory)
         : (0, devkit_1.joinPathFragments)(`{workspaceRoot}`, projectRoot, buildDirectory);
@@ -105,7 +106,7 @@ function buildTarget(buildTargetName, projectRoot, buildDirectory, assetsBuildDi
                 : (0, devkit_1.joinPathFragments)(`{workspaceRoot}`, projectRoot, buildDirectory),
         ]
         : [serverBuildOutputPath, assetsBuildOutputPath];
-    const buildTarget = {
+    return {
         cache: true,
         dependsOn: [`^${buildTargetName}`],
         inputs: [
@@ -120,45 +121,35 @@ function buildTarget(buildTargetName, projectRoot, buildDirectory, assetsBuildDi
             : 'remix build',
         options: { cwd: projectRoot },
     };
-    if (isUsingTsSolutionSetup) {
-        buildTarget.syncGenerators = ['@nx/js:typescript-sync'];
-    }
-    return buildTarget;
 }
-function devTarget(serverBuildPath, projectRoot, remixCompiler, isUsingTsSolutionSetup) {
-    const devTarget = {
+function devTarget(serverBuildPath, projectRoot, remixCompiler) {
+    return {
         command: remixCompiler === RemixCompiler.IsVte
             ? 'remix vite:dev'
             : 'remix dev --manual',
         options: { cwd: projectRoot },
     };
-    if (isUsingTsSolutionSetup) {
-        devTarget.syncGenerators = ['@nx/js:typescript-sync'];
-    }
-    return devTarget;
 }
-function startTarget(projectRoot, serverBuildPath, buildTargetName, remixCompiler, isUsingTsSolutionSetup) {
+function startTarget(projectRoot, serverBuildPath, buildTargetName, remixCompiler) {
     let serverPath = serverBuildPath;
     if (remixCompiler === RemixCompiler.IsVte) {
         if (serverBuildPath === 'build') {
             serverPath = `${serverBuildPath}/server/index.js`;
         }
     }
-    const startTarget = {
+    return {
         dependsOn: [buildTargetName],
         command: `remix-serve ${serverPath}`,
         options: {
             cwd: projectRoot,
         },
     };
-    if (isUsingTsSolutionSetup) {
-        startTarget.syncGenerators = ['@nx/js:typescript-sync'];
-    }
-    return startTarget;
 }
-function typecheckTarget(typecheckTargetName, projectRoot, namedInputs, siblingFiles, isUsingTsSolutionSetup) {
+function typecheckTarget(projectRoot, namedInputs, siblingFiles) {
     const hasTsConfigAppJson = siblingFiles.includes('tsconfig.app.json');
-    const typecheckTarget = {
+    const command = `tsc${hasTsConfigAppJson ? ` --project tsconfig.app.json` : ``}`;
+    return {
+        command,
         cache: true,
         inputs: [
             ...('production' in namedInputs
@@ -166,30 +157,10 @@ function typecheckTarget(typecheckTargetName, projectRoot, namedInputs, siblingF
                 : ['default', '^default']),
             { externalDependencies: ['typescript'] },
         ],
-        command: isUsingTsSolutionSetup
-            ? `tsc --build --emitDeclarationOnly`
-            : `tsc${hasTsConfigAppJson ? ` -p tsconfig.app.json` : ``} --noEmit`,
         options: {
             cwd: projectRoot,
         },
-        metadata: {
-            description: `Runs type-checking for the project.`,
-            technologies: ['typescript'],
-            help: {
-                command: isUsingTsSolutionSetup
-                    ? `${pmc.exec} tsc --build --help`
-                    : `${pmc.exec} tsc${hasTsConfigAppJson ? ` -p tsconfig.app.json` : ``} --help`,
-                example: isUsingTsSolutionSetup
-                    ? { args: ['--force'] }
-                    : { options: { noEmit: true } },
-            },
-        },
     };
-    if (isUsingTsSolutionSetup) {
-        typecheckTarget.dependsOn = [`^${typecheckTargetName}`];
-        typecheckTarget.syncGenerators = ['@nx/js:typescript-sync'];
-    }
-    return typecheckTarget;
 }
 async function getBuildPaths(configFilePath, projectRoot, workspaceRoot, remixCompiler) {
     const configPath = (0, path_1.join)(workspaceRoot, configFilePath);