\n`);
+ if (options.elementId) {
+ outputSpot.add(`
\n`);
outputSpot.add(ssrContent);
outputSpot.add(`\n
\n`);
@@ -197,7 +195,7 @@ module.exports = function setup(setupContext, token) {
};
const asyncProcess = async () => {
- if (props.timestamp) {
+ if (options.timestamp) {
outputSpot.add(``);
}
@@ -215,7 +213,7 @@ ${err.stack}
request.log(["error"], { msg: `SSR subapp ${name} failed`, err });
}
} finally {
- if (props.timestamp) {
+ if (options.timestamp) {
outputSpot.add(``);
}
diff --git a/packages/subapp-web/lib/util.js b/packages/subapp-web/lib/util.js
index d66eed49a..0c2db9360 100644
--- a/packages/subapp-web/lib/util.js
+++ b/packages/subapp-web/lib/util.js
@@ -9,8 +9,17 @@ const _ = require("lodash");
let CDN_ASSETS;
let CDN_JS_BUNDLES;
+let FrameworkLib;
const utils = {
+ getFramework(ref) {
+ return new FrameworkLib(ref);
+ },
+
+ setupFramework(frameworkLib) {
+ FrameworkLib = frameworkLib;
+ },
+
resetCdn() {
CDN_ASSETS = undefined;
CDN_JS_BUNDLES = undefined;
diff --git a/packages/subapp-web/package.json b/packages/subapp-web/package.json
index 92cd6a90a..b464a5e26 100644
--- a/packages/subapp-web/package.json
+++ b/packages/subapp-web/package.json
@@ -39,15 +39,7 @@
"@babel/preset-env": "^7.3.1",
"@babel/preset-react": "^7.0.0",
"babel-preset-minify": "^0.5.1",
- "electrode-archetype-njs-module-dev": "^3.0.0",
- "react": "^16.8.3",
- "react-dom": "^16.8.3",
- "react-redux": "^6.0.1",
- "redux": "^4.0.1"
- },
- "peerDependencies": {
- "react": "*",
- "react-dom": "*"
+ "electrode-archetype-njs-module-dev": "^3.0.0"
},
"fyn": {
"dependencies": {
diff --git a/packages/subapp-web/src/index.js b/packages/subapp-web/src/index.js
index d656ce3ca..2a94375f8 100644
--- a/packages/subapp-web/src/index.js
+++ b/packages/subapp-web/src/index.js
@@ -2,11 +2,8 @@ import { createBrowserHistory } from "history";
import makeSubAppSpec from "./make-subapp-spec";
export { default as makeSubAppSpec } from "./make-subapp-spec";
-export { default as AppContext } from "./app-context";
-import ReactFrameworkLib from "./fe-framework-lib";
-
-let FrameworkLib = ReactFrameworkLib;
+let FrameworkLib;
export function setupFramework(frameworkLib) {
FrameworkLib = frameworkLib;
diff --git a/packages/subapp-web/test/spec/util.spec.js b/packages/subapp-web/test/spec/util.spec.js
index 3f18fad27..56e38ad34 100644
--- a/packages/subapp-web/test/spec/util.spec.js
+++ b/packages/subapp-web/test/spec/util.spec.js
@@ -9,7 +9,9 @@ const {
getSubAppBundle,
getChunksById,
getBundleBase,
- getCdnJsBundles
+ getCdnJsBundles,
+ getFramework,
+ setupFramework
} = require("../../lib/util");
describe("loadAssetsFromStats", () => {
@@ -92,3 +94,15 @@ describe("getCdnJsBundles", function() {
expect(cdnJsBundles[7]).contains("http://cdnasset.com/hash-123.js");
});
});
+
+describe("get/set framework", function() {
+ it("should allow set/get framework lib", () => {
+ function FL(ref) {
+ this.ref = ref;
+ }
+
+ setupFramework(FL);
+ const lib = getFramework({ test: "framework setup" });
+ expect(lib.ref.test).to.equal("framework setup");
+ });
+});
diff --git a/samples/poc-subapp/fyn-lock.yaml b/samples/poc-subapp/fyn-lock.yaml
index 7965f91f7..422faad8d 100644
--- a/samples/poc-subapp/fyn-lock.yaml
+++ b/samples/poc-subapp/fyn-lock.yaml
@@ -5158,19 +5158,19 @@ ejs:
$: sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
_: 'https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz'
electrode-archetype-opt-critical-css:
- _latest: 1.0.3-fynlocal_h
+ _latest: 1.0.4-fynlocal_h
_:
- ../electrode-archetype-opt-critical-css: 1.0.3-fynlocal_h
- 1.0.3-fynlocal_h:
+ ../electrode-archetype-opt-critical-css: 1.0.4-fynlocal_h
+ 1.0.4-fynlocal_h:
optFailed: 1
$: local
_: ../../packages/electrode-archetype-opt-critical-css
electrode-archetype-opt-eslint:
_latest: 1.0.3
_:
- ../electrode-archetype-opt-eslint: 1.0.3-fynlocal_h
+ ../electrode-archetype-opt-eslint: 1.0.4-fynlocal_h
^1.0.3: 1.0.3
- 1.0.3-fynlocal_h:
+ 1.0.4-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-eslint
@@ -5196,9 +5196,9 @@ electrode-archetype-opt-eslint:
electrode-archetype-opt-flow:
_latest: 1.0.2
_:
- ../electrode-archetype-opt-flow: 1.0.2-fynlocal_h
+ ../electrode-archetype-opt-flow: 1.0.3-fynlocal_h
^1.0.2: 1.0.2
- 1.0.2-fynlocal_h:
+ 1.0.3-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-flow
@@ -5216,19 +5216,19 @@ electrode-archetype-opt-flow:
flow-bin: ^0.74.0
flow-typed: ^2.4.0
electrode-archetype-opt-inferno:
- _latest: 0.2.11-fynlocal_h
+ _latest: 0.2.12-fynlocal_h
_:
- ../electrode-archetype-opt-inferno: 0.2.11-fynlocal_h
- 0.2.11-fynlocal_h:
+ ../electrode-archetype-opt-inferno: 0.2.12-fynlocal_h
+ 0.2.12-fynlocal_h:
optFailed: 1
$: local
_: ../../packages/electrode-archetype-opt-inferno
electrode-archetype-opt-jest:
_latest: 1.0.3
_:
- ../electrode-archetype-opt-jest: 1.0.3-fynlocal_h
+ ../electrode-archetype-opt-jest: 1.0.4-fynlocal_h
^1.0.3: 1.0.3
- 1.0.3-fynlocal_h:
+ 1.0.4-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-jest
@@ -5254,9 +5254,9 @@ electrode-archetype-opt-jest:
electrode-archetype-opt-karma:
_latest: 2.0.7
_:
- ../electrode-archetype-opt-karma: 2.0.7-fynlocal_h
+ ../electrode-archetype-opt-karma: 2.0.8-fynlocal_h
^2.0.6: 2.0.7
- 2.0.7-fynlocal_h:
+ 2.0.8-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-karma
@@ -5308,9 +5308,9 @@ electrode-archetype-opt-karma:
electrode-archetype-opt-less:
_latest: 1.0.2
_:
- ../electrode-archetype-opt-less: 1.0.2-fynlocal_h
+ ../electrode-archetype-opt-less: 1.0.3-fynlocal_h
^1.0.2: 1.0.2
- 1.0.2-fynlocal_h:
+ 1.0.3-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-less
@@ -5328,9 +5328,9 @@ electrode-archetype-opt-less:
electrode-archetype-opt-mocha:
_latest: 1.0.3
_:
- ../electrode-archetype-opt-mocha: 1.0.3-fynlocal_h
+ ../electrode-archetype-opt-mocha: 1.0.4-fynlocal_h
^1.0.3: 1.0.3
- 1.0.3-fynlocal_h:
+ 1.0.4-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-mocha
@@ -5356,19 +5356,19 @@ electrode-archetype-opt-mocha:
enzyme-adapter-react-16: ^1.1.0
mocha: ^4.0.0
electrode-archetype-opt-phantomjs:
- _latest: 1.0.2-fynlocal_h
+ _latest: 1.0.3-fynlocal_h
_:
- ../electrode-archetype-opt-phantomjs: 1.0.2-fynlocal_h
- 1.0.2-fynlocal_h:
+ ../electrode-archetype-opt-phantomjs: 1.0.3-fynlocal_h
+ 1.0.3-fynlocal_h:
optFailed: 1
$: local
_: ../../packages/electrode-archetype-opt-phantomjs
electrode-archetype-opt-postcss:
_latest: 1.0.4
_:
- ../electrode-archetype-opt-postcss: 1.0.4-fynlocal_h
+ ../electrode-archetype-opt-postcss: 1.0.5-fynlocal_h
^1.0.4: 1.0.4
- 1.0.4-fynlocal_h:
+ 1.0.5-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-postcss
@@ -5396,19 +5396,19 @@ electrode-archetype-opt-postcss:
postcss-scss: ^1.0.6
sugarss: ^1.0.1
electrode-archetype-opt-preact:
- _latest: 1.0.0-fynlocal_h
+ _latest: 1.0.1-fynlocal_h
_:
- ../electrode-archetype-opt-preact: 1.0.0-fynlocal_h
- 1.0.0-fynlocal_h:
+ ../electrode-archetype-opt-preact: 1.0.1-fynlocal_h
+ 1.0.1-fynlocal_h:
optFailed: 1
$: local
_: ../../packages/electrode-archetype-opt-preact
electrode-archetype-opt-pwa:
_latest: 1.0.6
_:
- ../electrode-archetype-opt-pwa: 1.0.6-fynlocal_h
+ ../electrode-archetype-opt-pwa: 1.0.7-fynlocal_h
^1.0.6: 1.0.6
- 1.0.6-fynlocal_h:
+ 1.0.7-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-pwa
@@ -5436,48 +5436,33 @@ electrode-archetype-opt-pwa:
web-app-manifest-loader: ^0.1.1
webpack-disk-plugin: 0.0.2
electrode-archetype-opt-react:
- _latest: 2.0.4
+ _latest: 2.0.5-fynlocal_h
_:
- ../electrode-archetype-opt-react: 2.0.4-fynlocal_h
- ^2.0.4: 2.0.4
- 2.0.4-fynlocal_h:
+ '../../packages/electrode-archetype-opt-react,../electrode-archetype-opt-react': 2.0.5-fynlocal_h
+ 2.0.5-fynlocal_h:
+ top: 1
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-react
dependencies:
react: ^16.0.0
react-dom: ^16.0.0
- 2.0.4:
- top: 1
- hasPI: 1
- $: sha512-LvupNEI87aVnVo8z+otXoP5BrKa1vdANT49+laH5+8pk/32PZdQ80r0xkppWGf/wu4lS2B1VSjkvkzK95YTMnw==
- _: 'https://registry.npmjs.org/electrode-archetype-opt-react/-/electrode-archetype-opt-react-2.0.4.tgz'
- dependencies:
- react: ^16.0.0
- react-dom: ^16.0.0
electrode-archetype-opt-react-intl:
- _latest: 1.0.0
+ _latest: 1.0.1-fynlocal_h
_:
- ../electrode-archetype-opt-react-intl: 1.0.0-fynlocal_h
- ^1.0.0: 1.0.0
- 1.0.0-fynlocal_h:
+ '../../packages/electrode-archetype-opt-react-intl,../electrode-archetype-opt-react-intl': 1.0.1-fynlocal_h
+ 1.0.1-fynlocal_h:
+ top: 1
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-react-intl
dependencies:
react-intl: ^2.1.3
- 1.0.0:
- top: 1
- hasPI: 1
- $: sha512-99m0ivYYhZ+cbpZf+EdYkYWipTOtscBj9wbw+ccZEb0K1F+ry1p2VhqsZkO9xuvNwip8XF83vsXteDaZGbWbAg==
- _: 'https://registry.npmjs.org/electrode-archetype-opt-react-intl/-/electrode-archetype-opt-react-intl-1.0.0.tgz'
- dependencies:
- react-intl: ^2.1.3
electrode-archetype-opt-sass:
- _latest: 1.0.9-fynlocal_h
+ _latest: 1.0.10-fynlocal_h
_:
- ../electrode-archetype-opt-sass: 1.0.9-fynlocal_h
- 1.0.9-fynlocal_h:
+ ../electrode-archetype-opt-sass: 1.0.10-fynlocal_h
+ 1.0.10-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-sass
@@ -5487,9 +5472,9 @@ electrode-archetype-opt-sass:
electrode-archetype-opt-sinon:
_latest: 1.0.3
_:
- ../electrode-archetype-opt-sinon: 1.0.3-fynlocal_h
+ ../electrode-archetype-opt-sinon: 1.0.4-fynlocal_h
^1.0.3: 1.0.3
- 1.0.3-fynlocal_h:
+ 1.0.4-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-sinon
@@ -5507,9 +5492,9 @@ electrode-archetype-opt-sinon:
electrode-archetype-opt-stylus:
_latest: 1.0.2
_:
- ../electrode-archetype-opt-stylus: 1.0.2-fynlocal_h
+ ../electrode-archetype-opt-stylus: 1.0.3-fynlocal_h
^1.0.2: 1.0.2
- 1.0.2-fynlocal_h:
+ 1.0.3-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-stylus
@@ -5527,9 +5512,9 @@ electrode-archetype-opt-stylus:
electrode-archetype-opt-typescript:
_latest: 1.0.3
_:
- ../electrode-archetype-opt-typescript: 1.0.3-fynlocal_h
+ ../electrode-archetype-opt-typescript: 1.0.4-fynlocal_h
^1.0.3: 1.0.3
- 1.0.3-fynlocal_h:
+ 1.0.4-fynlocal_h:
hasPI: 1
$: local
_: ../../packages/electrode-archetype-opt-typescript
@@ -5545,10 +5530,10 @@ electrode-archetype-opt-typescript:
typescript: ^3.2.1
'@babel/preset-typescript': ^7.1.0
electrode-archetype-react-app:
- _latest: 6.5.21-fynlocal_h
+ _latest: 7.0.0-beta7.0-fynlocal_h
_:
- ../../packages/electrode-archetype-react-app: 6.5.21-fynlocal_h
- 6.5.21-fynlocal_h:
+ ../../packages/electrode-archetype-react-app: 7.0.0-beta7.0-fynlocal_h
+ 7.0.0-beta7.0-fynlocal_h:
top: 1
$: local
_: ../../packages/electrode-archetype-react-app
@@ -5560,13 +5545,13 @@ electrode-archetype-react-app:
optional-require: ^1.0.0
subapp-util: ^1.0.2
optionalDependencies:
- electrode-archetype-opt-inferno: ^0.2.11
- electrode-archetype-opt-react: ^2.0.4
+ electrode-archetype-opt-inferno: ^0.2.12
+ electrode-archetype-opt-react: ^2.0.5
electrode-archetype-react-app-dev:
- _latest: 6.5.21-fynlocal_h
+ _latest: 7.0.0-beta7.0-fynlocal_h
_:
- ../../packages/electrode-archetype-react-app-dev: 6.5.21-fynlocal_h
- 6.5.21-fynlocal_h:
+ ../../packages/electrode-archetype-react-app-dev: 7.0.0-beta7.0-fynlocal_h
+ 7.0.0-beta7.0-fynlocal_h:
top: 1
$: local
_: ../../packages/electrode-archetype-react-app-dev
@@ -5609,6 +5594,7 @@ electrode-archetype-react-app-dev:
electrode-cdn-file-loader: ^1.0.0
electrode-hapi-compat: ^1.2.0
electrode-node-resolver: ^2.0.0
+ fastify-plugin: ^1.6.0
file-loader: ^2.0.0
filter-scan-dir: ^1.0.9
finalhandler: ^1.1.1
@@ -5649,26 +5635,26 @@ electrode-archetype-react-app-dev:
xenv-config: ^1.3.0
xsh: ^0.4.4
optionalDependencies:
- electrode-archetype-opt-critical-css: ^1.0.3
- electrode-archetype-opt-eslint: ^1.0.3
- electrode-archetype-opt-flow: ^1.0.2
- electrode-archetype-opt-inferno: ^0.2.11
- electrode-archetype-opt-jest: ^1.0.3
- electrode-archetype-opt-karma: ^2.0.7
- electrode-archetype-opt-less: ^1.0.2
- electrode-archetype-opt-mocha: ^1.0.3
- electrode-archetype-opt-phantomjs: ^1.0.2
- electrode-archetype-opt-postcss: ^1.0.4
- electrode-archetype-opt-preact: ^1.0.0
- electrode-archetype-opt-pwa: ^1.0.6
- electrode-archetype-opt-react: ^2.0.4
- electrode-archetype-opt-react-intl: ^1.0.0
- electrode-archetype-opt-sass: ^1.0.9
- electrode-archetype-opt-stylus: ^1.0.2
- electrode-archetype-opt-sinon: ^1.0.3
- electrode-archetype-opt-typescript: ^1.0.3
+ electrode-archetype-opt-critical-css: ^1.0.4
+ electrode-archetype-opt-eslint: ^1.0.4
+ electrode-archetype-opt-flow: ^1.0.3
+ electrode-archetype-opt-inferno: ^0.2.12
+ electrode-archetype-opt-jest: ^1.0.4
+ electrode-archetype-opt-karma: ^2.0.8
+ electrode-archetype-opt-less: ^1.0.3
+ electrode-archetype-opt-mocha: ^1.0.4
+ electrode-archetype-opt-phantomjs: ^1.0.3
+ electrode-archetype-opt-postcss: ^1.0.5
+ electrode-archetype-opt-preact: ^1.0.1
+ electrode-archetype-opt-pwa: ^1.0.7
+ electrode-archetype-opt-react: ^2.0.5
+ electrode-archetype-opt-react-intl: ^1.0.1
+ electrode-archetype-opt-sass: ^1.0.10
+ electrode-archetype-opt-stylus: ^1.0.3
+ electrode-archetype-opt-sinon: ^1.0.4
+ electrode-archetype-opt-typescript: ^1.0.4
peerDependencies:
- electrode-archetype-react-app: ^6.0.0
+ electrode-archetype-react-app: 7.0.0-beta7.0
electrode-cdn-file-loader:
_latest: 1.1.1
_:
@@ -6541,6 +6527,15 @@ fastfall:
_: 'https://registry.npmjs.org/fastfall/-/fastfall-1.5.1.tgz'
dependencies:
reusify: ^1.0.0
+fastify-plugin:
+ _latest: 1.6.0
+ _:
+ ^1.6.0: 1.6.0
+ 1.6.0:
+ $: sha512-lFa9txg8LZx4tljj33oG53nUXhVg0baZxtP9Pxi0dJmI0NQxzkDk5DS9kr3D7iMalUAp3mvIq16OQumc7eIvLA==
+ _: 'https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-1.6.0.tgz'
+ dependencies:
+ semver: ^6.0.0
fastparallel:
_latest: 2.3.0
_:
@@ -13296,8 +13291,9 @@ rc:
react:
_latest: 16.12.0
_:
- ^16.0.0: 16.12.0
+ '^16.0.0,^16.12.0': 16.12.0
16.12.0:
+ top: 1
$: sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
_: 'https://registry.npmjs.org/react/-/react-16.12.0.tgz'
dependencies:
@@ -13321,6 +13317,7 @@ react-dom:
_:
'^16.0.0,^16.12.0': 16.12.0
16.12.0:
+ top: 1
$: sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
_: 'https://registry.npmjs.org/react-dom/-/react-dom-16.12.0.tgz'
dependencies:
@@ -15117,6 +15114,20 @@ stylus-relative-loader:
loader-utils: ^0.2.9
peerDependencies:
stylus: ^0.54.5
+subapp-react:
+ _latest: 0.0.1-fynlocal_h
+ _:
+ ../../packages/subapp-react: 0.0.1-fynlocal_h
+ 0.0.1-fynlocal_h:
+ top: 1
+ $: local
+ _: ../../packages/subapp-react
+ dependencies:
+ subapp-web: ^1.0.0
+ subapp-util: ^1.0.2
+ peerDependencies:
+ react: '*'
+ react-dom: '*'
subapp-redux:
_latest: 1.0.10-fynlocal_h
_:
@@ -15175,9 +15186,6 @@ subapp-web:
optional-require: ^1.0.0
request: ^2.88.0
subapp-util: ^1.0.2
- peerDependencies:
- react: '*'
- react-dom: '*'
sudo-prompt:
_latest: 9.1.1
_:
@@ -15727,7 +15735,7 @@ uglify-es:
commander: ~2.13.0
source-map: ~0.6.1
uglify-js:
- _latest: 3.7.1
+ _latest: 3.7.3
_:
^3.1.4: 3.7.1
3.7.1:
@@ -16557,12 +16565,12 @@ xaa:
$: sha512-hXBowvfAerjDQs2DxvAai8I/rlMFavEuiqPHuVIbhMfDwNB73UDOlikeU0HLcNXN7LeWsaxlYz2fSkQwMt11WQ==
_: 'https://registry.npmjs.org/xaa/-/xaa-1.1.4.tgz'
xclap:
- _latest: 0.2.39
+ _latest: 0.2.40
_:
- ^0.2.38: 0.2.39
- 0.2.39:
- $: sha512-Tw3CcHakbVuq2LWgmiMaDvRRvhbrKMkON4KW1dHxXbqHpk5RpZiH75LWeJb/El+sacoU6R0+cNyDmQ84hf3y8g==
- _: 'https://registry.npmjs.org/xclap/-/xclap-0.2.39.tgz'
+ ^0.2.38: 0.2.40
+ 0.2.40:
+ $: sha512-+hug6dq4j9JB849pYDM4PQj82UupeWpP1SHwlitTeRhOVlvcM+Ja2pPCApCKhaM1Tapx35yHSI3OeO3PiLOyMg==
+ _: 'https://registry.npmjs.org/xclap/-/xclap-0.2.40.tgz'
dependencies:
chalk: ^2.0.1
insync: ^2.1.1
diff --git a/samples/poc-subapp/package.json b/samples/poc-subapp/package.json
index 10f9daa39..c366b4e2b 100644
--- a/samples/poc-subapp/package.json
+++ b/samples/poc-subapp/package.json
@@ -36,20 +36,23 @@
},
"dependencies": {
"@hapi/inert": "^5.2.2",
+ "electrode-archetype-opt-react": "^2.0.4",
+ "electrode-archetype-opt-react-intl": "^1.0.0",
"electrode-archetype-react-app": "^6.3.0",
"electrode-confippet": "^1.5.0",
"electrode-server": "^3.0.0",
"electrode-static-paths": "^3.0.0",
+ "react": "^16.12.0",
"react-async-ssr": "^0.5.2",
+ "react-dom": "^16.12.0",
"react-redux": "^6.0.1",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"redux": "^4.0.4",
+ "subapp-react": "../../packages/subapp-react",
"subapp-redux": "../../packages/subapp-redux",
"subapp-server": "../../packages/subapp-server",
- "subapp-web": "../../packages/subapp-web",
- "electrode-archetype-opt-react": "^2.0.4",
- "electrode-archetype-opt-react-intl": "^1.0.0"
+ "subapp-web": "../../packages/subapp-web"
},
"devDependencies": {
"electrode-archetype-react-app-dev": "^6.3.0",
@@ -67,7 +70,9 @@
},
"fyn": {
"dependencies": {
- "electrode-archetype-react-app": "../../packages/electrode-archetype-react-app"
+ "electrode-archetype-react-app": "../../packages/electrode-archetype-react-app",
+ "electrode-archetype-opt-react": "../../packages/electrode-archetype-opt-react",
+ "electrode-archetype-opt-react-intl": "../../packages/electrode-archetype-opt-react-intl"
},
"devDependencies": {
"electrode-archetype-react-app-dev": "../../packages/electrode-archetype-react-app-dev"
diff --git a/samples/poc-subapp/src/01.header/subapp-header.jsx b/samples/poc-subapp/src/01.header/subapp-header.jsx
index 53cd12acf..f530c4fd3 100644
--- a/samples/poc-subapp/src/01.header/subapp-header.jsx
+++ b/samples/poc-subapp/src/01.header/subapp-header.jsx
@@ -1,6 +1,5 @@
// @subapp@ {name: "Header"}
-import React from "react";
-import { loadSubApp } from "subapp-web";
+import { loadSubApp, React } from "subapp-react";
const Header = () => {
return (
diff --git a/samples/poc-subapp/src/02.main-body/main-body.jsx b/samples/poc-subapp/src/02.main-body/main-body.jsx
index 458a6d746..d22646068 100644
--- a/samples/poc-subapp/src/02.main-body/main-body.jsx
+++ b/samples/poc-subapp/src/02.main-body/main-body.jsx
@@ -1,12 +1,12 @@
-import React from "react";
-import { getBrowserHistory, AppContext } from "subapp-web";
+import { reduxLoadSubApp } from "subapp-redux";
+import { React, getBrowserHistory } from "subapp-react";
+import { AppContext } from "subapp-react";
import { connect } from "react-redux";
import { withRouter } from "react-router";
import { Router, Route, Switch } from "react-router-dom";
import { Products } from "../components/products";
import { Navigation } from "../components/navigation";
import { Deals } from "../components/deals";
-import { reduxLoadSubApp } from "subapp-redux";
import reduxReducers from "./reducers";
const Home = () => {
diff --git a/samples/poc-subapp/src/03.bottom/bottom.jsx b/samples/poc-subapp/src/03.bottom/bottom.jsx
index 103c2f7b9..72dcb1aa6 100644
--- a/samples/poc-subapp/src/03.bottom/bottom.jsx
+++ b/samples/poc-subapp/src/03.bottom/bottom.jsx
@@ -1,12 +1,11 @@
-import React from "react";
-import { getBrowserHistory } from "subapp-web";
+import { React, getBrowserHistory } from "subapp-react";
+import { reduxLoadSubApp } from "subapp-redux";
import { withRouter } from "react-router";
import { Router, Route, Switch } from "react-router-dom";
import { createStore } from "redux";
import { connect } from "react-redux";
import PropTypes from "prop-types";
import Large from "../components/large";
-import { reduxLoadSubApp } from "subapp-redux";
// import AdvGridList from "../components/adv-grid";
diff --git a/samples/poc-subapp/src/04.footer/subapp-footer.jsx b/samples/poc-subapp/src/04.footer/subapp-footer.jsx
index 7dc0a94d1..aa77d1088 100644
--- a/samples/poc-subapp/src/04.footer/subapp-footer.jsx
+++ b/samples/poc-subapp/src/04.footer/subapp-footer.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import { React } from "subapp-react";
import { reduxLoadSubApp } from "subapp-redux";
import PropTypes from "prop-types";
import { connect } from "react-redux";
diff --git a/samples/poc-subapp/src/06.suspense-demo/subapp-suspense-demo.js b/samples/poc-subapp/src/06.suspense-demo/subapp-suspense-demo.js
index 3eacd7bbe..18c492768 100644
--- a/samples/poc-subapp/src/06.suspense-demo/subapp-suspense-demo.js
+++ b/samples/poc-subapp/src/06.suspense-demo/subapp-suspense-demo.js
@@ -1,5 +1,4 @@
-import React from "react";
-import { loadSubApp, AppContext } from "subapp-web";
+import { React, loadSubApp, AppContext } from "subapp-react";
let data;
diff --git a/samples/poc-subapp/src/components/deals.jsx b/samples/poc-subapp/src/components/deals.jsx
index 7a8d7a0ee..1f22bd94d 100644
--- a/samples/poc-subapp/src/components/deals.jsx
+++ b/samples/poc-subapp/src/components/deals.jsx
@@ -1,5 +1,4 @@
-import React from "react";
-import { dynamicLoadSubApp } from "subapp-web";
+import { React, dynamicLoadSubApp } from "subapp-react";
import PropTypes from "prop-types";
import { connect } from "react-redux";
diff --git a/samples/poc-subapp/src/deal/subapp-deal.jsx b/samples/poc-subapp/src/deal/subapp-deal.jsx
index 747be1cb2..205452889 100644
--- a/samples/poc-subapp/src/deal/subapp-deal.jsx
+++ b/samples/poc-subapp/src/deal/subapp-deal.jsx
@@ -1,5 +1,4 @@
-import React from "react";
-import { loadSubApp } from "subapp-web";
+import { React, loadSubApp } from "subapp-react";
const Deal = props => {
return
SPECIAL DEAL - SPECIAL DEAL - {props.deal}
;