Inject angular where window.angular is used.

This should work, but it does. It should make angular.js recurse but webpack takes care of it.
Many thanks to @huston007 for this even though I didn't merge #17.

Author: stackfull

README.md

@@ -5,19 +5,47 @@ Makes webpack aware of AngularJS modules.
 ## Getting Started
 This project is just getting off the ground.
 
-It is at the stage now where you can use it to get angular apps webpacked without needing `require()` in your code, but it does it by trying to map between angular module names and file names. The conventions for doing this are various, so it will not fit all cases. Please submit an issue on github if it isn't working for your modules and I'll try to iron out the wrinkles over time.
+It is at the stage now where you can use it to get angular apps webpacked
+without needing `require()` in your code, but it does it by trying to map
+between angular module names and file names. The conventions for doing this are
+various, so it will not fit all cases. Please submit an issue on github if it
+isn't working for your modules and I'll try to iron out the wrinkles over time.
 
 To see it in action, I've [forked the angular-seed project](https://github.com/stackfull/angular-seed)
 
+## Development
+
+Given how complex the problem is, regular test frameworks can't help much. I've
+developed a small grunt task to run compile scenarios and check the output. It's
+less than ideal and a little fragile. To add new scenarios, create a directory
+in test/scenarios containing a webpack.conf.js config file, an `in` and an `out`
+directory. The `in` directory will be used as the source and the output will
+be compared against `out/bundle.js` (ignoring comments etc.).
+
+To run the scenarios::
+
+    grunt webpackScenario
+
+by default, it won't show what the output was when it doesn't match, so use
+
+    grunt --debug webpackScenario
+
+In addition, karma tests in the `verify` directory check that the output makes
+a viable executable using the `karma.conf.js` file.
+
+The default grunt task checks everything.
 
 ## Release History
 
-#### 0.0.1 - 22 Apr 2014
-First release
+#### 0.0.3 - 7 Dec 2014
+Webpack 1.4 and fix for modules using window.angular
 
 #### 0.0.2 - 28 July 2014
 Working well enough to build the angular-seed project.
 
+#### 0.0.1 - 22 Apr 2014
+First release
+
 
 ## License
 Copyright (c) 2014 Paul Thomas. Licensed under the MIT license.

lib/index.js

@@ -56,6 +56,8 @@ AngularPlugin.prototype = {
   apply: function(compiler){
     bindCallbackMethod(compiler, "compilation",
                        this, this.addDependencyFactories);
+    bindCallbackMethod(compiler.parser, "expression window.angular",
+                       this, this.addAngularVariable);
     bindCallbackMethod(compiler.parser, "expression angular",
                        this, this.addAngularVariable);
     bindCallbackMethod(compiler.parser, "call angular.module",

tasks/stubng.js tasks/ng.stubjstasks/stubng.js renamed to tasks/ng.stubjs

@@ -0,0 +1,4 @@
+
+(function(window, angular, undefined) {
+// stub of angular-route.js
+})(window, window.angular);

tasks/ngroute.stubjs

@@ -54,7 +54,8 @@ module.exports = function(grunt){
         resolve: {
           root: path.resolve(confFile, '..', 'in'),
           alias: {
-            angular: path.resolve(__dirname, 'stubng.js')
+            angular: path.resolve(__dirname, 'ng.stubjs'),
+            ngRoute: path.resolve(__dirname, 'ngroute.stubjs')
           }
         },
       }, config);

tasks/webpack-scenario.js

@@ -17,7 +17,9 @@ function(module, exports, __webpack_require__) {
     }.call(exports, __webpack_require__(3)))
 },
 function(module, exports, __webpack_require__) {
+  (function(angular) {
   module.exports = window.angular
+    }.call(exports, __webpack_require__(3)))
 }
 ])
 

test/scenarios/alias-namespace/out/bundle.js

@@ -15,7 +15,9 @@ function(module, exports, __webpack_require__) {
   }.call(exports, __webpack_require__(2)))
 },
 function(module, exports, __webpack_require__) {
+  (function(angular) {
   // stub
   module.exports = window.angular
+  }.call(exports, __webpack_require__(2)))
 }
 ])

test/scenarios/basic-module-dependency/out/bundle.js

@@ -26,16 +26,9 @@ module.exports = function(config) {
       resolve: {
         root: path.resolve(__dirname, 'in'),
         alias: {
-          angular$: '../../../vendor/angular/angular.js'
+          angular$: path.resolve(__dirname, '../../vendor/angular/angular.js')
         }
       },
-      module: {
-        noParse: /angular\.js$/,
-        loaders: [{
-          test: /angular\.js$/,
-          loader: 'exports?window.angular'
-        }]
-      },
       plugins: [new AngularPlugin()]
     }
   });

test/scenarios/basic-module/karma.conf.js

@@ -5,8 +5,10 @@
     (module.exports['main'] = angular.module('main', []));
   }.call(exports, __webpack_require__(1)))
 },
-function(module, exports, require) {
+function(module, exports, __webpack_require__) {
+  (function(angular) {
   // angular.js stub
   module.exports = window.angular
+  }.call(exports, __webpack_require__(1)))
 }
 ])

test/scenarios/basic-module/out/bundle.js

@@ -13,8 +13,10 @@ function(module, exports, __webpack_require__) {
   }.call(exports, __webpack_require__(2)))
 },
 function(module, exports, __webpack_require__) {
+  (function(angular) {
   // stub
   module.exports = window.angular
+  }.call(exports, __webpack_require__(2)))
 }
 ])