From 93b31e563c78e53dd2fa472ba3f2953be7d5cd5f Mon Sep 17 00:00:00 2001
From: Andrew Wilcox <andrew.wilcox@gmail.com>
Date: Thu, 7 Feb 2013 14:15:20 +0000
Subject: [PATCH] Code review updates to the bundle manifest.

`__meteor_bootstrap__.bundler` => `__meteor_bootstrap__.bundle`

`bundle.bundle_dir` => `bundle.root`

Rather than placing app_info/appInfo containing the manifest in the
bundle object, instead I'm now placing the manifest directly in the
bundle object.  A) no code currently uses bundle.appInfo.load; B) if
someday we expand the manifest to also include server side resources
than we'd be getting rid of `load` anyway; C) I think it reads better:

`bundle.appInfo.manifest` => `bundle.manifest`

cp_r now returns a list of os-specific relative file system paths as
strings, instead of paths as arrays.

I changed the normalized "path" field in the manifest to be a relative
path instead of an absolute path (`"/static/cat.jpg"` =>
`"static/cat.jpg"`).  This felt better when looking at the manifest; I
think because the path is relative to the bundle root.
---
 app/lib/bundler.js   | 13 +++++++------
 app/lib/files.js     | 20 ++++++--------------
 app/server/server.js |  4 ++--
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/app/lib/bundler.js b/app/lib/bundler.js
index a9ae5574bb..2bd7b98146 100644
--- a/app/lib/bundler.js
+++ b/app/lib/bundler.js
@@ -403,7 +403,7 @@ _.extend(Bundle.prototype, {
       var name = '/' + hash + '.' + type;
       self.files.client_cacheable[name] = contents;
       self.manifest.push({
-        path: '/static_cacheable' + name,
+        path: 'static_cacheable' + name,
         where: 'client',
         type: type,
         cacheable: true,
@@ -535,16 +535,17 @@ _.extend(Bundle.prototype, {
           files.cp_r(path.join(project_dir, 'public'),
                      path.join(build_path, 'static'), {ignore: ignore_files});
 
-        _.each(copied, function (array_path) {
-          filepath = path.join.apply(null, [].concat(build_path, 'static', array_path));
+        _.each(copied, function (fs_relative_path) {
+          var filepath = path.join(build_path, 'static', fs_relative_path);
+          var normalized = fs_relative_path.split(path.sep).join('/');
           self.manifest.push({
             // path is normalized to use forward slashes, so deliberately
             // not using path.sep here
-            path: '/static/' + array_path.join('/'),
+            path: 'static/' + normalized,
             type: 'static',
             where: 'client',
             cacheable: false,
-            url: '/' + array_path.join('/'),
+            url: '/' + normalized,
             size: fs.statSync(filepath).size,
             hash: self._hash(fs.readFileSync(filepath))
           });
@@ -574,7 +575,7 @@ _.extend(Bundle.prototype, {
 
       self.manifest.push({
         // path is normalized to use forward slashes
-        path: '/static_cacheable' + file.split(path.sep).join('/'),
+        path: 'static_cacheable' + file.split(path.sep).join('/'),
         where: 'client',
         type: type,
         cacheable: true,
diff --git a/app/lib/files.js b/app/lib/files.js
index 882bf390f7..8514f6d1d7 100644
--- a/app/lib/files.js
+++ b/app/lib/files.js
@@ -295,11 +295,9 @@ var files = module.exports = {
   // file whose basename matches one of the regexps, before
   // transformation, will be skipped.
   //
-  // Returns the list of file paths copied to the destination, as
-  // filtered by ignore and transformed by transformer_filename.  For
-  // the convenience of the caller (so as not to need to split
-  // os-specific paths), file paths are represented as an array:
-  // "foo/bar/baz.js" as ["foo", "bar", "baz.js"].
+  // Returns the list of relative file paths copied to the
+  // destination, as filtered by ignore and transformed by
+  // transformer_filename.
   cp_r: function (from, to, options) {
     options = options || {};
     files.mkdir_p(to, 0755);
@@ -315,14 +313,8 @@ var files = module.exports = {
       var full_to = path.join(to, f);
       if (fs.statSync(full_from).isDirectory()) {
         var subdir_paths = files.cp_r(full_from, full_to, options);
-        copied = copied.concat(_.map(subdir_paths, function (path) {
-          // At this point f is the name of the subdirectory that just
-          // got copied, and path is the relative path of a file inside
-          // the subdirectory.  Prepend the subdirectory name to the
-          // path: ["bar", "baz.js"] => ["foo", "bar", "baz.js"]
-          path = path.slice(0);
-          path.unshift(f);
-          return path;
+        copied = copied.concat(_.map(subdir_paths, function (subpath) {
+          return path.join(f, subpath);
         }));
       }
       else {
@@ -334,7 +326,7 @@ var files = module.exports = {
           contents = options.transform_contents(contents, f);
           fs.writeFileSync(full_to, contents);
         }
-        copied.push([f]);
+        copied.push(f);
       }
     });
     return copied;
diff --git a/app/server/server.js b/app/server/server.js
index bef78b43ab..2c3a5330d5 100644
--- a/app/server/server.js
+++ b/app/server/server.js
@@ -88,7 +88,7 @@ var run = function () {
   var info_raw =
     fs.readFileSync(path.join(bundle_dir, 'app.json'), 'utf8');
   var info = JSON.parse(info_raw);
-  var bundler = {app_info: info, bundle_dir: bundle_dir};
+  var bundle = {manifest: info.manifest, root: bundle_dir};
 
   // start up app
 
@@ -96,7 +96,7 @@ var run = function () {
     require: require,
     startup_hooks: [],
     app: app,
-    bundler: bundler
+    bundle: bundle
   };
 
   __meteor_runtime_config__ = {};