GordonSmith · buunguyen · Apr 13, 2015 · Apr 13, 2015 · Apr 14, 2015 · Apr 15, 2015
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+bower_components
+build.txt
diff --git a/README.md b/README.md
@@ -53,3 +53,16 @@ None of this would would be possible without the great work of others.  The widg
 While widgets/src also includes wrappers for CDN hosted visualizations:
 * [Google Maps](https://developers.google.com/maps/)
 * [Google Charts](https://developers.google.com/chart/)
+
+
+# TODO
+
+- [x] Avoid embedding source of externa libs, declare via bower.json
+- [x] Gulp build for "legacy" and optimized (single files) mode
+- [x] Fix up incorrect/collided names in global scope (non-AMD usage)
+- [x] Fix helloworld.html & test.html to use built artifacts, not source
+- [x] Demos should use its own config.js and bower.json
+- [ ] Include map files in optimized build
+- [ ] Lazy load data files (countries.js etc.)
+- [ ] Handle goog! stuff in optimize build
+- [ ] Handle dynamic google map (lazy load?)
diff --git a/bower.json b/bower.json
@@ -0,0 +1,38 @@
+{
+  "name": "viz",
+  "version": "0.0.1",
+  "description": "Common visualization components",
+  "keywords": [
+    "visualization"
+  ],
+  "main": [
+    "dist/optimized/viz.min.css",
+    "dist/optimized/viz.min.js"
+  ],
+  "ignore": [
+    ".gitignore",
+    "viz",
+    "package.json",
+    "demos",
+    "gulpfile.js",
+    "rjs.noop.js"
+  ],
+  "dependencies": {
+    "requirejs": "2.1.17",
+    "requirejs-plugins": "1.0.3",
+    "require-css": "0.1.8",
+    "c3": "0.4.9",
+    "colorbrewer": "1.0.0",
+    "d3": "3.5.0",
+    "dagre": "0.7.1",
+    "font-awesome": "4.3.0",
+    "lodash": "3.0.0",
+    "topojson": "1.6.18",
+    "crossfilter": "[email protected]:square/crossfilter.git",
+    "d3-cloud": "[email protected]:jasondavies/d3-cloud.git"
+  },
+  "license": "Apache",
+  "authors": [
+    "HPCC Systems"
+  ]
+}
diff --git a/build.sh b/build.sh
diff --git a/demos/HelloWorld.html b/demos/HelloWorld.html
@@ -2,19 +2,14 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <script src="../widgets/lib/requirejs/require.js"></script>
-    <script src="../widgets/config.js"></script>
-    <script>
-        requirejs.config({
-            baseUrl: "../widgets"
-        });
-    </script>
+    <script src="../bower_components/requirejs/require.js"></script>
+    <script src="./config.js"></script>
 </head>
 <body>
     <div id="helloWorld" style="width:100%; height:100vh">
     </div>
     <script>
-        require(["src/common/TextBox"], function (TextBox) {
+        require(["viz/common/TextBox"], function (TextBox) {
             var helloWorld = new TextBox()
                 .target("helloWorld")
                 .text("Hello\nWorld!")
@@ -23,4 +18,4 @@
         });
     </script>
 </body>
-</html>
+</html>
diff --git a/demos/bower.json b/demos/bower.json
@@ -0,0 +1,29 @@
+{
+  "name": "viz-demos",
+  "version": "0.0.1",
+  "description": "Demos of Viz framework",
+  "keywords": [
+    "visualization"
+  ],
+  "dependencies": {
+    "c3": "0.4.9",
+    "colorbrewer": "1.0.0",
+    "crossfilter": "[email protected]:square/crossfilter.git",
+    "d3": "3.5.0",
+    "dagre": "0.7.1",
+    "font-awesome": "4.3.0",
+    "topojson": "1.6.18",
+    "d3-cloud": "[email protected]:jasondavies/d3-cloud.git",
+    "require-css": "~0.1.8",
+    "text": "~2.0.14",
+    "requirejs-plugins": "~1.0.3",
+    "requirejs": "~2.1.17"
+  },
+  "license": "Apache",
+  "authors": [
+    "HPCC Systems"
+  ],
+  "resolutions": {
+    "lodash": "3.0.0"
+  }
+}
diff --git a/demos/config.js b/demos/config.js
@@ -0,0 +1,34 @@
+require.config({
+    baseUrl: ".",
+    paths: {
+        'async': '../bower_components/requirejs-plugins/src/async',
+        'css': '../bower_components/require-css/css',
+        'text': '../bower_components/text/text',
+        'goog': '../bower_components/requirejs-plugins/src/goog',
+        'propertyParser': '../bower_components/requirejs-plugins/src/propertyParser',
+
+        'lodash': '../bower_components/lodash/dist/lodash',
+        'graphlib': '../bower_components/graphlib/dist/graphlib.core',
+        'd3-cloud': '../bower_components/d3-cloud',
+        'topojson': '../bower_components/topojson',
+        'font-awesome': '../bower_components/font-awesome',
+        'dagre/dagre': '../bower_components/dagre/dist/dagre.core',
+        'colorbrewer': '../bower_components/colorbrewer'
+    },
+    packages: [
+        {
+            name: 'd3',
+            location: '../bower_components/d3',
+            main: 'd3'
+        },
+        {
+            name: 'c3',
+            location: '../bower_components/c3',
+            main: 'c3'
+        },
+        {
+            name: 'viz',
+            location: '../viz'
+        }
+    ]
+});