Merge commit '1e4c2d352e9b42e0f48c98980714c5334bfd06d7' into prettier…

…-import-order

cli/.prettierrc.cjs

@@ -2,11 +2,8 @@ const baseConfig = require("../.prettierrc.cjs");
 
 /** @type {import('prettier').Config} */
 const config = {
- ...require("../.prettierrc.cjs"),
- plugins: [
- require.resolve("@ianvs/prettier-plugin-sort-imports"),
- require.resolve("prettier-plugin-tailwindcss"),
- ],
+ ...baseConfig,
+ plugins: [...baseConfig.plugins, "prettier-plugin-tailwindcss"],
  tailwindConfig: "./template/extras/config/tailwind.config.ts",
 };
 

cli/package.json

@@ -34,7 +34,7 @@
  "lint": "eslint . --report-unused-disable-directives",
  "lint:fix": "pnpm lint --fix",
  "format": "pnpm format:check --write",
- "format:check": "pnpm prettier --check --plugin-search-dir=. **/*.{cjs,mjs,ts,tsx,md,json} --ignore-path ../.gitignore --ignore-unknown --no-error-on-unmatched-pattern",
+ "format:check": "pnpm prettier --plugin-search-dir=. **/*.{cjs,mjs,ts,tsx,md,json} --ignore-path ../.gitignore --ignore-unknown --no-error-on-unmatched-pattern --check",
  "release": "changeset version",
  "pub:beta": "pnpm build && npm publish --tag beta",
  "pub:next": "pnpm build && npm publish --tag next",
@@ -52,7 +52,6 @@
  "sort-package-json": "^2.4.1"
  },
  "devDependencies": {
- "@ianvs/prettier-plugin-sort-imports": "^3.7.2",
  "@prisma/client": "^4.11.0",
  "@t3-oss/env-nextjs": "^0.2.1",
  "@tanstack/react-query": "^4.28.0",

cli/src/cli/index.ts

@@ -2,10 +2,8 @@ import chalk from "chalk";
 import { Command } from "commander";
 import inquirer from "inquirer";
 import { CREATE_T3_APP, DEFAULT_APP_NAME } from "~/consts.js";
-import {
- availablePackages,
- type AvailablePackages,
-} from "~/installers/index.js";
+import { type AvailablePackages } from "~/installers/index.js";
+import { availablePackages } from "~/installers/index.js";
 import { getVersion } from "~/utils/getT3Version.js";
 import { getUserPkgManager } from "~/utils/getUserPkgManager.js";
 import { logger } from "~/utils/logger.js";
@@ -17,7 +15,6 @@ interface CliFlags {
  noInstall: boolean;
  default: boolean;
  importAlias: string;
- strictEslintAndPrettier: boolean;
 
  /** @internal Used in CI. */
  CI: boolean;
@@ -50,7 +47,6 @@ const defaultOptions: CliResults = {
  prisma: false,
  nextAuth: false,
  importAlias: "~/",
- strictEslintAndPrettier: false,
  },
 };
 
@@ -118,11 +114,6 @@ export const runCli = async () => {
  "Explicitly tell the CLI to use a custom import alias",
  defaultOptions.flags.importAlias,
  )
- .option(
- "-ep -eslint-pretteier",
- "enable prettier and a strict eslint config",
- defaultOptions.flags.strictEslintAndPrettier,
- )
  /** END CI-FLAGS */
  .version(getVersion(), "-v, --version", "Display the version number")
  .addHelpText(
@@ -162,8 +153,6 @@ export const runCli = async () => {
  if (cliResults.flags.tailwind) cliResults.packages.push("tailwind");
  if (cliResults.flags.prisma) cliResults.packages.push("prisma");
  if (cliResults.flags.nextAuth) cliResults.packages.push("nextAuth");
- if (cliResults.flags.strictEslintAndPrettier)
- cliResults.packages.push("strictEslintAndPrettier");
  }
 
  // Explained below why this is in a try/catch block

cli/src/utils/renderVersionWarning.ts

@@ -1,13 +1,6 @@
 import { getVersion } from "./getT3Version.js";
 import { logger } from "./logger.js";
 import { execSync } from "child_process";
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- * https://github.com/facebook/create-react-app/blob/main/packages/create-react-app/LICENSE
- */
 import https from "https";
 
 export const renderVersionWarning = (npmVersion: string) => {
@@ -37,6 +30,13 @@ export const renderVersionWarning = (npmVersion: string) => {
  console.log("");
 };
 
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ * https://github.com/facebook/create-react-app/blob/main/packages/create-react-app/LICENSE
+ */
 type DistTagsBody = {
  latest: string;
 };

cli/template/extras/src/server/api/trpc/base.ts

@@ -20,18 +20,6 @@ import { ZodError } from "zod";
  * These allow you to access things when processing a request, like the database, the session, etc.
  */
 
-/**
- * 2. INITIALIZATION
- *
- * This is where the tRPC API is initialized, connecting the context and transformer. We also parse
- * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation
- * errors on the backend.
- */
-import { initTRPC } from "@trpc/server";
-import { type CreateNextContextOptions } from "@trpc/server/adapters/next";
-import superjson from "superjson";
-import { ZodError } from "zod";
-
 type CreateContextOptions = Record<string, never>;
 
 /**
@@ -58,6 +46,14 @@ export const createTRPCContext = (_opts: CreateNextContextOptions) => {
  return createInnerTRPCContext({});
 };
 
+/**
+ * 2. INITIALIZATION
+ *
+ * This is where the tRPC API is initialized, connecting the context and transformer. We also parse
+ * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation
+ * errors on the backend.
+ */
+
 const t = initTRPC.context<typeof createTRPCContext>().create({
  transformer: superjson,
  errorFormatter({ shape, error }) {

cli/template/extras/src/server/api/trpc/with-auth-prisma.ts

@@ -23,21 +23,6 @@ import { prisma } from "~/server/db";
  * These allow you to access things when processing a request, like the database, the session, etc.
  */
 
-/**
- * 2. INITIALIZATION
- *
- * This is where the tRPC API is initialized, connecting the context and transformer. We also parse
- * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation
- * errors on the backend.
- */
-import { initTRPC, TRPCError } from "@trpc/server";
-import { type CreateNextContextOptions } from "@trpc/server/adapters/next";
-import { type Session } from "next-auth";
-import superjson from "superjson";
-import { ZodError } from "zod";
-import { getServerAuthSession } from "~/server/auth";
-import { prisma } from "~/server/db";
-
 type CreateContextOptions = {
  session: Session | null;
 };
@@ -76,6 +61,14 @@ export const createTRPCContext = async (opts: CreateNextContextOptions) => {
  });
 };
 
+/**
+ * 2. INITIALIZATION
+ *
+ * This is where the tRPC API is initialized, connecting the context and transformer. We also parse
+ * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation
+ * errors on the backend.
+ */
+
 const t = initTRPC.context<typeof createTRPCContext>().create({
  transformer: superjson,
  errorFormatter({ shape, error }) {

cli/template/extras/src/server/api/trpc/with-auth.ts

@@ -21,20 +21,6 @@ import { getServerAuthSession } from "~/server/auth";
  * These allow you to access things when processing a request, like the database, the session, etc.
  */
 
-/**
- * 2. INITIALIZATION
- *
- * This is where the tRPC API is initialized, connecting the context and transformer. We also parse
- * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation
- * errors on the backend.
- */
-import { initTRPC, TRPCError } from "@trpc/server";
-import { type CreateNextContextOptions } from "@trpc/server/adapters/next";
-import { type Session } from "next-auth";
-import superjson from "superjson";
-import { ZodError } from "zod";
-import { getServerAuthSession } from "~/server/auth";
-
 type CreateContextOptions = {
  session: Session | null;
 };
@@ -73,6 +59,14 @@ export const createTRPCContext = async ({
  });
 };
 
+/**
+ * 2. INITIALIZATION
+ *
+ * This is where the tRPC API is initialized, connecting the context and transformer. We also parse
+ * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation
+ * errors on the backend.
+ */
+
 const t = initTRPC.context<typeof createTRPCContext>().create({
  transformer: superjson,
  errorFormatter({ shape, error }) {

cli/template/extras/src/server/api/trpc/with-prisma.ts

@@ -20,19 +20,6 @@ import { prisma } from "~/server/db";
  * These allow you to access things when processing a request, like the database, the session, etc.
  */
 
-/**
- * 2. INITIALIZATION
- *
- * This is where the tRPC API is initialized, connecting the context and transformer. We also parse
- * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation
- * errors on the backend.
- */
-import { initTRPC } from "@trpc/server";
-import { type CreateNextContextOptions } from "@trpc/server/adapters/next";
-import superjson from "superjson";
-import { ZodError } from "zod";
-import { prisma } from "~/server/db";
-
 type CreateContextOptions = Record<string, never>;
 
 /**
@@ -61,6 +48,14 @@ export const createTRPCContext = (_opts: CreateNextContextOptions) => {
  return createInnerTRPCContext({});
 };
 
+/**
+ * 2. INITIALIZATION
+ *
+ * This is where the tRPC API is initialized, connecting the context and transformer. We also parse
+ * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation
+ * errors on the backend.
+ */
+
 const t = initTRPC.context<typeof createTRPCContext>().create({
  transformer: superjson,
  errorFormatter({ shape, error }) {

www/package.json

@@ -43,10 +43,9 @@
  "devDependencies": {
  "@astrojs/react": "^2.1.1",
  "@astrojs/tailwind": "^3.1.1",
- "@ianvs/prettier-plugin-sort-imports": "^3.7.2",
- "@types/node": "^18.15.5",
- "@types/react": "^18.0.28",
- "@types/react-dom": "^18.0.11",
+ "@types/node": "^18.16.1",
+ "@types/react": "^18.2.0",
+ "@types/react-dom": "^18.2.1",
  "@types/react-typist": "^2.0.3",
  "@types/treeify": "^1.0.0",
  "@typescript-eslint/parser": "^5.59.1",

www/src/components/navigation/githubIcon.astro

@@ -2,10 +2,6 @@
 import { getIsRtlFromUrl, getLanguageFromURL } from "../../languages";
 import { fetchGithub } from "../../utils/fetchGithub";
 
-type GithubRepoResponse = {
- stargazers_count: number;
-};
-
 const githubStars =
  (await fetchGithub("https://api.github.com/repos/t3-oss/create-t3-app", {
  throwIfNoAuth: false,

www/src/pages/pt/usage/trpc.md

@@ -338,8 +338,8 @@ Aqui está um exemplo de teste de integração que usa [Vitest](https://vitest.d
 ```ts
 import { type inferProcedureInput } from "@trpc/server";
 import { expect, test } from "vitest";
-import { appRouter, type AppRouter } from "~/server/router/_app";
-import { createContextInner } from "~/server/router/context";
+import { appRouter, type AppRouter } from "~/server/api/root";
+import { createInnerTRPCContext } from "~/server/api/trpc";
 
 test("example router", async () => {
  const ctx = await createInnerTRPCContext({ session: null });