Merge branch 'iwer-upgrade'

Author: bbohlender

.github/workflows/static.yml

@@ -49,6 +49,7 @@ jobs:
           mkdir -p public/examples/layers
           mkdir -p public/examples/secondary-input-sources
           mkdir -p public/examples/editor
+          mkdir -p public/examples/hit-testing
           cp -r ./examples/minecraft/dist/* ./public/examples/minecraft
           cp -r ./examples/pingpong/dist/* ./public/examples/pingpong
           cp -r ./examples/rag-doll/dist/* ./public/examples/rag-doll
@@ -58,6 +59,7 @@ jobs:
           cp -r ./examples/layers/dist/* ./public/examples/layers
           cp -r ./examples/secondary-input-sources/dist/* ./public/examples/secondary-input-sources
           cp -r ./examples/editor/dist/* ./public/examples/editor
+          cp -r ./examples/hit-testing/dist/* ./public/examples/hit-testing
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4

CONTRIBUTING.md

@@ -6,6 +6,7 @@ To get started, make sure you have [Node](https://nodejs.org) and [PNPM](https:/
 
 ```bash
 pnpm i
+pnpm -r copy
 pnpm -r build
 ```
 

examples/demo-controller/package.json

@@ -1,8 +1,8 @@
 {
     "dependencies": {
-        "@pmndrs/xr": "workspace:^",
+        "@pmndrs/xr": "workspace:~",
         "@react-three/uikit": "^0.5.3",
-        "@react-three/xr": "workspace:^"
+        "@react-three/xr": "workspace:~"
     },
     "scripts": {
         "dev": "vite --host"

examples/demo-controller/vite.config.ts

@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })

examples/editor/app.tsx

@@ -86,7 +86,7 @@ const useSceneStore = create(() => ({
 
 const cameraStore = createScreenCameraStore({ yaw: 0, distance: 0.5 })
 
-const store = createXRStore()
+const store = createXRStore({ emulate: { syntheticEnvironment: false } })
 
 const buttonStyles: CSSProperties = {
   background: 'white',

examples/editor/package.json

@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "@pmndrs/handle": "workspace:^",
-    "@pmndrs/pointer-events": "workspace:^",
-    "@react-three/handle": "workspace:^",
-    "@react-three/xr": "workspace:^",
+    "@pmndrs/handle": "workspace:~",
+    "@pmndrs/pointer-events": "workspace:~",
+    "@react-three/handle": "workspace:~",
+    "@react-three/xr": "workspace:~",
     "meshline": "^3.3.1",
     "postprocessing": "^6.36.6",
     "zustand": "^4.5.2"

examples/editor/vite.config.ts

@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/editor/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })

examples/handheld-ar/package.json

@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "@react-three/xr": "workspace:^"
+        "@react-three/xr": "workspace:~"
     },
     "scripts": {
         "dev": "vite --host"

examples/handheld-ar/vite.config.ts

@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })

examples/handle-vanilla/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@pmndrs/pointer-events": "workspace:^",
-    "@pmndrs/handle": "workspace:^"
+    "@pmndrs/pointer-events": "workspace:~",
+    "@pmndrs/handle": "workspace:~"
   },
   "scripts": {
     "dev": "vite"