Updated for Meteor 1.2.x and fixed routing links to static assets

vsivsi · vsivsi · commit aa076bcd1b60 · 2016-01-28T18:11:13.000-08:00
diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders
@@ -6,3 +6,7 @@ notices-for-0.9.0
 notices-for-0.9.1
 0.9.4-platform-file
 notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
diff --git a/.meteor/packages b/.meteor/packages
@@ -16,4 +16,7 @@ momentjs:moment
 meteorhacks:npm
 meteorhacks:flow-router
 meteorhacks:flow-layout
-npm-container
+standard-minifiers
+
+
+npm-container
diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-METEOR@1.1.0.2
+METEOR@1.2.1
diff --git a/.meteor/versions b/.meteor/versions
@@ -1,72 +1,88 @@
-accounts-base@1.2.0
-accounts-password@1.1.1
-accounts-ui@1.1.5
-accounts-ui-unstyled@1.1.7
-autoupdate@1.2.1
-base64@1.0.3
+accounts-base@1.2.2
+accounts-password@1.1.4
+accounts-ui@1.1.6
+accounts-ui-unstyled@1.1.8
+autoupdate@1.2.4
+babel-compiler@5.8.24_1
+babel-runtime@0.1.4
+base64@1.0.4
 benjaminrh:jquery-cookie@0.1.0
-binary-heap@1.0.3
-blaze@2.1.2
-blaze-tools@1.0.3
-boilerplate-generator@1.0.3
-callback-hook@1.0.3
-check@1.0.5
-coffeescript@1.0.6
-cosmos:browserify@0.5.0
-ddp@1.1.0
-deps@1.0.7
-ejson@1.0.6
-email@1.0.6
-fastclick@1.0.3
-geojson-utils@1.0.3
-html-tools@1.0.4
-htmljs@1.0.4
-http@1.1.0
-id-map@1.0.3
-jquery@1.11.3_2
-json@1.0.3
-launch-screen@1.0.2
-less@1.0.14
-livedata@1.0.13
-localstorage@1.0.3
-logging@1.0.7
-meteor@1.1.6
-meteor-platform@1.2.2
+binary-heap@1.0.4
+blaze@2.1.3
+blaze-tools@1.0.4
+boilerplate-generator@1.0.4
+caching-compiler@1.0.0
+caching-html-compiler@1.0.2
+callback-hook@1.0.4
+check@1.1.0
+coffeescript@1.0.11
+cosmos:browserify@0.5.1
+ddp@1.2.2
+ddp-client@1.2.1
+ddp-common@1.2.2
+ddp-rate-limiter@1.0.0
+ddp-server@1.2.2
+deps@1.0.9
+diff-sequence@1.0.1
+ecmascript@0.1.6
+ecmascript-runtime@0.2.6
+ejson@1.0.7
+email@1.0.8
+fastclick@1.0.7
+geojson-utils@1.0.4
+html-tools@1.0.5
+htmljs@1.0.5
+http@1.1.1
+id-map@1.0.4
+jquery@1.11.4
+launch-screen@1.0.4
+less@2.5.1
+livedata@1.0.15
+localstorage@1.0.5
+logging@1.0.8
+meteor@1.1.10
+meteor-platform@1.2.3
 meteorhacks:async@1.0.0
 meteorhacks:flow-layout@1.4.2
 meteorhacks:flow-router@1.19.0
-meteorhacks:npm@1.3.0
-minifiers@1.1.5
-minimongo@1.0.8
-mobile-status-bar@1.0.3
-momentjs:moment@2.10.3
-mongo@1.1.0
+meteorhacks:npm@1.5.0
+minifiers@1.1.7
+minimongo@1.0.10
+mobile-status-bar@1.0.6
+momentjs:moment@2.11.1
+mongo@1.1.3
+mongo-id@1.0.1
 mrt:later@1.6.1
 npm-bcrypt@0.7.8_2
-npm-container@1.0.0
-numeral:numeral@1.5.3
-observe-sequence@1.0.6
-ordered-dict@1.0.3
-random@1.0.3
-reactive-dict@1.1.0
-reactive-var@1.0.5
-reload@1.1.3
-retry@1.0.3
-routepolicy@1.0.5
-service-configuration@1.0.4
-session@1.1.0
-sha@1.0.3
-spacebars@1.0.6
-spacebars-compiler@1.0.6
-srp@1.0.3
-standard-app-packages@1.0.5
-templating@1.1.1
-tracker@1.0.7
-twbs:bootstrap@3.3.5
-ui@1.0.6
-underscore@1.0.3
-url@1.0.4
-vsivsi:file-collection@1.2.0
-vsivsi:job-collection@1.2.0
-webapp@1.2.0
-webapp-hashing@1.0.3
+npm-container@1.2.0
+npm-mongo@1.4.39_1
+numeral:numeral@1.5.3_1
+observe-sequence@1.0.7
+ordered-dict@1.0.4
+promise@0.5.1
+random@1.0.5
+rate-limit@1.0.0
+reactive-dict@1.1.3
+reactive-var@1.0.6
+reload@1.1.4
+retry@1.0.4
+routepolicy@1.0.6
+service-configuration@1.0.5
+session@1.1.1
+sha@1.0.4
+spacebars@1.0.7
+spacebars-compiler@1.0.7
+srp@1.0.4
+standard-app-packages@1.0.6
+standard-minifiers@1.0.2
+templating@1.1.5
+templating-tools@1.0.0
+tracker@1.0.9
+twbs:bootstrap@3.3.6
+ui@1.0.8
+underscore@1.0.4
+url@1.0.5
+vsivsi:file-collection@1.3.0
+vsivsi:job-collection@1.2.3
+webapp@1.2.3
+webapp-hashing@1.0.5
diff --git a/packages/npm-container/index.js b/packages/npm-container/index.js
@@ -1,9 +1,9 @@
-  Meteor.npmRequire = function(moduleName) {                                             // 85
-    var module = Npm.require(moduleName);                                                // 86
-    return module;                                                                       // 87
-  };                                                                                     // 88
-                                                                                         // 89
-  Meteor.require = function(moduleName) {                                                // 90
-    console.warn('Meteor.require is deprecated. Please use Meteor.npmRequire instead!'); // 91
-    return Meteor.npmRequire(moduleName);                                                // 92
-  };                                                                                     // 93
+Meteor.npmRequire = function(moduleName) {
+  var module = Npm.require(moduleName);
+  return module;
+};
+
+Meteor.require = function(moduleName) {
+  console.warn('Meteor.require is deprecated. Please use Meteor.npmRequire instead!');
+  return Meteor.npmRequire(moduleName);
+};
diff --git a/packages/npm-container/package.js b/packages/npm-container/package.js
@@ -1,21 +1,30 @@
-  var path = Npm.require('path');                                                        // 97
-  var fs = Npm.require('fs');                                                            // 98
-                                                                                         // 99
-  Package.describe({                                                                     // 100
-    summary: 'Contains all your npm dependencies',                                       // 101
-    version: '1.0.0',                                                                    // 102
-    name: 'npm-container'                                                                // 103
-  });                                                                                    // 104
-                                                                                         // 105
-  var packagesJsonFile = path.resolve('./packages.json');                                // 106
-  try {                                                                                  // 107
-    var fileContent = fs.readFileSync(packagesJsonFile);                                 // 108
-    var packages = JSON.parse(fileContent.toString());                                   // 109
-    Npm.depends(packages);                                                               // 110
-  } catch(ex) {                                                                          // 111
-    console.error('ERROR: packages.json parsing error [ ' + ex.message + ' ]');          // 112
-  }                                                                                      // 113
-                                                                                         // 114
-  Package.onUse(function(api) {                                                          // 115
-    api.add_files(['index.js', '../../packages.json'], 'server');                        // 116
-  });                                                                                    // 117
+var path = Npm.require('path');
+var fs = Npm.require('fs');
+
+Package.describe({
+  summary: 'Contains all your npm dependencies',
+  version: '1.2.0',
+  name: 'npm-container'
+});
+
+var packagesJsonFile = path.resolve('./packages.json');
+try {
+  var fileContent = fs.readFileSync(packagesJsonFile);
+  var packages = JSON.parse(fileContent.toString());
+  Npm.depends(packages);
+} catch (ex) {
+  console.error('ERROR: packages.json parsing error [ ' + ex.message + ' ]');
+}
+
+// Adding the app's packages.json as a used file for this package will get
+// Meteor to watch it and reload this package when it changes
+Package.onUse(function(api) {
+  api.addFiles('index.js', 'server');
+  if (api.addAssets) {
+    api.addAssets('../../packages.json', 'server');
+  } else {
+    api.addFiles('../../packages.json', 'server', {
+      isAsset: true
+    });
+  }
+});
diff --git a/sample.html b/sample.html
@@ -48,9 +48,9 @@ <h3>fileCollection + jobCollection Test App</h3>
 	            <div class="thumbnail">
 	              {{#if isImage}}
 	                {{#if thumb}}
-	                  <a href="{{../baseURL}}/id/{{id}}"><img class="img-thumbnail" alt="{{altMessage}}" src="{{../baseURL}}/id/{{thumb}}"></a>
+	                  <a href="{{../baseURL}}/id/{{id}}" target="_self"><img class="img-thumbnail" alt="{{altMessage}}" src="{{../baseURL}}/id/{{thumb}}"></a>
 	                {{else}}
-	                  <a href="{{../baseURL}}/id/{{id}}"><img class="img-thumbnail" alt="{{altMessage}}" src=""></a>
+	                  <a href="{{../baseURL}}/id/{{id}}" target="_self"><img class="img-thumbnail" alt="{{altMessage}}" src=""></a>
 	                {{/if}}
 	              {{else}}
 	                <span class="text-muted text-center">No preview</span>
@@ -100,7 +100,7 @@ <h3>fileCollection + jobCollection Test App</h3>
 	        {{#each dataEntries}}
 	          <tr>
 	            <td>
-	              <a href="{{../baseURL}}/id/{{id}}?download=true">{{shortFilename 32}}</a>
+	              <a href="{{../baseURL}}/id/{{id}}?download=true" target="_self">{{shortFilename 32}}</a>
 	              <button type="button" class="close del-file" aria-hidden="true">&times;</button>
 	            </td>
 	            <td>{{id}}</td>

-Original file line number
+Diff line change
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]_1
 +[email protected]
 +[email protected]
 benjaminrh:[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -cosmos:[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]_2
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +cosmos:[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 -meteorhacks:[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -momentjs:[email protected]
 -[email protected]
 +meteorhacks:[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +momentjs:[email protected]
 +[email protected]
 +[email protected]
 mrt:[email protected]
 [email protected]_2
 -[email protected]
 -numeral:[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -twbs:[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -vsivsi:[email protected]
 -vsivsi:[email protected]
 -[email protected]
 -[email protected]
 +[email protected]
 +[email protected]_1
 +numeral:[email protected]_1
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +twbs:[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +vsivsi:[email protected]
 +vsivsi:[email protected]
 +[email protected]
 +[email protected]