From 87d1e199b1575bf6745220bb807a498809de41d3 Mon Sep 17 00:00:00 2001 From: Robert Snow Date: Fri, 10 May 2024 09:50:40 +1000 Subject: [PATCH] Fix main build (#6353) * Fix verdaccio build on main --- examples/rsp-cra-18/package.json | 4 ++-- examples/rsp-cra-18/src/App.tsx | 2 +- examples/rsp-cra-18/src/sections/ButtonExamples.tsx | 1 + examples/rsp-cra-18/src/sections/CollectionExamples.tsx | 3 +-- examples/rsp-cra-18/src/sections/DragAndDropExamples.tsx | 8 ++------ examples/rsp-webpack-4/package.json | 2 +- starters/docs/package.json | 4 ++-- starters/docs/tsconfig.json | 3 ++- starters/tailwind/package.json | 3 ++- starters/tailwind/tsconfig.json | 3 ++- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/examples/rsp-cra-18/package.json b/examples/rsp-cra-18/package.json index 55e575888f7..f37fd11da1e 100644 --- a/examples/rsp-cra-18/package.json +++ b/examples/rsp-cra-18/package.json @@ -5,10 +5,10 @@ "homepage": ".", "dependencies": { "@adobe/react-spectrum": "latest", + "@babel/plugin-proposal-private-property-in-object": "^7.16.7", + "@babel/preset-react": "^7.24.1", "@react-aria/dnd": "^3.5.0", - "@react-spectrum/inlinealert": "^3.0.0-rc.0", "@react-spectrum/color": "^3.0.0-beta.28", - "@react-spectrum/dropzone": "^3.0.0-beta.0", "@react-spectrum/toast": "^3.0.0-beta.7", "@spectrum-icons/workflow": "latest", "@spectrum-icons/illustrations": "^3.6.8", diff --git a/examples/rsp-cra-18/src/App.tsx b/examples/rsp-cra-18/src/App.tsx index 168059a2cf7..e2038b32dc2 100644 --- a/examples/rsp-cra-18/src/App.tsx +++ b/examples/rsp-cra-18/src/App.tsx @@ -1,5 +1,5 @@ import './App.css'; -import {Provider, defaultTheme, Item, TagGroup, Cell, Column, Row, TableBody, TableHeader, TableView, Content} from '@adobe/react-spectrum'; +import {Provider, defaultTheme, Item, TagGroup, Cell, Column, Row, TableBody, TableHeader, TableView} from '@adobe/react-spectrum'; import Lighting from './Lighting'; import {useState} from 'react' import BodyContent from './BodyContent'; diff --git a/examples/rsp-cra-18/src/sections/ButtonExamples.tsx b/examples/rsp-cra-18/src/sections/ButtonExamples.tsx index 8d824b6609b..ad32e8a464f 100644 --- a/examples/rsp-cra-18/src/sections/ButtonExamples.tsx +++ b/examples/rsp-cra-18/src/sections/ButtonExamples.tsx @@ -1,3 +1,4 @@ +/* eslint-disable react/style-prop-object */ import { ActionButton, Button, Divider, Flex, LogicButton, ToggleButton} from '@adobe/react-spectrum'; export default function ButtonExamples() { diff --git a/examples/rsp-cra-18/src/sections/CollectionExamples.tsx b/examples/rsp-cra-18/src/sections/CollectionExamples.tsx index 81e261e0894..b44012749fe 100644 --- a/examples/rsp-cra-18/src/sections/CollectionExamples.tsx +++ b/examples/rsp-cra-18/src/sections/CollectionExamples.tsx @@ -1,5 +1,4 @@ -import {ActionMenu, Flex, Divider, Item, ListBox, ListView, MenuTrigger, Menu, ActionButton, TableBody, TableView, Row, Cell, TableHeader, Column, TagGroup} from '@adobe/react-spectrum'; -import {SubmenuTrigger} from "@react-spectrum/menu"; +import {ActionMenu, Flex, Divider, Item, ListBox, ListView, MenuTrigger, Menu, SubmenuTrigger, ActionButton, TableBody, TableView, Row, Cell, TableHeader, Column, TagGroup} from '@adobe/react-spectrum'; export default function CollectionExamples(){ return ( diff --git a/examples/rsp-cra-18/src/sections/DragAndDropExamples.tsx b/examples/rsp-cra-18/src/sections/DragAndDropExamples.tsx index a2e8cc1dd7a..4379434fe6d 100644 --- a/examples/rsp-cra-18/src/sections/DragAndDropExamples.tsx +++ b/examples/rsp-cra-18/src/sections/DragAndDropExamples.tsx @@ -1,6 +1,4 @@ -import {DropZone} from '@react-spectrum/dropzone' -import {Flex, Divider, IllustratedMessage, Heading} from '@adobe/react-spectrum'; -import {Text} from 'react-aria-components'; +import {DropZone, Flex, Divider, IllustratedMessage, Heading} from '@adobe/react-spectrum'; import React from 'react'; import Upload from '@spectrum-icons/illustrations/Upload'; import {useDrag} from '@react-aria/dnd'; @@ -21,9 +19,7 @@ export default function DragAndDropExamples() { - - {isFilled ? 'You dropped something!' : 'Drag and drop your file'} - + {isFilled ? 'You dropped something!' : 'Drag and drop your file'} diff --git a/examples/rsp-webpack-4/package.json b/examples/rsp-webpack-4/package.json index 6183853c0ed..a90948f06b6 100644 --- a/examples/rsp-webpack-4/package.json +++ b/examples/rsp-webpack-4/package.json @@ -26,7 +26,7 @@ "@babel/core": "^7.24.3", "@babel/cli": "^7.24.3", "@babel/preset-env": "^7.24.3", - "@babel/preset-react": "^7.24.3", + "@babel/preset-react": "^7.24.1", "webpack": "4.46.0", "webpack-cli": "3.1.1", "webpack-dev-server": "3.1.8", diff --git a/starters/docs/package.json b/starters/docs/package.json index c675e9bee49..6c1cf296aa2 100644 --- a/starters/docs/package.json +++ b/starters/docs/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "@babel/preset-react": "^7.23.3", + "@babel/preset-react": "^7.24.1", "@storybook/addon-essentials": "^7.5.3", "@storybook/addon-interactions": "^7.5.3", "@storybook/addon-links": "^7.5.3", @@ -18,7 +18,7 @@ "react-dom": "^18.2.0", "storybook": "^7.5.3", "storybook-dark-mode": "^3.0.1", - "typescript": "^5.3.2" + "typescript": "5.3.3" }, "resolutions": { "@types/mime": "3.0.4", diff --git a/starters/docs/tsconfig.json b/starters/docs/tsconfig.json index 97604a7dacc..f33bf5b785c 100644 --- a/starters/docs/tsconfig.json +++ b/starters/docs/tsconfig.json @@ -17,7 +17,8 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react-jsx" + "jsx": "react-jsx", + "skipLibCheck": true }, "include": [ "src", diff --git a/starters/tailwind/package.json b/starters/tailwind/package.json index 9a6623f9af5..1c7b4b385b6 100644 --- a/starters/tailwind/package.json +++ b/starters/tailwind/package.json @@ -1,5 +1,6 @@ { "devDependencies": { + "@babel/preset-react": "^7.24.1", "@storybook/addon-essentials": "^7.5.3", "@storybook/addon-interactions": "^7.5.3", "@storybook/addon-links": "^7.5.3", @@ -16,7 +17,7 @@ "react-dom": "^18.2.0", "storybook": "^7.5.3", "tailwindcss-react-aria-components": "^1.0.0", - "typescript": "^5.3.2", + "typescript": "5.3.3", "vite": "^5.0.10" }, "scripts": { diff --git a/starters/tailwind/tsconfig.json b/starters/tailwind/tsconfig.json index 53492f72c91..091bceaa3ac 100644 --- a/starters/tailwind/tsconfig.json +++ b/starters/tailwind/tsconfig.json @@ -17,7 +17,8 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react" + "jsx": "react", + "skipLibCheck": true }, "include": [ "src",