diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 00000000..3186f3f0 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/__template/package.json b/__template/package.json index c55b22dd..883ca9eb 100644 --- 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 index adf2a0b5..abd0c5a3 100644 --- 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 b/_official-blog-tutorial/app/routes/_index.tsx similarity index 100% rename from _official-blog-tutorial/app/routes/index.tsx rename to _official-blog-tutorial/app/routes/_index.tsx diff --git a/_official-blog-tutorial/app/routes/notes/$noteId.tsx b/_official-blog-tutorial/app/routes/notes.$noteId.tsx similarity index 100% rename from _official-blog-tutorial/app/routes/notes/$noteId.tsx rename to _official-blog-tutorial/app/routes/notes.$noteId.tsx diff --git a/_official-blog-tutorial/app/routes/notes/index.tsx b/_official-blog-tutorial/app/routes/notes._index.tsx similarity index 100% rename from _official-blog-tutorial/app/routes/notes/index.tsx rename to _official-blog-tutorial/app/routes/notes._index.tsx diff --git a/_official-blog-tutorial/app/routes/notes/new.tsx b/_official-blog-tutorial/app/routes/notes.new.tsx similarity index 98% rename from _official-blog-tutorial/app/routes/notes/new.tsx rename to _official-blog-tutorial/app/routes/notes.new.tsx index 69e25431..80cce1c9 100644 --- a/_official-blog-tutorial/app/routes/notes/new.tsx +++ b/_official-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 index 2b9500b4..954a8fa9 100644 --- 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 index a2074b02..c21ef36d 100644 --- 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 index 3e3ff6f4..3bcddb69 100644 --- 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 b/_official-jokes/app/routes/_index.tsx similarity index 100% rename from _official-jokes/app/routes/index.tsx rename to _official-jokes/app/routes/_index.tsx diff --git a/_official-jokes/app/routes/jokes/$jokeId.tsx b/_official-jokes/app/routes/jokes.$jokeId.tsx similarity index 100% rename from _official-jokes/app/routes/jokes/$jokeId.tsx rename to _official-jokes/app/routes/jokes.$jokeId.tsx diff --git a/_official-jokes/app/routes/jokes/index.tsx b/_official-jokes/app/routes/jokes._index.tsx similarity index 100% rename from _official-jokes/app/routes/jokes/index.tsx rename to _official-jokes/app/routes/jokes._index.tsx diff --git a/_official-jokes/app/routes/jokes/new.tsx b/_official-jokes/app/routes/jokes.new.tsx similarity index 100% rename from _official-jokes/app/routes/jokes/new.tsx rename to _official-jokes/app/routes/jokes.new.tsx diff --git a/_official-jokes/package.json b/_official-jokes/package.json index 75ca67dc..9a45e548 100644 --- 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 index adf2a0b5..abd0c5a3 100644 --- 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 b/_official-realtime-app/app/routes/_index.tsx similarity index 100% rename from _official-realtime-app/app/routes/index.tsx rename to _official-realtime-app/app/routes/_index.tsx diff --git a/_official-realtime-app/package.json b/_official-realtime-app/package.json index b671f6bc..ae98f936 100644 --- 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 index adf2a0b5..abd0c5a3 100644 --- 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 b/_official-tutorial/app/routes/_index.tsx similarity index 100% rename from _official-tutorial/app/routes/index.tsx rename to _official-tutorial/app/routes/_index.tsx diff --git a/_official-tutorial/package.json b/_official-tutorial/package.json index 51c10402..c4114a10 100644 --- 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 index 4e31d3b1..d69c6944 100644 --- 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 b/basic/app/routes/_index.tsx similarity index 100% rename from basic/app/routes/index.tsx rename to basic/app/routes/_index.tsx diff --git a/basic/app/routes/demos/about/index.tsx b/basic/app/routes/demos.about._index.tsx similarity index 100% rename from basic/app/routes/demos/about/index.tsx rename to basic/app/routes/demos.about._index.tsx diff --git a/basic/app/routes/demos/about.tsx b/basic/app/routes/demos.about.tsx similarity index 100% rename from basic/app/routes/demos/about.tsx rename to basic/app/routes/demos.about.tsx diff --git a/basic/app/routes/demos/about/whoa.tsx b/basic/app/routes/demos.about.whoa.tsx similarity index 100% rename from basic/app/routes/demos/about/whoa.tsx rename to basic/app/routes/demos.about.whoa.tsx diff --git a/basic/app/routes/demos/actions.tsx b/basic/app/routes/demos.actions.tsx similarity index 100% rename from basic/app/routes/demos/actions.tsx rename to basic/app/routes/demos.actions.tsx diff --git a/basic/app/routes/demos/correct.tsx b/basic/app/routes/demos.correct.tsx similarity index 100% rename from basic/app/routes/demos/correct.tsx rename to basic/app/routes/demos.correct.tsx diff --git a/basic/app/routes/demos/params/$id.tsx b/basic/app/routes/demos.params.$id.tsx similarity index 99% rename from basic/app/routes/demos/params/$id.tsx rename to basic/app/routes/demos.params.$id.tsx index 0c16fb95..adf3260b 100644 --- a/basic/app/routes/demos/params/$id.tsx +++ b/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 b/basic/app/routes/demos.params._index.tsx similarity index 100% rename from basic/app/routes/demos/params/index.tsx rename to basic/app/routes/demos.params._index.tsx diff --git a/basic/app/routes/demos/params.tsx b/basic/app/routes/demos.params.tsx similarity index 100% rename from basic/app/routes/demos/params.tsx rename to basic/app/routes/demos.params.tsx diff --git a/basic/package.json b/basic/package.json index c55b22dd..883ca9eb 100644 --- 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 index adf2a0b5..abd0c5a3 100644 --- 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 b/bullmq-task-queue/app/routes/_index.tsx similarity index 100% rename from bullmq-task-queue/app/routes/index.tsx rename to bullmq-task-queue/app/routes/_index.tsx diff --git a/bullmq-task-queue/package.json b/bullmq-task-queue/package.json index 08f4b85f..c514bf78 100644 --- a/bullmq-task-queue/package.json +++ b/bullmq-task-queue/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", "bullmq": "^2.1.0", "ioredis": "^5.2.3", "isbot": "^3.6.5", @@ -18,8 +18,8 @@ "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 index 631de93a..182b7a79 100644 --- 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 b/catch-boundary/app/routes/_index.tsx similarity index 100% rename from catch-boundary/app/routes/index.tsx rename to catch-boundary/app/routes/_index.tsx diff --git a/catch-boundary/app/routes/users/$userId.tsx b/catch-boundary/app/routes/users.$userId.tsx similarity index 100% rename from catch-boundary/app/routes/users/$userId.tsx rename to catch-boundary/app/routes/users.$userId.tsx diff --git a/catch-boundary/package.json b/catch-boundary/package.json index c55b22dd..883ca9eb 100644 --- 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 index adf2a0b5..abd0c5a3 100644 --- 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 b/chakra-ui/app/routes/_index.tsx similarity index 100% rename from chakra-ui/app/routes/index.tsx rename to chakra-ui/app/routes/_index.tsx diff --git a/chakra-ui/package.json b/chakra-ui/package.json index 06560ef7..2058cb53 100644 --- 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 index adf2a0b5..abd0c5a3 100644 --- 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 b/client-only-components/app/routes/_index.tsx similarity index 100% rename from client-only-components/app/routes/index.tsx rename to client-only-components/app/routes/_index.tsx diff --git a/client-only-components/package.json b/client-only-components/package.json index d4214b15..539c04fa 100644 --- 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 index adf2a0b5..abd0c5a3 100644 --- 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 index c55b22dd..883ca9eb 100644 --- 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 index adf2a0b5..abd0c5a3 100644 --- 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 b/collected-notes/app/routes/_index.tsx similarity index 100% rename from collected-notes/app/routes/index.tsx rename to collected-notes/app/routes/_index.tsx diff --git a/collected-notes/package.json b/collected-notes/package.json index 92c3f029..06ba6dc4 100644 --- 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 index adf2a0b5..abd0c5a3 100644 --- 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 b/combobox-resource-route/app/routes/_index.tsx similarity index 100% rename from combobox-resource-route/app/routes/index.tsx rename to combobox-resource-route/app/routes/_index.tsx diff --git a/combobox-resource-route/package.json b/combobox-resource-route/package.json index 89075dc0..3dbdf68c 100644 --- a/combobox-resource-route/package.json +++ b/combobox-resource-route/package.json @@ -9,17 +9,17 @@ }, "dependencies": { "@reach/combobox": "^0.16.5", - "@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", "match-sorter": "^6.3.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/combobox-resource-route/remix.config.js b/combobox-resource-route/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/combobox-resource-route/remix.config.js +++ b/combobox-resource-route/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/dark-mode/app/routes/index.tsx b/dark-mode/app/routes/_index.tsx similarity index 100% rename from dark-mode/app/routes/index.tsx rename to dark-mode/app/routes/_index.tsx diff --git a/dark-mode/app/routes/action/set-theme.tsx b/dark-mode/app/routes/action.set-theme.tsx similarity index 100% rename from dark-mode/app/routes/action/set-theme.tsx rename to dark-mode/app/routes/action.set-theme.tsx diff --git a/dark-mode/package.json b/dark-mode/package.json index 3924f8d8..6c3f5257 100644 --- a/dark-mode/package.json +++ b/dark-mode/package.json @@ -8,15 +8,15 @@ "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/dev": "^1.15.0", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", "typescript": "^4.8.4" diff --git a/dark-mode/remix.config.js b/dark-mode/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/dark-mode/remix.config.js +++ b/dark-mode/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/dataloader/app/routes/index.tsx b/dataloader/app/routes/_index.tsx similarity index 100% rename from dataloader/app/routes/index.tsx rename to dataloader/app/routes/_index.tsx diff --git a/dataloader/app/routes/users/index.tsx b/dataloader/app/routes/users._index.tsx similarity index 100% rename from dataloader/app/routes/users/index.tsx rename to dataloader/app/routes/users._index.tsx diff --git a/dataloader/package.json b/dataloader/package.json index 6eb14f26..1cf6448a 100644 --- a/dataloader/package.json +++ b/dataloader/package.json @@ -9,21 +9,24 @@ "typecheck": "tsc" }, "dependencies": { - "@remix-run/express": "~1.14.2", - "@remix-run/node": "~1.14.2", - "@remix-run/react": "~1.14.2", + "@remix-run/express": "^1.15.0", + "@remix-run/node": "^1.15.0", + "@remix-run/react": "^1.15.0", "compression": "^1.7.4", "cross-env": "^7.0.3", "dataloader": "^2.0.0", "express": "^4.17.3", - "morgan": "^1.10.0", "isbot": "^3.6.5", + "morgan": "^1.10.0", "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/compression": "1.7.2", + "@types/express": "4.17.17", + "@types/morgan": "1.9.4", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", "esbuild-register": "^3.3.2", diff --git a/dataloader/remix.config.js b/dataloader/remix.config.js index 6675ae23..b1dbe4d2 100644 --- a/dataloader/remix.config.js +++ b/dataloader/remix.config.js @@ -1,7 +1,8 @@ /** @type {import('@remix-run/dev').AppConfig} */ module.exports = { ignoredRouteFiles: ["**/.*"], - serverBuildDirectory: "server/build", + serverBuildPath: "server/build/index.js", + future: { v2_routeConvention: true }, // appDirectory: "app", // assetsBuildDirectory: "public/build", // publicPath: "/build/", diff --git a/dataloader/server/index.ts b/dataloader/server/index.ts index 8d7ad5d9..058a2164 100644 --- a/dataloader/server/index.ts +++ b/dataloader/server/index.ts @@ -1,11 +1,11 @@ -const path = require("path"); +import path from "node:path"; -const { createRequestHandler } = require("@remix-run/express"); -const compression = require("compression"); -const express = require("express"); -const morgan = require("morgan"); +import { createRequestHandler } from "@remix-run/express"; +import compression from "compression"; +import express from "express"; +import morgan from "morgan"; -const { createUsersByIdLoader } = require("../app/loaders/userLoader"); +import { createUsersByIdLoader } from "../app/loaders/userLoader"; const MODE = process.env.NODE_ENV; const BUILD_DIR = path.join(process.cwd(), "server/build"); diff --git a/dataloader/tsconfig.json b/dataloader/tsconfig.json index 0700df63..d3f495c2 100644 --- a/dataloader/tsconfig.json +++ b/dataloader/tsconfig.json @@ -1,6 +1,8 @@ { "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx", "server/index.ts"], "compilerOptions": { + "allowJs": true, + "forceConsistentCasingInFileNames": true, "lib": ["DOM", "DOM.Iterable", "ES2019"], "isolatedModules": true, "esModuleInterop": true, diff --git a/emotion/app/routes/index.tsx b/emotion/app/routes/_index.tsx similarity index 100% rename from emotion/app/routes/index.tsx rename to emotion/app/routes/_index.tsx diff --git a/emotion/package.json b/emotion/package.json index df64e7a6..300d02d3 100644 --- a/emotion/package.json +++ b/emotion/package.json @@ -12,15 +12,15 @@ "@emotion/react": "^11.8.1", "@emotion/server": "^11.4.0", "@emotion/styled": "^11.8.1", - "@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", "react": "^17.0.2", "react-dom": "^17.0.2" }, "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": "^17.0.39", "@types/react-dom": "^17.0.13", "eslint": "^8.27.0", diff --git a/emotion/remix.config.js b/emotion/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/emotion/remix.config.js +++ b/emotion/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/file-and-cloudinary-upload/app/routes/_index.tsx b/file-and-cloudinary-upload/app/routes/_index.tsx new file mode 100644 index 00000000..1e5a4def --- /dev/null +++ b/file-and-cloudinary-upload/app/routes/_index.tsx @@ -0,0 +1,14 @@ +import { Link } from "@remix-run/react"; + +export default function () { + return ( + + ); +} diff --git a/file-and-cloudinary-upload/package.json b/file-and-cloudinary-upload/package.json index 81a9f682..c80af288 100644 --- a/file-and-cloudinary-upload/package.json +++ b/file-and-cloudinary-upload/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", "cloudinary": "^1.28.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/file-and-cloudinary-upload/remix.config.js b/file-and-cloudinary-upload/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/file-and-cloudinary-upload/remix.config.js +++ b/file-and-cloudinary-upload/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/file-and-s3-upload/app/routes/s3-upload.tsx b/file-and-s3-upload/app/routes/_index.tsx similarity index 97% rename from file-and-s3-upload/app/routes/s3-upload.tsx rename to file-and-s3-upload/app/routes/_index.tsx index b6fbce86..6139b6c4 100644 --- a/file-and-s3-upload/app/routes/s3-upload.tsx +++ b/file-and-s3-upload/app/routes/_index.tsx @@ -29,10 +29,7 @@ export const action = async ({ request }: ActionArgs) => { errorMsg: "Something went wrong while uploading", }); } - return json({ - imgSrc, - imgDesc, - }); + return json({ imgSrc, imgDesc }); }; export default function Index() { diff --git a/file-and-s3-upload/package.json b/file-and-s3-upload/package.json index 0c81ace6..36a197a9 100644 --- a/file-and-s3-upload/package.json +++ b/file-and-s3-upload/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", "aws-sdk": "^2.1152.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/file-and-s3-upload/remix.config.js b/file-and-s3-upload/remix.config.js index 260b82c7..793264aa 100644 --- a/file-and-s3-upload/remix.config.js +++ b/file-and-s3-upload/remix.config.js @@ -3,6 +3,7 @@ */ module.exports = { ignoredRouteFiles: ["**/.*"], + future: { v2_routeConvention: true }, // appDirectory: "app", // assetsBuildDirectory: "public/build", // serverBuildPath: "build/index.js", diff --git a/firebase/app/routes/index.tsx b/firebase/app/routes/_index.tsx similarity index 100% rename from firebase/app/routes/index.tsx rename to firebase/app/routes/_index.tsx diff --git a/firebase/package.json b/firebase/package.json index e13e6b6c..3bc704cd 100644 --- a/firebase/package.json +++ b/firebase/package.json @@ -10,9 +10,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", "firebase-admin": "^10.0.2", "firebase-functions": "^3.21.2", "isbot": "^3.6.5", @@ -21,8 +21,8 @@ "remix-google-cloud-functions": "0.0.3" }, "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/firebase/remix.config.js b/firebase/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/firebase/remix.config.js +++ b/firebase/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/form-to-notion-db/package.json b/form-to-notion-db/package.json index 38053347..333082bd 100644 --- a/form-to-notion-db/package.json +++ b/form-to-notion-db/package.json @@ -9,16 +9,16 @@ }, "dependencies": { "@notionhq/client": "^0.4.13", - "@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/form-to-notion-db/remix.config.js b/form-to-notion-db/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/form-to-notion-db/remix.config.js +++ b/form-to-notion-db/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/framer-motion/app/routes/index.tsx b/framer-motion/app/routes/_index.tsx similarity index 100% rename from framer-motion/app/routes/index.tsx rename to framer-motion/app/routes/_index.tsx diff --git a/framer-motion/package.json b/framer-motion/package.json index 96d3452f..98799d4a 100644 --- a/framer-motion/package.json +++ b/framer-motion/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", "framer-motion": "^5.6.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/framer-motion/remix.config.js b/framer-motion/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/framer-motion/remix.config.js +++ b/framer-motion/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/framer-route-animation/app/routes/index.tsx b/framer-route-animation/app/routes/_index.tsx similarity index 100% rename from framer-route-animation/app/routes/index.tsx rename to framer-route-animation/app/routes/_index.tsx diff --git a/framer-route-animation/package.json b/framer-route-animation/package.json index 063bb7d2..aea281ff 100644 --- a/framer-route-animation/package.json +++ b/framer-route-animation/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", "framer-motion": "^6.2.8", "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/framer-route-animation/remix.config.js b/framer-route-animation/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/framer-route-animation/remix.config.js +++ b/framer-route-animation/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/gdpr-cookie-consent/app/routes/index.tsx b/gdpr-cookie-consent/app/routes/_index.tsx similarity index 100% rename from gdpr-cookie-consent/app/routes/index.tsx rename to gdpr-cookie-consent/app/routes/_index.tsx diff --git a/gdpr-cookie-consent/package.json b/gdpr-cookie-consent/package.json index c55b22dd..883ca9eb 100644 --- a/gdpr-cookie-consent/package.json +++ b/gdpr-cookie-consent/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/gdpr-cookie-consent/remix.config.js b/gdpr-cookie-consent/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/gdpr-cookie-consent/remix.config.js +++ b/gdpr-cookie-consent/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/google-analytics/app/routes/index.tsx b/google-analytics/app/routes/_index.tsx similarity index 100% rename from google-analytics/app/routes/index.tsx rename to google-analytics/app/routes/_index.tsx diff --git a/google-analytics/package.json b/google-analytics/package.json index c55b22dd..883ca9eb 100644 --- a/google-analytics/package.json +++ b/google-analytics/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/google-analytics/remix.config.js b/google-analytics/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/google-analytics/remix.config.js +++ b/google-analytics/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/graphql-api/app/routes/index.tsx b/graphql-api/app/routes/_index.tsx similarity index 100% rename from graphql-api/app/routes/index.tsx rename to graphql-api/app/routes/_index.tsx diff --git a/graphql-api/app/routes/api/character.tsx b/graphql-api/app/routes/api.character.tsx similarity index 100% rename from graphql-api/app/routes/api/character.tsx rename to graphql-api/app/routes/api.character.tsx diff --git a/graphql-api/app/routes/api/characters.tsx b/graphql-api/app/routes/api.characters.tsx similarity index 100% rename from graphql-api/app/routes/api/characters.tsx rename to graphql-api/app/routes/api.characters.tsx diff --git a/graphql-api/app/routes/character/$id.tsx b/graphql-api/app/routes/character.$id.tsx similarity index 93% rename from graphql-api/app/routes/character/$id.tsx rename to graphql-api/app/routes/character.$id.tsx index 74fad202..7a981d8b 100644 --- a/graphql-api/app/routes/character/$id.tsx +++ b/graphql-api/app/routes/character.$id.tsx @@ -9,9 +9,7 @@ import { Code } from "~/components/Code"; */ export const loader = async ({ params }: LoaderArgs) => { const url = `http://localhost:3000/api/character?id=${params.id}`; - const res = await fetch(url, { - method: "GET", - }); + const res = await fetch(url, { method: "GET" }); return json(await res.json()); }; @@ -21,8 +19,7 @@ export const loader = async ({ params }: LoaderArgs) => { * the Remix loader & route params. */ export default function Character() { - const loader = useLoaderData(); - const { data } = loader; + const { data } = useLoaderData(); const character = data.character; diff --git a/graphql-api/app/routes/character/error.tsx b/graphql-api/app/routes/character.error.tsx similarity index 93% rename from graphql-api/app/routes/character/error.tsx rename to graphql-api/app/routes/character.error.tsx index 0e2a88d1..c385e651 100644 --- a/graphql-api/app/routes/character/error.tsx +++ b/graphql-api/app/routes/character.error.tsx @@ -43,12 +43,12 @@ export const loader = async () => { * an array of errors coming back from the GraphQL API. */ export default function CharacterError() { - const loader = useLoaderData(); + const data = useLoaderData(); return (

Ex: GraphQL Error

- +

Uh oh, we've intentionally triggered an error, expand the details above to see what's going on. diff --git a/graphql-api/package.json b/graphql-api/package.json index 49cddb4e..ed1b5256 100644 --- a/graphql-api/package.json +++ b/graphql-api/package.json @@ -11,9 +11,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", "apollo-server-errors": "^3.3.1", "graphql": "^16.4.0", "isbot": "^3.6.5", @@ -24,8 +24,8 @@ "@graphql-codegen/cli": "2.6.2", "@graphql-codegen/typescript": "^2.4.5", "@graphql-codegen/typescript-operations": "^2.3.2", - "@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/graphql-api/remix.config.js b/graphql-api/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/graphql-api/remix.config.js +++ b/graphql-api/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/image-resize/app/routes/index.tsx b/image-resize/app/routes/_index.tsx similarity index 100% rename from image-resize/app/routes/index.tsx rename to image-resize/app/routes/_index.tsx diff --git a/image-resize/app/routes/assets/resize/$.ts b/image-resize/app/routes/assets.resize.$.ts similarity index 100% rename from image-resize/app/routes/assets/resize/$.ts rename to image-resize/app/routes/assets.resize.$.ts diff --git a/image-resize/package.json b/image-resize/package.json index 070462e6..487259d9 100644 --- a/image-resize/package.json +++ b/image-resize/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", "sharp": "^0.30.2" }, "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", "@types/sharp": "^0.29.5", diff --git a/image-resize/remix.config.js b/image-resize/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/image-resize/remix.config.js +++ b/image-resize/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/infinite-scrolling/app/routes/index.tsx b/infinite-scrolling/app/routes/_index.tsx similarity index 100% rename from infinite-scrolling/app/routes/index.tsx rename to infinite-scrolling/app/routes/_index.tsx diff --git a/infinite-scrolling/app/routes/offset/advanced.tsx b/infinite-scrolling/app/routes/offset.advanced.tsx similarity index 100% rename from infinite-scrolling/app/routes/offset/advanced.tsx rename to infinite-scrolling/app/routes/offset.advanced.tsx diff --git a/infinite-scrolling/app/routes/offset/simple.tsx b/infinite-scrolling/app/routes/offset.simple.tsx similarity index 100% rename from infinite-scrolling/app/routes/offset/simple.tsx rename to infinite-scrolling/app/routes/offset.simple.tsx diff --git a/infinite-scrolling/app/routes/page/advanced.tsx b/infinite-scrolling/app/routes/page.advanced.tsx similarity index 100% rename from infinite-scrolling/app/routes/page/advanced.tsx rename to infinite-scrolling/app/routes/page.advanced.tsx diff --git a/infinite-scrolling/app/routes/page/alternative.tsx b/infinite-scrolling/app/routes/page.alternative.tsx similarity index 100% rename from infinite-scrolling/app/routes/page/alternative.tsx rename to infinite-scrolling/app/routes/page.alternative.tsx diff --git a/infinite-scrolling/app/routes/page/simple.tsx b/infinite-scrolling/app/routes/page.simple.tsx similarity index 100% rename from infinite-scrolling/app/routes/page/simple.tsx rename to infinite-scrolling/app/routes/page.simple.tsx diff --git a/infinite-scrolling/app/utils/backend.server.ts b/infinite-scrolling/app/utils/backend.server.ts index afd821a7..addec177 100644 --- a/infinite-scrolling/app/utils/backend.server.ts +++ b/infinite-scrolling/app/utils/backend.server.ts @@ -1,3 +1,7 @@ +declare global { + var __items: { id: string; value: string }[]; +} + const items = (global.__items = global.__items ?? Array.from({ length: 50_000 }, (_, i) => ({ diff --git a/infinite-scrolling/package.json b/infinite-scrolling/package.json index 84e599a5..624f367d 100644 --- a/infinite-scrolling/package.json +++ b/infinite-scrolling/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", "react-virtual": "^2.10.4" }, "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/infinite-scrolling/remix.config.js b/infinite-scrolling/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/infinite-scrolling/remix.config.js +++ b/infinite-scrolling/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/io-ts-formdata-decoding/app/routes/index.tsx b/io-ts-formdata-decoding/app/routes/_index.tsx similarity index 100% rename from io-ts-formdata-decoding/app/routes/index.tsx rename to io-ts-formdata-decoding/app/routes/_index.tsx diff --git a/io-ts-formdata-decoding/package.json b/io-ts-formdata-decoding/package.json index 3891d3f3..8dad8890 100644 --- a/io-ts-formdata-decoding/package.json +++ b/io-ts-formdata-decoding/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", "fp-ts": "^2.11.8", "io-ts": "^2.2.16", "isbot": "^3.6.5", @@ -18,8 +18,8 @@ "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/io-ts-formdata-decoding/remix.config.js b/io-ts-formdata-decoding/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/io-ts-formdata-decoding/remix.config.js +++ b/io-ts-formdata-decoding/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/ioredis/app/routes/index.tsx b/ioredis/app/routes/_index.tsx similarity index 100% rename from ioredis/app/routes/index.tsx rename to ioredis/app/routes/_index.tsx diff --git a/ioredis/package.json b/ioredis/package.json index 66c8fee2..79195b40 100644 --- a/ioredis/package.json +++ b/ioredis/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", "ioredis": "^4.28.5", "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.8", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", diff --git a/ioredis/remix.config.js b/ioredis/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/ioredis/remix.config.js +++ b/ioredis/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/leaflet/app/routes/index.tsx b/leaflet/app/routes/_index.tsx similarity index 100% rename from leaflet/app/routes/index.tsx rename to leaflet/app/routes/_index.tsx diff --git a/leaflet/package.json b/leaflet/package.json index 922e6710..473c829e 100644 --- a/leaflet/package.json +++ b/leaflet/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", "leaflet": "^1.8.0", "react-leaflet": "^4.0.2", "isbot": "^3.6.5", @@ -18,8 +18,8 @@ "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/leaflet": "^1.7.11", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", diff --git a/leaflet/remix.config.js b/leaflet/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/leaflet/remix.config.js +++ b/leaflet/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/mantine/app/routes/index.tsx b/mantine/app/routes/_index.tsx similarity index 100% rename from mantine/app/routes/index.tsx rename to mantine/app/routes/_index.tsx diff --git a/mantine/package.json b/mantine/package.json index 5f9dd517..21505c05 100644 --- a/mantine/package.json +++ b/mantine/package.json @@ -11,16 +11,16 @@ "@mantine/core": "^3.6.14", "@mantine/hooks": "^3.6.14", "@mantine/ssr": "^3.6.14", - "@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/mantine/remix.config.js b/mantine/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/mantine/remix.config.js +++ b/mantine/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/msw/package.json b/msw/package.json index 07239468..20122561 100644 --- a/msw/package.json +++ b/msw/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", "binode": "^1.0.5", diff --git a/msw/remix.config.js b/msw/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/msw/remix.config.js +++ b/msw/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/multiple-forms/app/routes/index.tsx b/multiple-forms/app/routes/_index.tsx similarity index 100% rename from multiple-forms/app/routes/index.tsx rename to multiple-forms/app/routes/_index.tsx diff --git a/multiple-forms/package.json b/multiple-forms/package.json index c55b22dd..883ca9eb 100644 --- a/multiple-forms/package.json +++ b/multiple-forms/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/multiple-forms/remix.config.js b/multiple-forms/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/multiple-forms/remix.config.js +++ b/multiple-forms/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/multiple-params/app/routes/index.tsx b/multiple-params/app/routes/_index.tsx similarity index 100% rename from multiple-params/app/routes/index.tsx rename to multiple-params/app/routes/_index.tsx diff --git a/multiple-params/app/routes/clients/$clientId/index.tsx b/multiple-params/app/routes/clients.$clientId._index.tsx similarity index 100% rename from multiple-params/app/routes/clients/$clientId/index.tsx rename to multiple-params/app/routes/clients.$clientId._index.tsx diff --git a/multiple-params/app/routes/clients/$clientId/invoices/$invoiceId.tsx b/multiple-params/app/routes/clients.$clientId.invoices.$invoiceId.tsx similarity index 100% rename from multiple-params/app/routes/clients/$clientId/invoices/$invoiceId.tsx rename to multiple-params/app/routes/clients.$clientId.invoices.$invoiceId.tsx diff --git a/multiple-params/app/routes/clients/$clientId/invoices.tsx b/multiple-params/app/routes/clients.$clientId.invoices.tsx similarity index 100% rename from multiple-params/app/routes/clients/$clientId/invoices.tsx rename to multiple-params/app/routes/clients.$clientId.invoices.tsx diff --git a/multiple-params/app/routes/clients/$clientId.tsx b/multiple-params/app/routes/clients.$clientId.tsx similarity index 100% rename from multiple-params/app/routes/clients/$clientId.tsx rename to multiple-params/app/routes/clients.$clientId.tsx diff --git a/multiple-params/app/routes/clients/index.tsx b/multiple-params/app/routes/clients._index.tsx similarity index 100% rename from multiple-params/app/routes/clients/index.tsx rename to multiple-params/app/routes/clients._index.tsx diff --git a/multiple-params/package.json b/multiple-params/package.json index c55b22dd..883ca9eb 100644 --- a/multiple-params/package.json +++ b/multiple-params/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/multiple-params/remix.config.js b/multiple-params/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/multiple-params/remix.config.js +++ b/multiple-params/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/newsletter-signup/app/routes/index.tsx b/newsletter-signup/app/routes/_index.tsx similarity index 100% rename from newsletter-signup/app/routes/index.tsx rename to newsletter-signup/app/routes/_index.tsx diff --git a/newsletter-signup/package.json b/newsletter-signup/package.json index c55b22dd..883ca9eb 100644 --- a/newsletter-signup/package.json +++ b/newsletter-signup/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/newsletter-signup/remix.config.js b/newsletter-signup/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/newsletter-signup/remix.config.js +++ b/newsletter-signup/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/nprogress/app/routes/index.tsx b/nprogress/app/routes/_index.tsx similarity index 100% rename from nprogress/app/routes/index.tsx rename to nprogress/app/routes/_index.tsx diff --git a/nprogress/package.json b/nprogress/package.json index ad17b003..fb8c65f8 100644 --- a/nprogress/package.json +++ b/nprogress/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", "nprogress": "^0.2.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/nprogress": "^0.2.0", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", diff --git a/nprogress/remix.config.js b/nprogress/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/nprogress/remix.config.js +++ b/nprogress/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/on-demand-hydration/app/routes/index.tsx b/on-demand-hydration/app/routes/_index.tsx similarity index 100% rename from on-demand-hydration/app/routes/index.tsx rename to on-demand-hydration/app/routes/_index.tsx diff --git a/on-demand-hydration/package.json b/on-demand-hydration/package.json index d4214b15..539c04fa 100644 --- a/on-demand-hydration/package.json +++ b/on-demand-hydration/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/on-demand-hydration/remix.config.js b/on-demand-hydration/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/on-demand-hydration/remix.config.js +++ b/on-demand-hydration/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/outlet-form-rerender/app/routes/index.tsx b/outlet-form-rerender/app/routes/_index.tsx similarity index 100% rename from outlet-form-rerender/app/routes/index.tsx rename to outlet-form-rerender/app/routes/_index.tsx diff --git a/outlet-form-rerender/app/routes/users/$userId.tsx b/outlet-form-rerender/app/routes/users.$userId.tsx similarity index 100% rename from outlet-form-rerender/app/routes/users/$userId.tsx rename to outlet-form-rerender/app/routes/users.$userId.tsx diff --git a/outlet-form-rerender/package.json b/outlet-form-rerender/package.json index c55b22dd..883ca9eb 100644 --- a/outlet-form-rerender/package.json +++ b/outlet-form-rerender/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/outlet-form-rerender/remix.config.js b/outlet-form-rerender/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/outlet-form-rerender/remix.config.js +++ b/outlet-form-rerender/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/package.json b/package.json index b05adcab..6ebb2dc5 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "MIT", "scripts": { "format": "prettier --write . && yarn lint:fix", - "lint": "eslint --ext .tsx,.ts,.js,.jsx,.md .", + "lint": "eslint .", "lint:fix": "yarn lint --fix" }, "devDependencies": { diff --git a/pathless-routes/package.json b/pathless-routes/package.json index c55b22dd..883ca9eb 100644 --- a/pathless-routes/package.json +++ b/pathless-routes/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/picocss/app/routes/index.tsx b/picocss/app/routes/_index.tsx similarity index 100% rename from picocss/app/routes/index.tsx rename to picocss/app/routes/_index.tsx diff --git a/picocss/package.json b/picocss/package.json index 22d78b88..d946a54b 100644 --- a/picocss/package.json +++ b/picocss/package.json @@ -9,16 +9,16 @@ }, "dependencies": { "@picocss/pico": "^1.5.7", - "@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/picocss/remix.config.js b/picocss/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/picocss/remix.config.js +++ b/picocss/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/playwright/app/routes/index.tsx b/playwright/app/routes/_index.tsx similarity index 100% rename from playwright/app/routes/index.tsx rename to playwright/app/routes/_index.tsx diff --git a/playwright/package.json b/playwright/package.json index 2d1bee6f..b50b6d8a 100644 --- a/playwright/package.json +++ b/playwright/package.json @@ -9,17 +9,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" }, "devDependencies": { "@playwright/test": "^1.27.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", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", "eslint": "^8.27.0", diff --git a/playwright/remix.config.js b/playwright/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/playwright/remix.config.js +++ b/playwright/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/pm-app/app/routes/index.tsx b/pm-app/app/routes/_index.tsx similarity index 100% rename from pm-app/app/routes/index.tsx rename to pm-app/app/routes/_index.tsx diff --git a/pm-app/app/routes/dashboard/index.tsx b/pm-app/app/routes/dashboard._index.tsx similarity index 100% rename from pm-app/app/routes/dashboard/index.tsx rename to pm-app/app/routes/dashboard._index.tsx diff --git a/pm-app/app/routes/dashboard/projects/$projectId/delete.tsx b/pm-app/app/routes/dashboard.projects.$projectId.delete.tsx similarity index 100% rename from pm-app/app/routes/dashboard/projects/$projectId/delete.tsx rename to pm-app/app/routes/dashboard.projects.$projectId.delete.tsx diff --git a/pm-app/app/routes/dashboard/projects/$projectId/list/$listId.tsx b/pm-app/app/routes/dashboard.projects.$projectId.list.$listId.tsx similarity index 100% rename from pm-app/app/routes/dashboard/projects/$projectId/list/$listId.tsx rename to pm-app/app/routes/dashboard.projects.$projectId.list.$listId.tsx diff --git a/pm-app/app/routes/dashboard/projects/$projectId.tsx b/pm-app/app/routes/dashboard.projects.$projectId.tsx similarity index 100% rename from pm-app/app/routes/dashboard/projects/$projectId.tsx rename to pm-app/app/routes/dashboard.projects.$projectId.tsx diff --git a/pm-app/app/routes/dashboard/projects/new.tsx b/pm-app/app/routes/dashboard.projects.new.tsx similarity index 100% rename from pm-app/app/routes/dashboard/projects/new.tsx rename to pm-app/app/routes/dashboard.projects.new.tsx diff --git a/pm-app/app/routes/dashboard/todo-lists/$listId/index.tsx b/pm-app/app/routes/dashboard.todo-lists.$listId._index.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todo-lists/$listId/index.tsx rename to pm-app/app/routes/dashboard.todo-lists.$listId._index.tsx diff --git a/pm-app/app/routes/dashboard/todo-lists/$listId/delete.tsx b/pm-app/app/routes/dashboard.todo-lists.$listId.delete.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todo-lists/$listId/delete.tsx rename to pm-app/app/routes/dashboard.todo-lists.$listId.delete.tsx diff --git a/pm-app/app/routes/dashboard/todo-lists/index.tsx b/pm-app/app/routes/dashboard.todo-lists._index.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todo-lists/index.tsx rename to pm-app/app/routes/dashboard.todo-lists._index.tsx diff --git a/pm-app/app/routes/dashboard/todo-lists/new.tsx b/pm-app/app/routes/dashboard.todo-lists.new.tsx similarity index 99% rename from pm-app/app/routes/dashboard/todo-lists/new.tsx rename to pm-app/app/routes/dashboard.todo-lists.new.tsx index 12e97777..420bc084 100644 --- a/pm-app/app/routes/dashboard/todo-lists/new.tsx +++ b/pm-app/app/routes/dashboard.todo-lists.new.tsx @@ -29,8 +29,7 @@ import { } from "~/ui/form"; import { MaxContainer } from "~/ui/max-container"; import { Heading } from "~/ui/section-heading"; - -import { TokenDismissButton } from "../../../ui/token"; +import { TokenDismissButton } from "~/ui/token"; type TempTodo = TodoDataUnordered & { _tempId: number }; diff --git a/pm-app/app/routes/dashboard/todos/$todoId/index.tsx b/pm-app/app/routes/dashboard.todos.$todoId._index.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todos/$todoId/index.tsx rename to pm-app/app/routes/dashboard.todos.$todoId._index.tsx diff --git a/pm-app/app/routes/dashboard/todos/$todoId/delete.tsx b/pm-app/app/routes/dashboard.todos.$todoId.delete.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todos/$todoId/delete.tsx rename to pm-app/app/routes/dashboard.todos.$todoId.delete.tsx diff --git a/pm-app/app/routes/dashboard/todos/$todoId/edit.tsx b/pm-app/app/routes/dashboard.todos.$todoId.edit.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todos/$todoId/edit.tsx rename to pm-app/app/routes/dashboard.todos.$todoId.edit.tsx diff --git a/pm-app/app/routes/dashboard/todos/$todoId/set.tsx b/pm-app/app/routes/dashboard.todos.$todoId.set.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todos/$todoId/set.tsx rename to pm-app/app/routes/dashboard.todos.$todoId.set.tsx diff --git a/pm-app/app/routes/dashboard/todos/index.tsx b/pm-app/app/routes/dashboard.todos._index.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todos/index.tsx rename to pm-app/app/routes/dashboard.todos._index.tsx diff --git a/pm-app/app/routes/dashboard/todos/new.tsx b/pm-app/app/routes/dashboard.todos.new.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todos/new.tsx rename to pm-app/app/routes/dashboard.todos.new.tsx diff --git a/pm-app/app/routes/dashboard/todos/toggle.tsx b/pm-app/app/routes/dashboard.todos.toggle.tsx similarity index 100% rename from pm-app/app/routes/dashboard/todos/toggle.tsx rename to pm-app/app/routes/dashboard.todos.toggle.tsx diff --git a/pm-app/app/ui/form.tsx b/pm-app/app/ui/form.tsx index 0b07f859..5a70a36b 100644 --- a/pm-app/app/ui/form.tsx +++ b/pm-app/app/ui/form.tsx @@ -9,7 +9,7 @@ export function useFieldContext() { return React.useContext(FieldContext); } -const FieldProvider = React.forwardRef< +export const FieldProvider = React.forwardRef< HTMLDivElement, React.PropsWithChildren >(({ children, className, ...ctx }, ref) => { diff --git a/pm-app/package.json b/pm-app/package.json index dc3b2016..02b1a7b5 100644 --- a/pm-app/package.json +++ b/pm-app/package.json @@ -24,9 +24,9 @@ "@reach/combobox": "^0.16.5", "@reach/dialog": "^0.16.2", "@reach/menu-button": "^0.16.2", - "@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", "bcrypt": "^5.0.1", "clsx": "^1.1.1", "isbot": "^3.6.5", @@ -37,9 +37,9 @@ "validator": "^13.7.0" }, "devDependencies": { - "@remix-run/dev": "~1.14.2", - "@remix-run/eslint-config": "~1.14.2", - "@remix-run/express": "~1.14.2", + "@remix-run/dev": "^1.15.0", + "@remix-run/eslint-config": "^1.15.0", + "@remix-run/express": "^1.15.0", "@types/bcrypt": "^5.0.0", "@types/express": "^4.17.13", "@types/react": "^18.0.25", diff --git a/pm-app/remix.config.js b/pm-app/remix.config.js index b089e89d..b1dbe4d2 100644 --- a/pm-app/remix.config.js +++ b/pm-app/remix.config.js @@ -1,15 +1,9 @@ /** @type {import('@remix-run/dev').AppConfig} */ module.exports = { ignoredRouteFiles: ["**/.*"], + serverBuildPath: "server/build/index.js", + future: { v2_routeConvention: true }, // appDirectory: "app", // assetsBuildDirectory: "public/build", - // serverBuildPath: "build/index.js", // publicPath: "/build/", }; - -module.exports = { - // appDirectory: "app", - browserBuildDirectory: "public/build", - publicPath: "/build/", - serverBuildDirectory: "server/build", -}; diff --git a/quirrel/app/routes/index.tsx b/quirrel/app/routes/_index.tsx similarity index 100% rename from quirrel/app/routes/index.tsx rename to quirrel/app/routes/_index.tsx diff --git a/quirrel/app/routes/queues/greetings.ts b/quirrel/app/routes/queues.greetings.ts similarity index 100% rename from quirrel/app/routes/queues/greetings.ts rename to quirrel/app/routes/queues.greetings.ts diff --git a/quirrel/package.json b/quirrel/package.json index 18941b5e..25bfb6c3 100644 --- a/quirrel/package.json +++ b/quirrel/package.json @@ -10,17 +10,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", "quirrel": "^1.8.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/quirrel/remix.config.js b/quirrel/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/quirrel/remix.config.js +++ b/quirrel/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/react-quill/app/routes/index.tsx b/react-quill/app/routes/_index.tsx similarity index 100% rename from react-quill/app/routes/index.tsx rename to react-quill/app/routes/_index.tsx diff --git a/react-quill/package.json b/react-quill/package.json index c67fc003..8cf96e5a 100644 --- a/react-quill/package.json +++ b/react-quill/package.json @@ -7,9 +7,9 @@ "start": "remix-serve build" }, "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", @@ -17,8 +17,8 @@ "remix-utils": "^5.1.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/react-quill/remix.config.js b/react-quill/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/react-quill/remix.config.js +++ b/react-quill/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/react-spring/app/routes/index.tsx b/react-spring/app/routes/_index.tsx similarity index 100% rename from react-spring/app/routes/index.tsx rename to react-spring/app/routes/_index.tsx diff --git a/react-spring/package.json b/react-spring/package.json index d5a3aba3..e5b39832 100644 --- a/react-spring/package.json +++ b/react-spring/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", "react-spring": "^9.4.3" }, "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/react-spring/remix.config.js b/react-spring/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/react-spring/remix.config.js +++ b/react-spring/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/redis-upstash-session/app/routes/index.tsx b/redis-upstash-session/app/routes/_index.tsx similarity index 100% rename from redis-upstash-session/app/routes/index.tsx rename to redis-upstash-session/app/routes/_index.tsx diff --git a/redis-upstash-session/package.json b/redis-upstash-session/package.json index c55b22dd..883ca9eb 100644 --- a/redis-upstash-session/package.json +++ b/redis-upstash-session/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/redis-upstash-session/remix.config.js b/redis-upstash-session/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/redis-upstash-session/remix.config.js +++ b/redis-upstash-session/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/remix-auth-auth0/app/routes/index.tsx b/remix-auth-auth0/app/routes/_index.tsx similarity index 100% rename from remix-auth-auth0/app/routes/index.tsx rename to remix-auth-auth0/app/routes/_index.tsx diff --git a/remix-auth-auth0/package.json b/remix-auth-auth0/package.json index a0178b4a..d23276e4 100644 --- a/remix-auth-auth0/package.json +++ b/remix-auth-auth0/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", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -18,8 +18,8 @@ "remix-auth-auth0": "^1.3.2" }, "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/remix-auth-auth0/remix.config.js b/remix-auth-auth0/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/remix-auth-auth0/remix.config.js +++ b/remix-auth-auth0/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/remix-auth-form/package.json b/remix-auth-form/package.json index 6d056a2f..8423692c 100644 --- a/remix-auth-form/package.json +++ b/remix-auth-form/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", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -18,8 +18,8 @@ "remix-auth-form": "^1.1.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/remix-auth-form/remix.config.js b/remix-auth-form/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/remix-auth-form/remix.config.js +++ b/remix-auth-form/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/remix-auth-github/app/routes/index.tsx b/remix-auth-github/app/routes/_index.tsx similarity index 100% rename from remix-auth-github/app/routes/index.tsx rename to remix-auth-github/app/routes/_index.tsx diff --git a/remix-auth-github/package.json b/remix-auth-github/package.json index 48efb21e..e0d69c1d 100644 --- a/remix-auth-github/package.json +++ b/remix-auth-github/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", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -18,8 +18,8 @@ "remix-auth-github": "^1.0.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/remix-auth-github/remix.config.js b/remix-auth-github/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/remix-auth-github/remix.config.js +++ b/remix-auth-github/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/remix-auth-supabase-github/app/routes/index.tsx b/remix-auth-supabase-github/app/routes/_index.tsx similarity index 100% rename from remix-auth-supabase-github/app/routes/index.tsx rename to remix-auth-supabase-github/app/routes/_index.tsx diff --git a/remix-auth-supabase-github/package.json b/remix-auth-supabase-github/package.json index 8c29fd5f..c13e611d 100644 --- a/remix-auth-supabase-github/package.json +++ b/remix-auth-supabase-github/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", "@supabase/supabase-js": "^1.30.7", "isbot": "^3.6.5", "react": "^18.2.0", @@ -19,8 +19,8 @@ "remix-auth-supabase": "^3.1.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/remix-auth-supabase-github/remix.config.js b/remix-auth-supabase-github/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/remix-auth-supabase-github/remix.config.js +++ b/remix-auth-supabase-github/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/remix-auth-supabase/app/routes/index.tsx b/remix-auth-supabase/app/routes/_index.tsx similarity index 100% rename from remix-auth-supabase/app/routes/index.tsx rename to remix-auth-supabase/app/routes/_index.tsx diff --git a/remix-auth-supabase/package.json b/remix-auth-supabase/package.json index 75893c18..b5e6f8d9 100644 --- a/remix-auth-supabase/package.json +++ b/remix-auth-supabase/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", "@supabase/supabase-js": "^1.30.7", "isbot": "^3.6.5", "react": "^18.2.0", @@ -19,8 +19,8 @@ "remix-auth-supabase": "^3.1.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/remix-auth-supabase/remix.config.js b/remix-auth-supabase/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/remix-auth-supabase/remix.config.js +++ b/remix-auth-supabase/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/route-modal/app/routes/invoices/$id/edit.tsx b/route-modal/app/routes/invoices.$id.edit.tsx similarity index 98% rename from route-modal/app/routes/invoices/$id/edit.tsx rename to route-modal/app/routes/invoices.$id.edit.tsx index 146224c9..d215a847 100644 --- a/route-modal/app/routes/invoices/$id/edit.tsx +++ b/route-modal/app/routes/invoices.$id.edit.tsx @@ -10,7 +10,7 @@ export const links: LinksFunction = () => [{ rel: "stylesheet", href: styles }]; export const loader = async ({ params }: LoaderArgs) => { const id = params.id; if (!id) { - return json({}); + throw new Response("Not found", { status: 404 }); } const invoices = [ diff --git a/route-modal/app/routes/invoices/add.tsx b/route-modal/app/routes/invoices.add.tsx similarity index 100% rename from route-modal/app/routes/invoices/add.tsx rename to route-modal/app/routes/invoices.add.tsx diff --git a/route-modal/package.json b/route-modal/package.json index 797a4009..8510d996 100644 --- a/route-modal/package.json +++ b/route-modal/package.json @@ -9,16 +9,16 @@ }, "dependencies": { "@reach/dialog": "^0.16.2", - "@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/route-modal/remix.config.js b/route-modal/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/route-modal/remix.config.js +++ b/route-modal/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/routes-gen/app/routes/index.tsx b/routes-gen/app/routes/_index.tsx similarity index 100% rename from routes-gen/app/routes/index.tsx rename to routes-gen/app/routes/_index.tsx diff --git a/routes-gen/app/routes/products/$productId.tsx b/routes-gen/app/routes/products.$productId.tsx similarity index 100% rename from routes-gen/app/routes/products/$productId.tsx rename to routes-gen/app/routes/products.$productId.tsx diff --git a/routes-gen/app/routes/products/index.tsx b/routes-gen/app/routes/products._index.tsx similarity index 100% rename from routes-gen/app/routes/products/index.tsx rename to routes-gen/app/routes/products._index.tsx diff --git a/routes-gen/package.json b/routes-gen/package.json index 1e0332d8..53994a9f 100644 --- a/routes-gen/package.json +++ b/routes-gen/package.json @@ -9,17 +9,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", "routes-gen": "^0.3.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", "@routes-gen/remix": "^0.2.10", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", diff --git a/routes-gen/remix.config.js b/routes-gen/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/routes-gen/remix.config.js +++ b/routes-gen/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/rust/app/routes/index.tsx b/rust/app/routes/_index.tsx similarity index 100% rename from rust/app/routes/index.tsx rename to rust/app/routes/_index.tsx diff --git a/rust/package.json b/rust/package.json index 97afaf38..80947dda 100644 --- a/rust/package.json +++ b/rust/package.json @@ -9,17 +9,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", "rust-functions": "file:rust-functions/pkg" }, "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/rust/remix.config.js b/rust/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/rust/remix.config.js +++ b/rust/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/sanity/app/routes/index.tsx b/sanity/app/routes/_index.tsx similarity index 100% rename from sanity/app/routes/index.tsx rename to sanity/app/routes/_index.tsx diff --git a/sanity/package.json b/sanity/package.json index 481ab01f..5fa03496 100644 --- a/sanity/package.json +++ b/sanity/package.json @@ -9,9 +9,9 @@ }, "dependencies": { "@portabletext/react": "^1.0.6", - "@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", "@sanity/groq-store": "^0.4.0", "@sanity/image-url": "^1.0.1", "picosanity": "^4.0.0", @@ -20,8 +20,8 @@ "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/sanity/remix.config.js b/sanity/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/sanity/remix.config.js +++ b/sanity/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/sass/app/routes/index.tsx b/sass/app/routes/_index.tsx similarity index 100% rename from sass/app/routes/index.tsx rename to sass/app/routes/_index.tsx diff --git a/sass/package.json b/sass/package.json index ba4b31ed..a5b176d7 100644 --- a/sass/package.json +++ b/sass/package.json @@ -13,16 +13,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/sass/remix.config.js b/sass/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/sass/remix.config.js +++ b/sass/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/search-input/app/routes/index.tsx b/search-input/app/routes/_index.tsx similarity index 100% rename from search-input/app/routes/index.tsx rename to search-input/app/routes/_index.tsx diff --git a/search-input/package.json b/search-input/package.json index c55b22dd..883ca9eb 100644 --- a/search-input/package.json +++ b/search-input/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/search-input/remix.config.js b/search-input/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/search-input/remix.config.js +++ b/search-input/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/session-flash/app/routes/index.tsx b/session-flash/app/routes/_index.tsx similarity index 100% rename from session-flash/app/routes/index.tsx rename to session-flash/app/routes/_index.tsx diff --git a/session-flash/package.json b/session-flash/package.json index 747adb3a..c1055099 100644 --- a/session-flash/package.json +++ b/session-flash/package.json @@ -9,17 +9,17 @@ }, "dependencies": { "@fontsource/fira-sans": "^4.5.8", - "@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", "react-router-dom": "^6.3.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/session-flash/remix.config.js b/session-flash/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/session-flash/remix.config.js +++ b/session-flash/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/sharing-loader-data/app/routes/index.tsx b/sharing-loader-data/app/routes/_index.tsx similarity index 100% rename from sharing-loader-data/app/routes/index.tsx rename to sharing-loader-data/app/routes/_index.tsx diff --git a/sharing-loader-data/app/routes/workshops/$workshopId.tsx b/sharing-loader-data/app/routes/workshops.$workshopId.tsx similarity index 100% rename from sharing-loader-data/app/routes/workshops/$workshopId.tsx rename to sharing-loader-data/app/routes/workshops.$workshopId.tsx diff --git a/sharing-loader-data/app/routes/workshops/index.tsx b/sharing-loader-data/app/routes/workshops._index.tsx similarity index 100% rename from sharing-loader-data/app/routes/workshops/index.tsx rename to sharing-loader-data/app/routes/workshops._index.tsx diff --git a/sharing-loader-data/package.json b/sharing-loader-data/package.json index c55b22dd..883ca9eb 100644 --- a/sharing-loader-data/package.json +++ b/sharing-loader-data/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/sharing-loader-data/remix.config.js b/sharing-loader-data/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/sharing-loader-data/remix.config.js +++ b/sharing-loader-data/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/socket.io/app/routes/index.tsx b/socket.io/app/routes/_index.tsx similarity index 100% rename from socket.io/app/routes/index.tsx rename to socket.io/app/routes/_index.tsx diff --git a/socket.io/package.json b/socket.io/package.json index 0b7621f9..21d6edfc 100644 --- a/socket.io/package.json +++ b/socket.io/package.json @@ -9,9 +9,9 @@ "typecheck": "tsc" }, "dependencies": { - "@remix-run/express": "~1.14.2", - "@remix-run/node": "~1.14.2", - "@remix-run/react": "~1.14.2", + "@remix-run/express": "^1.15.0", + "@remix-run/node": "^1.15.0", + "@remix-run/react": "^1.15.0", "compression": "^1.7.4", "cross-env": "^7.0.3", "express": "^4.17.3", @@ -23,8 +23,8 @@ "socket.io-client": "^4.4.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/socket.io/remix.config.js b/socket.io/remix.config.js index fd9331ed..e1aeb951 100644 --- a/socket.io/remix.config.js +++ b/socket.io/remix.config.js @@ -2,6 +2,7 @@ module.exports = { ignoredRouteFiles: ["**/.*"], serverBuildDirectory: "server/build", + future: { v2_routeConvention: true }, // appDirectory: "app", // assetsBuildDirectory: "public/build", // serverBuildPath: "build/index.js", diff --git a/sse-chat/app/routes/index.tsx b/sse-chat/app/routes/_index.tsx similarity index 100% rename from sse-chat/app/routes/index.tsx rename to sse-chat/app/routes/_index.tsx diff --git a/sse-chat/package.json b/sse-chat/package.json index e21253e6..48dc4b80 100644 --- a/sse-chat/package.json +++ b/sse-chat/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": "^6.0.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/sse-chat/remix.config.js b/sse-chat/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/sse-chat/remix.config.js +++ b/sse-chat/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/sse-counter/package.json b/sse-counter/package.json index e21253e6..48dc4b80 100644 --- a/sse-counter/package.json +++ b/sse-counter/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": "^6.0.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/sse-counter/remix.config.js b/sse-counter/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/sse-counter/remix.config.js +++ b/sse-counter/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/stitches/app/routes/index.tsx b/stitches/app/routes/_index.tsx similarity index 100% rename from stitches/app/routes/index.tsx rename to stitches/app/routes/_index.tsx diff --git a/stitches/app/routes/jokes-error.tsx b/stitches/app/routes/jokes-error.tsx new file mode 100644 index 00000000..4a9bb172 --- /dev/null +++ b/stitches/app/routes/jokes-error.tsx @@ -0,0 +1,3 @@ +export default function JokesError() { + throw new Error("This route is not joking with us."); +} diff --git a/stitches/app/routes/jokes/jokes-error.tsx b/stitches/app/routes/jokes/jokes-error.tsx deleted file mode 100644 index 0e45d749..00000000 --- a/stitches/app/routes/jokes/jokes-error.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function JokesError() { - throw new Error("This route is no joking with us."); -} diff --git a/stitches/package.json b/stitches/package.json index 6aca0936..ec04cc65 100644 --- a/stitches/package.json +++ b/stitches/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", "@stitches/react": "^1.2.7", "react": "^17.0.2", "react-dom": "^17.0.2" }, "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": "^17.0.39", "@types/react-dom": "^17.0.13", "eslint": "^8.27.0", diff --git a/stitches/remix.config.js b/stitches/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/stitches/remix.config.js +++ b/stitches/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/strapi/app/routes/index.tsx b/strapi/app/routes/_index.tsx similarity index 100% rename from strapi/app/routes/index.tsx rename to strapi/app/routes/_index.tsx diff --git a/strapi/package.json b/strapi/package.json index f0a4467f..70cbc4a7 100755 --- a/strapi/package.json +++ b/strapi/package.json @@ -10,17 +10,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", "marked": "^4.0.12", "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/marked": "^4.0.2", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", diff --git a/strapi/remix.config.js b/strapi/remix.config.js index adf2a0b5..abd0c5a3 100755 --- a/strapi/remix.config.js +++ b/strapi/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/stripe-integration/app/routes/_index.tsx b/stripe-integration/app/routes/_index.tsx new file mode 100644 index 00000000..89eeb287 --- /dev/null +++ b/stripe-integration/app/routes/_index.tsx @@ -0,0 +1,5 @@ +import { redirect } from "@remix-run/node"; + +export function loader() { + return redirect("/buy"); +} diff --git a/stripe-integration/app/routes/api/stripe-web-hook.tsx b/stripe-integration/app/routes/api.stripe-web-hook.tsx similarity index 100% rename from stripe-integration/app/routes/api/stripe-web-hook.tsx rename to stripe-integration/app/routes/api.stripe-web-hook.tsx diff --git a/stripe-integration/app/routes/payment/cancelled.tsx b/stripe-integration/app/routes/payment.cancelled.tsx similarity index 100% rename from stripe-integration/app/routes/payment/cancelled.tsx rename to stripe-integration/app/routes/payment.cancelled.tsx diff --git a/stripe-integration/app/routes/payment/success.tsx b/stripe-integration/app/routes/payment.success.tsx similarity index 100% rename from stripe-integration/app/routes/payment/success.tsx rename to stripe-integration/app/routes/payment.success.tsx diff --git a/stripe-integration/package.json b/stripe-integration/package.json index 2c678f77..1ef9a043 100644 --- a/stripe-integration/package.json +++ b/stripe-integration/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", "stripe": "^8.209.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/stripe-integration/remix.config.js b/stripe-integration/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/stripe-integration/remix.config.js +++ b/stripe-integration/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/styled-components/app/routes/index.tsx b/styled-components/app/routes/_index.tsx similarity index 100% rename from styled-components/app/routes/index.tsx rename to styled-components/app/routes/_index.tsx diff --git a/styled-components/package.json b/styled-components/package.json index 61ccdb14..91e89c90 100644 --- a/styled-components/package.json +++ b/styled-components/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", "react": "^17.0.2", "react-dom": "^17.0.2", "styled-components": "^5.3.3" }, "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": "^17.0.39", "@types/react-dom": "^17.0.13", "@types/styled-components": "^5.1.24", diff --git a/styled-components/remix.config.js b/styled-components/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/styled-components/remix.config.js +++ b/styled-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/styletron/app/routes/index.tsx b/styletron/app/routes/_index.tsx similarity index 100% rename from styletron/app/routes/index.tsx rename to styletron/app/routes/_index.tsx diff --git a/styletron/package.json b/styletron/package.json index 8592d317..366b7b26 100644 --- a/styletron/package.json +++ b/styletron/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", "react": "^17.0.2", "react-dom": "^17.0.2", "styletron-engine-atomic": "^1.4.8", "styletron-react": "^6.0.2" }, "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": "^17.0.39", "@types/react-dom": "^17.0.13", "@types/styled-components": "^5.1.24", diff --git a/styletron/remix.config.js b/styletron/remix.config.js index ecf1253b..abd0c5a3 100644 --- a/styletron/remix.config.js +++ b/styletron/remix.config.js @@ -1,6 +1,7 @@ /** @type {import('@remix-run/dev').AppConfig} */ module.exports = { - ignoredRouteFiles: [".*"], + ignoredRouteFiles: ["**/.*"], + future: { v2_routeConvention: true }, // appDirectory: "app", // assetsBuildDirectory: "public/build", // serverBuildPath: "build/index.js", diff --git a/supabase-subscription/app/routes/_index.tsx b/supabase-subscription/app/routes/_index.tsx new file mode 100644 index 00000000..728be13a --- /dev/null +++ b/supabase-subscription/app/routes/_index.tsx @@ -0,0 +1,5 @@ +import { redirect } from "@remix-run/node"; + +export function loader() { + return redirect("/realtime"); +} diff --git a/supabase-subscription/app/routes/realtime.tsx b/supabase-subscription/app/routes/realtime.tsx index e1e3020f..e53242ba 100644 --- a/supabase-subscription/app/routes/realtime.tsx +++ b/supabase-subscription/app/routes/realtime.tsx @@ -9,7 +9,7 @@ export const loader = async () => { const { count } = await client .from("clicks") .select("id", { count: "exact", head: true }); - return json(count); + return json(count ?? 0); }; export const action = async ({ request }: ActionArgs) => { diff --git a/supabase-subscription/package.json b/supabase-subscription/package.json index 1c5c7f78..edc88387 100644 --- a/supabase-subscription/package.json +++ b/supabase-subscription/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", "@supabase/supabase-js": "^1.31.1", "isbot": "^3.6.5", "react": "^18.2.0", @@ -18,8 +18,8 @@ "react-supabase": "^0.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/supabase-subscription/remix.config.js b/supabase-subscription/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/supabase-subscription/remix.config.js +++ b/supabase-subscription/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/tailwindcss/app/routes/index.tsx b/tailwindcss/app/routes/_index.tsx similarity index 100% rename from tailwindcss/app/routes/index.tsx rename to tailwindcss/app/routes/_index.tsx diff --git a/tailwindcss/package.json b/tailwindcss/package.json index 5d6c2793..a71286de 100644 --- a/tailwindcss/package.json +++ b/tailwindcss/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/tailwindcss/remix.config.js b/tailwindcss/remix.config.js index 5c729bfb..e4544744 100644 --- a/tailwindcss/remix.config.js +++ b/tailwindcss/remix.config.js @@ -3,6 +3,7 @@ module.exports = { ignoredRouteFiles: ["**/.*"], future: { unstable_tailwind: true, + v2_routeConvention: true, }, // appDirectory: "app", // assetsBuildDirectory: "public/build", diff --git a/theme-ui/app/routes/index.tsx b/theme-ui/app/routes/_index.tsx similarity index 100% rename from theme-ui/app/routes/index.tsx rename to theme-ui/app/routes/_index.tsx diff --git a/theme-ui/package.json b/theme-ui/package.json index 0ba5247f..1ae99860 100644 --- a/theme-ui/package.json +++ b/theme-ui/package.json @@ -11,16 +11,16 @@ "@emotion/cache": "^11.7.1", "@emotion/react": "^11.8.1", "@emotion/server": "^11.4.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", "@theme-ui/core": "^0.14.6", "react": "^17.0.2", "react-dom": "^17.0.2" }, "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": "^17.0.39", "@types/react-dom": "^17.0.13", "eslint": "^8.27.0", diff --git a/theme-ui/remix.config.js b/theme-ui/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/theme-ui/remix.config.js +++ b/theme-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/tiptap-collab-editing/app/routes/_index.tsx b/tiptap-collab-editing/app/routes/_index.tsx new file mode 100644 index 00000000..fe3e5439 --- /dev/null +++ b/tiptap-collab-editing/app/routes/_index.tsx @@ -0,0 +1,5 @@ +import { redirect } from "@remix-run/node"; + +export function loader() { + return redirect("/editor"); +} diff --git a/tiptap-collab-editing/package.json b/tiptap-collab-editing/package.json index 91b465a8..838b8495 100644 --- a/tiptap-collab-editing/package.json +++ b/tiptap-collab-editing/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", "@tiptap/extension-collaboration": "^2.0.0-beta.33", "@tiptap/react": "^2.0.0-beta.108", "@tiptap/starter-kit": "^2.0.0-beta.183", @@ -21,8 +21,8 @@ "yjs": "^13.5.34" }, "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/tiptap-collab-editing/remix.config.js b/tiptap-collab-editing/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/tiptap-collab-editing/remix.config.js +++ b/tiptap-collab-editing/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/toast-message/app/routes/index.tsx b/toast-message/app/routes/_index.tsx similarity index 100% rename from toast-message/app/routes/index.tsx rename to toast-message/app/routes/_index.tsx diff --git a/toast-message/package.json b/toast-message/package.json index 86c58781..3ff3023c 100644 --- a/toast-message/package.json +++ b/toast-message/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", "react-hot-toast": "^2.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/toast-message/remix.config.js b/toast-message/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/toast-message/remix.config.js +++ b/toast-message/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/turborepo-vercel/apps/remix-app/app/routes/index.tsx b/turborepo-vercel/apps/remix-app/app/routes/_index.tsx similarity index 100% rename from turborepo-vercel/apps/remix-app/app/routes/index.tsx rename to turborepo-vercel/apps/remix-app/app/routes/_index.tsx diff --git a/turborepo-vercel/apps/remix-app/package.json b/turborepo-vercel/apps/remix-app/package.json index d02e4882..44561a42 100644 --- a/turborepo-vercel/apps/remix-app/package.json +++ b/turborepo-vercel/apps/remix-app/package.json @@ -9,17 +9,17 @@ "typecheck": "tsc" }, "dependencies": { - "@remix-run/node": "~1.14.2", - "@remix-run/react": "~1.14.2", - "@remix-run/vercel": "~1.14.2", + "@remix-run/node": "^1.15.0", + "@remix-run/react": "^1.15.0", + "@remix-run/vercel": "^1.15.0", "react": "^18.2.0", "react-dom": "^18.2.0", "ui": "*" }, "devDependencies": { - "@remix-run/dev": "~1.14.2", - "@remix-run/eslint-config": "~1.14.2", - "@remix-run/serve": "~1.14.2", + "@remix-run/dev": "^1.15.0", + "@remix-run/eslint-config": "^1.15.0", + "@remix-run/serve": "^1.15.0", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", "eslint": "^8.27.0", diff --git a/turborepo-vercel/apps/remix-app/remix.config.js b/turborepo-vercel/apps/remix-app/remix.config.js index efdfbf9e..e85c102b 100644 --- a/turborepo-vercel/apps/remix-app/remix.config.js +++ b/turborepo-vercel/apps/remix-app/remix.config.js @@ -22,4 +22,5 @@ module.exports = { serverBuildPath: "api/index.js", serverDependenciesToBundle: "all", watchPaths: packages, + future: { v2_routeConvention: true }, }; diff --git a/twind/app/routes/index.tsx b/twind/app/routes/_index.tsx similarity index 100% rename from twind/app/routes/index.tsx rename to twind/app/routes/_index.tsx diff --git a/twind/package.json b/twind/package.json index dc5976da..c8eb3e74 100644 --- a/twind/package.json +++ b/twind/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", "@twind/preset-autoprefix": "1.0.0-next.38", "@twind/preset-tailwind": "1.0.0-next.38", "@twind/with-remix": "1.0.0-next.38", @@ -21,8 +21,8 @@ "twind": "^1.0.0-next.32" }, "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/twind/remix.config.js b/twind/remix.config.js index ceaf8bf6..310fa54a 100644 --- a/twind/remix.config.js +++ b/twind/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/unocss/app/routes/index.tsx b/unocss/app/routes/_index.tsx similarity index 100% rename from unocss/app/routes/index.tsx rename to unocss/app/routes/_index.tsx diff --git a/unocss/package.json b/unocss/package.json index a9d0529b..93133f54 100644 --- a/unocss/package.json +++ b/unocss/package.json @@ -13,16 +13,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", "@unocss/cli": "^0.46.4", diff --git a/unocss/remix.config.js b/unocss/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/unocss/remix.config.js +++ b/unocss/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/usematches-loader-data/app/routes/index.tsx b/usematches-loader-data/app/routes/_index.tsx similarity index 100% rename from usematches-loader-data/app/routes/index.tsx rename to usematches-loader-data/app/routes/_index.tsx diff --git a/usematches-loader-data/package.json b/usematches-loader-data/package.json index c55b22dd..883ca9eb 100644 --- a/usematches-loader-data/package.json +++ b/usematches-loader-data/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/usematches-loader-data/remix.config.js b/usematches-loader-data/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/usematches-loader-data/remix.config.js +++ b/usematches-loader-data/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/vanilla-extract/app/routes/index.tsx b/vanilla-extract/app/routes/_index.tsx similarity index 100% rename from vanilla-extract/app/routes/index.tsx rename to vanilla-extract/app/routes/_index.tsx diff --git a/vanilla-extract/package.json b/vanilla-extract/package.json index 3c2de553..3cc23f45 100644 --- a/vanilla-extract/package.json +++ b/vanilla-extract/package.json @@ -15,9 +15,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", "@vanilla-extract/css": "^1.9.0", "@vanilla-extract/sprinkles": "^1.5.0", "clsx": "^1.2.1", @@ -26,8 +26,8 @@ "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", "@vanilla-extract/esbuild-plugin": "^2.1.0", diff --git a/vanilla-extract/remix.config.js b/vanilla-extract/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/vanilla-extract/remix.config.js +++ b/vanilla-extract/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/xata/app/routes/index.tsx b/xata/app/routes/_index.tsx similarity index 100% rename from xata/app/routes/index.tsx rename to xata/app/routes/_index.tsx diff --git a/xata/package.json b/xata/package.json index d2b109b9..824e7c75 100644 --- a/xata/package.json +++ b/xata/package.json @@ -10,17 +10,17 @@ "xata:codegen": "xata codegen -o=app/lib/xata.codegen.server.ts" }, "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", "@xata.io/client": "^0.21.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", "@xata.io/cli": "^0.11.0", diff --git a/xata/remix.config.js b/xata/remix.config.js index adf2a0b5..abd0c5a3 100644 --- a/xata/remix.config.js +++ b/xata/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/yarn-pnp/app/routes/index.tsx b/yarn-pnp/app/routes/_index.tsx similarity index 100% rename from yarn-pnp/app/routes/index.tsx rename to yarn-pnp/app/routes/_index.tsx diff --git a/yarn-pnp/package.json b/yarn-pnp/package.json index 213cd9f5..d6570e42 100644 --- a/yarn-pnp/package.json +++ b/yarn-pnp/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", "~": "link:./app" }, "devDependencies": { - "@remix-run/dev": "~1.14.2", + "@remix-run/dev": "^1.15.0", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", "typescript": "^4.8.4" diff --git a/yarn-pnp/remix.config.js b/yarn-pnp/remix.config.js index 260b82c7..793264aa 100644 --- a/yarn-pnp/remix.config.js +++ b/yarn-pnp/remix.config.js @@ -3,6 +3,7 @@ */ module.exports = { ignoredRouteFiles: ["**/.*"], + future: { v2_routeConvention: true }, // appDirectory: "app", // assetsBuildDirectory: "public/build", // serverBuildPath: "build/index.js",