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

@@ -1,5 +1,5 @@
 {
-  "name": "dom-cra",
+  "name": "@examples/dom-cra",
   "version": "0.1.0",
   "private": true,
   "installConfig": {

examples/r3f-cra/.env

@@ -0,0 +1 @@
+SKIP_PREFLIGHT_CHECK=true

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*

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)

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"
+    ]
+  }
+}

examples/r3f-cra/public/index.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

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"
+}

examples/r3f-cra/public/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

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);
+  }
+}

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 (
+    <e.mesh
+      receiveShadow
+      castShadow
+      onClick={() => set(!zoom)}
+      onPointerOver={() => setActive(true)}
+      onPointerOut={() => setActive(false)}
+      uniqueName="The Button"
+    >
+      <sphereBufferGeometry args={[0.75, 64, 64]} />
+      <meshPhysicalMaterial
+        color={active ? 'purple' : '#e7b056'}
+        clearcoat={1}
+        clearcoatRoughness={0}
+      />
+      <Shadow
+        position-y={-0.79}
+        rotation-x={-Math.PI / 2}
+        opacity={0.6}
+        scale={[0.8, 0.8, 1]}
+      />
+      <directionalLight
+        ref={light}
+        castShadow
+        intensity={1.5}
+        shadow-camera-far={70}
+      />
+    </e.mesh>
+  )
+}
+
+function Plane({color, uniqueName, ...props}) {
+  return (
+    <e.mesh receiveShadow castShadow {...props} uniqueName={uniqueName}>
+      <boxBufferGeometry />
+      <meshStandardMaterial color={color} />
+    </e.mesh>
+  )
+}
+
+function App() {
+  return (
+    <div>
+      <Canvas
+        // @ts-ignore
+        shadowMap
+      >
+        <Wrapper
+          getSheet={() => getProject('Playground - R3F').sheet('R3F-Canvas')}
+        >
+          {/* @ts-ignore */}
+          <e.perspectiveCamera makeDefault uniqueName="Camera" />
+          <ambientLight intensity={0.4} />
+          <e.pointLight
+            position={[-10, -10, 5]}
+            intensity={2}
+            color="#ff20f0"
+            uniqueName="Light 1"
+          />
+          <e.pointLight
+            position={[0, 0.5, -1]}
+            distance={1}
+            intensity={2}
+            color="#e4be00"
+            uniqueName="Light 2"
+          />
+          <group position={[0, -0.9, -3]}>
+            <Plane
+              color="hotpink"
+              rotation-x={-Math.PI / 2}
+              position-z={2}
+              scale={[4, 20, 0.2]}
+              uniqueName="plane1"
+            />
+            <Plane
+              color="#e4be00"
+              rotation-x={-Math.PI / 2}
+              position-y={1}
+              scale={[4.2, 0.2, 4]}
+              uniqueName="plane2"
+            />
+            <Plane
+              color="#736fbd"
+              rotation-x={-Math.PI / 2}
+              position={[-1.7, 1, 3.5]}
+              scale={[0.5, 4, 4]}
+              uniqueName="plane3"
+            />
+            <Plane
+              color="white"
+              rotation-x={-Math.PI / 2}
+              position={[0, 4.5, 3]}
+              scale={[2, 0.03, 4]}
+              uniqueName="plane4"
+            />
+          </group>
+          <Button />
+        </Wrapper>
+      </Canvas>
+    </div>
+  )
+}
+
+export default App

examples/r3f-cra/src/App.test.js

@@ -0,0 +1,7 @@
+import {render, screen} from '@testing-library/react'
+
+test('renders learn react link', () => {
+  render(<App />)
+  const linkElement = screen.getByText(/learn react/i)
+  expect(linkElement).toBeInTheDocument()
+})

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;
+}

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(
+  <React.StrictMode>
+    <App project={getProject('CRA project')} />
+  </React.StrictMode>,
+  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()

examples/r3f-cra/src/logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

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

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'

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])
+}

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",

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/**/*"
   ],

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/**/*"
   ],

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 = (THREE as any).MathUtils.lerp(camera.fov, zoom ? 10 : 42, step)
-      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
       >
         <Wrapper
-          getSheet={() => getProject('Example project').sheet('R3F-Canvas')}
+          getSheet={() => getProject('Playground - R3F').sheet('R3F-Canvas')}
         >
-          <ECamera makeDefault uniqueName="Camera" />
+          {/* @ts-ignore */}
+          <e.perspectiveCamera makeDefault uniqueName="Camera" />
           <ambientLight intensity={0.4} />
           <e.pointLight
             position={[-10, -10, 5]}

packages/playground/src/space-exploration/App.tsx

@@ -49,7 +49,7 @@ function App() {
   const bg = '#272730'
   return (
     <div>
-      <Canvas dpr={[1.5, 2]} linear shadows>
+      <Canvas dpr={[1.5, 2]} linear shadows frameloop="demand">
         <Wrapper
           getSheet={() => getProject('Example project').sheet('R3F-Canvas')}
         >

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<typeof build>[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)

packages/plugin-r3f/devEnv/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  
+}

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": {

packages/plugin-r3f/src/index.tsx

@@ -1,8 +1,4 @@
-import SnapshotEditor from './components/SnapshotEditor'
+import setupPlugin from './setupPlugin'
-import studio from '@theatre/studio'
-import Toolbar from './components/Toolbar/Toolbar'
-import {types} from '@theatre/core'
-
 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({
+  setupPlugin()
-    id: '@theatre/plugin-r3f',
-    globalToolbar: {
-      component: Toolbar,
-    },
-    panes: [
-      {
-        class: 'snapshotEditor',
-        dataType: types.compound({
-          grosse: types.number(20),
-        }),
-        component: SnapshotEditor,
-      },
-    ],
-  })
 }

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,
+      },
+    ],
+  })
+}

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"}],

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",

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:*"
   }
 }

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"