Merge branch 'main' of github.com:adobe/react-spectrum

Author: devongovett

Makefile

@@ -100,6 +100,7 @@ build:
 	done
 	node scripts/buildI18n.js
 	node scripts/generateIconDts.js
+	node scripts/fixUseClient.js
 
 website:
 	yarn build:docs --public-url /reactspectrum/$$(git rev-parse HEAD)/docs --dist-dir dist/$$(git rev-parse HEAD)/docs

packages/@react-spectrum/s2/src/Fonts.tsx

@@ -1,7 +1,7 @@
 import ReactDOM from 'react-dom';
 import {ReactNode, version as ReactVersion, useEffect, useMemo, useRef} from 'react';
 import {useLocale} from 'react-aria';
-import './fonts.css';
+import './font-faces.css';
 
 // Typekit ids for each CJK locale. These use dynamic subsetting, so cannot be loaded as CSS.
 // Because of the large size of the JS, we only download the script for the locale that is used.

packages/@react-spectrum/s2/src/fonts.css renamed to packages/@react-spectrum/s2/src/font-faces.css

@@ -0,0 +1,7 @@
+const fs = require('fs');
+
+for (let f of ['packages/@react-spectrum/s2/dist/module.mjs', 'packages/@react-spectrum/s2/dist/main.cjs']) {
+  let contents = fs.readFileSync(f, 'utf8');
+  contents = contents.replace(/['"]use client['"];?/g, '');
+  fs.writeFileSync(f, contents);
+}