@nrwl/remix 13.7.1 → 14.7.0

package/README.md

@@ -111,10 +111,10 @@ npx nx dev demo
 
 ### Running unit tests
 
-Run `nx test remix` to execute the unit tests via [Jest](https://jestjs.io).
+Run `nx test demo` to execute the unit tests via [Jest](https://jestjs.io).
 
 ### Publishing
 
 ```bash
-nx publish remix --ver=[version]
+nx publish demo --ver=[version]
 ```

package/generators.json

@@ -35,6 +35,31 @@
       "schema": "./src/generators/route/schema.json",
       "description": "Generate a new route"
     },
+    "resource-route": {
+      "implementation": "./src/generators/resource-route/resource-route.impl",
+      "schema": "./src/generators/resource-route/schema.json",
+      "description": "Generate a new resource route"
+    },
+    "action": {
+      "implementation": "./src/generators/action/action.impl",
+      "schema": "./src/generators/action/schema.json",
+      "description": "Add an action function to an existing route"
+    },
+    "loader": {
+      "implementation": "./src/generators/loader/loader.impl",
+      "schema": "./src/generators/loader/schema.json",
+      "description": "Add a loader function to an existing route"
+    },
+    "style": {
+      "implementation": "./src/generators/style/style.impl",
+      "schema": "./src/generators/style/schema.json",
+      "description": "Generates a new stylesheet and adds it to an existing route"
+    },
+    "meta": {
+      "implementation": "./src/generators/meta/meta.impl",
+      "schema": "./src/generators/meta/schema.json",
+      "description": "Add a meta function to an existing route"
+    },
     "cypress": {
       "implementation": "./src/generators/cypress/cypress.impl",
       "schema": "./src/generators/cypress/schema.json",

package/migrations.json

@@ -0,0 +1,54 @@
+{
+  "schematics": {
+    "update-tsconfig-and-remix-config-for-1-6-8": {
+      "version": "14.5.4",
+      "cli": "nx",
+      "description": "Update tsconfig.json and tsconfig.json to enable import of workspace libs",
+      "factory": "./src/migrations/update-14-5-4/update-tsconfig-and-remix-config-for-1-6-8"
+    }
+
+  },
+  "packageJsonUpdates": {
+    "14.5.4": {
+      "version": "14.5.4",
+      "packages": {
+        "@remix-run/react": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/node": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/serve": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/dev": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/eslint-config": {
+          "version": "^1.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "react": {
+          "version": "^18.2.0",
+          "alwaysAddToPackageJson": true
+        },
+        "react-dom": {
+          "version": "^18.2.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@types/react-dom": {
+          "version": "^18.0.6",
+          "alwaysAddToPackageJson": true
+        },
+        "@types/react": {
+          "version": "^18.0.15",
+          "alwaysAddToPackageJson": true
+        }
+      }
+    }
+  }
+}

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "@nrwl/remix",
-  "version": "13.7.1",
+  "version": "14.7.0",
   "main": "src/index.js",
   "generators": "./generators.json",
   "dependencies": {
-    "@nrwl/devkit": "^13.4.3",
-    "@nrwl/js": "^13.4.3",
-    "@nrwl/react": "^13.4.3",
+    "@nrwl/devkit": "^14.5.0",
+    "@nrwl/js": "^14.5.0",
+    "@nrwl/react": "^14.5.0",
     "tslib": "^2.3.1"
   },
+  "ng-update": {
+    "requirements": {},
+    "migrations": "./migrations.json"
+  },
   "typings": "./src/index.d.ts"
 }

package/src/generators/action/action.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/action/action.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, 'ActionFunction', '@remix-run/node', {
+            typeOnly: true,
+        });
+        (0, insert_import_1.insertImport)(tree, routeFilePath, 'json', '@remix-run/node');
+        (0, insert_import_1.insertImport)(tree, routeFilePath, 'useActionData', '@remix-run/react');
+        const defaultExportName = (0, get_default_export_name_1.getDefaultExportName)(tree, routeFilePath);
+        const actionTypeName = `${defaultExportName}ActionData`;
+        (0, insert_statement_after_imports_1.insertStatementAfterImports)(tree, routeFilePath, `
+    type ${actionTypeName} = {
+        message: string;
+    };
+    
+    export let action: ActionFunction = async ({ request }) => {
+      let formData = await request.formData();
+  
+      return json({message: formData.toString()}, { status: 200 });
+    };
+    
+    `);
+        const statement = `\nconst actionMessage = useActionData<${actionTypeName}>();`;
+        try {
+            (0, insert_statement_in_default_function_1.insertStatementInDefaultFunction)(tree, routeFilePath, statement);
+        }
+        catch (err) {
+            // eslint-disable-next-line no-empty
+        }
+        finally {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=action.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"action.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/action/action.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,MAAM,EAAE,iBAAiB,CAAC,CAAC;QAC7D,IAAA,4BAAY,EAAC,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;QAEvE,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,yCAAyC,cAAc,MAAM,CAAC;QAEhF,IAAI;YACF,IAAA,uEAAgC,EAAC,IAAI,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;SAClE;QAAC,OAAO,GAAG,EAAE;YACZ,oCAAoC;SACrC;gBAAS;YACR,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAhDD,4BAgDC"}

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

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

package/src/generators/action/schema.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "action",
+  "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/application/application.impl.js

@@ -6,7 +6,7 @@ const normalize_options_1 = require("./lib/normalize-options");
 const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 const child_process_1 = require("child_process");
 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 = [];
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
@@ -16,19 +16,21 @@ function default_1(tree, _options) {
             tags: options.parsedTags,
         });
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@remix-run/react': '^1.0.6',
-            react: '^17.0.2',
-            'react-dom': '^17.0.2',
-            remix: '^1.0.6',
-            '@remix-run/serve': '^1.0.6',
+            '@remix-run/react': '^1.6.8',
+            '@remix-run/node': '^1.6.8',
+            react: '^18.2.0',
+            'react-dom': '^18.2.0',
+            '@remix-run/serve': '^1.6.8',
         }, {
-            '@remix-run/dev': '^1.0.6',
-            '@types/react': '^17.0.24',
-            '@types/react-dom': '^17.0.9',
-            typescript: '~4.4.3',
+            '@remix-run/dev': '^1.6.8',
+            '@remix-run/eslint-config': '^1.6.8',
+            '@types/react': '^18.0.15',
+            '@types/react-dom': '^18.0.6',
+            eslint: '^8.20.0',
+            typescript: '^4.7.4',
         });
         tasks.push(installTask);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '' }));
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.projectRoot, Object.assign(Object.assign({}, options), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot) }));
         const remixSetupCommand = 'remix setup node';
         // update package json with postinstall command
         (0, devkit_1.updateJson)(tree, 'package.json', (pkgJson) => {

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":";;;AAAA,yCASsB;AAEtB,+DAA2D;AAC3D,2FAAqF;AACrF,iDAAyC;AAEzC,mBAA+B,IAAU,EAAE,QAAgC;;QACzE,MAAM,OAAO,GAAG,IAAA,oCAAgB,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;SACzB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,kBAAkB,EAAE,QAAQ;YAC5B,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,SAAS;YACtB,KAAK,EAAE,QAAQ;YACf,kBAAkB,EAAE,QAAQ;SAC7B,EACD;YACE,gBAAgB,EAAE,QAAQ;YAC1B,cAAc,EAAE,UAAU;YAC1B,kBAAkB,EAAE,SAAS;YAC7B,UAAU,EAAE,QAAQ;SACrB,CACF,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,OAAO,CAAC,WAAW,kCAEd,OAAO,KACV,IAAI,EAAE,EAAE,IAEX,CAAC;QAEF,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;QAE7C,+CAA+C;QAC/C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;;YAC3C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;gBAChC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC;aACjD;iBAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;gBACnE,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,OAAO,iBAAiB,EAAE,CAAC;aACxF;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACd,IAAA,wBAAQ,EAAC,OAAO,iBAAiB,EAAE,EAAE;gBACnC,GAAG,EAAE,OAAO,CAAC,WAAW;gBACxB,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAhED,4BAgEC"}
+{"version":3,"file":"application.impl.js","sourceRoot":"","sources":["../../../../../../packages/remix/src/generators/application/application.impl.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;AAEtB,+DAA2D;AAC3D,2FAAqF;AACrF,iDAAyC;AAEzC,mBAA+B,IAAU,EAAE,QAAgC;;QACzE,MAAM,OAAO,GAAG,IAAA,oCAAgB,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;SACzB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,kBAAkB,EAAE,QAAQ;YAC5B,iBAAiB,EAAE,QAAQ;YAC3B,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,SAAS;YACtB,kBAAkB,EAAE,QAAQ;SAC7B,EACD;YACE,gBAAgB,EAAE,QAAQ;YAC1B,0BAA0B,EAAE,QAAQ;YACpC,cAAc,EAAE,UAAU;YAC1B,kBAAkB,EAAE,SAAS;YAC7B,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,QAAQ;SACrB,CACF,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,OAAO,CAAC,WAAW,kCAEd,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,IAEtD,CAAC;QAEF,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;QAE7C,+CAA+C;QAC/C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;;YAC3C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;gBAChC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC;aACjD;iBAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;gBACnE,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,OAAO,iBAAiB,EAAE,CAAC;aACxF;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACd,IAAA,wBAAQ,EAAC,OAAO,iBAAiB,EAAE,EAAE;gBACnC,GAAG,EAAE,OAAO,CAAC,WAAW;gBACxB,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAnED,4BAmEC"}

package/src/generators/application/files/.gitignore__tmpl__

@@ -0,0 +1,4 @@
+.cache
+build
+public/build
+.env

package/src/generators/application/files/app/entry.client.tsx__tmpl__

@@ -1,4 +1,4 @@
+import { RemixBrowser } from "@remix-run/react";
 import { hydrate } from "react-dom";
-import { RemixBrowser } from "remix";
 
-hydrate(<RemixBrowser />, document);
+hydrate(<RemixBrowser />, document);

package/src/generators/application/files/app/entry.server.tsx__tmpl__

@@ -1,6 +1,6 @@
+import type { EntryContext } from "@remix-run/node";
+import { RemixServer } from "@remix-run/react";
 import { renderToString } from "react-dom/server";
-import { RemixServer } from "remix";
-import type { EntryContext } from "remix";
 
 export default function handleRequest(
   request: Request,
@@ -16,6 +16,6 @@ export default function handleRequest(
 
   return new Response("<!DOCTYPE html>" + markup, {
     status: responseStatusCode,
-    headers: responseHeaders
+    headers: responseHeaders,
   });
-}
+}

package/src/generators/application/files/app/root.tsx__tmpl__

@@ -1,178 +1,32 @@
+import type { MetaFunction } from "@remix-run/node";
 import {
-  Link,
   Links,
   LiveReload,
   Meta,
   Outlet,
   Scripts,
   ScrollRestoration,
-  useCatch
-} from "remix";
-import type { LinksFunction } from "remix";
+} from "@remix-run/react";
 
-import globalStylesUrl from "~/styles/global.css";
-import darkStylesUrl from "~/styles/dark.css";
+export const meta: MetaFunction = () => ({
+  charset: "utf-8",
+  title: "New Remix App",
+  viewport: "width=device-width,initial-scale=1",
+});
 
-// https://remix.run/api/app#links
-export let links: LinksFunction = () => {
-  return [
-    { rel: "stylesheet", href: globalStylesUrl },
-    {
-      rel: "stylesheet",
-      href: darkStylesUrl,
-      media: "(prefers-color-scheme: dark)"
-    }
-  ];
-};
-
-// https://remix.run/api/conventions#default-export
-// https://remix.run/api/conventions#route-filenames
 export default function App() {
-  return (
-    <Document>
-      <Layout>
-        <Outlet />
-      </Layout>
-    </Document>
-  );
-}
-
-// https://remix.run/docs/en/v1/api/conventions#errorboundary
-export function ErrorBoundary({ error }: { error: Error }) {
-  console.error(error);
-  return (
-    <Document title="Error!">
-      <Layout>
-        <div>
-          <h1>There was an error</h1>
-          <p>{error.message}</p>
-          <hr />
-          <p>
-            Hey, developer, you should replace this with what you want your
-            users to see.
-          </p>
-        </div>
-      </Layout>
-    </Document>
-  );
-}
-
-// https://remix.run/docs/en/v1/api/conventions#catchboundary
-export function CatchBoundary() {
-  let caught = useCatch();
-
-  let message;
-  switch (caught.status) {
-    case 401:
-      message = (
-        <p>
-          Oops! Looks like you tried to visit a page that you do not have access
-          to.
-        </p>
-      );
-      break;
-    case 404:
-      message = (
-        <p>Oops! Looks like you tried to visit a page that does not exist.</p>
-      );
-      break;
-
-    default:
-      throw new Error(caught.data || caught.statusText);
-  }
-
-  return (
-    <Document title={`${caught.status} ${caught.statusText}`}>
-      <Layout>
-        <h1>
-          {caught.status}: {caught.statusText}
-        </h1>
-        {message}
-      </Layout>
-    </Document>
-  );
-}
-
-function Document({
-  children,
-  title
-}: {
-  children: React.ReactNode;
-  title?: string;
-}) {
   return (
     <html lang="en">
       <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width,initial-scale=1" />
-        {title ? <title>{title}</title> : null}
         <Meta />
         <Links />
       </head>
       <body>
-        {children}
+        <Outlet />
         <ScrollRestoration />
         <Scripts />
-        {process.env.NODE_ENV === "development" && <LiveReload />}
+        <LiveReload />
       </body>
     </html>
   );
-}
-
-function Layout({ children }: { children: React.ReactNode }) {
-  return (
-    <div className="remix-app">
-      <header className="remix-app__header">
-        <div className="container remix-app__header-content">
-          <Link to="/" title="Remix" className="remix-app__header-home-link">
-            <RemixLogo />
-          </Link>
-          <nav aria-label="Main navigation" className="remix-app__header-nav">
-            <ul>
-              <li>
-                <Link to="/">Home</Link>
-              </li>
-              <li>
-                <a href="https://remix.run/docs">Remix Docs</a>
-              </li>
-              <li>
-                <a href="https://github.com/remix-run/remix">GitHub</a>
-              </li>
-            </ul>
-          </nav>
-        </div>
-      </header>
-      <div className="remix-app__main">
-        <div className="container remix-app__main-content">{children}</div>
-      </div>
-      <footer className="remix-app__footer">
-        <div className="container remix-app__footer-content">
-          <p>&copy; You!</p>
-        </div>
-      </footer>
-    </div>
-  );
-}
-
-function RemixLogo() {
-  return (
-    <svg
-      viewBox="0 0 659 165"
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      xmlnsXlink="http://www.w3.org/1999/xlink"
-      aria-labelledby="remix-run-logo-title"
-      role="img"
-      width="106"
-      height="30"
-      fill="currentColor"
-    >
-      <title id="remix-run-logo-title">Remix Logo</title>
-      <path d="M0 161V136H45.5416C53.1486 136 54.8003 141.638 54.8003 145V161H0Z M133.85 124.16C135.3 142.762 135.3 151.482 135.3 161H92.2283C92.2283 158.927 92.2653 157.03 92.3028 155.107C92.4195 149.128 92.5411 142.894 91.5717 130.304C90.2905 111.872 82.3473 107.776 67.7419 107.776H54.8021H0V74.24H69.7918C88.2407 74.24 97.4651 68.632 97.4651 53.784C97.4651 40.728 88.2407 32.816 69.7918 32.816H0V0H77.4788C119.245 0 140 19.712 140 51.2C140 74.752 125.395 90.112 105.665 92.672C122.32 96 132.057 105.472 133.85 124.16Z" />
-      <path d="M229.43 120.576C225.59 129.536 218.422 133.376 207.158 133.376C194.614 133.376 184.374 126.72 183.35 112.64H263.478V101.12C263.478 70.1437 243.254 44.0317 205.11 44.0317C169.526 44.0317 142.902 69.8877 142.902 105.984C142.902 142.336 169.014 164.352 205.622 164.352C235.83 164.352 256.822 149.76 262.71 123.648L229.43 120.576ZM183.862 92.6717C185.398 81.9197 191.286 73.7277 204.598 73.7277C216.886 73.7277 223.542 82.4317 224.054 92.6717H183.862Z" />
-      <path d="M385.256 66.5597C380.392 53.2477 369.896 44.0317 349.672 44.0317C332.52 44.0317 320.232 51.7117 314.088 64.2557V47.1037H272.616V161.28H314.088V105.216C314.088 88.0638 318.952 76.7997 332.52 76.7997C345.064 76.7997 348.136 84.9917 348.136 100.608V161.28H389.608V105.216C389.608 88.0638 394.216 76.7997 408.04 76.7997C420.584 76.7997 423.4 84.9917 423.4 100.608V161.28H464.872V89.5997C464.872 65.7917 455.656 44.0317 424.168 44.0317C404.968 44.0317 391.4 53.7597 385.256 66.5597Z" />
-      <path d="M478.436 47.104V161.28H519.908V47.104H478.436ZM478.18 36.352H520.164V0H478.18V36.352Z" />
-      <path d="M654.54 47.1035H611.788L592.332 74.2395L573.388 47.1035H527.564L568.78 103.168L523.98 161.28H566.732L589.516 130.304L612.3 161.28H658.124L613.068 101.376L654.54 47.1035Z" />
-    </svg>
-  );
-}
+}

package/src/generators/application/files/app/routes/index.tsx__tmpl__

@@ -1,100 +1,32 @@
-import type { MetaFunction, LoaderFunction } from "remix";
-import { useLoaderData, json, Link } from "remix";
-
-type IndexData = {
-  resources: Array<{ name: string; url: string }>;
-  demos: Array<{ name: string; to: string }>;
-};
-
-// Loaders provide data to components and are only ever called on the server, so
-// you can connect to a database or run any server side code you want right next
-// to the component that renders it.
-// https://remix.run/api/conventions#loader
-export let loader: LoaderFunction = () => {
-  let data: IndexData = {
-    resources: [
-      {
-        name: "Remix Docs",
-        url: "https://remix.run/docs"
-      },
-      {
-        name: "React Router Docs",
-        url: "https://reactrouter.com/docs"
-      },
-      {
-        name: "Remix Discord",
-        url: "https://discord.gg/VBePs6d"
-      }
-    ],
-    demos: [
-      {
-        to: "demos/actions",
-        name: "Actions"
-      },
-      {
-        to: "demos/about",
-        name: "Nested Routes, CSS loading/unloading"
-      },
-      {
-        to: "demos/params",
-        name: "URL Params and Error Boundaries"
-      }
-    ]
-  };
-
-  // https://remix.run/api/remix#json
-  return json(data);
-};
-
-// https://remix.run/api/conventions#meta
-export let meta: MetaFunction = () => {
-  return {
-    title: "Remix Starter",
-    description: "Welcome to remix!"
-  };
-};
-
-// https://remix.run/guides/routing#index-routes
 export default function Index() {
-  let data = useLoaderData<IndexData>();
-
   return (
-    <div className="remix__page">
-      <main>
-        <h2>Welcome to Remix!</h2>
-        <p>We're stoked that you're here. 🥳</p>
-        <p>
-          Feel free to take a look around the code to see how Remix does things,
-          it might be a bit different than what you’re used to. When you're
-          ready to dive deeper, we've got plenty of resources to get you
-          up-and-running quickly.
-        </p>
-        <p>
-          Check out all the demos in this starter, and then just delete the{" "}
-          <code>app/routes/demos</code> and <code>app/styles/demos</code>{" "}
-          folders when you're ready to turn this into your next project.
-        </p>
-      </main>
-      <aside>
-        <h2>Demos In This App</h2>
-        <ul>
-          {data.demos.map(demo => (
-            <li key={demo.to} className="remix__page__resource">
-              <Link to={demo.to} prefetch="intent">
-                {demo.name}
-              </Link>
-            </li>
-          ))}
-        </ul>
-        <h2>Resources</h2>
-        <ul>
-          {data.resources.map(resource => (
-            <li key={resource.url} className="remix__page__resource">
-              <a href={resource.url}>{resource.name}</a>
-            </li>
-          ))}
-        </ul>
-      </aside>
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.4" }}>
+      <h1>Welcome to Remix</h1>
+      <ul>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/blog"
+            rel="noreferrer"
+          >
+            15m Quickstart Blog Tutorial
+          </a>
+        </li>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/jokes"
+            rel="noreferrer"
+          >
+            Deep Dive Jokes App Tutorial
+          </a>
+        </li>
+        <li>
+          <a target="_blank" href="https://remix.run/docs" rel="noreferrer">
+            Remix Docs
+          </a>
+        </li>
+      </ul>
     </div>
   );
-}
+}

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

@@ -10,17 +10,16 @@
     "start": "npx remix-serve build"
   },
   "dependencies": {
-    "@remix-run/react": "^1.0.6",
+    "@remix-run/react": "^1.6.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "remix": "^1.0.6",
-    "@remix-run/serve": "^1.0.6"
+    "@remix-run/serve": "^1.6.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.0.6",
+    "@remix-run/dev": "^1.6.0",
     "@types/react": "^17.0.24",
     "@types/react-dom": "^17.0.9",
-    "typescript": "^4.1.2"
+    "typescript": "^4.6.4"
   },
   "engines": {
     "node": ">=14"