Merge branch 'main' into kendallg/axe-test-on-ci

primer · Jan 27, 2025 · bd58df1 · bd58df1
2 parents a676ca6 + 0895e47
commit bd58df1
Show file tree

Hide file tree

Showing 20 changed files with 1,002 additions and 475 deletions.
diff --git a/.changeset/brave-dolls-sparkle.md b/.changeset/brave-dolls-sparkle.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": minor
+---
+
+Remove CSS modules feature flag from Spinner
diff --git a/.changeset/great-boxes-clap.md b/.changeset/great-boxes-clap.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": minor
+---
+
+Update dependency range for React dependencies to include 19.x
diff --git a/examples/codesandbox/src/App.tsx b/examples/codesandbox/src/App.tsx
@@ -1,7 +1,7 @@
 import {Button} from '@primer/react'
 
 function App() {
-  return <Button>Hello</Button>
+  return <Button>Hello World</Button>
 }
 
 export default App
diff --git a/examples/codesandbox/src/index.css b/examples/codesandbox/src/index.css
@@ -0,0 +1,8 @@
+@import '@primer/primitives/dist/css/primitives.css';
+@import '@primer/primitives/dist/css/functional/themes/light.css';
+@import '@primer/primitives/dist/css/functional/themes/dark.css';
+
+body {
+  color: var(--fgColor-default);
+  background-color: var(--bgColor-default);
+}
diff --git a/examples/app-router/.eslintrc.cjs → examples/nextjs/.eslintrc.cjs b/examples/app-router/.eslintrc.cjs → examples/nextjs/.eslintrc.cjs
diff --git a/examples/app-router/next-env.d.ts → examples/nextjs/next-env.d.ts b/examples/app-router/next-env.d.ts → examples/nextjs/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/examples/app-router/package.json → examples/nextjs/package.json b/examples/app-router/package.json → examples/nextjs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "example-app-router",
+  "name": "example-nextjs",
   "version": "0.0.0",
   "private": true,
   "scripts": {
@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@primer/react": "37.11.0",
-    "next": "^14.2.15",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "next": "^15.1.4",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "styled-components": "5.x",
     "typescript": "^5.7.2"
   },
   "devDependencies": {
-    "@next/eslint-plugin-next": "14.1.0",
+    "@next/eslint-plugin-next": "^15.1.4",
     "rimraf": "^5.0.5"
   }
 }
diff --git a/examples/nextjs/src/app/global.css b/examples/nextjs/src/app/global.css
@@ -0,0 +1,8 @@
+@import '@primer/primitives/dist/css/primitives.css';
+@import '@primer/primitives/dist/css/functional/themes/light.css';
+@import '@primer/primitives/dist/css/functional/themes/dark.css';
+
+body {
+  color: var(--fgColor-default);
+  background-color: var(--bgColor-default);
+}
diff --git a/examples/app-router/src/app/layout.tsx → examples/nextjs/src/app/layout.tsx b/examples/app-router/src/app/layout.tsx → examples/nextjs/src/app/layout.tsx
@@ -1,3 +1,4 @@
+import './global.css'
 import {BaseStyles, ThemeProvider} from '@primer/react'
 import {StyledComponentsRegistry} from './registry'
 

diff --git a/examples/app-router/src/app/page.tsx → examples/nextjs/src/app/page.tsx b/examples/app-router/src/app/page.tsx → examples/nextjs/src/app/page.tsx
diff --git a/examples/app-router/src/app/registry.tsx → examples/nextjs/src/app/registry.tsx b/examples/app-router/src/app/registry.tsx → examples/nextjs/src/app/registry.tsx
diff --git a/examples/app-router/tsconfig.json → examples/nextjs/tsconfig.json b/examples/app-router/tsconfig.json → examples/nextjs/tsconfig.json
@@ -20,7 +20,8 @@
       {
         "name": "next"
       }
-    ]
+    ],
+    "target": "ES2017"
   },
   "include": [
     "next-env.d.ts",