From e907076741040a3182f245b8f4c56fb7b1808845 Mon Sep 17 00:00:00 2001 From: John Dillick Date: Tue, 25 Apr 2023 07:36:02 -1000 Subject: [PATCH 1/2] Update babel strategy for server. --- .core/babel.config.js | 3 +++ .core/sdk/index.js | 5 ++++- .core/sdk/named-exports/index.js | 1 - .core/sdk/named-exports/useDispatcher.js | 2 +- .core/server-globals.js | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.core/babel.config.js b/.core/babel.config.js index a5d972e6..cfccf025 100644 --- a/.core/babel.config.js +++ b/.core/babel.config.js @@ -99,6 +99,9 @@ ReactiumBabel.env = { browsers: ['> 1%', 'IE 11'], }, }; + +if (!global.ReactiumWebpack) ReactiumBabel.env.targets = { node: '18' }; + ReactiumBabel.Hook.runSync('env', ReactiumBabel.env); /** diff --git a/.core/sdk/index.js b/.core/sdk/index.js index ffca4524..e3bd6bd5 100644 --- a/.core/sdk/index.js +++ b/.core/sdk/index.js @@ -13,7 +13,10 @@ import { } from '@atomic-reactor/reactium-sdk-core'; import { AppContext } from './named-exports'; -import { useDispatcherFactory, useStateEffectFactory } from './named-exports'; +import { + useDispatcherFactory, + useStateEffectFactory, +} from './named-exports/useDispatcher'; export * from '@atomic-reactor/reactium-sdk-core'; export * from './named-exports'; diff --git a/.core/sdk/named-exports/index.js b/.core/sdk/named-exports/index.js index b8e5801d..37d87ef4 100644 --- a/.core/sdk/named-exports/index.js +++ b/.core/sdk/named-exports/index.js @@ -6,4 +6,3 @@ export * from './i18n'; export * from './routing'; export * from './hookable-component'; export * from './app-context'; -export * from './useDispatcher'; diff --git a/.core/sdk/named-exports/useDispatcher.js b/.core/sdk/named-exports/useDispatcher.js index b618f78d..1716f11e 100644 --- a/.core/sdk/named-exports/useDispatcher.js +++ b/.core/sdk/named-exports/useDispatcher.js @@ -1,10 +1,10 @@ import _ from 'underscore'; -import cc from 'camelcase'; import op from 'object-path'; import { ComponentEvent, useEventEffect, } from '@atomic-reactor/reactium-sdk-core'; +import cc from 'camelcase'; export const useDispatcherFactory = Reactium => ({ props, state }) => ( type, diff --git a/.core/server-globals.js b/.core/server-globals.js index fe0b1eba..a9bb0a63 100644 --- a/.core/server-globals.js +++ b/.core/server-globals.js @@ -6,7 +6,8 @@ import reactiumBootHooks from './boot-hooks'; global.rootPath = path.resolve(__dirname, '..'); module.exports = async () => { - const ReactiumBoot = (await import('reactium-core/sdk')).default; + const ReactiumBoot = (await import('@atomic-reactor/reactium-sdk-core')) + .default; global.ReactiumBoot = ReactiumBoot; global.defines = {}; From 730a27632f6008889e080fd2fa9fc4caeda7c0de Mon Sep 17 00:00:00 2001 From: John Dillick Date: Tue, 25 Apr 2023 08:40:35 -1000 Subject: [PATCH 2/2] Update core modules to lessen isomorphic problems. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8540d5f4..553c7a18 100644 --- a/package.json +++ b/package.json @@ -166,10 +166,10 @@ }, "reactiumDependencies": { "@atomic-reactor/reactium-api": "5.0.2", - "@atomic-reactor/reactium-capability": "2.0.0", - "@atomic-reactor/reactium-role": "2.0.0", - "@atomic-reactor/reactium-user": "2.0.0", - "@atomic-reactor/reactium-setting": "2.0.0", + "@atomic-reactor/reactium-capability": "5.0.1", + "@atomic-reactor/reactium-role": "5.0.1", + "@atomic-reactor/reactium-user": "5.0.1", + "@atomic-reactor/reactium-setting": "5.0.1", "@atomic-reactor/reactium-svg": "0.0.3" } }