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 io
 import json
 import os
 import re
-import shutil
 from StringIO import StringIO
 import struct
 import subprocess
 import sys
-import tempfile
 
 from ensure_dependencies import read_deps
 from packager import (readMetadata, getDefaultFileName, getBuildVersion,
                       getTemplate, Files)
 
 defaultLocale = 'en_US'
 
 
 def getIgnoredFiles(params):
     return {'store.description'}
@@ skipping 116 matching lines @@
     return manifest.encode('utf-8')
 
 
 def create_bundles(params, files):
     base_extension_path = params['baseDir']
     info_templates = {
         'chrome': 'chromeInfo.js.tmpl',
         'edge': 'edgeInfo.js.tmpl',
         'gecko-webext': 'geckoInfo.js.tmpl'
     }
-    info_module = None
 
     # 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 = ' '.join(
         [os.path.join(base_extension_path, dir, 'lib')
          for dir in ['', 'adblockpluscore', 'adblockplusui']]
     )
 
-    temp_dir = tempfile.mkdtemp()
-    try:
-        info_module = os.path.join(temp_dir, 'info.js')
-        template = getTemplate(info_templates[params['type']])
-        with open(info_module, 'w') as info_file:
-            info_file.write(
-                template.render(
-                    basename=params['metadata'].get('general', 'basename'),
-                    version=params['metadata'].get('general', 'version')
-                ).encode('utf-8')
-            )
+    template = getTemplate(info_templates[params['type']])

[Wladimir Palant, 2017/10/04 10:38:06]

Nit: this variable is better named info_template I guess.

[kzar, 2017/10/04 13:13:25]

Done.

+    info_module = template.render(
+        basename=params['metadata'].get('general', 'basename'),
+        version=params['metadata'].get('general', 'version')
+    ).encode('utf-8')
 
-        for item in params['metadata'].items('bundles'):
-            name, value = item
-            base_item_path = os.path.dirname(item.source)
+    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()]
-            subprocess.check_call(
-                ['npm', 'run-script', 'webpack', '--silent'],
-                cwd=os.path.dirname(__file__),
-                env={
-                    'EXTENSION_PATH': base_extension_path,
-                    'ENTRY_POINTS': ' '.join(entry_files),
-                    'OUTPUT_PATH': temp_dir,
-                    'BUNDLE_NAME': bundle_file,
-                    'RESOLVE_PATHS': resolve_paths,
-                    'INFO_PATH': info_module,
-                    'PATH': os.environ['PATH']
-                }
-            )
-            for file_name in [bundle_file, bundle_file + '.map']:
-                with open(os.path.join(temp_dir, file_name), 'r') as f:
-                    files[file_name] = f.read()
-    finally:
-        shutil.rmtree(temp_dir)
+        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()]
+        files[bundle_file] = subprocess.check_output(
+            ['node', 'webpack_runner.js'],
+            cwd=os.path.dirname(__file__),

[Wladimir Palant, 2017/10/04 10:38:06]

I'd prefer an absolute path to webpack_runner.js instead of the cwd parameter.

[kzar, 2017/10/04 13:13:24]

Done.

+            env={
+                'EXTENSION_PATH': base_extension_path,
+                'ENTRY_POINTS': ' '.join(entry_files),

[Wladimir Palant, 2017/10/04 10:38:06]

This will break for paths containing spaces.

[kzar, 2017/10/04 13:13:24]

Whoops, good point.

+                'BUNDLE_NAME': bundle_file,
+                'RESOLVE_PATHS': resolve_paths,
+                'INFO_MODULE': info_module,

[Wladimir Palant, 2017/10/04 10:38:06]

Why do we still need to pass data via environment variables? Command line
parameters should make more sense, or maybe even writing a JSON-encoded blob to
stdin - this should be safer to parse.

[kzar, 2017/10/04 13:13:24]

Done.

+                'PATH': os.environ['PATH']
+            }
+        )
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': ')
     ).encode('utf-8') + '\n'
 
 
 def import_string_webext(data, key, source):
@@ skipping 222 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)