Merge pull request #1 from electrode/master

Update to electrode master
electrode-io · Dec 15, 2015 · 96d011a · 96d011a
2 parents 725f1a6 + 0eba3e5
commit 96d011a
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 3 deletions.
diff --git a/packages/electrode-archetype-react-component-dev/.gitignore b/packages/electrode-archetype-react-component-dev/.gitignore
@@ -0,0 +1,66 @@
+
+# Created by https://www.gitignore.io/api/osx,node
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
+node_modules
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+

diff --git a/packages/electrode-archetype-react-component/config/karma/karma.conf.js b/packages/electrode-archetype-react-component/config/karma/karma.conf.js
@@ -4,7 +4,7 @@ var path = require("path");
 
 var webpackCfg = require("../webpack/webpack.config.test");
 
-var MAIN_PATH = require.resolve("@walmart/electrode-archetype-react-component/config/karma/entry.js");
+var MAIN_PATH = require.resolve("@walmart/electrode-archetype-react-component/config/karma/entry.js"); // eslint-disable-line max-len
 
 var PREPROCESSORS = {};
 

diff --git a/packages/electrode-archetype-react-component/config/webpack/webpack.config.demo.dev.js b/packages/electrode-archetype-react-component/config/webpack/webpack.config.demo.dev.js
@@ -9,7 +9,7 @@ var _ = require("lodash");
 
 module.exports = {
   devServer: {
-    port: (process.env.WEBPACK_DEVSERVER_PORT || "4000"),
+    port: process.env.WEBPACK_DEVSERVER_PORT || "4000",
     contentBase: path.join(process.cwd(), "demo"),
     noInfo: false
   },

diff --git a/packages/electrode-archetype-react-component/config/webpack/webpack.config.test.js b/packages/electrode-archetype-react-component/config/webpack/webpack.config.test.js
@@ -6,6 +6,13 @@ var path = require("path");
 var _ = require("lodash");
 var prodCfg = require("./webpack.config");
 
+// Get Paths to give node_modules by resolving based on assumed presence of
+// `package.json`.
+var _archNodeModules = function (arch) {
+  var archDir = path.dirname(require.resolve(path.join(arch, "package.json")));
+  return path.join(archDir, "node_modules");
+};
+
 module.exports = {
   cache: true,
   context: path.join(process.cwd(), "test/client"),
@@ -19,7 +26,12 @@ module.exports = {
     alias: {
       // Allow root import of `src/FOO` from ROOT/src.
       src: path.join(process.cwd(), "src")
-    }
+    },
+    modulesDirectories: [
+      "node_modules",
+      _archNodeModules("@walmart/electrode-archetype-react-component"),
+      _archNodeModules("@walmart/electrode-archetype-react-component-dev")
+    ]
   }),
   resolveLoader: prodCfg.resolveLoader,
   module: prodCfg.module,