Issue 5535 - Replace our module system with webpack

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import errno
 import glob
 import io
 import json
 import os
 import re
@@ skipping 142 matching lines @@
         'chrome': 'chromeInfo.js.tmpl',
         'edge': 'edgeInfo.js.tmpl',
         'gecko-webext': 'geckoInfo.js.tmpl'
     }
 
     # Historically we didn't use relative paths when requiring modules, so in
     # order for webpack to know where to find them we need to pass in a list of
     # resolve paths. Going forward we should always use relative paths, once we
     # do that consistently this can be removed. See issues 5760, 5761 and 5762.
     resolve_paths = [os.path.join(base_extension_path, dir, 'lib')
                      for dir in ['', 'adblockpluscore', 'adblockplusui']]

[Sebastian Noack, 2017/10/10 16:35:19]

The "adblockplus" dependency has been removed meanwhile, and "buildtools/lib" is
gone too. So we don't have to hard-code adblockpluscore and adblockplusui here
anymore.

[kzar, 2017/10/10 17:03:38]

This is true but as discussed in IRC we can remove the resolve_paths and most
aliases after the relative paths have been removed anyway, so we might as well
keep it simple for now.

 
     info_template = getTemplate(info_templates[params['type']])
     info_module = info_template.render(
         basename=params['metadata'].get('general', 'basename'),
         version=params['metadata'].get('general', 'version')
     ).encode('utf-8')
 
     configuration = {
         'bundles': [],
         'extension_path': base_extension_path,
         'info_module': info_module,
         'resolve_paths': resolve_paths,
     }
 
     for item in params['metadata'].items('bundles'):
         name, value = item
         base_item_path = os.path.dirname(item.source)
 
         bundle_file = os.path.relpath(os.path.join(base_item_path, name),
                                       base_extension_path)
         entry_files = [os.path.join(base_item_path, module_path)
                        for module_path in value.split()]
         configuration['bundles'].append({
             'bundle_name': bundle_file,
             'entry_points': entry_files,
         })
 
-    command = ['node',
-               os.path.join(os.path.dirname(__file__), 'webpack_runner.js')]

[Sebastian Noack, 2017/10/10 16:35:19]

Nit: It seem you don't need to wrap this list if you ge rid of the temporary
variable:

  process = subprocess.Popen(
      ['node', os.path.join(os.path.dirname(__file__), 'webpack_runner.js')]
      command, stdout=subprocess.PIPE, stdin=subprocess.PIPE
  )

[kzar, 2017/10/10 17:03:39]

Well I pass the variable to the CalledProcessError, but how about this?

[Sebastian Noack, 2017/10/10 17:23:33]

Acknowledged.

-    process = subprocess.Popen(
-        command, stdout=subprocess.PIPE, stdin=subprocess.PIPE
-    )
+    cmd = ['node', os.path.join(os.path.dirname(__file__), 'webpack_runner.js')]
+    process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                               stdin=subprocess.PIPE)
     output = process.communicate(input=toJson(configuration))[0]
     if process.returncode != 0:
-        raise subprocess.CalledProcessError(process.returncode, cmd=command)
+        raise subprocess.CalledProcessError(process.returncode, cmd=cmd)
 
     bundles = json.loads(output)
     for bundle in bundles:
         files[bundle] = bundles[bundle].encode('utf-8')
 
 
 def import_locales(params, files):
     for item in params['metadata'].items('import_locales'):
         filename, keys = item
         for sourceFile in glob.glob(os.path.join(os.path.dirname(item.source),
@@ skipping 161 matching lines @@
                 params, 'testIndex.html.tmpl', ('general', 'testScripts')
             )
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)