Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: use app/globals.css instead of styles/globals.css #2030

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: use app/globals.css instead of styles/globals.css #2030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/installers/tailwind.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export const tailwindInstaller: Installer = ({ projectDir }) => {
const prettierSrc = path.join(extrasDir, "config/_prettier.config.js");
const prettierDest = path.join(projectDir, "prettier.config.js");

const cssSrc = path.join(extrasDir, "src/styles/globals.css");
const cssDest = path.join(projectDir, "src/styles/globals.css");
const cssSrc = path.join(extrasDir, "src/globals.css");
const cssDest = path.join(projectDir, "src/globals.css");

// add format:* scripts to package.json
const packageJsonPath = path.join(projectDir, "package.json");
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/app/layout/base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "~/styles/globals.css";
import "~/globals.css";

import { GeistSans } from "geist/font/sans";
import { type Metadata } from "next";
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/app/layout/with-trpc-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "~/styles/globals.css";
import "~/globals.css";

import { GeistSans } from "geist/font/sans";
import { type Metadata } from "next";
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/app/layout/with-trpc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "~/styles/globals.css";
import "~/globals.css";

import { GeistSans } from "geist/font/sans";
import { type Metadata } from "next";
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/app/layout/with-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "~/styles/globals.css";
import "~/globals.css";

import { GeistSans } from "geist/font/sans";
import { type Metadata } from "next";
Expand Down
0 cli/template/extras/src/styles/globals.css → cli/template/extras/src/globals.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cli/template/extras/src/pages/_app/base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { GeistSans } from "geist/font/sans";
import { type AppType } from "next/dist/shared/lib/utils";

import "~/styles/globals.css";
import "~/globals.css";

const MyApp: AppType = ({ Component, pageProps }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/pages/_app/with-auth-trpc-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { type AppType } from "next/app";

import { api } from "~/utils/api";

import "~/styles/globals.css";
import "~/globals.css";

const MyApp: AppType<{ session: Session | null }> = ({
Component,
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/pages/_app/with-auth-trpc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { type AppType } from "next/app";

import { api } from "~/utils/api";

import "~/styles/globals.css";
import "~/globals.css";

const MyApp: AppType<{ session: Session | null }> = ({
Component,
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/pages/_app/with-auth-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { type Session } from "next-auth";
import { SessionProvider } from "next-auth/react";
import { type AppType } from "next/app";

import "~/styles/globals.css";
import "~/globals.css";

const MyApp: AppType<{ session: Session | null }> = ({
Component,
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/pages/_app/with-auth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { type Session } from "next-auth";
import { SessionProvider } from "next-auth/react";
import { type AppType } from "next/app";

import "~/styles/globals.css";
import "~/globals.css";

const MyApp: AppType<{ session: Session | null }> = ({
Component,
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/pages/_app/with-trpc-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { type AppType } from "next/app";

import { api } from "~/utils/api";

import "~/styles/globals.css";
import "~/globals.css";

const MyApp: AppType = ({ Component, pageProps }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/pages/_app/with-trpc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { type AppType } from "next/app";

import { api } from "~/utils/api";

import "~/styles/globals.css";
import "~/globals.css";

const MyApp: AppType = ({ Component, pageProps }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/src/pages/_app/with-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { GeistSans } from "geist/font/sans";
import { type AppType } from "next/app";

import "~/styles/globals.css";
import "~/globals.css";

const MyApp: AppType = ({ Component, pageProps }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion upgrade/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "react-diff-view/style/index.css";
import "~/styles/globals.css";
import "~/globals.css";

import { Github } from "lucide-react";
import { type Metadata } from "next";
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/docs/folderStructureDiagramApp.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"src/server/api/routers/example.ts": ["trpc"],
"src/server/api/trpc.ts": ["trpc"],
"src/server/api/root.ts": ["trpc"],
"src/styles/globals.css": [],
"src/globals.css": [],
"src/env.js": [],
"src/trpc/query-client.ts": ["trpc"],
"src/trpc/react.tsx": ["trpc"],
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/docs/folderStructureDiagramPages.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"src/server/api/routers/example.ts": ["trpc"],
"src/server/api/trpc.ts": ["trpc"],
"src/server/api/root.ts": ["trpc"],
"src/styles/globals.css": [],
"src/globals.css": [],
"src/utils/api.ts": ["trpc"],
".env": [],
".env.example": [],
Expand Down
Loading