Merge branch 'refactor/swap_npm_#22'

Ryan Glover
2 parents 72dec6a209 b1c69063bf
Showing 7 changed files Show diff stats
.meteor/packages
.meteor/versions
packages.json
packages/.gitignore
packages/npm-container/index.js
packages/npm-container/package.js
packages/npm-packages/package.js
@@ -16,3 +16,7 @@ themeteorchef:jquery-validation
 particle4dev:sass@0.3.0
 twbs:bootstrap
 browser-policy
+meteorhacks:npm
+
+
+npm-container
 \ No newline at end of file
@@ -43,6 +43,8 @@ localstorage@1.0.2
 logging@1.0.6
 meteor@1.1.4
 meteor-platform@1.2.1
+meteorhacks:async@1.0.0
+meteorhacks:npm@1.2.2
 minifiers@1.1.3
 minimongo@1.0.6
 mobile-status-bar@1.0.2
@@ -0,0 +1,3 @@
+{
+  
+}
 \ No newline at end of file
@@ -1,13 +0,0 @@
-/iron-router
-/blaze-layout
-/sass
-/bootstrap-3
-/handlebars-server
-/velocity
-/velocity-quick-start
-/velocity-html-reporter
-/jasmine-unit
-/jasmine
-/mocha-web-velocity
-/package-stubber
-/mirror
@@ -0,0 +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
 \ No newline at end of file
@@ -0,0 +1,21 @@
+  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
 \ No newline at end of file
@@ -1,7 +0,0 @@
-Package.describe({
-  summary: "Give Meteor access to NPM modules for our application."
-});
-
-Npm.depends({
-  "fibers": "1.0.1"
-});
...	...	@@ -16,3 +16,7 @@ themeteorchef:jquery-validation
16	16	particle4dev:sass@0.3.0
17	17	twbs:bootstrap
18	18	browser-policy
	19	+meteorhacks:npm
	20	+
	21	+
	22	+npm-container
19	23	\ No newline at end of file
...	...
...	...	@@ -43,6 +43,8 @@ localstorage@1.0.2
43	43	logging@1.0.6
44	44	meteor@1.1.4
45	45	meteor-platform@1.2.1
	46	+meteorhacks:async@1.0.0
	47	+meteorhacks:npm@1.2.2
46	48	minifiers@1.1.3
47	49	minimongo@1.0.6
48	50	mobile-status-bar@1.0.2
...	...
...	...	@@ -0,0 +1,3 @@
	1	+{
	2	+
	3	+}
0	4	\ No newline at end of file
...	...
...	...	@@ -1,13 +0,0 @@
1		-/iron-router
2		-/blaze-layout
3		-/sass
4		-/bootstrap-3
5		-/handlebars-server
6		-/velocity
7		-/velocity-quick-start
8		-/velocity-html-reporter
9		-/jasmine-unit
10		-/jasmine
11		-/mocha-web-velocity
12		-/package-stubber
13		-/mirror
...	...	@@ -0,0 +1,9 @@
	1	+ Meteor.npmRequire = function(moduleName) { // 85
	2	+ var module = Npm.require(moduleName); // 86
	3	+ return module; // 87
	4	+ }; // 88
	5	+ // 89
	6	+ Meteor.require = function(moduleName) { // 90
	7	+ console.warn('Meteor.require is deprecated. Please use Meteor.npmRequire instead!'); // 91
	8	+ return Meteor.npmRequire(moduleName); // 92
	9	+ }; // 93
0	10	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,21 @@
	1	+ var path = Npm.require('path'); // 97
	2	+ var fs = Npm.require('fs'); // 98
	3	+ // 99
	4	+ Package.describe({ // 100
	5	+ summary: 'Contains all your npm dependencies', // 101
	6	+ version: '1.0.0', // 102
	7	+ name: 'npm-container' // 103
	8	+ }); // 104
	9	+ // 105
	10	+ var packagesJsonFile = path.resolve('./packages.json'); // 106
	11	+ try { // 107
	12	+ var fileContent = fs.readFileSync(packagesJsonFile); // 108
	13	+ var packages = JSON.parse(fileContent.toString()); // 109
	14	+ Npm.depends(packages); // 110
	15	+ } catch(ex) { // 111
	16	+ console.error('ERROR: packages.json parsing error [ ' + ex.message + ' ]'); // 112
	17	+ } // 113
	18	+ // 114
	19	+ Package.onUse(function(api) { // 115
	20	+ api.add_files(['index.js', '../../packages.json'], 'server'); // 116
	21	+ }); // 117
0	22	\ No newline at end of file
...	...
...	...	@@ -1,7 +0,0 @@
1		-Package.describe({
2		- summary: "Give Meteor access to NPM modules for our application."
3		-});
4		-
5		-Npm.depends({
6		- "fibers": "1.0.1"
7		-});