Issue 6625 - Expose webpack's resolve.alias to the packagers

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
 import struct
 import subprocess
 import sys
 import random
 import posixpath
 
+import ConfigParser

[Sebastian Noack, 2018/04/26 11:30:39]

Nit: ConfigParser is a corelib module. So it goes together with the other
corelib modules without a blank line in between.

[tlucas, 2018/04/26 11:40:58]

Done.

+
 from packager import (readMetadata, getDefaultFileName, getBuildVersion,
                       getTemplate, get_extension, Files, get_app_id)
 
 defaultLocale = 'en_US'
 
 
 def getIgnoredFiles(params):
     return {'store.description'}
 
 
@@ skipping 121 matching lines @@
     ).encode('utf-8') + '\n'
 
 
 def create_bundles(params, files, bundle_tests):
     base_extension_path = params['baseDir']
     info_templates = {
         'chrome': 'chromeInfo.js.tmpl',
         'edge': 'edgeInfo.js.tmpl',
         'gecko': 'geckoInfo.js.tmpl',
     }
+    aliases = {
+        # To use our custom loader for the info module we must first set up an
+        # alias to a file that exists.
+        'info$': os.path.join(os.path.dirname(__file__), 'info.js'),
+        # Prevent builtin Node.js modules from being used instead of our own
+        # when the names clash. Once relative paths are used this won't be
+        # necessary.
+        'url$': 'url.js',
+        'events$': 'events.js',
+        'punycode$': 'punycode.js',
+    }
+    try:
+        aliases.update(
+            {k: v for k, v in params['metadata'].items('module_alias')},

[Sebastian Noack, 2018/04/26 11:30:39]

Nit: The dict comprehension here is redundant.

[tlucas, 2018/04/26 11:40:58]

Done.

+        )
+    except ConfigParser.NoSectionError:
+        pass
 
     # 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']]
 
     info_template = getTemplate(info_templates[params['type']])
     info_module = info_template.render(
         basename=params['metadata'].get('general', 'basename'),
         version=params['version'],
     ).encode('utf-8')
 
     configuration = {
         'bundles': [],
         'extension_path': base_extension_path,
         'info_module': info_module,
         'resolve_paths': resolve_paths,
+        'aliases': aliases,
     }
 
     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()]
@@ skipping 200 matching lines @@
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)