Issue 5378 - Stop using of jshydra in libadblockplus

convert_js.py

 #!/usr/bin/env python
 # coding: utf-8
 
+import io
 import sys
 import os
 import codecs
 import re
 import json
 import argparse
 import xml.dom.minidom as minidom
 
-baseDir = os.path.abspath(os.path.dirname(__file__))
-sys.path.append(os.path.join(baseDir, 'adblockpluscore', 'buildtools', 'jshydra'))
-from abp_rewrite import doRewrite
-
+jsTemplate = """require.scopes["%s"] = (function() {
+  let exports = {};
+%s
+  return exports;
+})();"""
 
 class CStringArray:
     def __init__(self):
         self._buffer = []
         self._strings = []
 
     def add(self, string):
         string = string.encode('utf-8').replace('\r', '')
         self._strings.append('std::string(buffer + %i, %i)' % (len(self._buffer), len(string)))
         self._buffer.extend(map(lambda c: str(ord(c)), string))
@@ skipping 28 matching lines @@
         for name, value in node.attributes.items():
             result[name] = value
         data.append(result)
         fileName = os.path.basename(file)
     array.add(fileName)
     array.add('require.scopes["%s"] = %s;' % (fileName, json.dumps(data)))
     fileHandle.close()
 
 
 def convertJsFile(array, file):
-    converted = doRewrite([os.path.abspath(file)], ['module=true', 'source_repo=https://hg.adblockplus.org/adblockpluscore/'])
-    array.add(os.path.basename(file))
-    array.add(converted)
+    with io.open(file, encoding="utf-8") as jsFile:
+      jsFileContent = jsFile.read()
+    referenceFileName = os.path.basename(file)
+    array.add(referenceFileName)
+    array.add(jsTemplate % (re.sub("\\.jsm?$", "", referenceFileName), jsFileContent))
 
 
 def convert(verbatimBefore, convertFiles, verbatimAfter, outFile):
     array = CStringArray()
     addFilesVerbatim(array, verbatimBefore)
 
     for file in convertFiles:
         if file.endswith('.xml'):
             convertXMLFile(array, file)
         else:
@@ skipping 10 matching lines @@
     parser.add_argument('--before', metavar='verbatim_file', nargs='+',
                         help='JavaScript file to include verbatim at the beginning')
     parser.add_argument('--convert', metavar='file_to_convert', nargs='+',
                         help='JavaScript files to convert')
     parser.add_argument('--after', metavar='verbatim_file', nargs='+',
                         help='JavaScript file to include verbatim at the end')
     parser.add_argument('output_file',
                         help='output from the conversion')
     args = parser.parse_args()
     convert(args.before, args.convert, args.after, args.output_file)