Fix angular require paths

nkbt · nkbt · commit 9b7ff19ea889 · 2015-01-15T15:56:37.000+11:00
diff --git a/src/vendor/angular.js b/src/vendor/angular.js
@@ -1,7 +1,7 @@
 'use strict';
 
 if (!global.window.angular) {
-  require('angular');
+  require('npm/angular/angular');
 }
 var angular = global.window.angular;
 module.exports = angular;
diff --git a/src/vendor/angular_route.js b/src/vendor/angular_route.js
@@ -1,5 +1,5 @@
 'use strict';
 
-var angular = require('./angular');
-require('angular-route');
+var angular = require('vendor/angular');
+require('npm/angular-route/angular-route');
 module.exports = angular.module('ngRoute');
diff --git a/webpack.config.js b/webpack.config.js
@@ -13,6 +13,7 @@ module.exports = {
   resolve: {
     modulesDirectories: ['node_modules'],
     alias: {
+      'npm': __dirname + '/node_modules',
       'vendor': __dirname + '/src/vendor/'
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`'use strict';`
`2`	`2`
`3`	`3`	`if (!global.window.angular) {`
`4`		`- require('angular');`
	`4`	`+ require('npm/angular/angular');`
`5`	`5`	`}`
`6`	`6`	`var angular = global.window.angular;`
`7`	`7`	`module.exports = angular;`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ module.exports = {`
`13`	`13`	`resolve: {`
`14`	`14`	`modulesDirectories: ['node_modules'],`
`15`	`15`	`alias: {`
	`16`	`+ 'npm': __dirname + '/node_modules',`
`16`	`17`	`'vendor': __dirname + '/src/vendor/'`
`17`	`18`	`}`
`18`	`19`	`},`