@nx/remix 22.7.0-pr.35019.f500fd7 → 22.7.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "22.7.0-pr.35019.f500fd7",
+  "version": "22.7.0-rc.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",
@@ -22,23 +22,24 @@
   },
   "homepage": "https://nx.dev",
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "generators": "./generators.json",
   "executors": "./executors.json",
   "nx-migrations": {
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-pr.35019.f500fd7",
-    "@nx/js": "22.7.0-pr.35019.f500fd7",
-    "@nx/react": "22.7.0-pr.35019.f500fd7",
-    "@nx/workspace": "22.7.0-pr.35019.f500fd7",
+    "@nx/devkit": "22.7.0-rc.0",
+    "@nx/js": "22.7.0-rc.0",
+    "@nx/react": "22.7.0-rc.0",
+    "@nx/workspace": "22.7.0-rc.0",
     "tslib": "^2.3.0",
     "@phenomnomnominal/tsquery": "~6.1.4"
   },
   "devDependencies": {
-    "nx": "22.7.0-pr.35019.f500fd7",
-    "@nx/vitest": "22.7.0-pr.35019.f500fd7"
+    "nx": "22.7.0-rc.0",
+    "@nx/vitest": "22.7.0-rc.0"
   },
   "peerDependencies": {
     "@remix-run/dev": "^2.17.3"
@@ -62,7 +63,5 @@
     "./generators": "./generators.js",
     "./plugin": "./plugin.js",
     "./plugins/component-testing": "./plugins/component-testing/index.js"
-  },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  }
 }

package/plugins/component-testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/plugins/component-testing/index.ts"],"names":[],"mappings":"AAMA,KAAK,aAAa,GAAG;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,MAAM,GAAG;IAC9D,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,aAAa,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAuCA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/plugins/component-testing/index.ts"],"names":[],"mappings":"AAMA,KAAK,aAAa,GAAG;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,MAAM,GAAG;IAC9D,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,aAAa,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CA0CA"}

package/plugins/component-testing/index.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
@@ -66,7 +33,10 @@ function nxComponentTestingPreset(pathToConfig) {
             ...{ framework: 'react', bundler: 'vite' },
             viteConfig: async () => {
                 const viteConfigPath = findViteConfig(normalizedProjectRootPath);
-                const { mergeConfig, loadConfigFromFile, searchForWorkspaceRoot } = await Promise.resolve().then(() => __importStar(require('vite')));
+                // TODO(jack): Remove this when @nx/remix switches to
+                // moduleResolution: "nodenext". Vite 8 ships ESM-only type
+                // declarations (.d.mts) not resolvable under moduleResolution: "node".
+                const { mergeConfig, loadConfigFromFile, searchForWorkspaceRoot } = await Function('return import("vite")')();
                 const resolved = await loadConfigFromFile({
                     mode: 'watch',
                     command: 'serve',

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

@@ -1 +1 @@
-{"version":3,"file":"action.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/action/action.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,yBAA+B,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,iBAqC9D"}
+{"version":3,"file":"action.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/action/action.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,yBAA+B,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,iBAoC9D"}

package/src/generators/action/action.impl.js

@@ -28,7 +28,6 @@ async function default_1(tree, schema) {
         (0, insert_statement_in_default_function_1.insertStatementInDefaultFunction)(tree, routeFilePath, statement);
     }
     catch (err) {
-        // eslint-disable-next-line no-empty
     }
     finally {
         await (0, devkit_1.formatFiles)(tree);

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

@@ -13,7 +13,7 @@ function addTsconfigEntryPoints(tree, options) {
     (0, devkit_1.updateJson)(tree, baseTsConfig, (json) => {
         if (json.compilerOptions.paths &&
             json.compilerOptions.paths[options.importPath]) {
-            json.compilerOptions.paths[(0, devkit_1.joinPathFragments)(options.importPath, 'server')] = [serverFilePath];
+            json.compilerOptions.paths[(0, devkit_1.joinPathFragments)(options.importPath, 'server')] = [`./${serverFilePath}`];
         }
         return json;
     });

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

@@ -1 +1 @@
-{"version":3,"file":"loader.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/loader/loader.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,yBAA+B,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,iBAqC9D"}
+{"version":3,"file":"loader.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/loader/loader.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,yBAA+B,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,iBAoC9D"}

package/src/generators/loader/loader.impl.js

@@ -26,7 +26,6 @@ async function default_1(tree, schema) {
     const statement = `\nconst data = useLoaderData<typeof loader>();`;
     try {
         (0, insert_statement_in_default_function_1.insertStatementInDefaultFunction)(tree, routeFilePath, statement);
-        // eslint-disable-next-line no-empty
     }
     catch (err) {
     }

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":"AAEA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAQd,MAAM,YAAY,CAAC;AAYpB,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;AAmBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,kBAAkB,CAwBzD,CAAC;AAEF,eAAO,MAAM,aAAa,mCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/src/plugins/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,kBAAkB,EAGvB,aAAa,EAQd,MAAM,YAAY,CAAC;AAYpB,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;AAiBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,kBAAkB,CA4BzD,CAAC;AAEF,eAAO,MAAM,aAAa,mCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -13,7 +13,6 @@ 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) : {};
 }
@@ -34,8 +33,9 @@ exports.createNodes = [
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `remix-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         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, (0, ts_solution_setup_1.isUsingTsSolutionSetup)(), pmc), configFilePaths, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -43,7 +43,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, isUsingTsSolutionSetup) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isUsingTsSolutionSetup, pmc) {
     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
@@ -58,7 +58,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         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);
+    targetsCache[hash] ??= await buildRemixTargets(configFilePath, projectRoot, options, context, siblingFiles, remixCompiler, isUsingTsSolutionSetup, pmc);
     const { targets, metadata } = targetsCache[hash];
     const project = {
         root: projectRoot,
@@ -71,7 +71,7 @@ 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, isUsingTsSolutionSetup, pmc) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const { buildDirectory, assetsBuildDirectory, serverBuildPath } = await getBuildPaths(configFilePath, projectRoot, context.workspaceRoot, remixCompiler);
     const targets = {};
@@ -79,7 +79,7 @@ async function buildRemixTargets(configFilePath, projectRoot, options, context,
     targets[options.devTargetName] = devTarget(serverBuildPath, projectRoot, remixCompiler, isUsingTsSolutionSetup);
     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);
+    targets[options.typecheckTargetName] = typecheckTarget(options.typecheckTargetName, projectRoot, namedInputs, siblingFiles, isUsingTsSolutionSetup, pmc);
     (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return { targets, metadata: {} };
 }
@@ -150,7 +150,7 @@ function startTarget(projectRoot, serverBuildPath, buildTargetName, remixCompile
     }
     return startTarget;
 }
-function typecheckTarget(typecheckTargetName, projectRoot, namedInputs, siblingFiles, isUsingTsSolutionSetup) {
+function typecheckTarget(typecheckTargetName, projectRoot, namedInputs, siblingFiles, isUsingTsSolutionSetup, pmc) {
     const hasTsConfigAppJson = siblingFiles.includes('tsconfig.app.json');
     const typecheckTarget = {
         cache: true,

package/src/utils/executor-utils.d.ts

@@ -1,2 +1,2 @@
-export declare function loadViteDynamicImport(): Promise<typeof import("vite")>;
+export declare function loadViteDynamicImport(): Promise<any>;
 //# sourceMappingURL=executor-utils.d.ts.map

package/src/utils/executor-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/src/utils/executor-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,IACW,OAAO,CAAC,cAAc,MAAM,CAAC,CAAC,CAC7E"}
+{"version":3,"file":"executor-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/remix/src/utils/executor-utils.ts"],"names":[],"mappings":"AAGA,wBAAgB,qBAAqB,IACW,OAAO,CAAC,GAAG,CAAC,CAC3D"}

package/src/utils/executor-utils.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadViteDynamicImport = loadViteDynamicImport;
+// TODO(jack): Remove this cast when @nx/remix switches to moduleResolution:
+// "nodenext". Vite 8 ships ESM-only type declarations (.d.mts) not resolvable
+// under moduleResolution: "node".
 function loadViteDynamicImport() {
     return Function('return import("vite")')();
 }

package/project.json

@@ -1,39 +0,0 @@
-{
-    "name": "remix",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/remix/src",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/remix/README.md"],
-            "command": "node ./scripts/copy-readme.js remix"
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    "packages/remix/*.md",
-                    {
-                        "input": "./packages/remix/src",
-                        "glob": "**/!(*.ts)",
-                        "output": "./src"
-                    },
-                    {
-                        "input": "./packages/remix/src",
-                        "glob": "**/*.d.ts",
-                        "output": "./src"
-                    },
-                    {
-                        "input": "./packages/remix",
-                        "glob": "**.json",
-                        "output": ".",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"]
-                    },
-                    "LICENSE"
-                ]
-            }
-        }
-    },
-    "tags": []
-}