@nx/remix 16.2.0 → 16.3.0

package/generators.json

@@ -55,11 +55,21 @@
       "schema": "./src/generators/style/schema.json",
       "description": "Generates a new stylesheet and adds it to an existing route"
     },
+    "setup-tailwind": {
+      "implementation": "./src/generators/setup-tailwind/setup-tailwind.impl",
+      "schema": "./src/generators/setup-tailwind/schema.json",
+      "description": "Generates a TailwindCSS configuration for the Remix application"
+    },
     "meta": {
       "implementation": "./src/generators/meta/meta.impl",
       "schema": "./src/generators/meta/schema.json",
       "description": "Add a meta function to an existing route"
     },
+    "error-boundary": {
+      "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",

package/migrations.json

@@ -120,6 +120,35 @@
         "version": "^1.15.0",
         "alwaysAddToPackageJson": true
       }
+    },
+    "16.3.0": {
+      "version": "16.3.0",
+      "packages": {
+        "@remix-run/node": {
+          "version": "^1.16.1",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/react": {
+          "version": "^1.16.1",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/serve": {
+          "version": "^1.16.1",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/dev": {
+          "version": "^1.16.1",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/eslint-config": {
+          "version": "^1.16.1",
+          "alwaysAddToPackageJson": true
+        },
+        "isbot": {
+          "version": "^3.6.8",
+          "alwaysAddToPackageJson": true
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@nx/remix",
-  "version": "16.2.0",
+  "version": "16.3.0",
   "main": "src/index.js",
   "generators": "./generators.json",
   "dependencies": {
     "@nx/devkit": "^16.0.3",
     "@nx/js": "^16.0.3",
     "@nx/react": "^16.0.3",
+    "@phenomnomnominal/tsquery": "^5.0.1",
     "tslib": "^2.3.1",
-    "@nrwl/remix": "16.2.0"
+    "@nrwl/remix": "16.3.0"
   },
   "ng-update": {
     "requirements": {},

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

@@ -258,6 +258,59 @@ exports[`Remix Application Integrated Repo --js should create the application co
 "
 `;
 
+exports[`Remix Application Integrated Repo --unitTestRunner should generate the correct files for testing 1`] = `
+"/**
+ * @type {import('@remix-run/dev').AppConfig}
+ */
+module.exports = {
+  ignoredRouteFiles: ['**/.*'],
+  // appDirectory: \\"app\\",
+  // assetsBuildDirectory: \\"public/build\\",
+  // serverBuildPath: \\"build/index.js\\",
+  // publicPath: \\"/build/\\",
+  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+};
+"
+`;
+
+exports[`Remix Application Integrated Repo --unitTestRunner should generate the correct files for testing 2`] = `
+"/// <reference types=\\"vitest\\" />
+import react from '@vitejs/plugin-react';
+import { defineConfig } from 'vite';
+import viteTsConfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+  cacheDir: '../../node_modules/.vite/test',
+
+  plugins: [
+    react(),
+    viteTsConfigPaths({
+      root: '../../',
+    }),
+  ],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [
+  //    viteTsConfigPaths({
+  //      root: '../../',
+  //    }),
+  //  ],
+  // },
+
+  test: {
+    setupFiles: ['./test-setup.ts'],
+    globals: true,
+    cache: {
+      dir: '../../node_modules/.vitest',
+    },
+    environment: 'jsdom',
+    include: ['./app/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+  },
+});
+"
+`;
+
 exports[`Remix Application Integrated Repo should create the application correctly 1`] = `
 "/**
  * @type {import('@remix-run/dev').AppConfig}
@@ -429,6 +482,59 @@ exports[`Remix Application Standalone Project Repo --js should create the applic
 "
 `;
 
+exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing 1`] = `
+"/**
+ * @type {import('@remix-run/dev').AppConfig}
+ */
+module.exports = {
+  ignoredRouteFiles: ['**/.*'],
+  // appDirectory: \\"app\\",
+  // assetsBuildDirectory: \\"public/build\\",
+  // serverBuildPath: \\"build/index.js\\",
+  // publicPath: \\"/build/\\",
+  watchPaths: () => require('@nx/remix').createWatchPaths(__dirname),
+};
+"
+`;
+
+exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing 2`] = `
+"/// <reference types=\\"vitest\\" />
+import react from '@vitejs/plugin-react';
+import { defineConfig } from 'vite';
+import viteTsConfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+  cacheDir: './node_modules/.vite/test',
+
+  plugins: [
+    react(),
+    viteTsConfigPaths({
+      root: './',
+    }),
+  ],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [
+  //    viteTsConfigPaths({
+  //      root: './',
+  //    }),
+  //  ],
+  // },
+
+  test: {
+    setupFiles: ['./test-setup.ts'],
+    globals: true,
+    cache: {
+      dir: './node_modules/.vitest',
+    },
+    environment: 'jsdom',
+    include: ['./app/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+  },
+});
+"
+`;
+
 exports[`Remix Application Standalone Project Repo should create the application correctly 1`] = `
 "/**
  * @type {import('@remix-run/dev').AppConfig}

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

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 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");
+const cypress_impl_1 = require("../cypress/cypress.impl");
 const lib_1 = require("./lib");
 function default_1(tree, _options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -74,6 +75,19 @@ function default_1(tree, _options) {
         else {
             (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/integrated'), options.projectRoot, vars);
         }
+        if (options.unitTestRunner === 'vitest') {
+            const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', (0, versions_1.getPackageVersion)(tree, 'nx'));
+            const vitestTask = yield vitestGenerator(tree, {
+                uiFramework: 'react',
+                project: options.projectName,
+                coverageProvider: 'c8',
+                inSourceTests: false,
+                skipFormat: true,
+            });
+            const pkgInstallTask = (0, lib_1.updateViteTestConfig)(tree, options.projectRoot);
+            tasks.push(vitestTask);
+            tasks.push(pkgInstallTask);
+        }
         if (options.js) {
             (0, devkit_1.toJS)(tree);
         }
@@ -105,6 +119,13 @@ 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);
         }
+        if (options.e2eTestRunner === 'cypress') {
+            const cypressTasks = yield (0, cypress_impl_1.default)(tree, {
+                project: options.projectName,
+                name: options.rootProject ? `e2e` : `${options.projectName}-e2e`,
+            });
+            tasks.push(cypressTasks);
+        }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }

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

@@ -1 +1 @@
-{"version":3,"file":"application.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"application.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":";;;AAAA,uCAcoB;AACpB,mFAAmF;AACnF,mDAU8B;AAC9B,0DAAuD;AACvD,+BAA+D;AAG/D,mBAA+B,IAAU,EAAE,QAAgC;;QACzE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE;YACjD,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE;YACpC,WAAW,EAAE,aAAa;YAC1B,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,OAAO,EAAE;gBACP,KAAK,EAAE;oBACL,OAAO,EAAE,aAAa;oBACtB,OAAO,EAAE;wBACP,GAAG,EAAE,OAAO,CAAC,WAAW;qBACzB;iBACF;gBACD,KAAK,EAAE;oBACL,OAAO,EAAE,WAAW;oBACpB,OAAO,EAAE;wBACP,GAAG,EAAE,OAAO,CAAC,WAAW;qBACzB;iBACF;gBACD,KAAK,EAAE;oBACL,SAAS,EAAE,CAAC,OAAO,CAAC;oBACpB,OAAO,EAAE,mBAAmB;oBAC5B,OAAO,EAAE;wBACP,GAAG,EAAE,OAAO,CAAC,WAAW;qBACzB;iBACF;gBACD,SAAS,EAAE;oBACT,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE;wBACP,GAAG,EAAE,OAAO,CAAC,WAAW;qBACzB;iBACF;aACF;SACF,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,iBAAiB,EAAE,uBAAY;YAC/B,kBAAkB,EAAE,uBAAY;YAChC,kBAAkB,EAAE,uBAAY;YAChC,KAAK,EAAE,uBAAY;YACnB,KAAK,EAAE,uBAAY;YACnB,WAAW,EAAE,0BAAe;SAC7B,EACD;YACE,gBAAgB,EAAE,uBAAY;YAC9B,0BAA0B,EAAE,uBAAY;YACxC,cAAc,EAAE,4BAAiB;YACjC,kBAAkB,EAAE,+BAAoB;YACxC,MAAM,EAAE,wBAAa;YACrB,UAAU,EAAE,4BAAiB;SAC9B,CACF,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,MAAM,IAAI,mCACL,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,YAAY,EAAZ,uBAAY;YACZ,YAAY,EAAZ,uBAAY;YACZ,YAAY,EAAZ,uBAAY;YACZ,eAAe,EAAf,0BAAe;YACf,iBAAiB,EAAjB,4BAAiB;YACjB,oBAAoB,EAApB,+BAAoB;YACpB,aAAa,EAAb,wBAAa;YACb,iBAAiB,EAAjB,4BAAiB,GAClB,CAAC;QAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,cAAc,CAAC,EAC5C,OAAO,CAAC,WAAW,EACnB,IAAI,CACL,CAAC;QAEF,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,GAAG,SAAS,uCAAuC,CACpD,CAAC;SACH;aAAM;YACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,kBAAkB,CAAC,EAChD,OAAO,CAAC,WAAW,EACnB,IAAI,CACL,CAAC;SACH;QAED,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;YACvC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,sBAAa,EACvC,UAAU,EACV,IAAA,4BAAiB,EAAC,IAAI,EAAE,IAAI,CAAC,CAC9B,CAAC;YAEF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE;gBAC7C,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,OAAO,CAAC,WAAW;gBAC5B,gBAAgB,EAAE,IAAI;gBACtB,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAEvE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACvB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SAC5B;QAED,IAAI,OAAO,CAAC,EAAE,EAAE;YACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;SACZ;QAED,IAAI,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;YAC5D,+EAA+E;YAC/E,MAAM,gBAAgB,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;YAC9D,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;;gBACzC,OAAO,IAAI,CAAC,OAAO,CAAC;gBACpB,IAAI,CAAC,eAAe,iDACf,gBAAgB,CAAC,eAAe,GAChC,IAAI,CAAC,eAAe;oBACvB,iCAAiC;oBACjC,wFAAwF;oBACxF,KAAK,EAAE;wBACL,KAAK,EAAE,CAAC,SAAS,CAAC;qBACnB,GACF,CAAC;gBACF,IAAI,CAAC,OAAO,GAAG;oBACb,GAAG,CAAC,MAAA,gBAAgB,CAAC,OAAO,mCAAI,EAAE,CAAC;oBACnC,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,CAAC;iBACxB,CAAC;gBACF,IAAI,CAAC,OAAO,GAAG;oBACb,GAAG,CAAC,MAAA,gBAAgB,CAAC,OAAO,mCAAI,EAAE,CAAC;oBACnC,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,CAAC;iBACxB,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;SACnC;aAAM;YACL,yFAAyF;YACzF,IAAA,sCAAmB,EAAC,IAAI,CAAC,CAAC;SAC3B;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,YAAY,GAAG,MAAM,IAAA,sBAAgB,EAAC,IAAI,EAAE;gBAChD,OAAO,EAAE,OAAO,CAAC,WAAW;gBAC5B,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,WAAW,MAAM;aACjE,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC1B;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAlKD,4BAkKC"}

package/src/generators/application/lib/index.d.ts

@@ -1 +1,2 @@
 export * from './normalize-options';
+export * from './update-vite-test-config';

package/src/generators/application/lib/index.js

@@ -2,4 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./update-vite-test-config"), exports);
 //# sourceMappingURL=index.js.map

package/src/generators/application/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/application/lib/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/application/lib/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,oEAA0C"}

package/src/generators/application/lib/update-vite-test-config.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function updateViteTestConfig(tree: Tree, pathToRoot: string): import("@nx/devkit").GeneratorCallback;

package/src/generators/application/lib/update-vite-test-config.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateViteTestConfig = void 0;
+const devkit_1 = require("@nx/devkit");
+const testing_config_utils_1 = require("../../../utils/testing-config-utils");
+const versions_1 = require("../../../utils/versions");
+function updateViteTestConfig(tree, pathToRoot) {
+    const pathToViteConfig = (0, devkit_1.joinPathFragments)(pathToRoot, 'vite.config.ts');
+    const pathToTestSetup = (0, devkit_1.joinPathFragments)(pathToRoot, `test-setup.ts`);
+    tree.write(pathToTestSetup, (0, devkit_1.stripIndents) `
+  import { installGlobals } from '@remix-run/node';
+  import '@testing-library/jest-dom/extend-expect';
+  installGlobals();`);
+    (0, testing_config_utils_1.updateViteTestIncludes)(tree, pathToViteConfig, './app/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
+    (0, testing_config_utils_1.updateViteTestSetup)(tree, pathToViteConfig, './test-setup.ts');
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@testing-library/jest-dom': versions_1.testingLibraryJestDomVersion,
+        '@testing-library/react': versions_1.testingLibraryReactVersion,
+        '@testing-library/user-event': versions_1.testingLibraryUserEventsVersion,
+    });
+}
+exports.updateViteTestConfig = updateViteTestConfig;
+//# sourceMappingURL=update-vite-test-config.js.map

package/src/generators/application/lib/update-vite-test-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-vite-test-config.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/application/lib/update-vite-test-config.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AACpB,8EAG6C;AAC7C,sDAIiC;AAEjC,SAAgB,oBAAoB,CAAC,IAAU,EAAE,UAAkB;IACjE,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACzE,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IACvE,IAAI,CAAC,KAAK,CACR,eAAe,EACf,IAAA,qBAAY,EAAA;;;oBAGI,CACjB,CAAC;IAEF,IAAA,6CAAsB,EACpB,IAAI,EACJ,gBAAgB,EAChB,wDAAwD,CACzD,CAAC;IACF,IAAA,0CAAmB,EAAC,IAAI,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAE/D,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,2BAA2B,EAAE,uCAA4B;QACzD,wBAAwB,EAAE,qCAA0B;QACpD,6BAA6B,EAAE,0CAA+B;KAC/D,CACF,CAAC;AACJ,CAAC;AA3BD,oDA2BC"}

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

@@ -3,6 +3,8 @@ export interface NxRemixGeneratorSchema {
   tags?: string;
   js?: boolean;
   directory?: string;
+  unitTestRunner?: 'vitest' | 'none';
+  e2eTestRunner?: 'cypress' | 'none';
   skipFormat?: boolean;
   rootProject?: boolean;
 }

package/src/generators/application/schema.json

@@ -24,6 +24,19 @@
       "alias": "dir",
       "x-priority": "important"
     },
+    "unitTestRunner": {
+      "type": "string",
+      "enum": ["vitest", "none"],
+      "default": "vitest",
+      "description": "Test runner to use for unit tests.",
+      "x-prompt": "What unit test runner should be used?"
+    },
+    "e2eTestRunner": {
+      "type": "string",
+      "enum": ["cypress", "none"],
+      "default": "cypress",
+      "description": "Test runner to use for e2e tests"
+    },
     "tags": {
       "type": "string",
       "description": "Add tags to the project (used for linting)",

package/src/generators/error-boundary/__snapshots__/error-boundary.impl.spec.ts.snap

@@ -0,0 +1,49 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ErrorBoundary --apiVersion=1 should correctly add the ErrorBoundary to the route file 1`] = `
+"export function ErrorBoundary({ error }) {
+  console.error(error);
+  return (
+    <div>
+      <h1>Uh oh ...</h1>
+      <p>Something went wrong</p>
+      <pre>{error.message || 'Unknown error'}</pre>
+    </div>
+  );
+}
+"
+`;
+
+exports[`ErrorBoundary --apiVersion=2 should correctly add the ErrorBoundary to the route file 1`] = `
+"import { isRouteErrorResponse, useRouteError } from '@remix-run/react';
+export function ErrorBoundary() {
+  const error = useRouteError();
+
+  // when true, this is what used to go to 'CatchBoundary'
+  if (isRouteErrorResponse(error)) {
+    return (
+      <div>
+        <h1>Oops</h1>
+        <p>Status: {error.status}</p>
+        <p>{error.data.message}</p>
+      </div>
+    );
+  }
+
+  // Don't forget to typecheck with your own logic.
+  // Any value can be thrown, not just errors!
+  let errorMessage = 'Unknown error';
+  // if (isDefinitelyAnError(error)) {
+  //    errorMessage = error.message;
+  // }
+
+  return (
+    <div>
+      <h1>Uh oh ...</h1>
+      <p>Something went wrong.</p>
+      <pre>{errorMessage}</pre>
+    </div>
+  );
+}
+"
+`;

package/src/generators/error-boundary/error-boundary.impl.d.ts

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

package/src/generators/error-boundary/error-boundary.impl.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const lib_1 = require("./lib");
+function errorBoundaryGenerator(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = (0, lib_1.normalizeOptions)(tree, schema);
+        if (options.apiVersion === 1) {
+            (0, lib_1.addV1ErrorBoundary)(tree, options);
+        }
+        else {
+            (0, lib_1.addV2ErrorBoundary)(tree, options);
+        }
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = errorBoundaryGenerator;
+//# sourceMappingURL=error-boundary.impl.js.map

package/src/generators/error-boundary/error-boundary.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"error-boundary.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/error-boundary/error-boundary.impl.ts"],"names":[],"mappings":";;;AAAA,uCAAoD;AACpD,+BAIe;AAGf,SAA8B,sBAAsB,CAClD,IAAU,EACV,MAA2B;;QAE3B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAI,OAAO,CAAC,UAAU,KAAK,CAAC,EAAE;YAC5B,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;aAAM;YACL,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAfD,yCAeC"}

package/src/generators/error-boundary/lib/add-v1-error-boundary.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { ErrorBoundarySchema } from '../schema';
+export declare function addV1ErrorBoundary(tree: Tree, options: ErrorBoundarySchema): void;

package/src/generators/error-boundary/lib/add-v1-error-boundary.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addV1ErrorBoundary = void 0;
+const devkit_1 = require("@nx/devkit");
+const insert_statement_after_imports_1 = require("../../../utils/insert-statement-after-imports");
+function addV1ErrorBoundary(tree, options) {
+    (0, insert_statement_after_imports_1.insertStatementAfterImports)(tree, options.path, (0, devkit_1.stripIndents) `
+    export function ErrorBoundary({ error }) {
+        console.error(error);
+        return (
+            <div>
+                <h1>Uh oh ...</h1>
+                <p>Something went wrong</p>
+                <pre>{error.message || "Unknown error"}</pre>
+            </div>
+        );
+    }
+  `);
+}
+exports.addV1ErrorBoundary = addV1ErrorBoundary;
+//# sourceMappingURL=add-v1-error-boundary.js.map

package/src/generators/error-boundary/lib/add-v1-error-boundary.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-v1-error-boundary.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/error-boundary/lib/add-v1-error-boundary.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AACrD,kGAA4F;AAG5F,SAAgB,kBAAkB,CAAC,IAAU,EAAE,OAA4B;IACzE,IAAA,4DAA2B,EACzB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,IAAA,qBAAY,EAAA;;;;;;;;;;;GAWb,CACA,CAAC;AACJ,CAAC;AAjBD,gDAiBC"}

package/src/generators/error-boundary/lib/add-v2-error-boundary.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { ErrorBoundarySchema } from '../schema';
+export declare function addV2ErrorBoundary(tree: Tree, options: ErrorBoundarySchema): void;

package/src/generators/error-boundary/lib/add-v2-error-boundary.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addV2ErrorBoundary = void 0;
+const devkit_1 = require("@nx/devkit");
+const insert_import_1 = require("../../../utils/insert-import");
+const insert_statement_after_imports_1 = require("../../../utils/insert-statement-after-imports");
+function addV2ErrorBoundary(tree, options) {
+    (0, insert_import_1.insertImport)(tree, options.path, `useRouteError`, '@remix-run/react');
+    (0, insert_import_1.insertImport)(tree, options.path, `isRouteErrorResponse`, '@remix-run/react');
+    (0, insert_statement_after_imports_1.insertStatementAfterImports)(tree, options.path, (0, devkit_1.stripIndents) `
+    export function ErrorBoundary() {
+        const error = useRouteError();
+
+        // when true, this is what used to go to 'CatchBoundary'
+        if (isRouteErrorResponse(error)) {
+            return (
+                <div>
+                    <h1>Oops</h1>
+                    <p>Status: {error.status}</p>
+                    <p>{error.data.message}</p>
+                </div>
+            );
+        }
+
+        // Don't forget to typecheck with your own logic.
+        // Any value can be thrown, not just errors!
+        let errorMessage = "Unknown error";
+        // if (isDefinitelyAnError(error)) {
+        //    errorMessage = error.message;
+        // }
+
+        return (
+            <div>
+                <h1>Uh oh ...</h1>
+                <p>Something went wrong.</p>
+                <pre>{errorMessage}</pre>
+            </div>
+        );
+    }
+  `);
+}
+exports.addV2ErrorBoundary = addV2ErrorBoundary;
+//# sourceMappingURL=add-v2-error-boundary.js.map

package/src/generators/error-boundary/lib/add-v2-error-boundary.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-v2-error-boundary.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/error-boundary/lib/add-v2-error-boundary.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AACrD,gEAA4D;AAC5D,kGAA4F;AAG5F,SAAgB,kBAAkB,CAAC,IAAU,EAAE,OAA4B;IACzE,IAAA,4BAAY,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;IACtE,IAAA,4BAAY,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,sBAAsB,EAAE,kBAAkB,CAAC,CAAC;IAE7E,IAAA,4DAA2B,EACzB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,IAAA,qBAAY,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8Bb,CACA,CAAC;AACJ,CAAC;AAvCD,gDAuCC"}

package/src/generators/error-boundary/lib/index.d.ts

@@ -0,0 +1,3 @@
+export * from './add-v1-error-boundary';
+export * from './add-v2-error-boundary';
+export * from './normalize-options';

package/src/generators/error-boundary/lib/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./add-v1-error-boundary"), exports);
+tslib_1.__exportStar(require("./add-v2-error-boundary"), exports);
+tslib_1.__exportStar(require("./normalize-options"), exports);
+//# sourceMappingURL=index.js.map

package/src/generators/error-boundary/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/error-boundary/lib/index.ts"],"names":[],"mappings":";;;AAAA,kEAAwC;AACxC,kEAAwC;AACxC,8DAAoC"}

package/src/generators/error-boundary/lib/normalize-options.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { ErrorBoundarySchema } from '../schema';
+export declare function normalizeOptions(tree: Tree, schema: ErrorBoundarySchema): ErrorBoundarySchema;

package/src/generators/error-boundary/lib/normalize-options.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const remix_route_utils_1 = require("../../../utils/remix-route-utils");
+function normalizeOptions(tree, schema) {
+    const pathToRouteFile = (0, remix_route_utils_1.resolveRemixRouteFile)(tree, schema.path, schema.project);
+    if (!tree.exists(pathToRouteFile)) {
+        throw new Error(`Route file specified does not exist "${pathToRouteFile}". Please ensure you pass a correct path to the file, relative to the project root.`);
+    }
+    return Object.assign(Object.assign({}, schema), { path: pathToRouteFile });
+}
+exports.normalizeOptions = normalizeOptions;
+//# sourceMappingURL=normalize-options.js.map

package/src/generators/error-boundary/lib/normalize-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/error-boundary/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,wEAAyE;AAGzE,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAA2B;IAE3B,MAAM,eAAe,GAAG,IAAA,yCAAqB,EAC3C,IAAI,EACJ,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,OAAO,CACf,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CACb,wCAAwC,eAAe,qFAAqF,CAC7I,CAAC;KACH;IAED,uCACK,MAAM,KACT,IAAI,EAAE,eAAe,IACrB;AACJ,CAAC;AApBD,4CAoBC"}

package/src/generators/error-boundary/schema.d.ts

@@ -0,0 +1,6 @@
+export interface ErrorBoundarySchema {
+  project: string;
+  path: string;
+  apiVersion: number;
+  skipFormat?: false;
+}

package/src/generators/error-boundary/schema.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxRemixErrorBoundary",
+  "title": "Create an ErrorBoundary for a Route",
+  "type": "object",
+  "examples": [
+    {
+      "command": "g error-boundary --project=myapp --routePath=app/routes/my-route.tsx",
+      "description": "Generate an ErrorBoundary for my-route.tsx"
+    }
+  ],
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-prompt": "What project contains the route file that this ErrorBoundary is for?",
+      "pattern": "^[a-zA-Z].*$"
+    },
+    "path": {
+      "type": "string",
+      "description": "The path to route file relative to the project root."
+    },
+    "apiVersion": {
+      "type": "number",
+      "description": "Which version of the ErrorBoundary convention to use for the route.",
+      "default": 1
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "description": "Skip formatting files after generation.",
+      "default": false,
+      "x-priority": "internal"
+    }
+  },
+  "required": ["project", "path"]
+}

package/src/generators/library/lib/add-unit-testing.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { RemixLibraryOptions } from './normalize-options';
+export declare function addUnitTestingSetup(tree: Tree, options: RemixLibraryOptions): import("@nx/devkit").GeneratorCallback;

package/src/generators/library/lib/add-unit-testing.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addUnitTestingSetup = void 0;
+const devkit_1 = require("@nx/devkit");
+const testing_config_utils_1 = require("../../../utils/testing-config-utils");
+const versions_1 = require("../../../utils/versions");
+function addUnitTestingSetup(tree, options) {
+    const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
+    const pathToTestSetup = (0, devkit_1.joinPathFragments)(projectRoot, 'src/test-setup.ts');
+    let testSetupFileContents = '';
+    if (tree.exists(pathToTestSetup)) {
+        testSetupFileContents = tree.read(pathToTestSetup, 'utf-8');
+    }
+    tree.write(pathToTestSetup, (0, devkit_1.stripIndents) `${testSetupFileContents}
+    import { installGlobals } from '@remix-run/node';
+    import "@testing-library/jest-dom/extend-expect";
+  installGlobals();`);
+    if (options.unitTestRunner === 'vitest') {
+        const pathToVitestConfig = (0, devkit_1.joinPathFragments)(projectRoot, `vite.config.ts`);
+        (0, testing_config_utils_1.updateViteTestSetup)(tree, pathToVitestConfig, './src/test-setup.ts');
+    }
+    else if (options.unitTestRunner === 'jest') {
+        const pathToJestConfig = (0, devkit_1.joinPathFragments)(projectRoot, `jest.config.ts`);
+        (0, testing_config_utils_1.updateJestTestSetup)(tree, pathToJestConfig, './src/test-setup.ts');
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@testing-library/jest-dom': versions_1.testingLibraryJestDomVersion,
+        '@testing-library/react': versions_1.testingLibraryReactVersion,
+        '@testing-library/user-event': versions_1.testingLibraryUserEventsVersion,
+    });
+}
+exports.addUnitTestingSetup = addUnitTestingSetup;
+//# sourceMappingURL=add-unit-testing.js.map

package/src/generators/library/lib/add-unit-testing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-unit-testing.js","sourceRoot":"","sources":["../../../../../../../packages/remix/src/generators/library/lib/add-unit-testing.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AACpB,8EAG6C;AAC7C,sDAIiC;AAGjC,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAA4B;IAC1E,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EACpD,IAAI,EACJ,OAAO,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;IAC5E,IAAI,qBAAqB,GAAG,EAAE,CAAC;IAE/B,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;KAC7D;IAED,IAAI,CAAC,KAAK,CACR,eAAe,EACf,IAAA,qBAAY,EAAA,GAAG,qBAAqB;;;oBAGpB,CACjB,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;QACvC,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC5E,IAAA,0CAAmB,EAAC,IAAI,EAAE,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;KACtE;SAAM,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QAC5C,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC1E,IAAA,0CAAmB,EAAC,IAAI,EAAE,gBAAgB,EAAE,qBAAqB,CAAC,CAAC;KACpE;IAED,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,2BAA2B,EAAE,uCAA4B;QACzD,wBAAwB,EAAE,qCAA0B;QACpD,6BAA6B,EAAE,0CAA+B;KAC/D,CACF,CAAC;AACJ,CAAC;AArCD,kDAqCC"}