Skip to content

Commit

Permalink
Merge branch 'next' into drizzle
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusmarminge authored Aug 13, 2023
2 parents ce5f31b + 19dc2a3 commit 66e7107
Show file tree
Hide file tree
Showing 14 changed files with 271 additions and 53 deletions.
258 changes: 238 additions & 20 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@types/react-typist": "^2.0.3",
"@types/treeify": "^1.0.0",
"@typescript-eslint/parser": "6.0.0",
"astro": "^2.4.5",
"astro": "^2.5.5",
"eslint": "^8.40.0",
"eslint-plugin-astro": "^0.27.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/docs/folderStructureDiagram.astro
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"next.config.mjs": [],
"package.json": [],
"postcss.config.cjs": ["tailwind"],
"prettier.config.cjs": ["tailwind"],
"prettier.config.mjs": ["tailwind"],
"README.md": [],
"tailwind.config.ts": ["tailwind"],
"tsconfig.json": [],
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/navigation/tableOfContents.astro
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const isRtl = getIsRtlFromUrl(pathname);
dataComponentType = "nextauth";
break;
case "postcss.config.cjs":
case "prettier.config.cjs":
case "prettier.config.mjs":
dataComponentType = "tailwind";
break;
case "src/server/api":
Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/ar/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ dir: rtl
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

اختار أدواتك لترى بنية المجلد عند إنشاء تطبيقك بواسطة تلك ألاختيارات. بالأسفل ستجد وصف عن غرض كلاً منهم.

Expand Down Expand Up @@ -205,9 +205,9 @@ import Diagram from "../../components/docs/folderStructureDiagram.astro";
</div>
<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

إن ملف `prettier.config.cjs` ضروري عند استخدام Prettier ولإضافة prettier-plugin-tailwindcss لتنظيم الفئات (classes) مع Tailwind CSS، لمزيد من المعلومات [Tailwind CSS blog post](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier).
إن ملف `prettier.config.mjs` ضروري عند استخدام Prettier ولإضافة prettier-plugin-tailwindcss لتنظيم الفئات (classes) مع Tailwind CSS، لمزيد من المعلومات [Tailwind CSS blog post](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier).

</div>
<div>
Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/en/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ lang: en
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

Please select your packages to see the folder structure of a newly scaffolded app with those selections. Further down, you will find a description of each entry.

Expand Down Expand Up @@ -191,9 +191,9 @@ The `postcss.config.cjs` file is used for Tailwind PostCSS usage. See [Tailwind
</div>
<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

The `prettier.config.cjs` file is used to configure Prettier to include the prettier-plugin-tailwindcss for formatting Tailwind CSS classes. See the [Tailwind CSS blog post](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) for more information.
The `prettier.config.mjs` file is used to configure Prettier to include the prettier-plugin-tailwindcss for formatting Tailwind CSS classes. See the [Tailwind CSS blog post](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) for more information.

</div>
<div>
Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/es/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ lang: es
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

Por favor selecciona las librerías que deseas utilizar para ver la estructura de carpetas de una aplicación T3 recién creada con esas selecciones. Más abajo, encontrarás una descripción de cada entrada.

Expand Down Expand Up @@ -214,9 +214,9 @@ El archivo `postcss.config.cjs` se usa para la configuración de Tailwind PostCS

<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

El archivo `prettier.config.cjs` se usa para configurar Prettier para incluir el prettier-plugin-tailwindcss para formatear las clases de Tailwind CSS. Consulta [el artículo del blog de Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) para obtener más información.
El archivo `prettier.config.mjs` se usa para configurar Prettier para incluir el prettier-plugin-tailwindcss para formatear las clases de Tailwind CSS. Consulta [el artículo del blog de Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) para obtener más información.

</div>

Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/fr/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ lang: fr
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

Veuillez sélectionner vos packages pour voir la structure des dossiers d'une application nouvellement créée avec ces sélections. Plus bas, vous trouverez une description de chaque entrée.

Expand Down Expand Up @@ -204,9 +204,9 @@ Le fichier `postcss.config.cjs` est utilisé pour l'utilisation de Tailwind Post
</div>
<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

Le fichier `prettier.config.cjs` est utilisé pour configurer Prettier afin d'inclure le prettier-plugin-tailwindcss pour le formatage des classes CSS Tailwind. Consultez l'[article de blog Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) pour plus d'informations.
Le fichier `prettier.config.mjs` est utilisé pour configurer Prettier afin d'inclure le prettier-plugin-tailwindcss pour le formatage des classes CSS Tailwind. Consultez l'[article de blog Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) pour plus d'informations.

</div>
<div>
Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/ja/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ lang: ja
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

以下でパッケージを選択してみてください。すると、その選択したパッケージで新たに初期構成を生成したアプリケーションのフォルダ構造が表示されます。もっと下には各エントリーの説明があります。

Expand Down Expand Up @@ -194,9 +194,9 @@ Tailwind の PostCSS の利用には、`postcss.config.cjs`ファイルが使用
</div>
<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

`prettier.config.cjs`ファイルは、Tailwind CSS クラスをフォーマットするために prettier-plugin-tailwindcss を含めるように Prettier を設定するために使用します。詳しくは [Tailwind CSS ブログポスト](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) を参照してください。
`prettier.config.mjs`ファイルは、Tailwind CSS クラスをフォーマットするために prettier-plugin-tailwindcss を含めるように Prettier を設定するために使用します。詳しくは [Tailwind CSS ブログポスト](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) を参照してください。

</div>
<div>
Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/no/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ lang: no
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

Velg pakkene dine for å se mappestrukturen til en app med disse valgene. Lenger ned finner du en beskrivelse av hver oppføring.

Expand Down Expand Up @@ -190,9 +190,9 @@ Basert på dine valgte pakker inneholder denne ruteren flere eller færre ruter
</div>
<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

`prettier.config.cjs`-filen brukes til å konfigurere Prettier slik at prettier-plugin-tailwindcss inkluderes for formatering av Tailwind CSS-klasser. Se [Tailwind CSS-blogginnlegget](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) for mer informasjon.
`prettier.config.mjs`-filen brukes til å konfigurere Prettier slik at prettier-plugin-tailwindcss inkluderes for formatering av Tailwind CSS-klasser. Se [Tailwind CSS-blogginnlegget](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) for mer informasjon.

</div>
<div>
Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/pl/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ lang: pl
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

Wybierz paczkę, aby zobaczyć strukturę folderów nowo utworzonej z nią aplikacji. Poniżej znajdziesz opis każdego elementu.

Expand Down Expand Up @@ -191,9 +191,9 @@ Plik `postcss.config.cjs` jest używany przez Tailwind PostCSS. Po więcej infor
</div>
<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

Plik `prettier.config.cjs` jest używany do konfigurowania Prettiera. Dołącza on plugin `prettier-plugin-tailwindcss` formatujący klasy CSS Tailwinda. Po więcej informacji, zobacz [post na blogu Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier).
Plik `prettier.config.mjs` jest używany do konfigurowania Prettiera. Dołącza on plugin `prettier-plugin-tailwindcss` formatujący klasy CSS Tailwinda. Po więcej informacji, zobacz [post na blogu Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier).

</div>
<div>
Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/pt/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ lang: pt
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

Por favor, selecione seus pacotes para ver a estrutura de pastas de um aplicativo recém-estruturado com essas seleções. Mais abaixo, você encontrará uma descrição de cada pacote.

Expand Down Expand Up @@ -205,9 +205,9 @@ O arquivo `postcss.config.cjs` é usado para o uso do Tailwind PostCSS. Veja [Do
</div>
<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

O arquivo `prettier.config.cjs` é usado para configura o Prettier e incluir o prettier-plugin-tailwindcss para a formatação das classes CSS. Veja o post no [Blog do Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) para mais informações.
O arquivo `prettier.config.mjs` é usado para configura o Prettier e incluir o prettier-plugin-tailwindcss para a formatação das classes CSS. Veja o post no [Blog do Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) para mais informações.

</div>
<div>
Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/ru/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ lang: ru
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

Пожалуйста выберите пакеты, чтобы увидеть файловую структуру нового приложения с выбранными пакетами. Ниже вы найдете описание каждого элемента.

Expand Down Expand Up @@ -205,9 +205,9 @@ import Diagram from "../../components/docs/folderStructureDiagram.astro";
</div>
<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

Файл `prettier.config.cjs` используется для настройки Prettier для включения prettier-plugin-tailwindcss для форматирования классов Tailwind CSS. Смотрите [пост блога Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) для получения дополнительной информации.
Файл `prettier.config.mjs` используется для настройки Prettier для включения prettier-plugin-tailwindcss для форматирования классов Tailwind CSS. Смотрите [пост блога Tailwind CSS](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) для получения дополнительной информации.

</div>
<div>
Expand Down
6 changes: 3 additions & 3 deletions www/src/pages/zh-hans/folder-structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ lang: zh-hans
isMdx: true
---

import Form from "../../components/docs/folderStructureForm.astro";
import Diagram from "../../components/docs/folderStructureDiagram.astro";
import Form from "../../components/docs/folderStructureForm.astro";

请选择你要安装的依赖包来查看一个对应新建的 T3 App 的文件夹结构。继续往下阅读,你可以从每个文件夹的描述了解它们对应的用途。

Expand Down Expand Up @@ -192,9 +192,9 @@ root.ts 文件用于合并 tRPC 子路由并将它们导出为一个单一的路
</div>
<div data-components="tailwind">

### `prettier.config.cjs`
### `prettier.config.mjs`

文件 `prettier.config.cjs` 被用于配置 Prettier,以使用插件 prettier-plugin-tailwindcss 来格式化 Tailwind CSS 的类名。参看 [Tailwind CSS 博客](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) 来了解更多。
文件 `prettier.config.mjs` 被用于配置 Prettier,以使用插件 prettier-plugin-tailwindcss 来格式化 Tailwind CSS 的类名。参看 [Tailwind CSS 博客](https://tailwindcss.com/blog/automatic-class-sorting-with-prettier) 来了解更多。

</div>
<div>
Expand Down

0 comments on commit 66e7107

Please sign in to comment.