diff --git a/devEnv/deploy.mjs b/devEnv/deploy.mjs
index 8c9957b..d8bc8dd 100644
--- a/devEnv/deploy.mjs
+++ b/devEnv/deploy.mjs
@@ -12,7 +12,7 @@ const packagesToBuild = [
'theatre',
'@theatre/dataverse',
'@theatre/react',
- '@theatre/plugin-r3f',
+ '@theatre/r3f',
]
const packagesToPublish = [
@@ -20,7 +20,7 @@ const packagesToPublish = [
'@theatre/studio',
'@theatre/dataverse',
'@theatre/react',
- '@theatre/plugin-r3f',
+ '@theatre/r3f',
]
/**
@@ -33,7 +33,7 @@ const packagesWhoseVersionsShouldBump = [
'theatre/studio',
'packages/dataverse',
'packages/react',
- 'packages/plugin-r3f',
+ 'packages/r3f',
]
;(async function () {
diff --git a/devEnv/typecheck-all-projects/tsconfig.all.json b/devEnv/typecheck-all-projects/tsconfig.all.json
index ae712e6..2d5b8ef 100644
--- a/devEnv/typecheck-all-projects/tsconfig.all.json
+++ b/devEnv/typecheck-all-projects/tsconfig.all.json
@@ -9,6 +9,6 @@
{"path": "../../theatre"},
{"path": "../../packages/dataverse"},
{"path": "../../packages/playground"},
- {"path": "../../packages/plugin-r3f"}
+ {"path": "../../packages/r3f"}
]
}
diff --git a/examples/r3f-cra/package.json b/examples/r3f-cra/package.json
index 804fbb8..7add4a0 100644
--- a/examples/r3f-cra/package.json
+++ b/examples/r3f-cra/package.json
@@ -12,7 +12,7 @@
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@theatre/core": "workspace:*",
- "@theatre/plugin-r3f": "workspace:*",
+ "@theatre/r3f": "workspace:*",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "4.0.3",
diff --git a/examples/r3f-cra/src/App.js b/examples/r3f-cra/src/App.js
index d59d335..cd9ff9c 100644
--- a/examples/r3f-cra/src/App.js
+++ b/examples/r3f-cra/src/App.js
@@ -4,7 +4,7 @@ import {useState, useEffect, useRef} from 'react'
import {useFrame, Canvas} from '@react-three/fiber'
import {Shadow, softShadows} from '@react-three/drei'
import React from 'react'
-import {editable as e, Wrapper} from '@theatre/plugin-r3f'
+import {editable as e, Wrapper} from '@theatre/r3f'
// Soft shadows are expensive, comment and refresh when it's too slow
softShadows()
diff --git a/packages/playground/package.json b/packages/playground/package.json
index 6a92686..b6b82da 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -16,7 +16,7 @@
"@react-three/drei": "^7.2.2",
"@react-three/fiber": "^7.0.6",
"@theatre/core": "workspace:*",
- "@theatre/plugin-r3f": "workspace:*",
+ "@theatre/r3f": "workspace:*",
"@theatre/studio": "workspace:*",
"@types/jest": "^26.0.23",
"@types/lodash-es": "^4.17.4",
diff --git a/packages/playground/src/r3f/App.tsx b/packages/playground/src/r3f/App.tsx
index 51f435c..14a9bbe 100644
--- a/packages/playground/src/r3f/App.tsx
+++ b/packages/playground/src/r3f/App.tsx
@@ -1,4 +1,4 @@
-import {editable as e, SheetProvider} from '@theatre/plugin-r3f'
+import {editable as e, SheetProvider} from '@theatre/r3f'
import {getProject} from '@theatre/core'
import * as THREE from 'three'
import React, {useState, useEffect, useRef} from 'react'
diff --git a/packages/playground/src/space-exploration/App.tsx b/packages/playground/src/space-exploration/App.tsx
index 90e7bd5..9b57d83 100644
--- a/packages/playground/src/space-exploration/App.tsx
+++ b/packages/playground/src/space-exploration/App.tsx
@@ -3,7 +3,7 @@ import {
RefreshSnapshot,
SheetProvider,
extension,
-} from '@theatre/plugin-r3f'
+} from '@theatre/r3f'
import {OrbitControls, Stars} from '@react-three/drei'
import {getProject} from '@theatre/core'
import React, {Suspense, useState} from 'react'
diff --git a/packages/playground/tsconfig.json b/packages/playground/tsconfig.json
index fd86e4a..70bc8ad 100644
--- a/packages/playground/tsconfig.json
+++ b/packages/playground/tsconfig.json
@@ -11,7 +11,7 @@
"references": [
{"path": "../../theatre"},
{"path": "../dataverse"},
- {"path": "../plugin-r3f"}
+ {"path": "../r3f"}
],
"include": ["./src/**/*", "./devEnv/**/*"]
}
diff --git a/packages/plugin-r3f/.gitignore b/packages/r3f/.gitignore
similarity index 100%
rename from packages/plugin-r3f/.gitignore
rename to packages/r3f/.gitignore
diff --git a/packages/plugin-r3f/LICENSE b/packages/r3f/LICENSE
similarity index 100%
rename from packages/plugin-r3f/LICENSE
rename to packages/r3f/LICENSE
diff --git a/packages/plugin-r3f/README.md b/packages/r3f/README.md
similarity index 100%
rename from packages/plugin-r3f/README.md
rename to packages/r3f/README.md
diff --git a/packages/plugin-r3f/devEnv/build.ts b/packages/r3f/devEnv/build.ts
similarity index 100%
rename from packages/plugin-r3f/devEnv/build.ts
rename to packages/r3f/devEnv/build.ts
diff --git a/packages/plugin-r3f/devEnv/tsconfig.json b/packages/r3f/devEnv/tsconfig.json
similarity index 100%
rename from packages/plugin-r3f/devEnv/tsconfig.json
rename to packages/r3f/devEnv/tsconfig.json
diff --git a/packages/plugin-r3f/package.json b/packages/r3f/package.json
similarity index 95%
rename from packages/plugin-r3f/package.json
rename to packages/r3f/package.json
index b7d1666..029f021 100644
--- a/packages/plugin-r3f/package.json
+++ b/packages/r3f/package.json
@@ -1,5 +1,5 @@
{
- "name": "@theatre/plugin-r3f",
+ "name": "@theatre/r3f",
"version": "0.4.0-dev.14",
"license": "Apache-2.0",
"authors": [
@@ -17,7 +17,7 @@
"repository": {
"type": "git",
"url": "https://github.com/AriaMinaei/theatre",
- "directory": "packages/plugin-r3f"
+ "directory": "packages/r3f"
},
"main": "dist/index.js",
"types": "dist/index.d.ts",
diff --git a/packages/plugin-r3f/src/.eslintrc.js b/packages/r3f/src/.eslintrc.js
similarity index 100%
rename from packages/plugin-r3f/src/.eslintrc.js
rename to packages/r3f/src/.eslintrc.js
diff --git a/packages/plugin-r3f/src/SheetProvider.tsx b/packages/r3f/src/SheetProvider.tsx
similarity index 100%
rename from packages/plugin-r3f/src/SheetProvider.tsx
rename to packages/r3f/src/SheetProvider.tsx
diff --git a/packages/plugin-r3f/src/components/EditableProxy.tsx b/packages/r3f/src/components/EditableProxy.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/EditableProxy.tsx
rename to packages/r3f/src/components/EditableProxy.tsx
diff --git a/packages/plugin-r3f/src/components/EditorHelper.tsx b/packages/r3f/src/components/EditorHelper.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/EditorHelper.tsx
rename to packages/r3f/src/components/EditorHelper.tsx
diff --git a/packages/plugin-r3f/src/components/ProxyManager.tsx b/packages/r3f/src/components/ProxyManager.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/ProxyManager.tsx
rename to packages/r3f/src/components/ProxyManager.tsx
diff --git a/packages/plugin-r3f/src/components/RefreshSnapshot.tsx b/packages/r3f/src/components/RefreshSnapshot.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/RefreshSnapshot.tsx
rename to packages/r3f/src/components/RefreshSnapshot.tsx
diff --git a/packages/plugin-r3f/src/components/SnapshotEditor.tsx b/packages/r3f/src/components/SnapshotEditor.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/SnapshotEditor.tsx
rename to packages/r3f/src/components/SnapshotEditor.tsx
diff --git a/packages/plugin-r3f/src/components/Toolbar/Toolbar.tsx b/packages/r3f/src/components/Toolbar/Toolbar.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/Toolbar/Toolbar.tsx
rename to packages/r3f/src/components/Toolbar/Toolbar.tsx
diff --git a/packages/plugin-r3f/src/components/Toolbar/TransformControlsModeSelect.tsx b/packages/r3f/src/components/Toolbar/TransformControlsModeSelect.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/Toolbar/TransformControlsModeSelect.tsx
rename to packages/r3f/src/components/Toolbar/TransformControlsModeSelect.tsx
diff --git a/packages/plugin-r3f/src/components/Toolbar/TransformControlsSpaceSelect.tsx b/packages/r3f/src/components/Toolbar/TransformControlsSpaceSelect.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/Toolbar/TransformControlsSpaceSelect.tsx
rename to packages/r3f/src/components/Toolbar/TransformControlsSpaceSelect.tsx
diff --git a/packages/plugin-r3f/src/components/Toolbar/ViewportShadingSelect.tsx b/packages/r3f/src/components/Toolbar/ViewportShadingSelect.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/Toolbar/ViewportShadingSelect.tsx
rename to packages/r3f/src/components/Toolbar/ViewportShadingSelect.tsx
diff --git a/packages/plugin-r3f/src/components/TransformControls.tsx b/packages/r3f/src/components/TransformControls.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/TransformControls.tsx
rename to packages/r3f/src/components/TransformControls.tsx
diff --git a/packages/plugin-r3f/src/components/editable.tsx b/packages/r3f/src/components/editable.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/editable.tsx
rename to packages/r3f/src/components/editable.tsx
diff --git a/packages/plugin-r3f/src/components/editorStuff.ts b/packages/r3f/src/components/editorStuff.ts
similarity index 100%
rename from packages/plugin-r3f/src/components/editorStuff.ts
rename to packages/r3f/src/components/editorStuff.ts
diff --git a/packages/plugin-r3f/src/components/useInvalidate.ts b/packages/r3f/src/components/useInvalidate.ts
similarity index 100%
rename from packages/plugin-r3f/src/components/useInvalidate.ts
rename to packages/r3f/src/components/useInvalidate.ts
diff --git a/packages/plugin-r3f/src/components/useRefAndState.ts b/packages/r3f/src/components/useRefAndState.ts
similarity index 100%
rename from packages/plugin-r3f/src/components/useRefAndState.ts
rename to packages/r3f/src/components/useRefAndState.ts
diff --git a/packages/plugin-r3f/src/components/useRefreshSnapshot.ts b/packages/r3f/src/components/useRefreshSnapshot.ts
similarity index 100%
rename from packages/plugin-r3f/src/components/useRefreshSnapshot.ts
rename to packages/r3f/src/components/useRefreshSnapshot.ts
diff --git a/packages/plugin-r3f/src/components/useSelected.tsx b/packages/r3f/src/components/useSelected.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/useSelected.tsx
rename to packages/r3f/src/components/useSelected.tsx
diff --git a/packages/plugin-r3f/src/components/useSnapshotEditorCamera.tsx b/packages/r3f/src/components/useSnapshotEditorCamera.tsx
similarity index 100%
rename from packages/plugin-r3f/src/components/useSnapshotEditorCamera.tsx
rename to packages/r3f/src/components/useSnapshotEditorCamera.tsx
diff --git a/packages/plugin-r3f/src/extension.ts b/packages/r3f/src/extension.ts
similarity index 92%
rename from packages/plugin-r3f/src/extension.ts
rename to packages/r3f/src/extension.ts
index a4019ea..d1463d2 100644
--- a/packages/plugin-r3f/src/extension.ts
+++ b/packages/r3f/src/extension.ts
@@ -3,7 +3,7 @@ import type {IExtension} from '@theatre/studio'
import Toolbar from './components/Toolbar/Toolbar'
const r3fExtension: IExtension = {
- id: '@theatre/plugin-r3f',
+ id: '@theatre/r3f',
globalToolbar: {
component: Toolbar,
},
diff --git a/packages/plugin-r3f/src/globals.d.ts b/packages/r3f/src/globals.d.ts
similarity index 100%
rename from packages/plugin-r3f/src/globals.d.ts
rename to packages/r3f/src/globals.d.ts
diff --git a/packages/plugin-r3f/src/index.tsx b/packages/r3f/src/index.tsx
similarity index 100%
rename from packages/plugin-r3f/src/index.tsx
rename to packages/r3f/src/index.tsx
diff --git a/packages/plugin-r3f/src/store.ts b/packages/r3f/src/store.ts
similarity index 100%
rename from packages/plugin-r3f/src/store.ts
rename to packages/r3f/src/store.ts
diff --git a/packages/plugin-r3f/src/types.ts b/packages/r3f/src/types.ts
similarity index 100%
rename from packages/plugin-r3f/src/types.ts
rename to packages/r3f/src/types.ts
diff --git a/packages/plugin-r3f/tsconfig.json b/packages/r3f/tsconfig.json
similarity index 100%
rename from packages/plugin-r3f/tsconfig.json
rename to packages/r3f/tsconfig.json
diff --git a/theatre/devEnv/buildUtils.ts b/theatre/devEnv/buildUtils.ts
index e43170b..16b5ba5 100644
--- a/theatre/devEnv/buildUtils.ts
+++ b/theatre/devEnv/buildUtils.ts
@@ -32,7 +32,7 @@ export function createBundles(watch: boolean) {
* - ToolbarIconButton
* - IStudio['extend']({globalToolbar: {component}})
*
- * These are further exposed by @theatre/plugin-r3f which provides ``
+ * These are further exposed by @theatre/r3f which provides ``
* as an API.
*
* It's probably possible to bundle our own react version and somehow share it
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 23102f5..eb57864 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -23,7 +23,7 @@
"@theatre/shared/*": ["./theatre/shared/src/*"],
"@theatre/dataverse": ["./packages/dataverse/src/index.ts"],
"@theatre/react": ["./packages/react/src/index.ts"],
- "@theatre/plugin-r3f": ["./packages/plugin-r3f/src/index.tsx"],
+ "@theatre/r3f": ["./packages/r3f/src/index.tsx"],
"@theatre/dataverse2": ["./packages/dataverse2/src/index.ts"]
},
"forceConsistentCasingInFileNames": true
diff --git a/yarn.lock b/yarn.lock
index 26f530f..28f0c11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3157,7 +3157,7 @@ __metadata:
"@testing-library/react": ^11.1.0
"@testing-library/user-event": ^12.1.10
"@theatre/core": "workspace:*"
- "@theatre/plugin-r3f": "workspace:*"
+ "@theatre/r3f": "workspace:*"
"@theatre/studio": "workspace:*"
react: ^17.0.2
react-dom: ^17.0.2
@@ -5243,9 +5243,9 @@ __metadata:
languageName: unknown
linkType: soft
-"@theatre/plugin-r3f@workspace:*, @theatre/plugin-r3f@workspace:packages/plugin-r3f":
+"@theatre/r3f@workspace:*, @theatre/r3f@workspace:packages/r3f":
version: 0.0.0-use.local
- resolution: "@theatre/plugin-r3f@workspace:packages/plugin-r3f"
+ resolution: "@theatre/r3f@workspace:packages/r3f"
dependencies:
"@react-three/drei": ^7.3.1
"@theatre/react": "workspace:*"
@@ -18215,7 +18215,7 @@ fsevents@^1.2.7:
"@react-three/drei": ^7.2.2
"@react-three/fiber": ^7.0.6
"@theatre/core": "workspace:*"
- "@theatre/plugin-r3f": "workspace:*"
+ "@theatre/r3f": "workspace:*"
"@theatre/studio": "workspace:*"
"@types/jest": ^26.0.23
"@types/lodash-es": ^4.17.4