Flattened src dir

gulpfile.js

@@ -3,6 +3,7 @@ var jshint = require('gulp-jshint');
 var concat = require('gulp-concat');
 var rename = require('gulp-rename');
 var uglify = require('gulp-uglify');
+var order = require('gulp-order');
 var gutil = require('gulp-util');
 var plumber = require('gulp-plumber');
 var onError = function (err) {
@@ -10,34 +11,39 @@ var onError = function (err) {
 };
 var server = require("./tools/serve.js");
 
+var files = [
+  'bower_components/rsvp/rsvp.js',
+  'src/epub.js',
+  'src/core.js',
+  'src/queue.js',
+  'src/hooks.js',
+  'src/parser.js',
+  'src/epubcfi.js',
+  'src/navigation.js',
+  'src/section.js',
+  'src/spine.js',
+  'src/replacements.js',
+  'src/book.js',
+  'src/view.js',
+  'src/layout.js',
+  'src/rendition.js',
+  'src/continuous.js',
+  'src/paginate.js',
+  'src/map.js'
+];
+
 // Lint JS
 gulp.task('lint', function() {
-  return gulp.src('src/*/*.js')
+  return gulp.src('src/*.js')
     .pipe(jshint())
     .pipe(jshint.reporter('default'));
 });
 
 // Concat & Minify JS
 gulp.task('minify', function(){
-  return gulp.src(['src/*.js', 'bower_components/rsvp/rsvp.js', 
-      'src/epubjs/core.js',
-      'src/epubjs/queue.js',
-      'src/epubjs/hooks.js',
-      'src/epubjs/parser.js',
-      'src/epubjs/epubcfi.js',
-      'src/epubjs/navigation.js',
-      'src/epubjs/section.js',
-      'src/epubjs/spine.js',
-      'src/epubjs/replacements.js',
-      'src/epubjs/book.js',
-      'src/epubjs/view.js',
-      'src/epubjs/layout.js',
-      'src/epubjs/rendition.js',
-      'src/epubjs/continuous.js',
-      'src/epubjs/paginate.js',
-      'src/epubjs/map.js'
-    ])
+  return gulp.src(files)
     .pipe(plumber({ errorHandler: onError }))
+    .pipe(order(files))
     .pipe(concat('epub.js'))
     .pipe(gulp.dest('dist'))
     .pipe(rename('epub.min.js'))
@@ -47,7 +53,7 @@ gulp.task('minify', function(){
 
 // Watch Our Files
 gulp.task('watch', function() {
-  gulp.watch('src/*/*.js', ['minify']);
+  gulp.watch('src/*.js', ['minify']);
 });
 
 gulp.task('serve', ["watch"], function() {

package.json

@@ -3,7 +3,7 @@
   "version": "0.3.0",
   "description": "Render Epubs",
   "main": "/lib/epub.js",
-  "repository" : "https://github.com/futurepress/epub.js",
+  "repository": "https://github.com/futurepress/epub.js",
   "directories": {
     "test": "test"
   },
@@ -20,6 +20,7 @@
     "gulp-concat": "^2.3.4",
     "gulp-connect": "~2.0.6",
     "gulp-jshint": "^1.8.4",
+    "gulp-order": "^1.1.1",
     "gulp-plumber": "^0.6.4",
     "gulp-rename": "^1.2.0",
     "gulp-uglify": "^0.3.1",

src/epub.js

@@ -3,7 +3,6 @@ if (typeof EPUBJS === 'undefined') {
 }
 
 EPUBJS.VERSION = "0.3.0";
-EPUBJS.Render = {};
 
 (function(root) {
 	"use strict";
@@ -11,12 +10,6 @@ EPUBJS.Render = {};
 		return new EPUBJS.Book(_url);
 	};
 
-	ePub.Render = {
-		register: function(name, renderer) {
-			ePub.Render[name] = renderer;
-		}
-	}
-
 	// CommonJS
 	if (typeof exports === "object") {
 		root.RSVP = require("rsvp");