Revert "Reland "Convert ui/ARIAUtils.js to an ES module""
This reverts commit ec810baced8e07ca3e9f2b801703be433807d2a2.
Reason for revert: causing eslint failures on Linux Tests:
/b/s/w/ir/third_party/blink/renderer/devtools/front_end/dom_extension/DOMExtension.js
817:10 error 'onInvokeElement' is defined but never used no-unused-vars
https://ci.chromium.org/p/chromium/builders/ci/Linux%20Tests/81950
Original change's description:
> Reland "Convert ui/ARIAUtils.js to an ES module"
>
> This is a reland of b3373919f86df10c190a8672ca828c7ea4b920e5
>
> Original change's description:
> > Convert ui/ARIAUtils.js to an ES module
> >
> > ES modules allow files to explicitly import and export symbols [1].
> > This patch migrates ARIAUtils.js to an ES module, while maintaining
> > backwards compatibility with existing usages of `window.UI.ARIAUtils`.
> >
> > The build system is updated to copy these modules verbatim, as it no
> > longer require pre-processing to be loaded. The `module.json` no longer
> > includes this file as a script, to make sure it is not double-bundled
> > into `shell.js`. Instead, it is added to the new field `modules`, which
> > contains all modules. By doing so, it becomes clear which files are
> > converted to modules already and which require the legacy references
> > to the global scope.
> >
> > This module and future modules will be imported from `root.js`, which is
> > added to all existing HTML application files.
> >
> > Design Doc: https://docs.google.com/document/d/1h9dOy3nNPNfZ2AtZXzB-DwJqG4Oo37WWvKLCuzCcPzo/edit?usp=sharing
> >
> > [1]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import
> >
> > TBR=jochen@chromium.org
> >
> > Change-Id: Ie79c8f2fce3aff96fa28af0b575eae39bfe8e1a5
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1748949
> > Reviewed-by: Jochen Eisinger <jochen@chromium.org>
> > Reviewed-by: Yang Guo <yangguo@chromium.org>
> > Commit-Queue: Tim van der Lippe <tvanderlippe@google.com>
> > Cr-Commit-Position: refs/heads/master@{#697238}
>
> Change-Id: I7544cbf4364d0b1a3c2f137a4d17a1afdb1d4aed
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1810534
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Tim Van der Lippe <tvanderlippe@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#697626}
TBR=yangguo@chromium.org,aerotwist@chromium.org,tvanderlippe@chromium.org
Change-Id: I445fd35f135450cd9e8ed4c69bf913662f461ce6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1811989
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#697824}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 901bcc219d9204748f9c256ceca0f2cd68061006
diff --git a/scripts/build/build_release_applications.py b/scripts/build/build_release_applications.py
index db32b00..74e1c10 100755
--- a/scripts/build/build_release_applications.py
+++ b/scripts/build/build_release_applications.py
@@ -133,13 +133,13 @@
output = StringIO()
with open(join(self.application_dir, html_name), 'r') as app_input_html:
for line in app_input_html:
- if ('<script ' in line and 'type="module"' not in line) or '<link ' in line:
+ if '<script ' in line or '<link ' in line:
continue
if '</head>' in line:
self._write_include_tags(self.descriptors, output)
js_file = join(self.application_dir, self.app_file('js'))
if path.exists(js_file):
- output.write(' <script type="module">%s</script>\n' % minify_js(read_file(js_file)))
+ output.write(' <script>%s</script>\n' % minify_js(read_file(js_file)))
output.write(line)
write_file(join(self.output_dir, html_name), output.getvalue())
@@ -154,7 +154,7 @@
def _generate_include_tag(self, resource_path):
if resource_path.endswith('.js'):
- return ' <script defer src="%s"></script>\n' % resource_path
+ return ' <script type="text/javascript" src="%s"></script>\n' % resource_path
else:
assert resource_path
diff --git a/scripts/build/copy_devtools_modules.py b/scripts/build/copy_devtools_modules.py
deleted file mode 100755
index 10d9ee2..0000000
--- a/scripts/build/copy_devtools_modules.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-#
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Copies the modules into the resources folder
-"""
-
-from os.path import join, relpath
-import shutil
-import sys
-
-
-def main(argv):
- try:
- input_path_flag_index = argv.index('--input_path')
- input_path = argv[input_path_flag_index + 1]
- output_path_flag_index = argv.index('--output_path')
- output_path = argv[output_path_flag_index + 1]
- devtools_modules = argv[1:input_path_flag_index]
- except:
- print 'Usage: %s module_1 module_2 ... module_N --input_path <input_path> --output_path <output_path>' % argv[0]
- raise
-
- for file_name in devtools_modules:
- shutil.copy(join(input_path, file_name), join(output_path, relpath(file_name, 'front_end')))
-
-
-if __name__ == '__main__':
- sys.exit(main(sys.argv))
diff --git a/scripts/build/modular_build.py b/scripts/build/modular_build.py
index c818ad9..90d6697 100755
--- a/scripts/build/modular_build.py
+++ b/scripts/build/modular_build.py
@@ -76,7 +76,7 @@
for name in self.sorted_modules():
module = self.modules[name]
skipped_files = set(module.get('skip_compilation', []))
- for script in module.get('scripts', []) + module.get('modules', []):
+ for script in module.get('scripts', []):
if script not in skipped_files:
files[path.normpath(path.join(self.application_dir, name, script))] = True
return files.keys()
diff --git a/scripts/check_localizability.js b/scripts/check_localizability.js
index 98e695c..f71a713 100644
--- a/scripts/check_localizability.js
+++ b/scripts/check_localizability.js
@@ -285,7 +285,7 @@
if (path.extname(filePath) === '.grdp')
return auditGrdpFile(filePath, fileContent, errors);
- const ast = esprima.parseModule(fileContent, {loc: true});
+ const ast = esprima.parse(fileContent, {loc: true});
const relativeFilePath = localizationUtils.getRelativeFilePathFromSrc(filePath);
for (const node of ast.body)
diff --git a/scripts/check_localizable_resources.js b/scripts/check_localizable_resources.js
index acf7e72..50a2859 100644
--- a/scripts/check_localizable_resources.js
+++ b/scripts/check_localizable_resources.js
@@ -32,7 +32,6 @@
else
await getErrors();
} catch (e) {
- console.log(e.stack);
console.log(`Error: ${e.message}`);
process.exit(1);
}
diff --git a/scripts/compile_frontend.py b/scripts/compile_frontend.py
index 78a553d..53ad724 100755
--- a/scripts/compile_frontend.py
+++ b/scripts/compile_frontend.py
@@ -77,7 +77,6 @@
GLOBAL_EXTERNS_FILE = to_platform_path(path.join(DEVTOOLS_FRONTEND_PATH, 'externs.js'))
DEFAULT_PROTOCOL_EXTERNS_FILE = path.join(DEVTOOLS_FRONTEND_PATH, 'protocol_externs.js')
RUNTIME_FILE = to_platform_path(path.join(DEVTOOLS_FRONTEND_PATH, 'Runtime.js'))
-ROOT_MODULE_FILE = to_platform_path(path.join(DEVTOOLS_FRONTEND_PATH, 'root.js'))
CLOSURE_COMPILER_JAR = to_platform_path(path.join(SCRIPTS_PATH, 'closure', 'compiler.jar'))
CLOSURE_RUNNER_JAR = to_platform_path(path.join(SCRIPTS_PATH, 'closure', 'closure_runner', 'closure_runner.jar'))
@@ -280,8 +279,6 @@
namespace_externs_path,
'--js',
RUNTIME_FILE,
- '--js',
- ROOT_MODULE_FILE,
]
all_files = descriptors.all_compiled_files()