Issue 4090 - Make require() load modules lazily

lib/compat.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //
 // Module framework stuff
 //
 
 function require(module)
 {
-  return require.scopes[module];
+  let result = require.scopes[module];
+  if (typeof result == "function" && !(module in require.loaded))

[Sebastian Noack, 2016/05/31 11:44:27]

Where is it actually added to require.loaded?

[Wladimir Palant, 2016/05/31 13:47:54]

I probably should have tested this code path :)

It's not really used due to none of our modules returning functions. But I fixed
this issue and this time I also made sure to test it properly.

+    result = require.scopes[module] = result();
+  return result;
 }
+require.loaded = Object.create(null);
 require.scopes = Object.create(null);
 
 function importAll(module, globalObj)
 {
   var exports = require(module);
   for (var key in exports)
     globalObj[key] = exports[key];
 }
 
 onShutdown = {
@@ skipping 220 matching lines @@
   status: -1,
   notificationCallbacks: {},
   loadFlags: 0,
   INHIBIT_CACHING: 0,
   VALIDATE_ALWAYS: 0,
   QueryInterface: function()
   {
     return this;
   }
 };