more webpack tests

torkelo · torkelo · commit ed89329d268a · 2015-09-13T19:35:39.000+02:00
diff --git a/public/app/app.js b/public/app/app.js
@@ -5,7 +5,6 @@ define([
   'jquery',
   'lodash',
   'angular',
-  'require',
   'config',
   'bootstrap',
   'angular-route',
@@ -16,7 +15,7 @@ define([
   'extend-jquery',
   'bindonce',
 ],
-function ($, _, angular, appLevelRequire) {
+function ($, _, angular) {
 
   "use strict";
 
@@ -97,25 +96,25 @@ function ($, _, angular, appLevelRequire) {
       .element(document)
       .ready(function() {
         angular.bootstrap(document, apps_deps)
-        .invoke(['$rootScope', function ($rootScope) {
+        .invoke([function () {
           _.each(pre_boot_modules, function (module) {
             _.extend(module, register_fns);
           });
 
           pre_boot_modules = false;
-          $rootScope.requireContext = appLevelRequire;
-          $rootScope.require = function (deps, fn) {
-            var $scope = this;
-            $scope.requireContext(deps, function () {
-              var deps = _.toArray(arguments);
-              // Check that this is a valid scope.
-              if($scope.$id) {
-                $scope.$apply(function () {
-                  fn.apply($scope, deps);
-                });
-              }
-            });
-          };
+          // $rootScope.requireContext = appLevelRequire;
+          // $rootScope.require = function (deps, fn) {
+          //   var $scope = this;
+          //   $scope.requireContext(deps, function () {
+          //     var deps = _.toArray(arguments);
+          //     // Check that this is a valid scope.
+          //     if($scope.$id) {
+          //       $scope.$apply(function () {
+          //         fn.apply($scope, deps);
+          //       });
+          //     }
+          //   });
+          // };
         }]);
       });
     });
diff --git a/public/app/core/routes/module_loader.ts b/public/app/core/routes/module_loader.ts
@@ -1,4 +1,5 @@
-///<reference path="../../headers/require/require.d.ts" />
+
+declare var require : any;
 
 export class ModuleLoader {
   lazy: any;
@@ -8,7 +9,8 @@ export class ModuleLoader {
     this.lazy = ["$q", "$route", "$rootScope", function($q, $route, $rootScope) {
       var defered = $q.defer();
 
-      require([moduleName], function () {
+      require.ensure([], function () {
+        require('../../features/org/all');
         defered.resolve();
       });
 
diff --git a/public/views/index.html b/public/views/index.html
@@ -55,11 +55,10 @@
 	</script>
 
 	<!-- build:js [[.AppSubUrl]]/app/app.js -->
-   <script src="[[.AppSubUrl]]/public/app/bundle.js"></script>
+   <script src="[[.AppSubUrl]]/public/app/bundle.app.js"></script>
   <!-- endbuild -->
 
 
-
 	[[if .GoogleAnalyticsId]]
 		<script>
 		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/webpack.config.js b/webpack.config.js
@@ -14,8 +14,10 @@ var webpackConfig = {
   },
   output: {
     path: __dirname + '/public_gen/app/',
-    filename: 'bundle.js',
-    publicPath: 'app/'
+    filename: 'bundle.[name].js',
+    chunkFilename: "bundle.chunk.[name].[chunkhash].[id].js",
+    sourceMapFilename: '[file].map',
+    publicPath: 'app/',
   },
   plugins: [
     // This replaces shim stuff in RequireJS.
@@ -27,9 +29,18 @@ var webpackConfig = {
   ],
   module: {
     unknownContextRegExp: /$^/,
+    unknownContextCritical: true,
+
+    exprContextRegExp: /$^/,
+    exprContextCritical: true,
+
+    wrappedContextRegExp: /$^/,
+    wrappedContextCritical: true,
+
     noParse: [
       /\.html/,
       /\.ts/,
+      /\.d\.ts/,
       /\.map/,
       /cloudwatch/,
       /app\/panels/,
@@ -45,6 +56,7 @@ var webpackConfig = {
     ]
   },
   resolve: {
+    extenions: ['', '.js'],
     alias: {
       "kbn":  absDir('/app/components/kbn.js'),
       "extend-jquery":  absDir('/app/components/extend-jquery.js'),
