commit e6a9868686ae207226061cb797232606d985f747
author Tim van der Lippe <tvanderlippe@chromium.org> Wed Jan 15 14:23:08 2020 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Jan 15 15:27:13 2020 +0000
tree 480ac9ea34a55e7fda0a2dbf06626b8a31c9660d
parent ddf58342e06028df6aeef07f2a1fcbdf3340403d

Migrate javascript_metadata/ to ESM internally

Bug: 1006759
Change-Id: Ibb7c4fb15197431c37c485bd1a05b20acf2bf098
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1994967
Commit-Queue: Tim van der Lippe <tvanderlippe@chromium.org>
Reviewed-by: Paul Lewis <aerotwist@chromium.org>

scripts/javascript_natives/index.js

diff --git a/scripts/javascript_natives/index.js b/scripts/javascript_natives/index.js
index b6b5041..c00369c 100644
--- a/scripts/javascript_natives/index.js
+++ b/scripts/javascript_natives/index.js
@@ -9,8 +9,11 @@
 const methodsByName = {
   __proto__: null
 };
-const program =
-    ts.createProgram([path.join(__dirname, 'node_modules', 'typescript', 'lib', 'lib.esnext.d.ts')], {noLib: true});
+const program = ts.createProgram(
+    [
+      path.join(__dirname, 'node_modules', 'typescript', 'lib', 'lib.esnext.d.ts'),
+    ],
+    {noLib: true});
 for (const file of program.getSourceFiles()) {
   ts.forEachChild(file, node => {
     if (node.kind === ts.SyntaxKind.InterfaceDeclaration) {
@@ -42,11 +45,11 @@
   storeMethod(node.name.text, func.name.escapedText, args);
 }
 
-const files = glob('../../../+(core|modules)/**/*.idl', {cwd: __dirname}, function(er, files) {
+const files = glob('../../../../blink/renderer/+(core|modules)/**/*.idl', {cwd: process.env.PWD}, function(er, files) {
   for (const file of files) {
     if (file.includes('testing'))
       continue;
-    const data = fs.readFileSync(path.join(__dirname, file), 'utf8');
+    const data = fs.readFileSync(path.join(process.env.PWD, file), 'utf8');
     const lines = data.split('\n');
     const newLines = [];
     for (line of lines) {
@@ -189,13 +192,5 @@
       path.join(__dirname, '..', '..', 'front_end', 'javascript_metadata', 'NativeFunctions.js'),
       `// Generated from ${path.relative(path.join(__dirname, '..', '..'), __filename)}
 export const NativeFunctions = ${JSON.stringify(functions)};
-
-/* Legacy exported object */
-self.JavaScriptMetadata = self.JavaScriptMetadata || {};
-
-/* Legacy exported object */
-JavaScriptMetadata = JavaScriptMetadata || {};
-
-JavaScriptMetadata.NativeFunctions = NativeFunctions;
 `);
 }