Convert to imports.

Author: wparad

.eslintrc

@@ -1,12 +1,8 @@
 {
   "parser": "@typescript-eslint/parser",
   "root": true,
-  "plugins": [
-    "@typescript-eslint"
-  ],
   "extends": [
-    "cimpress-atsquad",
-    "plugin:@typescript-eslint/recommended"
+    "@authress/eslint-config"
   ],
   "rules": {
     "arrow-parens": ["error", "as-needed"],

jsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "commonjs",
+    "allowSyntheticDefaultImports": false
+  },
+  "exclude": [
+  ]
+}

make.js

@@ -1,47 +1,48 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable node/no-unpublished-import */
 /* eslint-disable no-console */
 
-const aws = require('aws-sdk');
-const { Route53Client, GetHostedZoneCommand } = require("@aws-sdk/client-route-53");
-const { STSClient, GetCallerIdentityCommand } = require("@aws-sdk/client-sts");
-const commander = require('commander');
-const AwsArchitect = require('aws-architect');
-const path = require('path');
-const yaml = require('js-yaml');
-const fs = require('fs-extra');
+import aws from 'aws-sdk';
+import { Route53Client, ListHostedZonesByNameCommand } from '@aws-sdk/client-route-53';
+import { STSClient, GetCallerIdentityCommand } from '@aws-sdk/client-sts';
+import commander from 'commander';
+import AwsArchitect from 'aws-architect';
+import path from 'path';
+import fs from 'fs-extra';
+
+import stackTemplateProvider from './template/cloudFormationWebsiteTemplate.js';
 
 aws.config.update({ region: 'us-east-1' });
 
-const packageMetadataFile = path.join(__dirname, 'package.json');
-const packageMetadata = require(packageMetadataFile);
+const underscoreDirname = path.dirname(import.meta.url).replace('file:', '');
+const packageMetadataFile = path.join(underscoreDirname, 'package.json');
+const packageMetadata = await fs.readJson(packageMetadataFile);
 
 function getVersion() {
   let release_version = '0.0';
   const pull_request = '';
   const branch = process.env.GITHUB_REF;
   const build_number = process.env.GITHUB_RUN_NUMBER;
 
-  //Builds of pull requests
+  // Builds of pull requests
   if (pull_request && !pull_request.match(/false/i)) {
     release_version = `0.${pull_request}`;
   } else if (!branch || !branch.match(/^(refs\/heads\/)?release[/-]/i)) {
-    //Builds of branches that aren't master or release
+    // Builds of branches that aren't master or release
     release_version = '0.0';
   } else {
-    //Builds of release branches (or locally or on server)
+    // Builds of release branches (or locally or on server)
     release_version = branch.match(/^(?:refs\/heads\/)?release[/-](\d+(?:\.\d+){0,3})$/i)[1];
   }
   return `${release_version}.${(build_number || '0')}.0.0.0.0`.split('.').slice(0, 3).join('.');
 }
 const version = getVersion();
 commander.version(version);
 
-
 const parameters = { hostedName: 'dev0ps.fyi' };
 
 const contentOptions = {
   bucket: parameters.hostedName,
-  contentDirectory: path.join(__dirname, 'build')
+  contentDirectory: path.join(underscoreDirname, 'build')
 };
 
 /**
@@ -51,24 +52,22 @@ commander
 .command('build')
 .description('Setup require build files for npm package.')
 .action(async () => {
-  let package_metadata = require('./package.json');
-  package_metadata.version = version;
-  await fs.writeJson('./package.json', package_metadata, { spaces: 2 });
+  packageMetadata.version = version;
+  await fs.writeJson('./package.json', packageMetadata, { spaces: 2 });
 
-  console.log('Building package %s (%s)', package_metadata.name, version);
+  console.log('Building package %s (%s)', packageMetadata.name, version);
   console.log('');
 });
 
 commander
 .command('deploy')
 .description('Deploying website to AWS.')
 .action(async () => {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const stackTemplateProvider = require('./template/cloudFormationWebsiteTemplate');
-  const requestInterceptorLambdaFunction = await fs.readFile(path.join(__dirname, 'template/requestInterceptorLambdaFunction.js'));
+  const requestInterceptorLambdaFunction = await fs.readFile(path.join(underscoreDirname, 'template/requestInterceptorLambdaFunction.js'));
   const stackTemplate = stackTemplateProvider.getStack(requestInterceptorLambdaFunction.toString());
 
-  const callerIdentityResponse = await client.send(new GetCallerIdentityCommand({}));
+  const stsClient = new STSClient({});
+  const callerIdentityResponse = await stsClient.send(new GetCallerIdentityCommand({}));
   const apiOptions = {
     deploymentBucket: `rhosys-deployments-artifacts-${callerIdentityResponse.Account}-${aws.config.region}`
   };
@@ -86,16 +85,15 @@ commander
         automaticallyProtectStack: true
       };
 
-      const config = {};
-      const client = new Route53Client(config);
+      const route53Client = new Route53Client({});
       const command = new ListHostedZonesByNameCommand({ DNSName: parameters.hostedName });
-      const response = await client.send(command);
+      const response = await route53Client.send(command);
       const hostedZoneId = response.HostedZones[0].Id;
       parameters.hostedZoneId = hostedZoneId;
       await awsArchitect.deployTemplate(stackTemplate, stackConfiguration, parameters);
     }
 
-    console.log(`Deployed to ${deploymentLocation}`);
+    console.log('Deployment Success!');
   } catch (failure) {
     console.log(`Failed to upload website ${failure} - ${JSON.stringify(failure, null, 2)}`);
     process.exit(1);

package.json

@@ -1,23 +1,26 @@
 {
   "name": "PodcastLinkProxy",
   "version": "0.0.0",
+  "type": "module",
   "private": "true",
   "scripts": {
     "deploy": "node make.js deploy",
     "delete": "node make.js delete",
-    "lint": "eslint --ext=.jsx,.js,.tsx,.ts src"
+    "lint": "eslint --ext=.jsx,.js,.tsx,.ts ."
   },
   "dependencies": {
+    "aws-sdk": "^2.1254.0",
     "error-object-polyfill": "^1.0.11",
     "lodash": "4.17.5",
     "luxon": "^3.2.0"
   },
   "devDependencies": {
-    "@authress/eslint-config": "1.0.4",
+    "@authress/eslint-config": "^1.0.5",
     "@aws-sdk/client-route-53": "^3.896.0",
     "@aws-sdk/client-sts": "^3.896.0",
+    "@typescript-eslint/eslint-plugin": "^8.44.1",
+    "@typescript-eslint/parser": "^8.44.1",
     "aws-architect": "^6.7.101",
-    "aws-sdk": "^2.1254.0",
     "axios": "^0.21.4",
     "commander": "2.15.1",
     "cross-env": "^7.0.2",
@@ -26,7 +29,7 @@
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",
     "fs-extra": "^11.1.0",
-    "mocha": "^5.0.5",
+    "mocha": "^11.7.2",
     "sinon": "3.2.1",
     "sinon-chai": "2.13.0",
     "typescript": "^4.9.4",

template/cloudFormationWebsiteTemplate.js

@@ -406,4 +406,4 @@ const stackProvider = {
   }
 };
 
-module.exports = stackProvider;
+export default stackProvider;

template/requestInterceptorLambdaFunction.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line node/no-missing-import
 import cf from 'cloudfront';
 
 const kvsId = '';
@@ -19,7 +20,7 @@ try {
   }));
 }
 
-// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
+// eslint-disable-next-line no-unused-vars
 async function handler(event) {
   // IMPORTANT: if this path requested doesn't exist in the bucket then the site error default will be loaded instead:
   // https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/functions-event-structure.html#functions-event-structure-request
@@ -41,7 +42,7 @@ async function handler(event) {
         location: { value: `${redirectUrl}` }
       }
     };
-  } catch (err) {
+  } catch (error) {
     // eslint-disable-next-line no-console
     console.log(JSON.stringify({
       message: {