Upgrade archiver.

Author: wparad

.eslintrc

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 
-let commander = require('commander');
+const { program } = require('commander');
 let fs = require('fs-extra');
 let path = require('path');
 
 let version = require(path.join(__dirname, '../package.json')).version;
-commander.version(version);
+program.version(version);
 
 let displayHeader = () => {
 	console.log('AWS Architect (%s)', version);
 	console.log('---------------------------');
 };
 
-commander
+program
 .command('init')
 .description('Setup microservice package from template.')
 .action(() => {
@@ -29,12 +29,14 @@ commander
 	.catch(result => console.log(`failure: ${JSON.stringify(result, null, 2)}`));
 });
 
-commander.on('*', () => {
-	if (commander.args.join(' ') === 'tests/**/*.js') { return; }
+program.on('command:*', () => {
+	if (program.args.join(' ') === 'tests/**/*.js') { return; }
 	displayHeader();
-	console.log(`Unknown Command: ${commander.args.join(' ')}`);
-	commander.help();
+	console.log(`Unknown Command: ${program.args.join(' ')}`);
+	program.help();
 	process.exit(0);
 });
 
-commander.parse(process.argv[2] ? process.argv : process.argv.concat(['init']));
+if (require.main === module) {
+	program.parse(process.argv[2] ? process.argv : process.argv.concat(['init']));
+}

bin/aws-architect.js

@@ -1,6 +1,6 @@
 require('error-object-polyfill');
 const path = require('path');
-const commander = require('commander');
+const { program } = require('commander');
 const aws = require('aws-sdk');
 const AwsArchitect = require('aws-architect');
 
@@ -23,7 +23,7 @@ function getVersion() {
   return `${release_version}.${(build_number || '0')}.0.0.0.0`.split('.').slice(0, 3).join('.');
 }
 const version = getVersion();
-commander.version(version);
+program.version(version);
 
 let packageMetadataFile = path.join(__dirname, 'package.json');
 let packageMetadata = require(packageMetadataFile);
@@ -39,7 +39,7 @@ let contentOptions = {
   contentDirectory: path.join(__dirname, 'content')
 };
 
-commander
+program
 .command('run')
 .description('Run lambda web service locally.')
 .action(async () => {
@@ -60,7 +60,7 @@ commander
   }
 });
 
-commander
+program
 .command('deploy')
 .description('Deploy to AWS.')
 .action(async () => {
@@ -110,7 +110,7 @@ commander
   }
 });
 
-commander
+program
 .command('deploy-website')
 .description('Depling website to AWS.')
 .action(async () => {
@@ -162,7 +162,7 @@ commander
   }
 });
 
-commander
+program
 .command('deploy-hosted-zone')
 .description('Deploy hosted zone to AWS.')
 .action(async () => {
@@ -190,7 +190,7 @@ commander
   }
 });
 
-commander
+program
 .command('delete')
 .description('Delete Stage from AWS.')
 .action(async () => {
@@ -210,7 +210,7 @@ commander
   }
 });
 
-commander
+program
 .command('delete-website')
 .description('Delete a website version from AWS.')
 .action(async () => {
@@ -230,10 +230,10 @@ commander
   }
 });
 
-commander.on('*', () => {
-  if (commander.args.join(' ') === 'tests/**/*.js') { return; }
-  console.log(`Unknown Command: ${commander.args.join(' ')}`);
-  commander.help();
+program.on('command:*', () => {
+  if (program.args.join(' ') === 'tests/**/*.js') { return; }
+  console.log(`Unknown Command: ${program.args.join(' ')}`);
+  program.help();
   process.exit(0);
 });
-commander.parse(process.argv[2] ? process.argv : process.argv.concat(['build']));
+program.parse(process.argv[2] ? process.argv : process.argv.concat(['build']));

bin/template/make.js

@@ -0,0 +1,55 @@
+const nodePlugin = require('eslint-plugin-node');
+const importPlugin = require('eslint-plugin-import');
+const promisePlugin = require('eslint-plugin-promise');
+
+module.exports = [
+  {
+    ignores: ['node_modules/**', 'dist/**', '.git/**']
+  },
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      ecmaVersion: 2020,
+      sourceType: 'module',
+      globals: {
+        console: 'readonly',
+        process: 'readonly',
+        Buffer: 'readonly',
+        __dirname: 'readonly',
+        __filename: 'readonly',
+        module: 'readonly',
+        require: 'readonly',
+        global: 'readonly'
+      }
+    },
+    plugins: {
+      node: nodePlugin,
+      import: importPlugin,
+      promise: promisePlugin
+    },
+    rules: {
+      'arrow-parens': ['error', 'as-needed'],
+      'indent': ['error', 2, { 'SwitchCase': 1, 'MemberExpression': 0 }],
+      'node/no-unsupported-features/es-syntax': ['off'],
+      'no-throw-literal': 'off',
+      'spaced-comment': 'off',
+      'no-continue': 'off',
+      'require-atomic-updates': 'off'
+    }
+  },
+  {
+    files: ['tests/**/*.js'],
+    languageOptions: {
+      globals: {
+        describe: 'readonly',
+        it: 'readonly',
+        expect: 'readonly',
+        beforeEach: 'readonly',
+        afterEach: 'readonly',
+        beforeAll: 'readonly',
+        afterAll: 'readonly',
+        vi: 'readonly'
+      }
+    }
+  }
+];

eslint.config.js

@@ -60,7 +60,7 @@ class AwsArchitect {
       let zipStream = fs.createWriteStream(zipArchivePath);
       zipStream.on('close', () => resolve());
 
-      let archive = archiver.create('zip', {});
+      let archive = archiver('zip', {});
       archive.on('error', e => reject({ Error: e }));
       archive.pipe(zipStream);
       archive.glob('**', { dot: true, cwd: tmpDir, ignore: options.zipFileName });
@@ -99,7 +99,6 @@ class AwsArchitect {
 
       let cmd = lockFile.command;
       await new Promise((resolve, reject) => {
-        /* eslint-disable-next-line no-unused-vars */
         exec(cmd, { cwd: tmpDir }, (error, stdout, stderr) => {
           if (error) { return reject({ Error: 'Failed installing production npm modules.', Details: error }); }
           return resolve(tmpDir);
@@ -112,7 +111,7 @@ class AwsArchitect {
       let zipStream = fs.createWriteStream(zipArchivePath);
       zipStream.on('close', () => resolve({ Archive: zipArchivePath }));
 
-      let archive = archiver.create('zip', {});
+      let archive = archiver('zip', {});
       archive.on('error', e => reject({ Error: e }));
       archive.pipe(zipStream);
       archive.glob('**', { dot: true, cwd: tmpDir, ignore: lambdaZip });

index.js

@@ -98,7 +98,6 @@ function Server(contentDirectory, lambdaApi, logger) {
   api.use(bodyParser.text({ type: ['application/x-www-form-urlencoded', 'text/css', 'text/csv', 'text/html', 'text/plain', 'text/html'] }));
   api.use(bodyParser.raw({ type: ['application/octet-stream', 'application/binary', 'image/*', 'audio/*', 'video/*', 'application/pdf', 'application/x-tar', 'application/zip'], limit: '6mb' }));
   api.use(bodyParser.json({ type: '*/*', limit: '6mb' }));
-  /* eslint-disable-next-line no-unused-vars */
   api.use((error, req, res, next) => {
     this.logger(stringify({ title: 'Failed to parse the body', error }));
     res.status(400).send({ title: 'Invalid body parsing, it can be due to the default parsing types that are set up in AWS Architect Server configuration' });
@@ -246,15 +245,13 @@ function Server(contentDirectory, lambdaApi, logger) {
     });
   });
 
-  /* eslint-disable-next-line no-unused-vars */
   api.all(/.*/, (req, res, next) => {
     res.status(404).json({
       statusCode: 404,
       title: `Resource not found at ${req.originalUrl}`
     });
   });
 
-  /* eslint-disable-next-line no-unused-vars */
   api.use((error, req, res, next) => {
     console.error(`Catch-all Error: ${error.stack || error} - ${stringify(error, null, 2)}`);
     res.status(500).json({

lib/server.js

@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-const commander = require('commander');
+const { program } = require('commander');
 const fs = require('fs-extra');
 
 function getVersion() {
@@ -23,12 +23,12 @@ function getVersion() {
   return `${release_version}.${(build_number)}.0.0.0.0`.split('.').slice(0, 3).join('.');
 }
 const version = getVersion();
-commander.version(version);
+program.version(version);
 
 /**
   * Build
   */
-commander
+program
 .command('build')
 .description('Setup require build files for npm package.')
 .action(async () => {
@@ -43,7 +43,7 @@ commander
 /**
   * After Build
   */
-commander
+program
 .command('after_build')
 .description('Publishes git tags and reports failures.')
 .action(() => {
@@ -52,10 +52,10 @@ commander
   console.log('');
 });
 
-commander.on('*', () => {
-  if (commander.args.join(' ') === 'tests/**/*.js') { return; }
-  console.log(`Unknown Command: ${commander.args.join(' ')}`);
-  commander.help();
+program.on('command:*', () => {
+  if (program.args.join(' ') === 'tests/**/*.js') { return; }
+  console.log(`Unknown Command: ${program.args.join(' ')}`);
+  program.help();
   process.exit(0);
 });
-commander.parse(process.argv[2] ? process.argv : process.argv.concat(['build']));
+program.parse(process.argv[2] ? process.argv : process.argv.concat(['build']));

make.js

@@ -21,9 +21,9 @@
     "@aws-sdk/client-cloudformation": "^3.1000.0",
     "@aws-sdk/client-s3": "^3.1000",
     "@aws-sdk/client-sts": "^3.1000",
-    "archiver": "^5.3.0",
+    "archiver": "^7.0.0",
     "body-parser": "^1.18.2",
-    "commander": "^2.5.0",
+    "commander": "^14.0.0",
     "cookie-parser": "^1.4.7",
     "express": "^5",
     "fs-extra": "^6.0.1",
@@ -43,7 +43,7 @@
     "@authress/eslint-config": "^1.0.2",
     "aws-sdk": "*",
     "error-object-polyfill": "^1.1.14",
-    "eslint": "~8.35.0",
+    "eslint": "^10.2.0",
     "eslint-config-cimpress-atsquad": "^1.0.67",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",