Merge pull request #694 from jchip/update-demo-component

Update demo component
electrode-io · Jan 20, 2018 · 89d5358 · 89d5358
2 parents e70662b + 15c0037
commit 89d5358
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/samples/demo-component/demo-app/archetype/config/webpack/webpack.config.dev.js b/samples/demo-component/demo-app/archetype/config/webpack/webpack.config.dev.js
@@ -6,10 +6,11 @@ module.exports = {
   resolve: {
     alias: {
       "demo-component": Path.join(repoPackagesDir, "demo-component/src"),
-      "react": Path.dirname(require.resolve("react/package.json")),
+      react: Path.dirname(require.resolve("react/package.json")),
       "react-dom": Path.dirname(require.resolve("react-dom/package.json"))
     },
     modules: [
+      Path.resolve("node_modules"),
       Path.join(repoPackagesDir, "demo-component"),
       Path.join(repoPackagesDir, "demo-component/node_modules")
     ]

diff --git a/samples/demo-component/demo-app/archetype/config/webpack/webpack.config.js b/samples/demo-component/demo-app/archetype/config/webpack/webpack.config.js
@@ -7,10 +7,11 @@ module.exports = {
   resolve: {
     alias: {
       "demo-component": Path.join(repoPackagesDir, "demo-component/src"),
-      "react": Path.dirname(require.resolve("react/package.json")),
+      react: Path.dirname(require.resolve("react/package.json")),
       "react-dom": Path.dirname(require.resolve("react-dom/package.json"))
     },
     modules: [
+      Path.resolve("node_modules"),
       Path.join(repoPackagesDir, "demo-component"),
       Path.join(repoPackagesDir, "demo-component/node_modules")
     ]

diff --git a/samples/demo-component/package.json b/samples/demo-component/package.json
@@ -15,11 +15,12 @@
   },
   "homepage": "https://github.com/electrode-io/electrode",
   "scripts": {
-    "bootstrap": "lerna bootstrap",
+    "bootstrap": "eval `fyn bash` && fynpo",
     "test": "npm run bootstrap && lerna run test"
   },
   "dependency": {},
   "devDependencies": {
+    "fynpo": "^0.1.3",
     "lerna": "^2.7.1",
     "lodash": "^4.10.1",
     "xclap": "^0.2.0"

diff --git a/samples/demo-component/packages/demo-component/.babelrc b/samples/demo-component/packages/demo-component/.babelrc
@@ -1,3 +1,3 @@
 {
-  "extends": "./node_modules/electrode-archetype-react-component/config/babel/.babelrc"
+  "extends": "electrode-archetype-react-component-dev/config/babel/.babelrc"
 }