@nx/remix 23.0.0-beta.12 → 23.0.0-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "23.0.0-beta.12",
+  "version": "23.0.0-beta.14",
   "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",
@@ -30,15 +30,15 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.12",
-    "@nx/js": "23.0.0-beta.12",
-    "@nx/react": "23.0.0-beta.12",
+    "@nx/devkit": "23.0.0-beta.14",
+    "@nx/js": "23.0.0-beta.14",
+    "@nx/react": "23.0.0-beta.14",
     "tslib": "^2.3.0",
     "@phenomnomnominal/tsquery": "~6.2.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.12",
-    "@nx/vitest": "23.0.0-beta.12"
+    "nx": "23.0.0-beta.14",
+    "@nx/vitest": "23.0.0-beta.14"
   },
   "peerDependencies": {
     "@remix-run/dev": "^2.17.3"

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

@@ -1 +1 @@
-{"version":3,"file":"application.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA4BpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAQlD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BAOhC;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,sBAAsB,8BA+SjC;AAED,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"application.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA2BpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAOlD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BAOhC;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,sBAAsB,8BA+SjC;AAED,eAAe,yBAAyB,CAAC"}

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

@@ -6,15 +6,13 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const create_ts_config_1 = require("@nx/js/src/utils/typescript/create-ts-config");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 const testing_config_utils_1 = require("../../utils/testing-config-utils");
 const versions_1 = require("../../utils/versions");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const update_dependencies_1 = require("../utils/update-dependencies");
 const lib_1 = require("./lib");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const internal_2 = require("@nx/js/internal");
 function remixApplicationGenerator(tree, options) {
     return remixApplicationGeneratorInternal(tree, {
         addPlugin: true,
@@ -23,7 +21,7 @@ function remixApplicationGenerator(tree, options) {
     });
 }
 async function remixApplicationGeneratorInternal(tree, _options) {
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, _options.addPlugin, _options.useTsSolution);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(tree, _options.addPlugin, _options.useTsSolution);
     const tasks = [
         await (0, init_1.default)(tree, {
             skipFormat: true,
@@ -43,7 +41,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
     if (options.useProjectJson) {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
@@ -197,7 +195,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     }
     else {
         // Otherwise, extract the tsconfig.base.json from tsconfig.json so we can share settings.
-        (0, create_ts_config_1.extractTsConfigBase)(tree);
+        (0, js_1.extractTsConfigBase)(tree);
     }
     if (options.rootProject) {
         (0, devkit_1.updateJson)(tree, `package.json`, (json) => {
@@ -213,14 +211,14 @@ export default {...nxPreset};
     }
     tasks.push(await (0, lib_1.addE2E)(tree, options));
     await (0, lib_1.ignoreViteTempFiles)(tree, options.projectRoot);
-    (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.projectRoot, 'tsconfig.app.json', {
+    (0, internal_2.updateTsconfigFiles)(tree, options.projectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined, '.');
-    (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
+    (0, internal_2.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/application/lib/add-e2e.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAIT,iBAAiB,EAGlB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAI5D,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAoH5B"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,IAAI,EAIT,iBAAiB,EAGlB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAI5D,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAoH5B"}

package/src/generators/application/lib/add-e2e.js

@@ -98,9 +98,9 @@ async function getRemixE2EWebServerInfo(tree, projectName, configFilePath, isPlu
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = isPluginBeingAdded ? 3000 : 4200;
     const defaultServeTarget = isPluginBeingAdded ? 'dev' : 'serve';
-    if (nxJson.targetDefaults?.[defaultServeTarget] &&
-        nxJson.targetDefaults?.[defaultServeTarget].options?.port) {
-        e2ePort = nxJson.targetDefaults?.[defaultServeTarget].options?.port;
+    const serveTargetOptions = (0, internal_1.readTargetDefaultsForTarget)(defaultServeTarget, nxJson.targetDefaults)?.options;
+    if (serveTargetOptions?.port) {
+        e2ePort = serveTargetOptions.port;
     }
     return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/remix/plugin',

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(tree, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'application');
     const { projectName, projectRoot, importPath } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
@@ -17,7 +17,7 @@ async function normalizeOptions(tree, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(tree);
     const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${projectRoot}-e2e`;

package/src/generators/library/lib/add-tsconfig-entry-points.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTsconfigEntryPoints = addTsconfigEntryPoints;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function addTsconfigEntryPoints(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-    const projectSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const projectSourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     const serverFilePath = (0, devkit_1.joinPathFragments)(projectSourceRoot, 'server.ts');
     tree.write(serverFilePath, `// This file should be used to export ONLY server-code from the library.`);
     const baseTsConfig = (0, js_1.getRootTsConfigPathInTree)(tree);

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(tree, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'application');
     const { projectName, projectRoot, importPath } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
@@ -15,7 +15,7 @@ async function normalizeOptions(tree, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(tree);
     return {
         ...options,
         unitTestRunner: options.unitTestRunner ?? 'vitest',

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

@@ -6,8 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const react_1 = require("@nx/react");
 const lib_1 = require("./lib");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const internal_1 = require("@nx/js/internal");
 const update_dependencies_1 = require("../utils/update-dependencies");
 async function remixLibraryGenerator(tree, schema) {
     return remixLibraryGeneratorInternal(tree, {
@@ -18,7 +17,7 @@ async function remixLibraryGenerator(tree, schema) {
 }
 async function remixLibraryGeneratorInternal(tree, schema) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin);
+    const addTsPlugin = (0, internal_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin);
     const installTask = (0, update_dependencies_1.updateDependencies)(tree);
     tasks.push(installTask);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
@@ -29,7 +28,7 @@ async function remixLibraryGeneratorInternal(tree, schema) {
     tasks.push(jsInitTask);
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+        await (0, internal_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
     const libGenTask = await (0, react_1.libraryGenerator)(tree, {
         directory: options.directory,
@@ -56,14 +55,14 @@ async function remixLibraryGeneratorInternal(tree, schema) {
     if (options.bundler === 'rollup' || options.buildable) {
         (0, lib_1.updateBuildableConfig)(tree, options);
     }
-    (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.projectRoot, 'tsconfig.lib.json', {
+    (0, internal_1.updateTsconfigFiles)(tree, options.projectRoot, 'tsconfig.lib.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
-    (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
+    (0, internal_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/src/plugins/plugin.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAOd,MAAM,YAAY,CAAC;AASpB,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAID;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,kBAAkB,CA6BzD,CAAC;AAEF,eAAO,MAAM,aAAa,mCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/src/plugins/plugin.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAOd,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAID;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,kBAAkB,CA6BzD,CAAC;AAEF,eAAO,MAAM,aAAa,mCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -9,8 +9,7 @@ const js_1 = require("@nx/js");
 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 internal_2 = require("@nx/js/internal");
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -29,7 +28,7 @@ exports.createNodes = [
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, (0, ts_solution_setup_1.isUsingTsSolutionSetup)(), pmc, lockFileName), configFilePaths, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, (0, internal_2.isUsingTsSolutionSetup)(), pmc, lockFileName), configFilePaths, options, context);
         }
         finally {
             targetsCache.writeToDisk();
@@ -76,7 +75,7 @@ async function buildRemixTargets(configFilePath, projectRoot, options, context,
     targets[options.startTargetName] = 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, pmc);
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return { targets, metadata: {} };
 }
 function buildTarget(buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs, remixCompiler, isUsingTsSolutionSetup) {

package/src/utils/testing-config-utils.js

@@ -5,11 +5,11 @@ exports.updateJestTestSetup = updateJestTestSetup;
 exports.updateJestTestMatch = updateJestTestMatch;
 exports.updateVitestTestIncludes = updateVitestTestIncludes;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function updateVitestTestSetup(tree, pathToVitestConfig, pathToTestSetup) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContents = tree.read(pathToVitestConfig, 'utf-8');
@@ -32,7 +32,7 @@ function updateVitestTestSetup(tree, pathToVitestConfig, pathToTestSetup) {
 }
 function updateJestTestSetup(tree, pathToJestConfig, pathToTestSetup) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContents = tree.read(pathToJestConfig, 'utf-8');
@@ -55,7 +55,7 @@ function updateJestTestSetup(tree, pathToJestConfig, pathToTestSetup) {
 }
 function updateJestTestMatch(tree, pathToJestConfig, includesString) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContents = tree.read(pathToJestConfig, 'utf-8');
@@ -69,7 +69,7 @@ function updateJestTestMatch(tree, pathToJestConfig, includesString) {
 }
 function updateVitestTestIncludes(tree, pathToVitestConfig, includesString) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContents = tree.read(pathToVitestConfig, 'utf-8');