Merge pull request #35 from bbcrd/feature-simplified-deps

Simplifying the AMD tree
bbc · Mar 11, 2014 · a574f30 · a574f30
2 parents 8819085 + 9ad8b2d
commit a574f30
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 515 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -5,33 +5,27 @@ module.exports = function(grunt) {
     // JS Lint on all non-vendor files
     jshint: {
       all: [
-        'lib/js/**/*.js',
-        '!lib/js/almond.js',
-        '!lib/js/vendor/*.js'
+        'src/**/*.js',
+        '!src/almond.js'
       ]
-      // lib_test: {
-      //   src: ['lib/**/*.js', 'test/**/*.js']
-      // }
     },
 
     // r.js concatenation and minification of javascript
     requirejs: {
       compile: {
         options: {
-          name: "almond",
-          baseUrl: "lib/js/",
-          include: ['main'],
-          mainConfigFile: "lib/js/main.js",
+          name: "bower_components/almond/almond",
+          baseUrl: '.',
+          include: ['peaks'],
           out: "build/js/peaks.min.js",
-          optimize: "none",
           paths: {
-            "waveform-data": "../../bower_components/waveform-data/dist/waveform-data.min",
-            "EventEmitter": "../../bower_components/eventEmitter/EventEmitter",
-            "m": "waveform_viewer"
+            "peaks": "src/main",
+            "waveform-data": "bower_components/waveform-data/dist/waveform-data.min",
+            "EventEmitter": "bower_components/eventEmitter/EventEmitter"
           },
           wrap: { // https://github.com/jrburke/almond#exporting-a-public-api
-            startFile: 'lib/js/frag/start.frag',
-            endFile: 'lib/js/frag/end.frag'
+            startFile: 'src/frag/start.frag',
+            endFile: 'src/frag/end.frag'
           },
           optimize: "uglify2",
           uglify2: {
@@ -76,7 +70,7 @@ module.exports = function(grunt) {
         livereload: 1337
       },
       js: {
-        files: ['lib/**/*.js']
+        files: ['src/*.js']
       },
       lib_test: {
         files: '<%= jshint.lib_test.src %>',

diff --git a/bower.json b/bower.json
@@ -15,5 +15,9 @@
     "KineticJS": "http://d3lp1msu2r81bx.cloudfront.net/kjs/js/lib/kinetic-v4.5.5.min.js",
     "eventEmitter": "~4.2.1",
     "waveform-data": "~1.1.1"
+  },
+  "devDependencies": {
+    "requirejs": "~2.1.11",
+    "almond": "~0.2.9"
   }
 }
diff --git a/build/js/peaks.min.js b/build/js/peaks.min.js
diff --git a/demo_page_dev.html b/demo_page_dev.html
@@ -23,21 +23,18 @@
 
     <script type="text/javascript">
         var require = {
-          baseUrl: "lib/js/",
           paths: {
-            "waveform-data": "/bower_components/waveform-data/dist/waveform-data.min",
-            "EventEmitter": "/bower_components/eventEmitter/EventEmitter"
+            "peaks": "src/main",
+            "waveform-data": "bower_components/waveform-data/dist/waveform-data.min",
+            "EventEmitter": "bower_components/eventEmitter/EventEmitter"
           }
         };
     </script>
 
-    <script main="lib/js/main" src="lib/vendor/require.js"></script>
+    <script src="bower_components/requirejs/require.js"></script>
 
     <script>
-
-      document.addEventListener('DOMContentLoaded', function () {
-
-        require(['main'], function (Peaks) {
+        require(['peaks'], function (Peaks) {
 
           var peaksInstance = Peaks.init({
             container: document.getElementById('first-waveform-visualiser-container'),
@@ -99,9 +96,6 @@
           });
 
         });
-
-      });
-
     </script>
 
     <style>

diff --git a/karma.conf.js b/karma.conf.js
@@ -11,11 +11,11 @@ module.exports = function (config) {
     files : [
       { pattern: 'test/test_img/*', included: false },
       { pattern: 'test_data/*', included: false },
-      { pattern: 'bower_components/eventEmitter/EventEmitter.min.js', included: false },
-      { pattern: 'bower_components/waveform-data/dist/waveform-data.js', included: false },
-      { pattern: 'bower_components/KineticJS/index.js', included: false },
+      { pattern: 'bower_components/eventEmitter/*.js', included: false },
+      { pattern: 'bower_components/waveform-data/dist/*.js', included: false },
+      { pattern: 'bower_components/KineticJS/*.js', included: false },
       { pattern: 'test/*.html' },
-      { pattern: 'lib/js/**/*.js', included: false },
+      { pattern: 'src/**/*.js', included: false },
       { pattern: 'test/unit/**/*.js', included: false },
       { pattern: 'test_data/sample.*', included: false, served: true },
       'test/test-main.js'