diff --git a/packages/behavior/build/flecks.bootstrap.js b/packages/behavior/build/flecks.bootstrap.js index 938ee70..57d387c 100644 --- a/packages/behavior/build/flecks.bootstrap.js +++ b/packages/behavior/build/flecks.bootstrap.js @@ -1 +1 @@ -exports.dependencies = ['@flecks/react']; +exports.dependencies = ['@flecks/react-redux']; diff --git a/packages/behavior/package.json b/packages/behavior/package.json index 58984f0..eb11289 100644 --- a/packages/behavior/package.json +++ b/packages/behavior/package.json @@ -28,7 +28,7 @@ "@babel/parser": "^7.13.13", "@flecks/core": "^3.0.0", "@flecks/react": "^3.0.0", - "@flecks/redux": "^3.0.0", + "@flecks/react-redux": "^3.0.0", "babeler": "^1.0.0", "lodash.get": "^4.4.2", "lodash.set": "^4.3.2", diff --git a/packages/behavior/src/persea/controllers/script/component.jsx b/packages/behavior/src/persea/controllers/script/component.jsx index 470aeb3..75f0be5 100644 --- a/packages/behavior/src/persea/controllers/script/component.jsx +++ b/packages/behavior/src/persea/controllers/script/component.jsx @@ -5,14 +5,14 @@ import { React, useContext, } from '@flecks/react'; -import {useDispatch} from '@flecks/redux'; +import {useDispatch} from '@flecks/react-redux'; import locals from './component.module.scss'; -const ScriptComponent = ({ +function ScriptComponent({ path, resource, -}) => { +}) { const dispatch = useDispatch(); const {uri, uuid} = useContext(Context); return ( @@ -26,7 +26,7 @@ const ScriptComponent = ({ }} /> ); -}; +} ScriptComponent.defaultProps = { path: '/', diff --git a/packages/filters/build/fleck.webpack.config.js b/packages/filters/build/fleck.webpack.config.js deleted file mode 100644 index e44d7c2..0000000 --- a/packages/filters/build/fleck.webpack.config.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = async (env, argv, flecks) => { - // eslint-disable-next-line import/no-extraneous-dependencies, global-require - const config = await require('@flecks/fleck/build/fleck.webpack.config')(env, argv, flecks); - config.module.rules.push({ - test: /\.(frag|glsl|vert)$/, - use: ['webpack-glsl-loader'], - }); - return config; -}; diff --git a/packages/filters/src/server.js b/packages/filters/build/flecks.bootstrap.js similarity index 87% rename from packages/filters/src/server.js rename to packages/filters/build/flecks.bootstrap.js index 7c3fe2a..cd7aa41 100644 --- a/packages/filters/src/server.js +++ b/packages/filters/build/flecks.bootstrap.js @@ -1,4 +1,4 @@ -export const hooks = { +exports.hooks = { '@flecks/build.config': (target, config) => { config.module.rules.push({ test: /\.(frag|glsl|vert)$/, diff --git a/packages/filters/package.json b/packages/filters/package.json index 3ef2930..a796bff 100644 --- a/packages/filters/package.json +++ b/packages/filters/package.json @@ -9,8 +9,7 @@ "test": "flecks test" }, "files": [ - "client.js", - "server.js" + "client.js" ], "dependencies": { "@flecks/core": "^3.0.0", diff --git a/packages/graphics/build/flecks.bootstrap.js b/packages/graphics/build/flecks.bootstrap.js index 97adb15..f92812f 100644 --- a/packages/graphics/build/flecks.bootstrap.js +++ b/packages/graphics/build/flecks.bootstrap.js @@ -2,6 +2,6 @@ exports.dependencies = ['@flecks/react']; exports.stubs = { server: [ - /^@pixi/, + '@pixi', ], }; diff --git a/packages/input/build/flecks.bootstrap.js b/packages/input/build/flecks.bootstrap.js index 6b68b44..c06e070 100644 --- a/packages/input/build/flecks.bootstrap.js +++ b/packages/input/build/flecks.bootstrap.js @@ -1,5 +1,5 @@ exports.stubs = { server: [ - /^gamepads/, + 'gamepads', ], }; diff --git a/packages/input/src/index.js b/packages/input/src/index.js index 829becb..7057701 100644 --- a/packages/input/src/index.js +++ b/packages/input/src/index.js @@ -24,5 +24,5 @@ export const hooks = { Input: InputPacket, TraitInteractive, }), - '@flecks/web.config': (flecks) => flecks.get('@avocado/input.actions'), + '@flecks/web.config': (req, flecks) => flecks.get('@avocado/input'), }; diff --git a/packages/react/build/flecks.bootstrap.js b/packages/react/build/flecks.bootstrap.js index f32e2c9..ae4cb65 100644 --- a/packages/react/build/flecks.bootstrap.js +++ b/packages/react/build/flecks.bootstrap.js @@ -2,6 +2,6 @@ exports.dependencies = ['@flecks/react']; exports.stubs = { server: [ - /^ace-builds/, + 'ace-builds', ], }; diff --git a/packages/resource/build/flecks.bootstrap.js b/packages/resource/build/flecks.bootstrap.js index 938ee70..57d387c 100644 --- a/packages/resource/build/flecks.bootstrap.js +++ b/packages/resource/build/flecks.bootstrap.js @@ -1 +1 @@ -exports.dependencies = ['@flecks/react']; +exports.dependencies = ['@flecks/react-redux']; diff --git a/packages/resource/package.json b/packages/resource/package.json index 0056265..52255fb 100644 --- a/packages/resource/package.json +++ b/packages/resource/package.json @@ -24,6 +24,7 @@ "@avocado/react": "^4.0.0", "@flecks/core": "^3.0.0", "@flecks/react": "^3.0.0", + "@flecks/react-redux": "^3.0.0", "@flecks/redux": "^3.0.0", "deepmerge": "^4.2.2", "fast-json-patch": "^3.0.0-1", diff --git a/packages/resource/src/persea/hooks/use-json-patcher.js b/packages/resource/src/persea/hooks/use-json-patcher.js index 31be04d..35b008a 100644 --- a/packages/resource/src/persea/hooks/use-json-patcher.js +++ b/packages/resource/src/persea/hooks/use-json-patcher.js @@ -1,5 +1,5 @@ import {useContext} from '@flecks/react'; -import {useDispatch} from '@flecks/redux'; +import {useDispatch} from '@flecks/react-redux'; import {compare} from 'fast-json-patch'; import Context from '../context/json-patcher'; diff --git a/packages/topdown/package.json b/packages/topdown/package.json index 765e9de..e47e0a2 100644 --- a/packages/topdown/package.json +++ b/packages/topdown/package.json @@ -31,6 +31,7 @@ "@avocado/traits": "^4.0.0", "@flecks/core": "^3.0.0", "@flecks/react": "^3.0.0", + "@flecks/react-redux": "^3.0.0", "@flecks/redux": "^3.0.0", "@flecks/socket": "^3.0.0", "@flecks/web": "^3.0.0", diff --git a/packages/topdown/src/persea/controllers/room/component.jsx b/packages/topdown/src/persea/controllers/room/component.jsx index 5fcd4f6..910ba14 100644 --- a/packages/topdown/src/persea/controllers/room/component.jsx +++ b/packages/topdown/src/persea/controllers/room/component.jsx @@ -26,17 +26,15 @@ import { usePrevious, useState, } from '@flecks/react'; -import { - useDispatch, -} from '@flecks/redux'; +import {useDispatch} from '@flecks/react-redux'; import styles from './component.module.scss'; const renderer = new Renderer(); -const RoomComponent = ({ +function RoomComponent({ resource, -}) => { +}) { const {uri, uuid} = useContext(Context); const dispatch = useDispatch(); const flecks = useFlecks(); @@ -249,7 +247,7 @@ const RoomComponent = ({ ); -}; +} RoomComponent.defaultProps = {};