Skip to content

Commit

Permalink
chore: use app/globals.css instead of styles/globals.css
Browse files Browse the repository at this point in the history
  • Loading branch information
ritmillio committed Nov 22, 2024
1 parent d22a0bf commit 74b2f29
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions cli/src/installers/tailwind.ts
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
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
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
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
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
File renamed without changes.
2 changes: 1 addition & 1 deletion cli/template/extras/src/pages/_app/base.tsx
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 74b2f29

Please sign in to comment.