From 1497eaf610cd52b54a7fb7e701d5e8a0b31acf82 Mon Sep 17 00:00:00 2001 From: Aria Minaei Date: Sat, 7 Aug 2021 21:41:07 +0200 Subject: [PATCH] WIP: Getting r3f to work with create-react-app * Temporarily disabled ESM bundles because the current setup confuses webpack4 (but not parceljs). Since create-react-app uses webpack4, not doing this would make theatre incompatible with CRA. --- examples/dom-cra/package.json | 2 +- examples/r3f-cra/.env | 1 + examples/r3f-cra/.gitignore | 23 +++ examples/r3f-cra/README.md | 70 +++++++++ examples/r3f-cra/package.json | 43 ++++++ examples/r3f-cra/public/favicon.ico | Bin 0 -> 3870 bytes examples/r3f-cra/public/index.html | 43 ++++++ examples/r3f-cra/public/logo192.png | Bin 0 -> 5347 bytes examples/r3f-cra/public/logo512.png | Bin 0 -> 9664 bytes examples/r3f-cra/public/manifest.json | 25 +++ examples/r3f-cra/public/robots.txt | 3 + examples/r3f-cra/src/App.css | 38 +++++ examples/r3f-cra/src/App.js | 142 ++++++++++++++++++ examples/r3f-cra/src/App.test.js | 7 + examples/r3f-cra/src/index.css | 13 ++ examples/r3f-cra/src/index.js | 17 +++ examples/r3f-cra/src/logo.svg | 1 + examples/r3f-cra/src/reportWebVitals.js | 13 ++ examples/r3f-cra/src/setupTests.js | 5 + examples/r3f-cra/src/useDrag.js | 130 ++++++++++++++++ package.json | 1 + packages/dataverse-react/package.json | 9 -- packages/dataverse/package.json | 9 -- packages/playground/src/r3f/App.tsx | 15 +- .../playground/src/space-exploration/App.tsx | 2 +- packages/plugin-r3f/devEnv/build.ts | 75 +++++++++ packages/plugin-r3f/devEnv/tsconfig.json | 3 + packages/plugin-r3f/package.json | 8 +- packages/plugin-r3f/src/index.tsx | 22 +-- packages/plugin-r3f/src/setupPlugin.ts | 22 +++ packages/plugin-r3f/tsconfig.json | 2 +- theatre/core/package.json | 11 +- theatre/studio/package.json | 15 +- yarn.lock | 52 +++++-- 34 files changed, 731 insertions(+), 91 deletions(-) create mode 100644 examples/r3f-cra/.env create mode 100644 examples/r3f-cra/.gitignore create mode 100644 examples/r3f-cra/README.md create mode 100644 examples/r3f-cra/package.json create mode 100644 examples/r3f-cra/public/favicon.ico create mode 100644 examples/r3f-cra/public/index.html create mode 100644 examples/r3f-cra/public/logo192.png create mode 100644 examples/r3f-cra/public/logo512.png create mode 100644 examples/r3f-cra/public/manifest.json create mode 100644 examples/r3f-cra/public/robots.txt create mode 100644 examples/r3f-cra/src/App.css create mode 100644 examples/r3f-cra/src/App.js create mode 100644 examples/r3f-cra/src/App.test.js create mode 100644 examples/r3f-cra/src/index.css create mode 100644 examples/r3f-cra/src/index.js create mode 100644 examples/r3f-cra/src/logo.svg create mode 100644 examples/r3f-cra/src/reportWebVitals.js create mode 100644 examples/r3f-cra/src/setupTests.js create mode 100644 examples/r3f-cra/src/useDrag.js create mode 100644 packages/plugin-r3f/devEnv/build.ts create mode 100644 packages/plugin-r3f/devEnv/tsconfig.json create mode 100644 packages/plugin-r3f/src/setupPlugin.ts diff --git a/examples/dom-cra/package.json b/examples/dom-cra/package.json index b7ed650..f777cee 100644 --- a/examples/dom-cra/package.json +++ b/examples/dom-cra/package.json @@ -1,5 +1,5 @@ { - "name": "dom-cra", + "name": "@examples/dom-cra", "version": "0.1.0", "private": true, "installConfig": { diff --git a/examples/r3f-cra/.env b/examples/r3f-cra/.env new file mode 100644 index 0000000..7d910f1 --- /dev/null +++ b/examples/r3f-cra/.env @@ -0,0 +1 @@ +SKIP_PREFLIGHT_CHECK=true \ No newline at end of file diff --git a/examples/r3f-cra/.gitignore b/examples/r3f-cra/.gitignore new file mode 100644 index 0000000..4d29575 --- /dev/null +++ b/examples/r3f-cra/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/examples/r3f-cra/README.md b/examples/r3f-cra/README.md new file mode 100644 index 0000000..02aac3f --- /dev/null +++ b/examples/r3f-cra/README.md @@ -0,0 +1,70 @@ +# Getting Started with Create React App + +This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). + +## Available Scripts + +In the project directory, you can run: + +### `yarn start` + +Runs the app in the development mode.\ +Open [http://localhost:3000](http://localhost:3000) to view it in the browser. + +The page will reload if you make edits.\ +You will also see any lint errors in the console. + +### `yarn test` + +Launches the test runner in the interactive watch mode.\ +See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. + +### `yarn build` + +Builds the app for production to the `build` folder.\ +It correctly bundles React in production mode and optimizes the build for the best performance. + +The build is minified and the filenames include the hashes.\ +Your app is ready to be deployed! + +See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. + +### `yarn eject` + +**Note: this is a one-way operation. Once you `eject`, you can’t go back!** + +If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. + +Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. + +You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. + +## Learn More + +You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). + +To learn React, check out the [React documentation](https://reactjs.org/). + +### Code Splitting + +This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting) + +### Analyzing the Bundle Size + +This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size) + +### Making a Progressive Web App + +This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app) + +### Advanced Configuration + +This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration) + +### Deployment + +This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment) + +### `yarn build` fails to minify + +This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify) diff --git a/examples/r3f-cra/package.json b/examples/r3f-cra/package.json new file mode 100644 index 0000000..5bf1ed2 --- /dev/null +++ b/examples/r3f-cra/package.json @@ -0,0 +1,43 @@ +{ + "name": "@examples/r3f-cra", + "version": "0.1.0", + "private": true, + "installConfig": { + "hoistingLimits": "dependencies" + }, + "dependencies": { + "@react-three/drei": "^7.2.2", + "@react-three/fiber": "^7.0.6", + "@testing-library/jest-dom": "^5.11.4", + "@testing-library/react": "^11.1.0", + "@testing-library/user-event": "^12.1.10", + "@theatre/core": "workspace:*", + "@theatre/plugin-r3f": "workspace:*", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-scripts": "4.0.3", + "three": "^0.130.1", + "web-vitals": "^1.0.1" + }, + "devDependencies": { + "@theatre/studio": "workspace:*" + }, + "scripts": { + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test", + "eject": "react-scripts eject" + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + } +} diff --git a/examples/r3f-cra/public/favicon.ico b/examples/r3f-cra/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a11777cc471a4344702741ab1c8a588998b1311a GIT binary patch literal 3870 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 baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@ literal 0 HcmV?d00001 diff --git a/examples/r3f-cra/public/index.html b/examples/r3f-cra/public/index.html new file mode 100644 index 0000000..aa069f2 --- /dev/null +++ b/examples/r3f-cra/public/index.html @@ -0,0 +1,43 @@ + + + + + + + + + + + + + React App + + + +
+ + + diff --git a/examples/r3f-cra/public/logo192.png b/examples/r3f-cra/public/logo192.png new file mode 100644 index 0000000000000000000000000000000000000000..fc44b0a3796c0e0a64c3d858ca038bd4570465d9 GIT binary patch literal 5347 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 b{|{}U^kRn2wo}j7|0ATu<;8xA7zX}7|B6mN literal 0 HcmV?d00001 diff --git a/examples/r3f-cra/public/manifest.json b/examples/r3f-cra/public/manifest.json new file mode 100644 index 0000000..080d6c7 --- /dev/null +++ b/examples/r3f-cra/public/manifest.json @@ -0,0 +1,25 @@ +{ + "short_name": "React App", + "name": "Create React App Sample", + "icons": [ + { + "src": "favicon.ico", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + }, + { + "src": "logo192.png", + "type": "image/png", + "sizes": "192x192" + }, + { + "src": "logo512.png", + "type": "image/png", + "sizes": "512x512" + } + ], + "start_url": ".", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" +} diff --git a/examples/r3f-cra/public/robots.txt b/examples/r3f-cra/public/robots.txt new file mode 100644 index 0000000..e9e57dc --- /dev/null +++ b/examples/r3f-cra/public/robots.txt @@ -0,0 +1,3 @@ +# https://www.robotstxt.org/robotstxt.html +User-agent: * +Disallow: diff --git a/examples/r3f-cra/src/App.css b/examples/r3f-cra/src/App.css new file mode 100644 index 0000000..74b5e05 --- /dev/null +++ b/examples/r3f-cra/src/App.css @@ -0,0 +1,38 @@ +.App { + text-align: center; +} + +.App-logo { + height: 40vmin; + pointer-events: none; +} + +@media (prefers-reduced-motion: no-preference) { + .App-logo { + animation: App-logo-spin infinite 20s linear; + } +} + +.App-header { + background-color: #282c34; + min-height: 100vh; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: calc(10px + 2vmin); + color: white; +} + +.App-link { + color: #61dafb; +} + +@keyframes App-logo-spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} diff --git a/examples/r3f-cra/src/App.js b/examples/r3f-cra/src/App.js new file mode 100644 index 0000000..e568443 --- /dev/null +++ b/examples/r3f-cra/src/App.js @@ -0,0 +1,142 @@ +import {getProject} from '@theatre/core' +import * as THREE from 'three' +import {useState, useEffect, useRef} from 'react' +import {useFrame} from '@react-three/fiber' +import {softShadows} from '@react-three/drei' + +// Soft shadows are expensive, comment and refresh when it's too slow +softShadows() + +// credit: https://codesandbox.io/s/camera-pan-nsb7f + +function Button() { + const vec = new THREE.Vector3() + const light = useRef(undefined) + const [active, setActive] = useState(false) + const [zoom, set] = useState(true) + useEffect( + () => void (document.body.style.cursor = active ? 'pointer' : 'auto'), + [active], + ) + + useFrame((state) => { + const step = 0.1 + const camera = state.camera + camera.fov = THREE.MathUtils.lerp(camera.fov, zoom ? 10 : 42, step) + camera.position.lerp( + vec.set(zoom ? 25 : 10, zoom ? 1 : 5, zoom ? 0 : 10), + step, + ) + state.camera.lookAt(0, 0, 0) + state.camera.updateProjectionMatrix() + + light.current.position.lerp( + vec.set(zoom ? 4 : 0, zoom ? 3 : 8, zoom ? 3 : 5), + step, + ) + }) + + return ( + set(!zoom)} + onPointerOver={() => setActive(true)} + onPointerOut={() => setActive(false)} + uniqueName="The Button" + > + + + + + + ) +} + +function Plane({color, uniqueName, ...props}) { + return ( + + + + + ) +} + +function App() { + return ( +
+ + getProject('Playground - R3F').sheet('R3F-Canvas')} + > + {/* @ts-ignore */} + + + + + + + + + + +
+ ) +} + +export default App diff --git a/examples/r3f-cra/src/App.test.js b/examples/r3f-cra/src/App.test.js new file mode 100644 index 0000000..426d4f4 --- /dev/null +++ b/examples/r3f-cra/src/App.test.js @@ -0,0 +1,7 @@ +import {render, screen} from '@testing-library/react' + +test('renders learn react link', () => { + render() + const linkElement = screen.getByText(/learn react/i) + expect(linkElement).toBeInTheDocument() +}) diff --git a/examples/r3f-cra/src/index.css b/examples/r3f-cra/src/index.css new file mode 100644 index 0000000..ec2585e --- /dev/null +++ b/examples/r3f-cra/src/index.css @@ -0,0 +1,13 @@ +body { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +code { + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; +} diff --git a/examples/r3f-cra/src/index.js b/examples/r3f-cra/src/index.js new file mode 100644 index 0000000..1625c86 --- /dev/null +++ b/examples/r3f-cra/src/index.js @@ -0,0 +1,17 @@ +import ReactDOM from 'react-dom' +import './index.css' +import reportWebVitals from './reportWebVitals' +import '@theatre/studio' +import {getProject} from '@theatre/core' + +ReactDOM.render( + + + , + document.getElementById('root'), +) + +// If you want to start measuring performance in your app, pass a function +// to log results (for example: reportWebVitals(console.log)) +// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals +reportWebVitals() diff --git a/examples/r3f-cra/src/logo.svg b/examples/r3f-cra/src/logo.svg new file mode 100644 index 0000000..9dfc1c0 --- /dev/null +++ b/examples/r3f-cra/src/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/examples/r3f-cra/src/reportWebVitals.js b/examples/r3f-cra/src/reportWebVitals.js new file mode 100644 index 0000000..21ea93d --- /dev/null +++ b/examples/r3f-cra/src/reportWebVitals.js @@ -0,0 +1,13 @@ +const reportWebVitals = (onPerfEntry) => { + if (onPerfEntry && onPerfEntry instanceof Function) { + import('web-vitals').then(({getCLS, getFID, getFCP, getLCP, getTTFB}) => { + getCLS(onPerfEntry) + getFID(onPerfEntry) + getFCP(onPerfEntry) + getLCP(onPerfEntry) + getTTFB(onPerfEntry) + }) + } +} + +export default reportWebVitals diff --git a/examples/r3f-cra/src/setupTests.js b/examples/r3f-cra/src/setupTests.js new file mode 100644 index 0000000..52aaef1 --- /dev/null +++ b/examples/r3f-cra/src/setupTests.js @@ -0,0 +1,5 @@ +// jest-dom adds custom jest matchers for asserting on DOM nodes. +// allows you to do things like: +// expect(element).toHaveTextContent(/react/i) +// learn more: https://github.com/testing-library/jest-dom +import '@testing-library/jest-dom' diff --git a/examples/r3f-cra/src/useDrag.js b/examples/r3f-cra/src/useDrag.js new file mode 100644 index 0000000..65ef93b --- /dev/null +++ b/examples/r3f-cra/src/useDrag.js @@ -0,0 +1,130 @@ +import {useLayoutEffect, useRef} from 'react' + +const noop = () => {} + +function createCursorLock(cursor) { + const el = document.createElement('div') + el.style.cssText = ` + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 9999999;` + + el.style.cursor = cursor + document.body.appendChild(el) + const relinquish = () => { + document.body.removeChild(el) + } + + return relinquish +} + +export default function useDrag(target, opts) { + const optsRef = useRef(opts) + optsRef.current = opts + + const modeRef = useRef('notDragging') + + const stateRef = useRef({dragHappened: false, startPos: {x: 0, y: 0}}) + + useLayoutEffect(() => { + if (!target) return + + const getDistances = (event) => { + const {startPos} = stateRef.current + return [event.screenX - startPos.x, event.screenY - startPos.y] + } + + let relinquishCursorLock = noop + + const dragHandler = (event) => { + if (!stateRef.current.dragHappened && optsRef.current.lockCursorTo) { + relinquishCursorLock = createCursorLock(optsRef.current.lockCursorTo) + } + if (!stateRef.current.dragHappened) stateRef.current.dragHappened = true + modeRef.current = 'dragging' + + const deltas = getDistances(event) + optsRef.current.onDrag(deltas[0], deltas[1], event) + } + + const dragEndHandler = () => { + removeDragListeners() + modeRef.current = 'notDragging' + + optsRef.current.onDragEnd && + optsRef.current.onDragEnd(stateRef.current.dragHappened) + relinquishCursorLock() + relinquishCursorLock = noop + } + + const addDragListeners = () => { + document.addEventListener('mousemove', dragHandler) + document.addEventListener('mouseup', dragEndHandler) + } + + const removeDragListeners = () => { + document.removeEventListener('mousemove', dragHandler) + document.removeEventListener('mouseup', dragEndHandler) + } + + const preventUnwantedClick = (event) => { + if (optsRef.current.disabled) return + if (stateRef.current.dragHappened) { + if ( + !optsRef.current.dontBlockMouseDown && + modeRef.current !== 'notDragging' + ) { + event.stopPropagation() + event.preventDefault() + } + stateRef.current.dragHappened = false + } + } + + const dragStartHandler = (event) => { + const opts = optsRef.current + if (opts.disabled === true) return + + if (event.button !== 0) return + const resultOfStart = opts.onDragStart && opts.onDragStart(event) + + if (resultOfStart === false) return + + if (!opts.dontBlockMouseDown) { + event.stopPropagation() + event.preventDefault() + } + + modeRef.current = 'dragStartCalled' + + const {screenX, screenY} = event + stateRef.current.startPos = {x: screenX, y: screenY} + stateRef.current.dragHappened = false + + addDragListeners() + } + + const onMouseDown = (e) => { + dragStartHandler(e) + } + + target.addEventListener('mousedown', onMouseDown) + target.addEventListener('click', preventUnwantedClick) + + return () => { + removeDragListeners() + target.removeEventListener('mousedown', onMouseDown) + target.removeEventListener('click', preventUnwantedClick) + relinquishCursorLock() + + if (modeRef.current !== 'notDragging') { + optsRef.current.onDragEnd && + optsRef.current.onDragEnd(modeRef.current === 'dragging') + } + modeRef.current = 'notDragging' + } + }, [target]) +} diff --git a/package.json b/package.json index c526724..48088a4 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "theatre" ], "scripts": { + "playground": "yarn workspace playground run serve", "typecheck": "tsc --build ./devEnv/typecheck-all-projects/tsconfig.all.json", "test": "jest", "postinstall": "husky install", diff --git a/packages/dataverse-react/package.json b/packages/dataverse-react/package.json index fe65f78..ca455d3 100644 --- a/packages/dataverse-react/package.json +++ b/packages/dataverse-react/package.json @@ -14,15 +14,6 @@ }, "main": "dist/index.cjs", "types": "dist/index.d.ts", - "module": "dist/index.mjs", - "exports": { - ".": { - "require": "./dist/index.cjs", - "import": "./dist/index.mjs", - "default": "./dist/index.cjs", - "node": "./dist/index.cjs" - } - }, "files": [ "dist/**/*" ], diff --git a/packages/dataverse/package.json b/packages/dataverse/package.json index a644fdf..f8d6bd4 100644 --- a/packages/dataverse/package.json +++ b/packages/dataverse/package.json @@ -14,15 +14,6 @@ }, "main": "dist/index.cjs", "types": "dist/index.d.ts", - "module": "dist/index.mjs", - "exports": { - ".": { - "require": "./dist/index.cjs", - "import": "./dist/index.mjs", - "default": "./dist/index.cjs", - "node": "./dist/index.cjs" - } - }, "files": [ "dist/**/*" ], diff --git a/packages/playground/src/r3f/App.tsx b/packages/playground/src/r3f/App.tsx index 05eb7d1..b020777 100644 --- a/packages/playground/src/r3f/App.tsx +++ b/packages/playground/src/r3f/App.tsx @@ -1,5 +1,4 @@ import {editable as e, Wrapper} from '@theatre/plugin-r3f' -import {PerspectiveCamera} from '@react-three/drei' import {getProject} from '@theatre/core' import * as THREE from 'three' import React, {useState, useEffect, useRef} from 'react' @@ -7,9 +6,6 @@ import type {Color} from '@react-three/fiber' import {Canvas, useFrame} from '@react-three/fiber' import {softShadows, Shadow} from '@react-three/drei' import type {DirectionalLight} from 'three' -import type {$FixMe} from '../../../plugin-r3f/src/types' - -const ECamera = e(PerspectiveCamera, 'perspectiveCamera') // Soft shadows are expensive, comment and refresh when it's too slow softShadows() @@ -29,11 +25,7 @@ function Button() { useFrame((state) => { const step = 0.1 const camera = state.camera as THREE.PerspectiveCamera - camera.fov = (THREE as $FixMe).MathUtils.lerp( - camera.fov, - zoom ? 10 : 42, - step, - ) + camera.fov = (THREE as any).MathUtils.lerp(camera.fov, zoom ? 10 : 42, step) camera.position.lerp( vec.set(zoom ? 25 : 10, zoom ? 1 : 5, zoom ? 0 : 10), step, @@ -99,9 +91,10 @@ function App() { shadowMap > getProject('Example project').sheet('R3F-Canvas')} + getSheet={() => getProject('Playground - R3F').sheet('R3F-Canvas')} > - + {/* @ts-ignore */} + - + getProject('Example project').sheet('R3F-Canvas')} > diff --git a/packages/plugin-r3f/devEnv/build.ts b/packages/plugin-r3f/devEnv/build.ts new file mode 100644 index 0000000..136c217 --- /dev/null +++ b/packages/plugin-r3f/devEnv/build.ts @@ -0,0 +1,75 @@ +import path from 'path' +import {build} from 'esbuild' +import type {Plugin} from 'esbuild' +import {writeFileSync} from 'fs' + +const externalPlugin = (patterns: RegExp[]): Plugin => { + return { + name: `external`, + + setup(build) { + build.onResolve({filter: /.*/}, (args) => { + const external = patterns.some((p) => { + return p.test(args.path) + }) + + if (external) { + return {path: args.path, external} + } + }) + }, + } +} + +const definedGlobals = { + global: 'window', +} + +function createBundles(watch: boolean) { + const pathToPackage = path.join(__dirname, '../') + const esbuildConfig: Parameters[0] = { + entryPoints: [path.join(pathToPackage, 'src/index.tsx')], + bundle: true, + sourcemap: true, + define: definedGlobals, + watch, + platform: 'neutral', + mainFields: ['browser', 'module', 'main'], + target: ['firefox57', 'chrome58'], + conditions: ['browser', 'node'], + // every dependency is considered external + plugins: [externalPlugin([/^[\@a-zA-Z]+/])], + } + + build({ + ...esbuildConfig, + define: {...definedGlobals, 'process.env.NODE_ENV': '"production"'}, + outfile: path.join(pathToPackage, 'dist/index.production.cjs'), + format: 'cjs', + treeShaking: true, + }) + + build({ + ...esbuildConfig, + define: {...definedGlobals, 'process.env.NODE_ENV': '"development"'}, + outfile: path.join(pathToPackage, 'dist/index.development.cjs'), + format: 'cjs', + }) + + writeFileSync( + path.join(pathToPackage, 'dist/index.cjs'), + `module.exports = + process.env.NODE_ENV === "production" + ? require("./index.production.cjs") + : require("./index.development.cjs")`, + {encoding: 'utf-8'}, + ) + + build({ + ...esbuildConfig, + outfile: path.join(pathToPackage, 'dist/index.mjs'), + format: 'esm', + }) +} + +createBundles(false) diff --git a/packages/plugin-r3f/devEnv/tsconfig.json b/packages/plugin-r3f/devEnv/tsconfig.json new file mode 100644 index 0000000..077404a --- /dev/null +++ b/packages/plugin-r3f/devEnv/tsconfig.json @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file diff --git a/packages/plugin-r3f/package.json b/packages/plugin-r3f/package.json index 15e6b31..c6ae4ff 100644 --- a/packages/plugin-r3f/package.json +++ b/packages/plugin-r3f/package.json @@ -19,15 +19,18 @@ "url": "https://github.com/AriaMinaei/theatre", "directory": "packages/plugin-r3f" }, - "main": "dist/index.js", + "main": "dist/index.cjs", "types": "dist/index.d.ts", + "sideEffects": false, "files": [ "dist/**/*" ], "scripts": { "prepack": "yarn run build", "typecheck": "yarn run build", - "build": "tsc --build ./tsconfig.json", + "build": "run-s build:ts build:js", + "build:ts": "tsc --build ./tsconfig.json", + "build:js": "node -r esbuild-register ./devEnv/build.ts", "prepublish": "node ../../devEnv/ensurePublishing.js" }, "devDependencies": { @@ -36,6 +39,7 @@ "@types/node": "^15.6.2", "@types/react": "^17.0.9", "@types/styled-components": "^5.1.9", + "npm-run-all": "^4.1.5", "typescript": "^4.3.2" }, "dependencies": { diff --git a/packages/plugin-r3f/src/index.tsx b/packages/plugin-r3f/src/index.tsx index 24f3475..22419ab 100644 --- a/packages/plugin-r3f/src/index.tsx +++ b/packages/plugin-r3f/src/index.tsx @@ -1,8 +1,4 @@ -import SnapshotEditor from './components/SnapshotEditor' -import studio from '@theatre/studio' -import Toolbar from './components/Toolbar/Toolbar' -import {types} from '@theatre/core' - +import setupPlugin from './setupPlugin' export {default as EditorHelper} from './components/EditorHelper' export type {EditorHelperProps} from './components/EditorHelper' export {default as editable} from './components/editable' @@ -10,19 +6,5 @@ export type {EditableState, BindFunction} from './store' export {default as Wrapper} from './Wrapper' if (process.env.NODE_ENV === 'development') { - studio.extend({ - id: '@theatre/plugin-r3f', - globalToolbar: { - component: Toolbar, - }, - panes: [ - { - class: 'snapshotEditor', - dataType: types.compound({ - grosse: types.number(20), - }), - component: SnapshotEditor, - }, - ], - }) + setupPlugin() } diff --git a/packages/plugin-r3f/src/setupPlugin.ts b/packages/plugin-r3f/src/setupPlugin.ts new file mode 100644 index 0000000..29850b1 --- /dev/null +++ b/packages/plugin-r3f/src/setupPlugin.ts @@ -0,0 +1,22 @@ +import SnapshotEditor from './components/SnapshotEditor' +import studio from '@theatre/studio' +import Toolbar from './components/Toolbar/Toolbar' +import {types} from '@theatre/core' + +export default function setupPlugin() { + studio.extend({ + id: '@theatre/plugin-r3f', + globalToolbar: { + component: Toolbar, + }, + panes: [ + { + class: 'snapshotEditor', + dataType: types.compound({ + grosse: types.number(20), + }), + component: SnapshotEditor, + }, + ], + }) +} diff --git a/packages/plugin-r3f/tsconfig.json b/packages/plugin-r3f/tsconfig.json index 42750b4..3c42607 100644 --- a/packages/plugin-r3f/tsconfig.json +++ b/packages/plugin-r3f/tsconfig.json @@ -5,7 +5,7 @@ "lib": ["ESNext", "DOM"], "rootDir": "src", "types": ["jest", "node"], - "emitDeclarationOnly": false, + "emitDeclarationOnly": true, "composite": true }, "references": [{"path": "../../theatre"}], diff --git a/theatre/core/package.json b/theatre/core/package.json index 833fef6..49a64e6 100644 --- a/theatre/core/package.json +++ b/theatre/core/package.json @@ -14,17 +14,8 @@ "url": "https://www.theatrejs.com" }, "main": "dist/index.cjs", - "module": "dist/index.mjs", - "exports": { - ".": { - "require": "./dist/index.cjs", - "import": "./dist/index.mjs", - "default": "./dist/index.cjs", - "node": "./dist/index.cjs", - "script": "./dist/index.min.js" - } - }, "types": "dist/index.d.ts", + "type": "commonjs", "files": [ "dist/index.cjs", "dist/index.cjs.map", diff --git a/theatre/studio/package.json b/theatre/studio/package.json index 948fc98..deecaea 100644 --- a/theatre/studio/package.json +++ b/theatre/studio/package.json @@ -14,16 +14,6 @@ "url": "https://www.theatrejs.com" }, "main": "dist/index.cjs", - "module": "dist/index.mjs", - "exports": { - ".": { - "require": "./dist/index.cjs", - "import": "./dist/index.mjs", - "default": "./dist/index.cjs", - "node": "./dist/index.cjs", - "script": "./dist/index.min.js" - } - }, "types": "dist/index.d.ts", "files": [ "dist/index.cjs", @@ -38,8 +28,11 @@ "scripts": { "prepublish": "node ../../devEnv/ensurePublishing.js" }, - "sideEffects": true, + "sideEffects": false, "peerDependencies": { "@theatre/core": "*" + }, + "dependencies": { + "@theatre/dataverse": "workspace:*" } } diff --git a/yarn.lock b/yarn.lock index 39b6c87..2cd37a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3625,6 +3625,42 @@ __metadata: languageName: unknown linkType: soft +"@examples/dom-cra@workspace:examples/dom-cra": + version: 0.0.0-use.local + resolution: "@examples/dom-cra@workspace:examples/dom-cra" + dependencies: + "@testing-library/jest-dom": ^5.11.4 + "@testing-library/react": ^11.1.0 + "@testing-library/user-event": ^12.1.10 + "@theatre/core": "workspace:*" + "@theatre/studio": "workspace:*" + react: ^17.0.2 + react-dom: ^17.0.2 + react-scripts: 4.0.3 + web-vitals: ^1.0.1 + languageName: unknown + linkType: soft + +"@examples/r3f-cra@workspace:examples/r3f-cra": + version: 0.0.0-use.local + resolution: "@examples/r3f-cra@workspace:examples/r3f-cra" + dependencies: + "@react-three/drei": ^7.2.2 + "@react-three/fiber": ^7.0.6 + "@testing-library/jest-dom": ^5.11.4 + "@testing-library/react": ^11.1.0 + "@testing-library/user-event": ^12.1.10 + "@theatre/core": "workspace:*" + "@theatre/plugin-r3f": "workspace:*" + "@theatre/studio": "workspace:*" + react: ^17.0.2 + react-dom: ^17.0.2 + react-scripts: 4.0.3 + three: ^0.130.1 + web-vitals: ^1.0.1 + languageName: unknown + linkType: soft + "@hapi/address@npm:2.x.x": version: 2.1.4 resolution: "@hapi/address@npm:2.1.4" @@ -10630,22 +10666,6 @@ __metadata: languageName: node linkType: hard -"dom-cra@workspace:examples/dom-cra": - version: 0.0.0-use.local - resolution: "dom-cra@workspace:examples/dom-cra" - dependencies: - "@testing-library/jest-dom": ^5.11.4 - "@testing-library/react": ^11.1.0 - "@testing-library/user-event": ^12.1.10 - "@theatre/core": "workspace:*" - "@theatre/studio": "workspace:*" - react: ^17.0.2 - react-dom: ^17.0.2 - react-scripts: 4.0.3 - web-vitals: ^1.0.1 - languageName: unknown - linkType: soft - "dom-serializer@npm:0": version: 0.2.2 resolution: "dom-serializer@npm:0.2.2"