Merge branch 'main' into feature/add-native-checkbox-form-component

Author: rezrah

.changeset/clever-chairs-look.md

@@ -0,0 +1,5 @@
+---
+"@primer/components": patch
+---
+
+Upgrading primer/[email protected]

.changeset/mean-shoes-rule.md

@@ -0,0 +1,5 @@
+---
+"@primer/components": patch
+---
+
+Fix preval of `theme-preval.js`

.github/workflows/ci.yml

@@ -24,11 +24,8 @@ jobs:
       - name: Lint
         run: npm run lint
 
-      - name: Type check
-        run: npm run typecheck
+      - name: Build
+        run: npm run build
 
       - name: Test
         run: npm run test
-
-      - name: Build
-        run: npm run build

package-lock.json

@@ -20,8 +20,7 @@
     "test": "jest",
     "test:update": "npm run test -- --updateSnapshot",
     "release": "npm run build && changeset publish",
-    "size": "size-limit",
-    "typecheck": "npx tsc --project tsconfig.json"
+    "size": "size-limit"
   },
   "repository": "primer/react",
   "keywords": [
@@ -45,7 +44,7 @@
   "license": "MIT",
   "dependencies": {
     "@primer/octicons-react": "^16.1.0",
-    "@primer/primitives": "7.0.1",
+    "@primer/primitives": "7.1.1",
     "@radix-ui/react-polymorphic": "0.0.14",
     "@react-aria/ssr": "3.1.0",
     "@styled-system/css": "5.1.5",

package.json

@@ -14,7 +14,7 @@ npx cross-env NODE_ENV=production rollup -c
 npx cross-env BABEL_MODULE=commonjs babel src --out-dir lib --extensions ".js,.ts,.jsx,.tsx"
 npx babel src --out-dir lib-esm --extensions ".js,.ts,.jsx,.tsx"
 
-# Build type declarations
+# Type check
 npx tsc --project tsconfig.build.json
 
 # Copy type declarations

script/build

@@ -1,7 +1,7 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   // NOTE: We exclude Storybook stories — in part because we don't want their type definitions
   // included in our build, but also because _something_ in Storybook mucks with the type definitions
   // of Primer components. See also https://github.com/primer/react/issues/1163.
-  "exclude": ["**/*.stories.tsx"],
+  "exclude": ["**/*.stories.tsx"]
 }

tsconfig.base.json

@@ -1,7 +1,20 @@
 {
-  "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "noEmit": true,
-    "emitDeclarationOnly": false
+    "target": "esnext",
+    "module": "commonjs",
+    "allowJs": true,
+    "checkJs": false,
+    "jsx": "preserve",
+    "declaration": true,
+    "outDir": "./lib",
+    "emitDeclarationOnly": true,
+    "strict": true,
+    "moduleResolution": "node",
+    "rootDirs": ["src"],
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "typeRoots": ["./node_modules/@types", "./@types"]
   },
-}
+  "include": ["@types/**/*.ts", "src/**/*.js", "src/**/*.ts", "src/**/*.tsx"]
+}