remix-run · mcansh · Mar 31, 2023 · Mar 31, 2023 · Mar 31, 2023 · Mar 31, 2023
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/__template/package.json b/__template/package.json
@@ -8,16 +8,16 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "eslint": "^8.27.0",

diff --git a/__template/remix.config.js b/__template/remix.config.js
@@ -1,6 +1,7 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
+  future: { v2_routeConvention: true },
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",

diff --git a/_official-blog-tutorial/app/routes/index.tsx → ...icial-blog-tutorial/app/routes/_index.tsx b/_official-blog-tutorial/app/routes/index.tsx → ...icial-blog-tutorial/app/routes/_index.tsx
diff --git a/...log-tutorial/app/routes/notes/$noteId.tsx → ...log-tutorial/app/routes/notes.$noteId.tsx b/...log-tutorial/app/routes/notes/$noteId.tsx → ...log-tutorial/app/routes/notes.$noteId.tsx
diff --git a/...-blog-tutorial/app/routes/notes/index.tsx → ...blog-tutorial/app/routes/notes._index.tsx b/...-blog-tutorial/app/routes/notes/index.tsx → ...blog-tutorial/app/routes/notes._index.tsx
diff --git a/...al-blog-tutorial/app/routes/notes/new.tsx → ...al-blog-tutorial/app/routes/notes.new.tsx b/...al-blog-tutorial/app/routes/notes/new.tsx → ...al-blog-tutorial/app/routes/notes.new.tsx
@@ -1,4 +1,4 @@
-import Alert from "@reach/alert";
+import { Alert } from "@reach/alert";
 import type { ActionArgs } from "@remix-run/node";
 import { json, redirect } from "@remix-run/node";
 import { Form, useActionData } from "@remix-run/react";

diff --git a/_official-blog-tutorial/package.json b/_official-blog-tutorial/package.json
@@ -31,9 +31,9 @@
     "@node-rs/bcrypt": "^1.6.0",
     "@prisma/client": "^3.13.0",
     "@reach/alert": "^0.17.0",
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "marked": "^4.0.15",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
@@ -42,8 +42,8 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^6.3.1",
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@testing-library/cypress": "^8.0.2",
     "@testing-library/dom": "^8.13.0",
     "@testing-library/jest-dom": "^5.16.4",

diff --git a/_official-blog-tutorial/remix.config.js b/_official-blog-tutorial/remix.config.js
@@ -2,4 +2,5 @@
 module.exports = {
   cacheDirectory: "./node_modules/.cache/remix",
   ignoredRouteFiles: ["**/.*", "**/*.css", "**/*.test.{js,jsx,ts,tsx}"],
+  future: { v2_routeConvention: true },
 };
diff --git a/_official-blog-tutorial/tsconfig.json b/_official-blog-tutorial/tsconfig.json
@@ -2,10 +2,12 @@
   "exclude": ["./cypress"],
   "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
+    "allowJs": true,
     "lib": ["DOM", "DOM.Iterable", "ES2019"],
     "types": ["vitest/globals"],
     "isolatedModules": true,
     "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
     "jsx": "react-jsx",
     "module": "ES2020",
     "moduleResolution": "node",

diff --git a/_official-jokes/app/routes/index.tsx → _official-jokes/app/routes/_index.tsx b/_official-jokes/app/routes/index.tsx → _official-jokes/app/routes/_index.tsx
diff --git a/_official-jokes/app/routes/jokes/$jokeId.tsx → _official-jokes/app/routes/jokes.$jokeId.tsx b/_official-jokes/app/routes/jokes/$jokeId.tsx → _official-jokes/app/routes/jokes.$jokeId.tsx
diff --git a/_official-jokes/app/routes/jokes/index.tsx → _official-jokes/app/routes/jokes._index.tsx b/_official-jokes/app/routes/jokes/index.tsx → _official-jokes/app/routes/jokes._index.tsx
diff --git a/_official-jokes/app/routes/jokes/new.tsx → _official-jokes/app/routes/jokes.new.tsx b/_official-jokes/app/routes/jokes/new.tsx → _official-jokes/app/routes/jokes.new.tsx
diff --git a/_official-jokes/package.json b/_official-jokes/package.json
@@ -9,17 +9,17 @@
   },
   "dependencies": {
     "@prisma/client": "^3.10.0",
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "bcryptjs": "^2.4.3",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/bcryptjs": "^2.4.2",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",

diff --git a/_official-jokes/remix.config.js b/_official-jokes/remix.config.js
@@ -1,6 +1,7 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
+  future: { v2_routeConvention: true },
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",

diff --git a/_official-realtime-app/app/routes/index.tsx → _official-realtime-app/app/routes/_index.tsx b/_official-realtime-app/app/routes/index.tsx → _official-realtime-app/app/routes/_index.tsx
diff --git a/_official-realtime-app/package.json b/_official-realtime-app/package.json
@@ -13,9 +13,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "classnames": "^2.3.2",
     "compression": "^1.7.4",
     "isbot": "^3.6.5",
@@ -25,8 +25,8 @@
     "tiny-invariant": "^1.3.1"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "eslint": "^8.27.0",

diff --git a/_official-realtime-app/remix.config.js b/_official-realtime-app/remix.config.js
@@ -1,6 +1,7 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
+  future: { v2_routeConvention: true },
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",

diff --git a/_official-tutorial/app/routes/index.tsx → _official-tutorial/app/routes/_index.tsx b/_official-tutorial/app/routes/index.tsx → _official-tutorial/app/routes/_index.tsx
diff --git a/_official-tutorial/package.json b/_official-tutorial/package.json
@@ -8,9 +8,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "isbot": "^3.6.5",
     "match-sorter": "^6.3.1",
     "react": "^18.2.0",
@@ -19,8 +19,8 @@
     "tiny-invariant": "^1.3.1"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "eslint": "^8.27.0",

diff --git a/_official-tutorial/remix.config.js b/_official-tutorial/remix.config.js
@@ -2,6 +2,7 @@
 module.exports = {
   future: {
     unstable_dev: true,
+    v2_routeConvention: true,
   },
   ignoredRouteFiles: ["**/.*"],
   // appDirectory: "app",

diff --git a/basic/app/routes/index.tsx → basic/app/routes/_index.tsx b/basic/app/routes/index.tsx → basic/app/routes/_index.tsx
diff --git a/basic/app/routes/demos/about/index.tsx → basic/app/routes/demos.about._index.tsx b/basic/app/routes/demos/about/index.tsx → basic/app/routes/demos.about._index.tsx
diff --git a/basic/app/routes/demos/about.tsx → basic/app/routes/demos.about.tsx b/basic/app/routes/demos/about.tsx → basic/app/routes/demos.about.tsx
diff --git a/basic/app/routes/demos/about/whoa.tsx → basic/app/routes/demos.about.whoa.tsx b/basic/app/routes/demos/about/whoa.tsx → basic/app/routes/demos.about.whoa.tsx
diff --git a/basic/app/routes/demos/actions.tsx → basic/app/routes/demos.actions.tsx b/basic/app/routes/demos/actions.tsx → basic/app/routes/demos.actions.tsx
diff --git a/basic/app/routes/demos/correct.tsx → basic/app/routes/demos.correct.tsx b/basic/app/routes/demos/correct.tsx → basic/app/routes/demos.correct.tsx
diff --git a/basic/app/routes/demos/params/$id.tsx → basic/app/routes/demos.params.$id.tsx b/basic/app/routes/demos/params/$id.tsx → basic/app/routes/demos.params.$id.tsx
@@ -29,6 +29,7 @@ export const loader = async ({ params }: LoaderArgs) => {
   // Sometimes your code just blows up and you never anticipated it. Remix will
   // automatically catch it and send the UI to the error boundary.
   if (params.id === "kaboom") {
+    // @ts-expect-error
     lol();
   }
 

diff --git a/basic/app/routes/demos/params/index.tsx → basic/app/routes/demos.params._index.tsx b/basic/app/routes/demos/params/index.tsx → basic/app/routes/demos.params._index.tsx
diff --git a/basic/app/routes/demos/params.tsx → basic/app/routes/demos.params.tsx b/basic/app/routes/demos/params.tsx → basic/app/routes/demos.params.tsx
diff --git a/basic/package.json b/basic/package.json
@@ -8,16 +8,16 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "eslint": "^8.27.0",

diff --git a/basic/remix.config.js b/basic/remix.config.js
@@ -1,6 +1,7 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
+  future: { v2_routeConvention: true },
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",

diff --git a/bullmq-task-queue/app/routes/index.tsx → bullmq-task-queue/app/routes/_index.tsx b/bullmq-task-queue/app/routes/index.tsx → bullmq-task-queue/app/routes/_index.tsx
diff --git a/bullmq-task-queue/package.json b/bullmq-task-queue/package.json
@@ -8,18 +8,18 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "bullmq": "^2.1.0",
     "ioredis": "^5.2.3",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/ioredis": "^4.28.10",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",

diff --git a/bullmq-task-queue/remix.config.js b/bullmq-task-queue/remix.config.js
@@ -4,4 +4,5 @@ module.exports = {
   browserBuildDirectory: "public/build",
   publicPath: "/build/",
   serverBuildDirectory: "build",
+  future: { v2_routeConvention: true },
 };
diff --git a/catch-boundary/app/routes/index.tsx → catch-boundary/app/routes/_index.tsx b/catch-boundary/app/routes/index.tsx → catch-boundary/app/routes/_index.tsx
diff --git a/catch-boundary/app/routes/users/$userId.tsx → catch-boundary/app/routes/users.$userId.tsx b/catch-boundary/app/routes/users/$userId.tsx → catch-boundary/app/routes/users.$userId.tsx
diff --git a/catch-boundary/package.json b/catch-boundary/package.json
@@ -8,16 +8,16 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "eslint": "^8.27.0",

diff --git a/catch-boundary/remix.config.js b/catch-boundary/remix.config.js
@@ -1,6 +1,7 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
+  future: { v2_routeConvention: true },
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",

diff --git a/chakra-ui/app/routes/index.tsx → chakra-ui/app/routes/_index.tsx b/chakra-ui/app/routes/index.tsx → chakra-ui/app/routes/_index.tsx
diff --git a/chakra-ui/package.json b/chakra-ui/package.json
@@ -12,17 +12,17 @@
     "@emotion/react": "^11.10.4",
     "@emotion/server": "^11.10.0",
     "@emotion/styled": "^11.10.4",
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "framer-motion": "^6.5.1",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "eslint": "^8.27.0",

diff --git a/chakra-ui/remix.config.js b/chakra-ui/remix.config.js
@@ -1,6 +1,7 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
+  future: { v2_routeConvention: true },
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",

diff --git a/client-only-components/app/routes/index.tsx → client-only-components/app/routes/_index.tsx b/client-only-components/app/routes/index.tsx → client-only-components/app/routes/_index.tsx
diff --git a/client-only-components/package.json b/client-only-components/package.json
@@ -8,17 +8,17 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "remix-utils": "^2.7.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "eslint": "^8.27.0",

diff --git a/client-only-components/remix.config.js b/client-only-components/remix.config.js
@@ -1,6 +1,7 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
+  future: { v2_routeConvention: true },
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",

diff --git a/client-side-validation/package.json b/client-side-validation/package.json
@@ -8,16 +8,16 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "eslint": "^8.27.0",

diff --git a/client-side-validation/remix.config.js b/client-side-validation/remix.config.js
@@ -1,6 +1,7 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
+  future: { v2_routeConvention: true },
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",

diff --git a/collected-notes/app/routes/index.tsx → collected-notes/app/routes/_index.tsx b/collected-notes/app/routes/index.tsx → collected-notes/app/routes/_index.tsx
diff --git a/collected-notes/package.json b/collected-notes/package.json
@@ -8,17 +8,17 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "~1.14.2",
-    "@remix-run/react": "~1.14.2",
-    "@remix-run/serve": "~1.14.2",
+    "@remix-run/node": "^1.15.0",
+    "@remix-run/react": "^1.15.0",
+    "@remix-run/serve": "^1.15.0",
     "collected-notes": "^2.3.0",
     "isbot": "^3.6.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "~1.14.2",
-    "@remix-run/eslint-config": "~1.14.2",
+    "@remix-run/dev": "^1.15.0",
+    "@remix-run/eslint-config": "^1.15.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "eslint": "^8.27.0",

diff --git a/collected-notes/remix.config.js b/collected-notes/remix.config.js
@@ -1,6 +1,7 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ["**/.*"],
+  future: { v2_routeConvention: true },
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
   // serverBuildPath: "build/index.js",

diff --git a/combobox-resource-route/app/routes/index.tsx → ...obox-resource-route/app/routes/_index.tsx b/combobox-resource-route/app/routes/index.tsx → ...obox-resource-route/app/routes/_index.tsx