@nrwl/remix 13.7.1 → 14.7.0

package/src/generators/application/files/remix.config.js__tmpl__

@@ -1,10 +1,11 @@
 /**
- * @type {import('@remix-run/dev/config').AppConfig}
+ * @type {import('@remix-run/dev').AppConfig}
  */
 module.exports = {
-  appDirectory: "app",
-  browserBuildDirectory: "public/build",
-  publicPath: "/build/",
-  serverBuildDirectory: "build",
-  devServerPort: 8002
-};
+  ignoredRouteFiles: ["**/.*"],
+  // appDirectory: "app",
+  // assetsBuildDirectory: "public/build",
+  // serverBuildPath: "build/index.js",
+  // publicPath: "/build/",
+  watchPaths: ["<%= offsetFromRoot %>libs"]
+};

package/src/generators/application/files/tsconfig.json__tmpl__

@@ -1,17 +1,18 @@
 {
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
   "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2019"],
+    "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "target": "ES2019",
     "strict": true,
-    "paths": {
-      "~/*": ["./app/*"]
-    },
+    "allowJs": true,
+    "forceConsistentCasingInFileNames": true,
     // Remix takes care of building everything in `remix build`.
     "noEmit": true
   }
-}
+}

package/src/generators/cypress/cypress.impl.js

@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const cypress_1 = require("@nrwl/cypress");
 function default_1(tree, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-        const initSideEffects = (0, cypress_1.cypressInitGenerator)(tree);
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const initSideEffects = (0, cypress_1.cypressInitGenerator)(tree, {});
         const projSideEffects = (0, cypress_1.cypressProjectGenerator)(tree, Object.assign(Object.assign({}, options), { standaloneConfig: true }));
         const config = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-        tree.delete((0, devkit_1.joinPathFragments)(config.sourceRoot, "support", "app.po.ts"));
-        tree.write((0, devkit_1.joinPathFragments)(config.sourceRoot, "integration", "app.spec.ts"), `describe('webapp', () => {
+        tree.delete((0, devkit_1.joinPathFragments)(config.sourceRoot, 'support', 'app.po.ts'));
+        tree.write((0, devkit_1.joinPathFragments)(config.sourceRoot, 'integration', 'app.spec.ts'), `describe('webapp', () => {
   beforeEach(() => cy.visit('/'));
 
   it('should display welcome message', () => {
@@ -17,7 +17,7 @@ function default_1(tree, options) {
   });
 });`);
         // returning this in case the cypress generator has any side effects
-        return () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             yield initSideEffects;
             yield projSideEffects;
         });

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

@@ -1 +1 @@
-{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/cypress/cypress.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAgF;AAEhF,2CAA2E;AAE3E,mBACE,IAAU,EACV,OAAY;;QAEZ,MAAM,eAAe,GAAG,IAAA,8BAAoB,EAAC,IAAI,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,IAAA,iCAAuB,EAAC,IAAI,kCAAM,OAAO,KAAE,gBAAgB,EAAE,IAAI,IAAE,CAAA;QAE3F,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QAC3D,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,KAAK,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,aAAa,CAAC,EAAE;;;;;;IAM7E,CAAC,CAAA;QACH,oEAAoE;QACpE,OAAO,GAAS,EAAE;YAChB,MAAM,eAAe,CAAA;YACrB,MAAM,eAAe,CAAA;QACvB,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AArBD,4BAqBC"}
+{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/cypress/cypress.impl.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAEtB,2CAA8E;AAE9E,mBAA+B,IAAU,EAAE,OAAY;;QACrD,MAAM,eAAe,GAAG,IAAA,8BAAoB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,IAAA,iCAAuB,EAAC,IAAI,kCAC/C,OAAO,KACV,gBAAgB,EAAE,IAAI,IACtB,CAAC;QAEH,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,aAAa,CAAC,EAClE;;;;;;IAMA,CACD,CAAC;QACF,oEAAoE;QACpE,OAAO,GAAS,EAAE;YAChB,MAAM,eAAe,CAAC;YACtB,MAAM,eAAe,CAAC;QACxB,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AAxBD,4BAwBC"}

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

@@ -7,7 +7,7 @@ const linter_1 = require("@nrwl/linter");
 const child_process_1 = require("child_process");
 const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 function default_1(tree, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
         const name = (0, devkit_1.names)(options.name).fileName;
         const pm = (0, devkit_1.detectPackageManager)();

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

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

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

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const insert_import_1 = require("../../utils/insert-import");
+const insert_statement_after_imports_1 = require("../../utils/insert-statement-after-imports");
+const get_default_export_name_1 = require("../../utils/get-default-export-name");
+const insert_statement_in_default_function_1 = require("../../utils/insert-statement-in-default-function");
+const remix_route_utils_1 = require("../../utils/remix-route-utils");
+function default_1(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const routeFilePath = (0, remix_route_utils_1.resolveRemixRouteFile)(tree, schema.path, schema.project);
+        if (!tree.exists(routeFilePath)) {
+            throw new Error(`Route path does not exist: ${routeFilePath}. Please generate a Remix route first.`);
+        }
+        (0, insert_import_1.insertImport)(tree, routeFilePath, 'LoaderFunction', '@remix-run/node', {
+            typeOnly: true,
+        });
+        (0, insert_import_1.insertImport)(tree, routeFilePath, 'useLoaderData', '@remix-run/react');
+        (0, insert_import_1.insertImport)(tree, routeFilePath, 'json', '@remix-run/node');
+        const defaultExportName = (0, get_default_export_name_1.getDefaultExportName)(tree, routeFilePath);
+        const loaderTypeName = `${defaultExportName}LoaderData`;
+        (0, insert_statement_after_imports_1.insertStatementAfterImports)(tree, routeFilePath, `
+    type ${loaderTypeName} = {
+        message: string;
+    };
+
+    export const loader: LoaderFunction = async () => {
+      return json({
+        message: 'Hello, world!',
+      })
+    };
+    
+    `);
+        const statement = `\nconst data = useLoaderData<${loaderTypeName}>();`;
+        try {
+            (0, insert_statement_in_default_function_1.insertStatementInDefaultFunction)(tree, routeFilePath, statement);
+            // eslint-disable-next-line no-empty
+        }
+        catch (err) {
+        }
+        finally {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=loader.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"loader.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/loader/loader.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAEjD,6DAAyD;AACzD,+FAAyF;AACzF,iFAA2E;AAC3E,2GAAoG;AACpG,qEAAsE;AAEtE,mBAA+B,IAAU,EAAE,MAAoB;;QAC7D,MAAM,aAAa,GAAG,IAAA,yCAAqB,EACzC,IAAI,EACJ,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,OAAO,CACf,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,8BAA8B,aAAa,wCAAwC,CACpF,CAAC;SACH;QAED,IAAA,4BAAY,EAAC,IAAI,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAAE;YACrE,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAA,4BAAY,EAAC,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;QACvE,IAAA,4BAAY,EAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;QAE7D,MAAM,iBAAiB,GAAG,IAAA,8CAAoB,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,GAAG,iBAAiB,YAAY,CAAC;QAExD,IAAA,4DAA2B,EACzB,IAAI,EACJ,aAAa,EACb;WACO,cAAc;;;;;;;;;;KAUpB,CACF,CAAC;QAEF,MAAM,SAAS,GAAG,gCAAgC,cAAc,MAAM,CAAC;QAEvE,IAAI;YACF,IAAA,uEAAgC,EAAC,IAAI,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;YACjE,oCAAoC;SACrC;QAAC,OAAO,GAAG,EAAE;SACb;gBAAS;YACR,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAhDD,4BAgDC"}

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

@@ -0,0 +1,4 @@
+export interface LoaderSchema {
+  project: string;
+  path: string;
+}

package/src/generators/loader/schema.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "data-loader",
+  "type": "object",
+  "properties": {
+    "path": {
+      "type": "string",
+      "description": "The route path or path to the filename of the route.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What is the path of the route? (e.g. 'foo/bar')"
+    },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-prompt": "What project is this route for?",
+      "pattern": "^[a-zA-Z].*$"
+    }
+  },
+  "required": ["path", "project"]
+}

package/src/generators/meta/meta.impl.d.ts

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

package/src/generators/meta/meta.impl.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const insert_import_1 = require("../../utils/insert-import");
+const insert_statement_after_imports_1 = require("../../utils/insert-statement-after-imports");
+const get_default_export_name_1 = require("../../utils/get-default-export-name");
+const remix_route_utils_1 = require("../../utils/remix-route-utils");
+function default_1(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const routeFilePath = (0, remix_route_utils_1.resolveRemixRouteFile)(tree, schema.path, schema.project);
+        if (!tree.exists(routeFilePath)) {
+            throw new Error(`Route path does not exist: ${routeFilePath}. Please generate a Remix route first.`);
+        }
+        (0, insert_import_1.insertImport)(tree, routeFilePath, 'MetaFunction', '@remix-run/node', {
+            typeOnly: true,
+        });
+        const defaultExportName = (0, get_default_export_name_1.getDefaultExportName)(tree, routeFilePath);
+        (0, insert_statement_after_imports_1.insertStatementAfterImports)(tree, routeFilePath, `   
+    export const meta: MetaFunction = () =>{
+      return { title: '${defaultExportName} Route' };
+    };
+    
+    `);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=meta.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"meta.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/meta/meta.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAEjD,6DAAyD;AACzD,+FAAyF;AACzF,iFAA2E;AAC3E,qEAAsE;AAEtE,mBAA+B,IAAU,EAAE,MAAoB;;QAC7D,MAAM,aAAa,GAAG,IAAA,yCAAqB,EACzC,IAAI,EACJ,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,OAAO,CACf,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,8BAA8B,aAAa,wCAAwC,CACpF,CAAC;SACH;QAED,IAAA,4BAAY,EAAC,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE;YACnE,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,IAAA,8CAAoB,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACpE,IAAA,4DAA2B,EACzB,IAAI,EACJ,aAAa,EACb;;yBAEqB,iBAAiB;;;KAGrC,CACF,CAAC;QACF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA7BD,4BA6BC"}

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

@@ -0,0 +1,4 @@
+export interface LoaderSchema {
+  path: string;
+  project: string;
+}

package/src/generators/meta/schema.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "meta",
+  "type": "object",
+  "properties": {
+    "path": {
+      "type": "string",
+      "description": "The route path or path to the filename of the route.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What is the path of the route? (e.g. 'foo/bar')"
+    },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-prompt": "What project is this route for?",
+      "pattern": "^[a-zA-Z].*$"
+    }
+  },
+  "required": ["path", "project"]
+}

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

@@ -8,7 +8,7 @@ const setup_impl_1 = require("../setup/setup.impl");
 const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 const set_default_collection_1 = require("@nrwl/workspace/src/utilities/set-default-collection");
 function default_1(tree, _options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = (0, normalize_options_1.normalizeOptions)(tree, _options);
         const tasks = [];
         const appGenTask = yield (0, application_impl_1.default)(tree, {

package/src/generators/resource-route/resource-route.impl.d.ts

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

package/src/generators/resource-route/resource-route.impl.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const loader_impl_1 = require("../loader/loader.impl");
+const action_impl_1 = require("../action/action.impl");
+const remix_route_utils_1 = require("../../utils/remix-route-utils");
+function default_1(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const routeFilePath = (0, remix_route_utils_1.resolveRemixRouteFile)(tree, options.path, options.project, '.ts');
+        if (tree.exists(routeFilePath))
+            throw new Error(`Path already exists: ${options.path}`);
+        if (!options.loader && !options.action)
+            throw new Error('The resource route generator requires either `loader` or `action` to be true');
+        tree.write(routeFilePath, '');
+        if (options.loader) {
+            yield (0, loader_impl_1.default)(tree, {
+                project: options.project,
+                path: routeFilePath,
+            });
+        }
+        if (options.action) {
+            yield (0, action_impl_1.default)(tree, {
+                path: routeFilePath,
+                project: options.project,
+            });
+        }
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=resource-route.impl.js.map

package/src/generators/resource-route/resource-route.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-route.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/resource-route/resource-route.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAEjD,uDAAoD;AACpD,uDAAoD;AACpD,qEAAsE;AAEtE,mBAA+B,IAAU,EAAE,OAAyB;;QAClE,MAAM,aAAa,GAAG,IAAA,yCAAqB,EACzC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,OAAO,EACf,KAAK,CACN,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM;YACpC,MAAM,IAAI,KAAK,CACb,8EAA8E,CAC/E,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAE9B,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,MAAM,IAAA,qBAAe,EAAC,IAAI,EAAE;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,IAAI,EAAE,aAAa;aACpB,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,MAAM,IAAA,qBAAe,EAAC,IAAI,EAAE;gBAC1B,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAjCD,4BAiCC"}

package/src/generators/resource-route/schema.d.ts

@@ -0,0 +1,6 @@
+export interface RemixRouteSchema {
+  project: string;
+  path: string;
+  action: boolean;
+  loader: boolean;
+}

package/src/generators/resource-route/schema.json

@@ -0,0 +1,44 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxRemixResourceRoute",
+  "cli": "nx",
+  "title": "Create a Resource Route",
+  "type": "object",
+  "examples": [
+    {
+      "command": "g resource-route 'path/to/page'",
+      "description": "Generate resource route at /path/to/page"
+    }
+  ],
+  "properties": {
+    "path": {
+      "type": "string",
+      "description": "The route path or path to the filename of the route.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What is the path of the route? (e.g. 'foo/bar')"
+    },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-prompt": "What project is this route for?",
+      "pattern": "^[a-zA-Z].*$"
+    },
+    "action": {
+      "type": "boolean",
+      "description": "Generate an action function",
+      "default": false
+    },
+    "loader": {
+      "type": "boolean",
+      "description": "Generate a loader function",
+      "default": true
+    }
+  },
+  "required": ["project", "path"]
+}

package/src/generators/route/route.impl.js

@@ -2,85 +2,61 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const loader_impl_1 = require("../loader/loader.impl");
+const meta_impl_1 = require("../meta/meta.impl");
+const action_impl_1 = require("../action/action.impl");
+const style_impl_1 = require("../style/style.impl");
+const remix_route_utils_1 = require("../../utils/remix-route-utils");
 function default_1(tree, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-        const { fileName: routePath, className: componentName } = (0, devkit_1.names)(options.path.replace(/^\//, '').replace(/\/$/, ''));
-        const projects = (0, devkit_1.getProjects)(tree);
-        const project = projects.get(options.project);
-        const normalizedRoutePath = normalizeRoutePath(routePath, project.root);
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
         if (!project)
             throw new Error(`Project does not exist: ${options.project}`);
-        const componentPath = (0, devkit_1.joinPathFragments)(project.root, 'app/routes', `${normalizedRoutePath}.tsx`);
-        if (tree.exists(componentPath))
-            throw new Error(`Path already exists: ${options.path}`);
-        tree.write(componentPath, (0, devkit_1.stripIndents) `
-    import { useEffect, useRef } from 'react';
-    ${options.style === 'css'
-            ? `import type { LinksFunction, LoaderFunction, MetaFunction } from 'remix';
-      `
-            : `import type { LoaderFunction, MetaFunction } from 'remix';`}
-    import { useActionData, useLoaderData, redirect } from 'remix';
+        const routeFilePath = (0, remix_route_utils_1.resolveRemixRouteFile)(tree, options.path, options.project, '.tsx');
+        const { className: componentName } = (0, devkit_1.names)(options.path.replace(/^\//, '').replace(/\/$/, '').replace('.tsx', ''));
+        if (tree.exists(routeFilePath))
+            throw new Error(`Path already exists: ${routeFilePath}`);
+        tree.write(routeFilePath, (0, devkit_1.stripIndents) `
 
-    ${options.style === 'css'
-            ? `import stylesUrl from '~/styles/${normalizedRoutePath}.css';`
-            : ''}
-
-
-    // Provide meta tags for this page.
-    // - https://remix.run/api/conventions#meta
-    export const meta: MetaFunction = () =>{
-      return { title: '${componentName}' };
-    }
-
-    ${options.style === 'css'
-            ? (0, devkit_1.stripIndents) `
-          // Provide stylesheet for this page.
-          // - https://remix.run/api/conventions#links
-          export const links: LinksFunction = () => {
-            return [{ rel: 'stylesheet', href: stylesUrl }];
-          };
-        `
-            : ''}
-
-    // Use this function to provide data for the route.
-    // - https://remix.run/api/conventions#loader
-    export const loader: LoaderFunction = async () => {
-      return {
-        message: 'Hello, world!',
-      }
-    }
 
     export default function ${componentName}() {
-      const data = useLoaderData();
+    ${options.loader
+            ? `
       return (
         <p>
           Message: {data.message}
         </p>
       );
+    `
+            : `return (<p>${componentName} works!</p>)`}
     }
   `);
+        if (options.loader) {
+            yield (0, loader_impl_1.default)(tree, {
+                project: options.project,
+                path: routeFilePath,
+            });
+        }
+        if (options.meta) {
+            yield (0, meta_impl_1.default)(tree, {
+                path: routeFilePath,
+                project: options.project,
+            });
+        }
+        if (options.action) {
+            yield (0, action_impl_1.default)(tree, {
+                path: routeFilePath,
+                project: options.project,
+            });
+        }
         if (options.style === 'css') {
-            const stylesheetPath = (0, devkit_1.joinPathFragments)(project.root, 'app/styles', `${normalizedRoutePath}.css`);
-            tree.write(stylesheetPath, (0, devkit_1.stripIndents) `
-      :root {
-        --color-foreground: #fff;
-        --color-background: #143157;
-        --color-links: hsl(214, 73%, 69%);
-        --color-border: #275da8;
-        --font-body: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
-          Liberation Mono, Courier New, monospace;
-      }
-    `);
+            yield (0, style_impl_1.default)(tree, {
+                project: options.project,
+                path: options.path,
+            });
         }
         yield (0, devkit_1.formatFiles)(tree);
     });
 }
 exports.default = default_1;
-function normalizeRoutePath(path, projectRoot) {
-    if (path.indexOf(projectRoot) === -1)
-        return path;
-    if (path.indexOf('/routes/') > -1)
-        return path.substring(path.indexOf('/routes/') + 8);
-    return path.substring(projectRoot.length + 1);
-}
 //# sourceMappingURL=route.impl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"route.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/route/route.impl.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAGtB,mBAA+B,IAAU,EAAE,OAAyB;;QAClE,MAAM,EAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAC,GAAG,IAAA,cAAK,EAC3D,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACnD,CAAC;QAGF,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE9C,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QAEvE,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5E,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,IAAI,EACZ,YAAY,EACZ,GAAG,mBAAmB,MAAM,CAC7B,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,KAAK,CACR,aAAa,EACb,IAAA,qBAAY,EAAA;;MAGV,OAAO,CAAC,KAAK,KAAK,KAAK;YACrB,CAAC,CAAC;OACH;YACC,CAAC,CAAC,4DACN;;;MAIE,OAAO,CAAC,KAAK,KAAK,KAAK;YACrB,CAAC,CAAC,mCAAmC,mBAAmB,QAAQ;YAChE,CAAC,CAAC,EACN;;;;;;yBAMqB,aAAa;;;MAIhC,OAAO,CAAC,KAAK,KAAK,KAAK;YACrB,CAAC,CAAC,IAAA,qBAAY,EAAA;;;;;;SAMb;YACD,CAAC,CAAC,EACN;;;;;;;;;;8BAU0B,aAAa;;;;;;;;GAQxC,CACA,CAAC;QAEF,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE;YAC3B,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,YAAY,EACZ,GAAG,mBAAmB,MAAM,CAC7B,CAAC;YACF,IAAI,CAAC,KAAK,CACR,cAAc,EACd,IAAA,qBAAY,EAAA;;;;;;;;;KASb,CACA,CAAC;SACH;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AApGD,4BAoGC;AAED,SAAS,kBAAkB,CAAC,IAAY,EAAE,WAAmB;IAC3D,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IACjD,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;IACtF,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAC/C,CAAC"}
+{"version":3,"file":"route.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/route/route.impl.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAEtB,uDAAoD;AACpD,iDAA8C;AAC9C,uDAAoD;AACpD,oDAAiD;AACjD,qEAAsE;AAEtE,mBAA+B,IAAU,EAAE,OAAyB;;QAClE,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5E,MAAM,aAAa,GAAG,IAAA,yCAAqB,EACzC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,OAAO,EACf,MAAM,CACP,CAAC;QAEF,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,IAAA,cAAK,EACxC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CACvE,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,wBAAwB,aAAa,EAAE,CAAC,CAAC;QAE3D,IAAI,CAAC,KAAK,CACR,aAAa,EACb,IAAA,qBAAY,EAAA;;;8BAGc,aAAa;MAErC,OAAO,CAAC,MAAM;YACZ,CAAC,CAAC;;;;;;KAML;YACG,CAAC,CAAC,cAAc,aAAa,cACjC;;GAED,CACA,CAAC;QAEF,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,MAAM,IAAA,qBAAe,EAAC,IAAI,EAAE;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,IAAI,EAAE,aAAa;aACpB,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,MAAM,IAAA,mBAAa,EAAC,IAAI,EAAE;gBACxB,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,MAAM,IAAA,qBAAe,EAAC,IAAI,EAAE;gBAC1B,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE;YAC3B,MAAM,IAAA,oBAAc,EAAC,IAAI,EAAE;gBACzB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AApED,4BAoEC"}

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

@@ -2,4 +2,7 @@ export interface RemixRouteSchema {
   project: string;
   path: string;
   style: 'css' | 'none';
+  action: boolean;
+  meta: boolean;
+  loader: boolean;
 }

package/src/generators/route/schema.json

@@ -11,6 +11,15 @@
     }
   ],
   "properties": {
+    "path": {
+      "type": "string",
+      "description": "The route path or path to the filename of the route.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What is the path of the route? (e.g. 'foo/bar')"
+    },
     "project": {
       "type": "string",
       "description": "The name of the project.",
@@ -20,20 +29,26 @@
       "x-prompt": "What project is this route for?",
       "pattern": "^[a-zA-Z].*$"
     },
-    "path": {
-      "type": "string",
-      "description": "Route path",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "What is the path of the route? (e.g. 'foo/bar')"
-    },
     "style": {
       "type": "string",
       "description": "Generate a stylesheet",
       "enum": ["none", "css"],
       "default": "css"
+    },
+    "meta": {
+      "type": "boolean",
+      "description": "Generate a meta function",
+      "default": false
+    },
+    "action": {
+      "type": "boolean",
+      "description": "Generate an action function",
+      "default": false
+    },
+    "loader": {
+      "type": "boolean",
+      "description": "Generate a loader function",
+      "default": false
     }
   },
   "required": ["project", "path"]

package/src/generators/setup/setup.impl.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 function default_1(tree, options) {
     var _a;
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
         const pm = (_a = options.packageManager) !== null && _a !== void 0 ? _a : (0, devkit_1.detectPackageManager)();
         // Enable yarn/npm/pnpm workspaces for buildable libs

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

@@ -0,0 +1,4 @@
+export interface RemixStyleSchema {
+  project: string;
+  path: string;
+}

package/src/generators/style/schema.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxRemixRouteStyle",
+  "cli": "nx",
+  "title": "Add style import to a route",
+  "type": "object",
+  "examples": [
+    {
+      "command": "g style --project=webapp --path='path/to/page'",
+      "description": "Generate route at /path/to/page"
+    }
+  ],
+  "properties": {
+    "path": {
+      "type": "string",
+      "description": "Route path",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What is the path of the route? (e.g. 'foo/bar')"
+    },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-prompt": "What project is this route in?",
+      "pattern": "^[a-zA-Z].*$"
+    }
+  },
+  "required": ["project", "path"]
+}

package/src/generators/style/style.impl.d.ts

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