refactor(editor): convert source files to ESM and update got to v12

Author: hivanalejandro

run/markdown-preview/editor/app.js

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const express = require('express');
-const handlebars = require('handlebars');
-const {readFile} = require('fs').promises;
-const renderRequest = require('./render.js');
+import express from 'express';
+import handlebars from 'handlebars';
+import { readFile } from 'fs/promises';
+import renderRequest from './render.js';
 
 const app = express();
 app.use(express.json());
@@ -25,14 +25,13 @@ let markdownDefault, compiledTemplate, renderedHtml;
 // Load the template files and serve them with the Editor service.
 const buildRenderedHtml = async () => {
   try {
-    markdownDefault = await readFile(__dirname + '/templates/markdown.md');
-    compiledTemplate = handlebars.compile(
-      await readFile(__dirname + '/templates/index.html', 'utf8')
-    );
-    renderedHtml = compiledTemplate({default: markdownDefault});
+    markdownDefault = await readFile(new URL('./templates/markdown.md', import.meta.url));
+    const indexTemplate = await readFile(new URL('./templates/index.html', import.meta.url), 'utf8');
+    compiledTemplate = handlebars.compile(indexTemplate);
+    renderedHtml = compiledTemplate({ default: markdownDefault });
     return renderedHtml;
   } catch (err) {
-    throw Error('Error loading template: ', err);
+    throw Error('Error loading template: ' + err);
   }
 };
 
@@ -62,7 +61,4 @@ app.post('/render', async (req, res) => {
 // [END cloudrun_secure_request_do]
 
 // Exports for testing purposes.
-module.exports = {
-  app,
-  buildRenderedHtml,
-};
+export { app, buildRenderedHtml };

run/markdown-preview/editor/index.js

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const {app} = require('./app');
-const pkg = require('./package.json');
-const PORT = parseInt(process.env.PORT) || 8080;
+import { app } from './app';
+import pkg from './package.json' assert {type: 'json'};
 
-app.listen(PORT, () => console.log(`${pkg.name} listening on port ${PORT}`));
+const PORT = parseInt(process.env.PORT) || 8080;
+app.listen(PORT, () => console.log(`${pkg.name} listening on port ${PORT}`));

run/markdown-preview/editor/package.json

@@ -24,12 +24,12 @@
   "dependencies": {
     "express": "^4.17.1",
     "google-auth-library": "^9.0.0",
-    "got": "^11.5.0",
+    "got": "^12.6.1",
     "handlebars": "^4.7.6"
   },
   "devDependencies": {
     "c8": "^10.0.0",
     "mocha": "^10.0.0",
     "supertest": "^7.0.0"
   }
-}
+}

run/markdown-preview/editor/render.js

@@ -13,17 +13,18 @@
 // limitations under the License.
 
 // [START cloudrun_secure_request]
-const {GoogleAuth} = require('google-auth-library');
-const got = require('got');
-const auth = new GoogleAuth();
+import { GoogleAuth } from 'google-auth-library';
+import got from 'got';
 
+const auth = new GoogleAuth();
 let client, serviceUrl;
 
 // renderRequest creates a new HTTP request with IAM ID Token credential.
 // This token is automatically handled by private Cloud Run (fully managed) and Cloud Functions.
 const renderRequest = async markdown => {
   if (!process.env.EDITOR_UPSTREAM_RENDER_URL)
     throw Error('EDITOR_UPSTREAM_RENDER_URL needs to be set.');
+
   serviceUrl = process.env.EDITOR_UPSTREAM_RENDER_URL;
 
   // Build the request to the Renderer receiving service.
@@ -33,15 +34,16 @@ const renderRequest = async markdown => {
       'Content-Type': 'text/plain',
     },
     body: markdown,
-    timeout: 3000,
+    timeout: {
+      request: 3000,
+    },
   };
 
   try {
     // [END cloudrun_secure_request]
     // If we're in the test environment, use the envvar instead
     if (process.env.ID_TOKEN) {
-      serviceRequestOptions.headers['Authorization'] =
-        'Bearer ' + process.env.ID_TOKEN;
+      serviceRequestOptions.headers['Authorization'] = `Bearer ${process.env.ID_TOKEN}`;
     } else {
       // [START cloudrun_secure_request]
       // Create a Google Auth client with the Renderer service url as the target audience.
@@ -60,13 +62,13 @@ const renderRequest = async markdown => {
 
   try {
     // serviceResponse converts the Markdown plaintext to HTML.
-    const serviceResponse = await got(serviceUrl, serviceRequestOptions);
-    return serviceResponse.body;
+    const { body } = await got(serviceUrl, serviceRequestOptions);
+    return body;
   } catch (err) {
     throw Error('request to rendering service failed: ' + err.message);
   }
 };
 
 // [END cloudrun_secure_request]
 
-module.exports = renderRequest;
+export default renderRequest;