@adobe/helix-deploy 4.15.0 → 5.0.2

package/CHANGELOG.md

@@ -1,3 +1,36 @@
+## [5.0.2](https://github.com/adobe/helix-deploy/compare/v5.0.1...v5.0.2) (2021-12-11)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([b898a1d](https://github.com/adobe/helix-deploy/commit/b898a1da4e06a20cb616cf524458a98608124e6c))
+
+## [5.0.1](https://github.com/adobe/helix-deploy/compare/v5.0.0...v5.0.1) (2021-12-07)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([eca546c](https://github.com/adobe/helix-deploy/commit/eca546ce271ba6c6d37fcf1572f5d1d0f5c068b2))
+
+# [5.0.0](https://github.com/adobe/helix-deploy/compare/v4.15.1...v5.0.0) (2021-12-02)
+
+
+### Features
+
+* convert to ESM ([2946721](https://github.com/adobe/helix-deploy/commit/294672121135f32495cc48e58f636553b3473489))
+
+
+### BREAKING CHANGES
+
+* exported APIs only available through ESM
+
+## [4.15.1](https://github.com/adobe/helix-deploy/compare/v4.15.0...v4.15.1) (2021-11-20)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([21e2af6](https://github.com/adobe/helix-deploy/commit/21e2af69186b80607747d390aa4f98507b02e070))
+
 # [4.15.0](https://github.com/adobe/helix-deploy/compare/v4.14.1...v4.15.0) (2021-11-20)
 
 

package/CONTRIBUTING.md

@@ -72,3 +72,9 @@ The project's committers will release to the [Adobe organization on npmjs.org](h
 Please contact the [Adobe Open Source Advisory Board](https://git.corp.adobe.com/OpenSourceAdvisoryBoard/discuss/issues) to get access to the npmjs organization.
 
 The release process is fully automated using `semantic-release`, increasing the version numbers, etc. based on the contents of the commit messages found.
+
+# Managing Secrets
+
+## Azure
+
+The Azure deployment is using an application secret that is expiring on a regular basis. To update the secret, refer to the [Azure Active Directory Documentation on configuring access policies on resources](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal#option-2-create-a-new-application-secret)

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "4.15.0",
+  "version": "5.0.2",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
+  "homepage": "https://github.com/adobe/helix-deploy#readme",
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/helix-deploy.git"
@@ -15,15 +16,17 @@
     "serverless"
   ],
   "main": "index.js",
+  "type": "module",
   "bin": {
     "hedy": "src/index.js"
   },
   "scripts": {
     "lint": "eslint .",
-    "test": "nyc mocha -i -g Integration",
-    "test-ci": "npm run lint && nyc mocha -i -g Integration && codecov",
-    "integration-ci": "nyc mocha --reporter-options=configFile=.mocha-multi.json -g Integration && codecov",
-    "semantic-release": "semantic-release"
+    "test": "c8 mocha -i -g Integration",
+    "test-ci": "npm run lint && c8 mocha -i -g Integration && codecov",
+    "integration-ci": "c8 mocha -g Integration && codecov",
+    "semantic-release": "semantic-release",
+    "prepare": "husky install"
   },
   "mocha": {
     "reporter": "mocha-multi-reporters",
@@ -36,38 +39,38 @@
   "dependencies": {
     "@adobe/fastly-native-promises": "2.0.0",
     "@adobe/helix-fetch": "3.0.0",
-    "@aws-sdk/client-apigatewayv2": "3.41.0",
-    "@aws-sdk/client-lambda": "3.41.0",
-    "@aws-sdk/client-s3": "3.41.0",
-    "@aws-sdk/client-secrets-manager": "3.41.0",
-    "@aws-sdk/client-ssm": "3.41.0",
+    "@aws-sdk/client-apigatewayv2": "3.43.0",
+    "@aws-sdk/client-lambda": "3.43.0",
+    "@aws-sdk/client-s3": "3.44.0",
+    "@aws-sdk/client-secrets-manager": "3.43.0",
+    "@aws-sdk/client-ssm": "3.44.0",
     "@azure/arm-appservice": "9.0.0",
     "@azure/ms-rest-nodeauth": "3.1.0",
     "@fastly/js-compute": "0.2.1",
     "@google-cloud/functions": "1.2.0",
     "@google-cloud/secret-manager": "3.10.1",
-    "@google-cloud/storage": "5.16.0",
+    "@google-cloud/storage": "5.16.1",
     "@rollup/plugin-alias": "3.1.8",
     "@rollup/plugin-commonjs": "21.0.1",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.0.6",
     "archiver": "5.3.0",
-    "chalk": "4.1.2",
+    "chalk-template": "0.2.0",
     "constants-browserify": "1.0.0",
     "dotenv": "10.0.0",
     "express": "4.17.1",
     "form-data": "4.0.0",
     "fs-extra": "10.0.0",
     "get-stream": "6.0.1",
-    "isomorphic-git": "1.10.1",
+    "isomorphic-git": "1.10.2",
     "openwhisk": "3.21.5",
     "proxyquire": "2.1.3",
-    "rollup": "2.60.0",
+    "rollup": "2.61.1",
     "rollup-plugin-terser": "7.0.2",
     "semver": "7.3.5",
     "tar": "6.1.11",
-    "webpack": "5.64.0",
-    "yargs": "17.2.1"
+    "webpack": "5.65.0",
+    "yargs": "17.3.0"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.1",
@@ -76,20 +79,20 @@
     "@adobe/helix-universal-logger": "2.0.0",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
+    "c8": "7.10.0",
     "chai": "4.3.4",
     "chai-http": "4.3.0",
     "codecov": "3.8.3",
-    "eslint": "8.2.0",
+    "eslint": "8.4.1",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.25.3",
-    "ghooks": "2.0.4",
-    "lint-staged": "12.0.2",
+    "husky": "7.0.4",
+    "lint-staged": "12.1.2",
     "mocha": "9.1.3",
     "mocha-junit-reporter": "2.0.2",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.2.1",
-    "nyc": "15.1.0",
-    "semantic-release": "18.0.0",
+    "semantic-release": "18.0.1",
     "sinon": "12.0.1",
     "yauzl": "2.10.0"
   },
@@ -98,11 +101,5 @@
   },
   "lint-staged": {
     "*.js": "eslint"
-  },
-  "config": {
-    "ghooks": {
-      "pre-commit": "npx lint-staged"
-    }
-  },
-  "homepage": "https://github.com/adobe/helix-deploy#readme"
+  }
 }

package/src/ActionBuilder.js

@@ -11,15 +11,15 @@
  */
 /* eslint-disable no-await-in-loop */
 
-const path = require('path');
-const fs = require('fs');
-const fse = require('fs-extra');
-const chalk = require('chalk');
-const git = require('isomorphic-git');
-const WebpackBundler = require('./bundler/WebpackBundler');
-const EdgeBundler = require('./bundler/EdgeBundler');
-const RollupBundler = require('./bundler/RollupBundler');
-const { version } = require('../package.json');
+import path from 'path';
+import fs from 'fs';
+import fse from 'fs-extra';
+import chalk from 'chalk-template';
+import git from 'isomorphic-git';
+import WebpackBundler from './bundler/WebpackBundler.js';
+import EdgeBundler from './bundler/EdgeBundler.js';
+import RollupBundler from './bundler/RollupBundler.js';
+import pkgJson from './package.cjs';
 
 const Bundlers = {
   node: {
@@ -62,7 +62,7 @@ async function getCurrentRevision(dir) {
   }
 }
 
-module.exports = class ActionBuilder {
+export default class ActionBuilder {
   /**
    * Iterates the given params and resolves potential file references.
    * @param {object} params the params
@@ -310,7 +310,7 @@ module.exports = class ActionBuilder {
         // eslint-disable-next-line no-await-in-loop
         await dep[fnName](...args);
       } catch (e) {
-        cfg.log.error(`${chalk.red('error:')} ${dep.name} - ${e.message}`);
+        cfg.log.error(chalk`{red error:} ${dep.name} - ${e.message}`);
         errors.push(e);
       }
     }
@@ -338,7 +338,7 @@ module.exports = class ActionBuilder {
   async updateLinks() {
     const { cfg } = this;
     if (cfg.baseName === cfg.name) {
-      cfg.log.warn(`${chalk.yellow('warn:')} unable to create version links. unsupported action name format. should be: "name@version"`);
+      cfg.log.warn(chalk`{yellow warn:} unable to create version links. unsupported action name format. should be: "name@version"`);
       return false;
     }
     return this.execute('updateLinks', 'updating links on ');
@@ -372,7 +372,7 @@ module.exports = class ActionBuilder {
 
   async _run() {
     const { cfg } = this;
-    cfg.log.info(chalk`{grey universal-action-builder v${version}}`);
+    cfg.log.info(chalk`{grey universal-action-builder v${pkgJson.version}}`);
     await this.validate();
     await this.validateAdditionalTasks();
     await this.validateBundlers();
@@ -466,4 +466,4 @@ module.exports = class ActionBuilder {
     await this.runAdditionalTasks();
     return '';
   }
-};
+}

package/src/BaseConfig.js

@@ -9,11 +9,11 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const crypto = require('crypto');
-const path = require('path');
-const fse = require('fs-extra');
-const chalk = require('chalk');
-const dotenv = require('dotenv');
+import crypto from 'crypto';
+import path from 'path';
+import fse from 'fs-extra';
+import chalk from 'chalk-template';
+import dotenv from 'dotenv';
 
 // eslint-disable-next-line no-template-curly-in-string
 const DEFAULT_ACTION_FORMAT = '/${packageName}/${baseName}/${version}';
@@ -41,7 +41,7 @@ function coerceDate(value) {
  * @field baseName Name of the function w/o the version. eg `my-action`
  * @field packageName Name of the function package. eg `my-package`
  */
-class BaseConfig {
+export default class BaseConfig {
   constructor() {
     Object.assign(this, {
       cwd: process.cwd(),
@@ -806,5 +806,3 @@ class BaseConfig {
       });
   }
 }
-
-module.exports = BaseConfig;

package/src/DevelopmentServer.js

@@ -9,12 +9,16 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const fse = require('fs-extra');
-const path = require('path');
-const express = require('express');
+import { createRequire } from 'module';
+import fse from 'fs-extra';
+import path from 'path';
+import express from 'express';
+import ActionBuilder from './ActionBuilder.js';
+import BaseConfig from './BaseConfig.js';
+
+// load proxyquire specially since it doesn't support ESM yet.
+const require = createRequire(import.meta.url);
 const proxyquire = require('proxyquire').noCallThru();
-const ActionBuilder = require('./ActionBuilder');
-const BaseConfig = require('./BaseConfig.js');
 
 function rawBody() {
   return (req, res, next) => {
@@ -61,7 +65,7 @@ function addRequestHeader(name, value) {
  *
  * @type {DevelopmentServer}
  */
-module.exports = class DevelopmentServer {
+export default class DevelopmentServer {
   /**
    * Creates a new development server using the given universal function.
    * @param {UniversalFunction} main - The universal function
@@ -169,4 +173,4 @@ module.exports = class DevelopmentServer {
       });
     });
   }
-};
+}

package/src/bundler/BaseBundler.js

@@ -9,19 +9,22 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-
-const path = require('path');
-const fse = require('fs-extra');
-const chalk = require('chalk');
-const archiver = require('archiver');
-const semver = require('semver');
-const { validateBundle } = require('../utils.js');
-const { dependencies } = require('../../package.json');
+import path from 'path';
+import { fileURLToPath } from 'url';
+import fse from 'fs-extra';
+import chalk from 'chalk-template';
+import archiver from 'archiver';
+import semver from 'semver';
+import { validateBundle } from '../utils.js';
+import pkgJson from '../package.cjs';
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.resolve(fileURLToPath(import.meta.url), '..');
 
 /**
  * Base for all bundlers
  */
-module.exports = class BaseBundler {
+export default class BaseBundler {
   /**
    * Simple string substitute. Replaces all `${key}` occurrences from the given object.
    * @param {string} str string to substitute
@@ -62,7 +65,7 @@ module.exports = class BaseBundler {
       cfg.log.error(chalk`{red error:}`, result.error);
       throw Error(`Validation failed: ${result.error}`);
     }
-    cfg.log.info(chalk`{green ok:} bundle can be loaded and has a {gray main()} function.`);
+    cfg.log.info(chalk`{green ok:} bundle can be loaded and has a {grey main()} function.`);
   }
 
   async createArchive() {
@@ -112,8 +115,8 @@ module.exports = class BaseBundler {
           // google cloud installs these dependencies at deploy time
           // all other environments ignore them – this allows us to
           // avoid bundling something that only google needs
-          '@google-cloud/secret-manager': dependencies['@google-cloud/secret-manager'],
-          '@google-cloud/storage': dependencies['@google-cloud/storage'],
+          '@google-cloud/secret-manager': pkgJson.dependencies['@google-cloud/secret-manager'],
+          '@google-cloud/storage': pkgJson.dependencies['@google-cloud/storage'],
         },
       };
       archive.pipe(output);
@@ -186,4 +189,4 @@ module.exports = class BaseBundler {
       archive.file(path.resolve(__dirname, '..', 'template', 'aws-esm-adapter.js'), { name: 'esm-adapter/index.js' });
     }
   }
-};
+}

package/src/bundler/EdgeBundler.js

@@ -9,15 +9,18 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { fileURLToPath } from 'url';
+import path from 'path';
+import webpack from 'webpack';
+import WebpackBundler from './WebpackBundler.js';
 
-const path = require('path');
-const webpack = require('webpack');
-const WebpackBundler = require('./WebpackBundler.js');
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.resolve(fileURLToPath(import.meta.url), '..');
 
 /**
  * Creates the action bundle
  */
-module.exports = class EdgeBundler extends WebpackBundler {
+export default class EdgeBundler extends WebpackBundler {
   async getWebpackConfig() {
     const { cfg } = this;
     const opts = {
@@ -48,8 +51,11 @@ module.exports = class EdgeBundler extends WebpackBundler {
       }, {}),
       module: {
         rules: [{
-          test: /\.mjs$/,
+          test: /\.js$/,
           type: 'javascript/auto',
+        }, {
+          test: /\.mjs$/,
+          type: 'javascript/esm',
         }],
       },
       resolve: {
@@ -115,4 +121,4 @@ module.exports = class EdgeBundler extends WebpackBundler {
     }
     return this.createWebpackBundle('edge');
   }
-};
+}

package/src/bundler/RollupBundler.js

@@ -10,21 +10,26 @@
  * governing permissions and limitations under the License.
  */
 
-const path = require('path');
-const fse = require('fs-extra');
-const rollup = require('rollup');
-const chalk = require('chalk');
-const { nodeResolve } = require('@rollup/plugin-node-resolve');
-const commonjs = require('@rollup/plugin-commonjs');
-const alias = require('@rollup/plugin-alias');
-const pluginJson = require('@rollup/plugin-json');
-const { terser } = require('rollup-plugin-terser');
-const BaseBundler = require('./BaseBundler.js');
+import path from 'path';
+import fse from 'fs-extra';
+import { fileURLToPath } from 'url';
+import { rollup } from 'rollup';
+import chalk from 'chalk-template';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import alias from '@rollup/plugin-alias';
+import pluginJson from '@rollup/plugin-json';
+import { terser } from 'rollup-plugin-terser';
+
+import BaseBundler from './BaseBundler.js';
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.resolve(fileURLToPath(import.meta.url), '..');
 
 /**
  * Creates the action bundle using rollup
  */
-module.exports = class Bundler extends BaseBundler {
+export default class Bundler extends BaseBundler {
   async getRollupConfig() {
     const { cfg } = this;
     /**
@@ -92,7 +97,7 @@ module.exports = class Bundler extends BaseBundler {
 
     cfg.log.info(`--: creating ${cfg.esm ? 'esm ' : ''}${cfg.minify ? 'minified ' : ''}bundle using rollup...`);
     const config = await this.getRollupConfig();
-    const bundle = await rollup.rollup(config);
+    const bundle = await rollup(config);
 
     const { output } = await bundle.generate(config.output);
     await this.resolveDependencyInfos(output);
@@ -162,4 +167,4 @@ module.exports = class Bundler extends BaseBundler {
           .sort((d0, d1) => d0.name.localeCompare(d1.name));
       });
   }
-};
+}

package/src/bundler/WebpackBundler.js

@@ -9,17 +9,20 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { fileURLToPath } from 'url';
+import path from 'path';
+import fse from 'fs-extra';
+import webpack from 'webpack';
+import chalk from 'chalk-template';
+import BaseBundler from './BaseBundler.js';
 
-const path = require('path');
-const fse = require('fs-extra');
-const webpack = require('webpack');
-const chalk = require('chalk');
-const BaseBundler = require('./BaseBundler.js');
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.resolve(fileURLToPath(import.meta.url), '..');
 
 /**
  * Webpack based bundler
  */
-module.exports = class WebpackBundler extends BaseBundler {
+export default class WebpackBundler extends BaseBundler {
   async init() {
     if (this.cfg.esm) {
       throw new Error('Webpack bundler does not support ESM builds.');
@@ -33,6 +36,7 @@ module.exports = class WebpackBundler extends BaseBundler {
       mode: 'development',
       // the universal adapter is the entry point
       entry: cfg.adapterFile || path.resolve(__dirname, '..', 'template', 'node-index.js'),
+      context: cfg.cwd,
       output: {
         path: cfg.cwd,
         filename: path.relative(cfg.cwd, cfg.bundle),
@@ -56,8 +60,11 @@ module.exports = class WebpackBundler extends BaseBundler {
       }, {}),
       module: {
         rules: [{
-          test: /\.mjs$/,
+          test: /\.js$/,
           type: 'javascript/auto',
+        }, {
+          test: /\.mjs$/,
+          type: 'javascript/esm',
         }],
       },
       resolve: {
@@ -197,4 +204,4 @@ module.exports = class WebpackBundler extends BaseBundler {
           .sort((d0, d1) => d0.name.localeCompare(d1.name));
       });
   }
-};
+}

package/src/cli.js

@@ -11,18 +11,18 @@
  */
 
 /* eslint-disable no-console */
-const yargs = require('yargs');
-const chalk = require('chalk');
-
-const BaseConfig = require('./BaseConfig.js');
-
-const OpenWhiskDeployer = require('./deploy/OpenWhiskDeployer');
-const AWSDeployer = require('./deploy/AWSDeployer');
-const AzureDeployer = require('./deploy/AzureDeployer');
-const GoogleDeployer = require('./deploy/GoogleDeployer');
-const CloudflareDeployer = require('./deploy/CloudflareDeployer');
-const ComputeAtEdgeDeployer = require('./deploy/ComputeAtEdgeDeployer');
-const FastlyGateway = require('./gateway/FastlyGateway');
+import yargs from 'yargs';
+import chalk from 'chalk-template';
+import { config as envConfig } from 'dotenv';
+import BaseConfig from './BaseConfig.js';
+import OpenWhiskDeployer from './deploy/OpenWhiskDeployer.js';
+import AWSDeployer from './deploy/AWSDeployer.js';
+import AzureDeployer from './deploy/AzureDeployer.js';
+import GoogleDeployer from './deploy/GoogleDeployer.js';
+import CloudflareDeployer from './deploy/CloudflareDeployer.js';
+import ComputeAtEdgeDeployer from './deploy/ComputeAtEdgeDeployer.js';
+import FastlyGateway from './gateway/FastlyGateway.js';
+import ActionBuilder from './ActionBuilder.js';
 
 const PLUGINS = [
   OpenWhiskDeployer,
@@ -34,11 +34,9 @@ const PLUGINS = [
   FastlyGateway,
 ];
 
-const defaultConfig = require('./config/adobeioruntime-node10.js');
-
-require('dotenv').config();
+envConfig();
 
-class CLI {
+export default class CLI {
   constructor() {
     this._yargs = yargs()
       .pkgConf('wsk')
@@ -48,18 +46,11 @@ class CLI {
     this._yargs.help();
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  createBuilder() {
-    // eslint-disable-next-line global-require
-    const ActionBuilder = require('./ActionBuilder.js');
-    return new ActionBuilder();
-  }
-
   prepare(args) {
     const argv = this._yargs.parse(args);
 
     if (argv.externals.length === 0) {
-      argv.externals = defaultConfig.externals;
+      argv.externals = [/^openwhisk(\/.*)?$/];
     }
 
     const config = new BaseConfig().configure(argv);
@@ -68,7 +59,7 @@ class CLI {
       return new PluginClass(config, pluginConfig);
     });
 
-    return this.createBuilder()
+    return new ActionBuilder()
       .withConfig(config)
       .withPlugins(plugins);
   }
@@ -80,10 +71,8 @@ class CLI {
         console.log(JSON.stringify(res, null, 2));
       }
     } catch (err) {
-      console.log(`${chalk.red('error:')} ${err.message}`);
+      console.log(chalk`{red error:} ${err.message}`);
       process.exitCode = 1;
     }
   }
 }
-
-module.exports = CLI;

package/src/deploy/AWSConfig.js

@@ -13,7 +13,7 @@
 // eslint-disable-next-line no-template-curly-in-string
 const DEFAULT_LAMBDA_FORMAT = '${packageName}--${baseName}';
 
-class AWSConfig {
+export default class AWSConfig {
   constructor() {
     Object.assign(this, {
       region: '',
@@ -125,5 +125,3 @@ class AWSConfig {
       });
   }
 }
-
-module.exports = AWSConfig;

package/src/deploy/AWSDeployer.js

@@ -10,60 +10,47 @@
  * governing permissions and limitations under the License.
  */
 /* eslint-disable no-await-in-loop,no-restricted-syntax */
-const chalk = require('chalk');
-const {
-  S3Client,
-  CreateBucketCommand,
+import chalk from 'chalk-template';
+import {
+  CreateBucketCommand, DeleteBucketCommand, DeleteObjectCommand, DeleteObjectsCommand,
   ListBucketsCommand,
-  ListObjectsV2Command,
-  PutObjectCommand,
-  DeleteBucketCommand,
-  DeleteObjectCommand,
-  DeleteObjectsCommand,
-} = require('@aws-sdk/client-s3');
-const {
-  LambdaClient,
-  CreateFunctionCommand,
+  ListObjectsV2Command, PutObjectCommand,
+  S3Client,
+} from '@aws-sdk/client-s3';
+
+import {
+  AddPermissionCommand,
+  CreateAliasCommand,
+  CreateFunctionCommand, GetAliasCommand,
   GetFunctionCommand,
+  LambdaClient, PublishVersionCommand, UpdateAliasCommand, UpdateFunctionCodeCommand,
   UpdateFunctionConfigurationCommand,
-  UpdateFunctionCodeCommand,
-  GetAliasCommand,
-  PublishVersionCommand,
-  CreateAliasCommand,
-  UpdateAliasCommand,
-  AddPermissionCommand,
-} = require('@aws-sdk/client-lambda');
-const {
+} from '@aws-sdk/client-lambda';
+
+import {
   ApiGatewayV2Client,
-  GetApisCommand,
-  GetApiCommand,
-  GetStagesCommand,
-  GetIntegrationsCommand,
   CreateApiCommand,
+  CreateIntegrationCommand, CreateRouteCommand,
   CreateStageCommand,
-  CreateIntegrationCommand,
   DeleteIntegrationCommand,
-  CreateRouteCommand,
-  GetRoutesCommand,
-  UpdateRouteCommand,
-} = require('@aws-sdk/client-apigatewayv2');
-const {
-  SSMClient,
-  PutParameterCommand,
-} = require('@aws-sdk/client-ssm');
-const {
-  SecretsManagerClient,
-  PutSecretValueCommand,
-} = require('@aws-sdk/client-secrets-manager');
-
-const path = require('path');
-const fse = require('fs-extra');
-const crypto = require('crypto');
-const BaseDeployer = require('./BaseDeployer');
-const ActionBuilder = require('../ActionBuilder.js');
-const AWSConfig = require('./AWSConfig.js');
-
-class AWSDeployer extends BaseDeployer {
+  GetApiCommand,
+  GetApisCommand,
+  GetIntegrationsCommand, GetRoutesCommand,
+  GetStagesCommand, UpdateRouteCommand,
+} from '@aws-sdk/client-apigatewayv2';
+
+import { PutParameterCommand, SSMClient } from '@aws-sdk/client-ssm';
+
+import { PutSecretValueCommand, SecretsManagerClient } from '@aws-sdk/client-secrets-manager';
+
+import path from 'path';
+import fse from 'fs-extra';
+import crypto from 'crypto';
+import BaseDeployer from './BaseDeployer.js';
+import ActionBuilder from '../ActionBuilder.js';
+import AWSConfig from './AWSConfig.js';
+
+export default class AWSDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
 
@@ -422,7 +409,7 @@ class AWSDeployer extends BaseDeployer {
       // ignore, most likely the permission already exists
     }
 
-    this.log.info(chalk`{green ok:} function deployed: ${chalk.blueBright(this._functionURL)}`);
+    this.log.info(chalk`{green ok:} function deployed: {blueBright ${this._functionURL}}`);
   }
 
   async test() {
@@ -530,7 +517,7 @@ class AWSDeployer extends BaseDeployer {
     });
     const unused = [];
     if (filter) {
-      this.log.info(chalk`Integrations / Routes for {gray ${filter}}`);
+      this.log.info(chalk`Integrations / Routes for {grey ${filter}}`);
     } else {
       this.log.info('Integrations / Routes');
     }
@@ -752,4 +739,3 @@ class AWSDeployer extends BaseDeployer {
 }
 
 AWSDeployer.Config = AWSConfig;
-module.exports = AWSDeployer;

package/src/deploy/AzureConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class AzureConfig {
+export default class AzureConfig {
   constructor() {
     Object.assign(this, {
       appName: '',
@@ -36,5 +36,3 @@ class AzureConfig {
       });
   }
 }
-
-module.exports = AzureConfig;

package/src/deploy/AzureDeployer.js

@@ -9,13 +9,14 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const msRestNodeAuth = require('@azure/ms-rest-nodeauth');
-const { WebSiteManagementClient } = require('@azure/arm-appservice');
-const fs = require('fs');
-const BaseDeployer = require('./BaseDeployer');
-const AzureConfig = require('./AzureConfig.js');
+import msRestNodeAuth from '@azure/ms-rest-nodeauth';
+import { WebSiteManagementClient } from '@azure/arm-appservice';
 
-class AzureDeployer extends BaseDeployer {
+import fs from 'fs';
+import BaseDeployer from './BaseDeployer.js';
+import AzureConfig from './AzureConfig.js';
+
+export default class AzureDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -229,4 +230,3 @@ class AzureDeployer extends BaseDeployer {
 }
 
 AzureDeployer.Config = AzureConfig;
-module.exports = AzureDeployer;

package/src/deploy/BaseDeployer.js

@@ -9,12 +9,12 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const path = require('path');
-const chalk = require('chalk');
-const semver = require('semver');
-const fetchAPI = require('@adobe/helix-fetch');
+import path from 'path';
+import chalk from 'chalk-template';
+import semver from 'semver';
+import { h1, context } from '@adobe/helix-fetch';
 
-class BaseDeployer {
+export default class BaseDeployer {
   constructor(cfg) {
     this.isDeployer = true;
     this.cfg = cfg;
@@ -42,8 +42,8 @@ class BaseDeployer {
   getOrCreateFetchContext() {
     if (!this._fetchContext) {
       this._fetchContext = process.env.HELIX_FETCH_FORCE_HTTP1
-        ? fetchAPI.h1()
-        : fetchAPI.context();
+        ? h1()
+        : context();
     }
     return this._fetchContext;
   }
@@ -99,7 +99,7 @@ class BaseDeployer {
     while (retry404 >= 0) {
       // eslint-disable-next-line no-param-reassign
       const testUrl = `${url}${this.cfg.testPath || ''}`;
-      this.log.info(`--: requesting: ${chalk.blueBright(testUrl)} ...`);
+      this.log.info(chalk`--: requesting: {blueBright ${testUrl}} ...`);
       // eslint-disable-next-line no-await-in-loop
       const ret = await this.fetch(testUrl, {
         headers,
@@ -110,21 +110,21 @@ class BaseDeployer {
       const body = await ret.text();
       const id = idHeader ? ret.headers.get(idHeader) : 'n/a';
       if (ret.ok) {
-        this.log.info(`id: ${chalk.grey(id)}`);
-        this.log.info(`${chalk.green('ok:')} ${ret.status}`);
-        this.log.debug(chalk.grey(JSON.stringify(ret.headers.plain(), null, 2)));
+        this.log.info(chalk`id: {grey ${id}}`);
+        this.log.info(chalk`{green ok:} ${ret.status}`);
+        this.log.debug(chalk`{grey ${JSON.stringify(ret.headers.plain(), null, 2)}}`);
         this.log.debug('');
-        this.log.debug(chalk.grey(body));
+        this.log.debug(chalk`{grey ${body}}`);
         return;
       }
       if (ret.status === 302 || ret.status === 301) {
-        this.log.info(`${chalk.green('ok:')} ${ret.status}`);
-        this.log.debug(chalk.grey(`Location: ${ret.headers.get('location')}`));
+        this.log.info(chalk`{green ok:} ${ret.status}`);
+        this.log.debug(chalk`{grey Location: ${ret.headers.get('location')}}`);
         return;
       }
-      this.log.info(`id: ${chalk.grey(id)}`);
+      this.log.info(chalk`id: {grey ${id}}`);
       if ((ret.status === 404 || ret.status === 500) && retry404) {
-        this.log.info(`${chalk.yellow('warn:')} ${ret.status} (retry)`);
+        this.log.info(chalk`{yellow warn:} ${ret.status} (retry)`);
         // eslint-disable-next-line no-param-reassign
         retry404 -= 1;
         // eslint-disable-next-line no-await-in-loop
@@ -132,7 +132,7 @@ class BaseDeployer {
           setTimeout(resolve, 1500);
         });
       } else {
-        // this.log.info(`${chalk.red('error:')} test failed: ${ret.status} ${body}`);
+        // this.log.info(chalk`{red error:} test failed: ${ret.status} ${body}`);
         throw new Error(`test failed: ${ret.status} ${body}`);
       }
     }
@@ -164,7 +164,7 @@ class BaseDeployer {
       if (link === 'major' || link === 'minor') {
         if (!s) {
           // eslint-disable-next-line no-underscore-dangle
-          this.log.warn(`${chalk.yellow('warn:')} unable to create version sequences. error while parsing version: ${this.cfg.version}`);
+          this.log.warn(chalk`{yellow warn:} unable to create version sequences. error while parsing version: ${this.cfg.version}`);
           return;
         }
         if (link === 'major') {
@@ -179,5 +179,3 @@ class BaseDeployer {
     return sfx;
   }
 }
-
-module.exports = BaseDeployer;

package/src/deploy/CloudflareConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class CloudflareConfig {
+export default class CloudflareConfig {
   constructor() {
     Object.assign(this, {});
   }
@@ -67,5 +67,3 @@ class CloudflareConfig {
       });
   }
 }
-
-module.exports = CloudflareConfig;

package/src/deploy/CloudflareDeployer.js

@@ -9,13 +9,13 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const path = require('path');
-const fs = require('fs');
-const FormData = require('form-data');
-const BaseDeployer = require('./BaseDeployer');
-const CloudflareConfig = require('./CloudflareConfig');
+import path from 'path';
+import fs from 'fs';
+import FormData from 'form-data';
+import BaseDeployer from './BaseDeployer.js';
+import CloudflareConfig from './CloudflareConfig.js';
 
-class CloudflareDeployer extends BaseDeployer {
+export default class CloudflareDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -142,4 +142,3 @@ class CloudflareDeployer extends BaseDeployer {
 }
 
 CloudflareDeployer.Config = CloudflareConfig;
-module.exports = CloudflareDeployer;

package/src/deploy/ComputeAtEdgeConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class ComputeAtEdgeConfig {
+export default class ComputeAtEdgeConfig {
   constructor() {
     Object.assign(this, {});
   }
@@ -89,5 +89,3 @@ class ComputeAtEdgeConfig {
       });
   }
 }
-
-module.exports = ComputeAtEdgeConfig;

package/src/deploy/ComputeAtEdgeDeployer.js

@@ -9,14 +9,18 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const { fork } = require('child_process');
-const path = require('path');
-const fs = require('fs/promises');
-const tar = require('tar');
-const getStream = require('get-stream');
-const Fastly = require('@adobe/fastly-native-promises');
-const BaseDeployer = require('./BaseDeployer');
-const ComputeAtEdgeConfig = require('./ComputeAtEdgeConfig');
+import { fork } from 'child_process';
+import { fileURLToPath } from 'url';
+import path from 'path';
+import fs from 'fs/promises';
+import tar from 'tar';
+import getStream from 'get-stream';
+import Fastly from '@adobe/fastly-native-promises';
+import BaseDeployer from './BaseDeployer.js';
+import ComputeAtEdgeConfig from './ComputeAtEdgeConfig.js';
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.resolve(fileURLToPath(import.meta.url), '..');
 
 /**
  * The class ComputeAtEdgeDeployer deploys to Fastly's Compute(at)Edge (WASM) runtime.
@@ -24,7 +28,7 @@ const ComputeAtEdgeConfig = require('./ComputeAtEdgeConfig');
  * and not confused with the FastlyGateway (which only routes requests, but
  * does not handle them.)
  */
-class ComputeAtEdgeDeployer extends BaseDeployer {
+export default class ComputeAtEdgeDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -187,4 +191,3 @@ service_id = ""
 }
 
 ComputeAtEdgeDeployer.Config = ComputeAtEdgeConfig;
-module.exports = ComputeAtEdgeDeployer;

package/src/deploy/GoogleConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class GoogleConfig {
+export default class GoogleConfig {
   constructor() {
     Object.assign(this, {
       appName: '',
@@ -69,5 +69,3 @@ class GoogleConfig {
       });
   }
 }
-
-module.exports = GoogleConfig;

package/src/deploy/GoogleDeployer.js

@@ -9,17 +9,17 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const { CloudFunctionsServiceClient } = require('@google-cloud/functions');
-const { SecretManagerServiceClient } = require('@google-cloud/secret-manager');
-const path = require('path');
-const fs = require('fs');
-const semver = require('semver');
-const chalk = require('chalk');
-const BaseDeployer = require('./BaseDeployer');
-const GoogleConfig = require('./GoogleConfig.js');
-const { filterActions } = require('../utils.js');
-
-class GoogleDeployer extends BaseDeployer {
+import { CloudFunctionsServiceClient } from '@google-cloud/functions';
+import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
+import path from 'path';
+import fs from 'fs';
+import semver from 'semver';
+import chalk from 'chalk-template';
+import BaseDeployer from './BaseDeployer.js';
+import GoogleConfig from './GoogleConfig.js';
+import { filterActions } from '../utils.js';
+
+export default class GoogleDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -344,4 +344,3 @@ class GoogleDeployer extends BaseDeployer {
 }
 
 GoogleDeployer.Config = GoogleConfig;
-module.exports = GoogleDeployer;

package/src/deploy/OpenWhiskConfig.js

@@ -14,7 +14,7 @@
  * @field {string} actionName Action as it would be deployed (package + name)
  * @field {boolean} packageShared If package is shared.
  */
-class OpenWhiskConfig {
+export default class OpenWhiskConfig {
   constructor() {
     Object.assign(this, {
       namespace: '',
@@ -52,5 +52,3 @@ class OpenWhiskConfig {
       });
   }
 }
-
-module.exports = OpenWhiskConfig;

package/src/deploy/OpenWhiskDeployer.js

@@ -10,18 +10,16 @@
  * governing permissions and limitations under the License.
  */
 /* eslint-disable no-underscore-dangle */
+import ow from 'openwhisk';
+import os from 'os';
+import fse from 'fs-extra';
+import path from 'path';
+import chalk from 'chalk-template';
+import dotenv from 'dotenv';
+import BaseDeployer from './BaseDeployer.js';
+import OpenWhiskConfig from './OpenWhiskConfig.js';
 
-const ow = require('openwhisk');
-const os = require('os');
-const fse = require('fs-extra');
-const path = require('path');
-const chalk = require('chalk');
-const dotenv = require('dotenv');
-
-const BaseDeployer = require('./BaseDeployer');
-const OpenWhiskConfig = require('./OpenWhiskConfig.js');
-
-class OpenWhiskDeployer extends BaseDeployer {
+export default class OpenWhiskDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
 
@@ -88,7 +86,7 @@ class OpenWhiskDeployer extends BaseDeployer {
 
   getOpenwhiskClient() {
     if (!this._cfg.apiHost || !this._cfg.auth || !this._cfg.namespace) {
-      throw Error(chalk`\nMissing OpenWhisk credentials. Make sure you have a {grey .wskprops} in your home directory.\nYou can also set {grey WSK_NAMESPACE}, {gray WSK_AUTH} and {gray WSK_API_HOST} environment variables.`);
+      throw Error(chalk`\nMissing OpenWhisk credentials. Make sure you have a {grey .wskprops} in your home directory.\nYou can also set {grey WSK_NAMESPACE}, {grey WSK_AUTH} and {grey WSK_API_HOST} environment variables.`);
     }
     return ow({
       apihost: this._cfg.apiHost,
@@ -117,7 +115,7 @@ class OpenWhiskDeployer extends BaseDeployer {
         });
         this.log.info(chalk`{green ok:} package created. ${res.namespace}/${res.name}`);
       } else {
-        this.log.error(`${chalk.red('error: ')} ${e.message}`);
+        this.log.error(chalk`{red error:} ${e.message}`);
       }
     }
 
@@ -187,7 +185,7 @@ class OpenWhiskDeployer extends BaseDeployer {
         fn = openwhisk.packages.create.bind(openwhisk.packages);
         verb = 'created';
       } else {
-        this.log.error(`${chalk.red('error: ')} ${e.message}`);
+        this.log.error(chalk`{red error:} ${e.message}`);
       }
     }
 
@@ -203,9 +201,9 @@ class OpenWhiskDeployer extends BaseDeployer {
           parameters,
         },
       });
-      this.log.info(`${chalk.green('ok:')} ${verb} package ${chalk.whiteBright(`/${result.namespace}/${result.name}`)}`);
+      this.log.info(chalk`{green ok:} ${verb} package {whiteBright /${result.namespace}/${result.name}}`);
     } catch (e) {
-      this.log.error(`${chalk.red('error: failed processing package: ')} ${e.stack}`);
+      this.log.error(chalk`{red error: failed processing package: } ${e.stack}`);
       throw Error('abort.');
     }
   }
@@ -270,10 +268,10 @@ class OpenWhiskDeployer extends BaseDeployer {
       try {
         this.log.debug(`creating sequence: ${options.name} -> ${options.action.exec.components[0]}`);
         const result = await openwhisk.actions.update(options);
-        this.log.info(`${chalk.green('ok:')} created sequence ${chalk.whiteBright(`/${result.namespace}/${result.name}`)} -> ${chalk.whiteBright(fqn)}`);
+        this.log.info(chalk`{green ok:} created sequence {whiteBright /${result.namespace}/${result.name}} -> {whiteBright ${fqn}}`);
       } catch (e) {
         hasErrors = true;
-        this.log.error(`${chalk.red('error:')} failed creating sequence: ${e.message}`);
+        this.log.error(chalk`{red error:} failed creating sequence: ${e.message}`);
       }
     }));
     if (hasErrors) {
@@ -283,4 +281,3 @@ class OpenWhiskDeployer extends BaseDeployer {
 }
 
 OpenWhiskDeployer.Config = OpenWhiskConfig;
-module.exports = OpenWhiskDeployer;

package/src/gateway/FastlyConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class FastlyConfig {
+export default class FastlyConfig {
   constructor() {
     Object.assign(this, {
       service: null,
@@ -94,5 +94,3 @@ class FastlyConfig {
       });
   }
 }
-
-module.exports = FastlyConfig;

package/src/gateway/FastlyGateway.js

@@ -9,15 +9,16 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const Fastly = require('@adobe/fastly-native-promises');
-const chalk = require('chalk');
+import Fastly from '@adobe/fastly-native-promises';
+import chalk from 'chalk-template';
+import FastlyConfig from './FastlyConfig.js';
+import BaseDeployer from '../deploy/BaseDeployer.js';
+
 const {
   toString, vcl, time, req, res, str, concat,
-} = require('@adobe/fastly-native-promises').loghelpers;
-const FastlyConfig = require('./FastlyConfig.js');
-const BaseDeployer = require('../deploy/BaseDeployer.js');
+} = Fastly.loghelpers;
 
-class FastlyGateway {
+export default class FastlyGateway {
   constructor(baseConfig, config) {
     Object.assign(this, {
       cfg: baseConfig,
@@ -505,4 +506,3 @@ if (req.url ~ "^/([^/]+)/([^/@_]+)([@_]([^/@_?]+)+)?(.*$)") {
 }
 
 FastlyGateway.Config = FastlyConfig;
-module.exports = FastlyGateway;

package/src/index.js

@@ -12,6 +12,6 @@
  * governing permissions and limitations under the License.
  */
 
-const CLI = require('./cli.js');
+import CLI from './cli.js';
 
 new CLI().run(process.argv.slice(2));

package/src/{config/adobeioruntime-node10.js → package.cjs}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Adobe. All rights reserved.
+ * Copyright 2021 Adobe. All rights reserved.
  * This file is licensed to you under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License. You may obtain a copy
  * of the License at http://www.apache.org/licenses/LICENSE-2.0
@@ -9,15 +9,4 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-
-module.exports = {
-  // modules that are provided by the runtime container
-  externals: [
-    // 'express',
-    // 'body-parser',
-    // 'cls-hooked',
-    // 'request',
-    // 'request-promise',
-    /^openwhisk(\/.*)?$/,
-  ],
-};
+module.exports = require('../package.json');

package/src/template/node-index.js

@@ -9,9 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-// eslint-disable-next-line no-underscore-dangle
-global.__rootdir = __dirname;
-
+const { dirname } = require('path');
 const {
   openwhisk,
   aws,
@@ -19,6 +17,9 @@ const {
   azure,
 } = require('@adobe/helix-universal').adapter;
 
+// eslint-disable-next-line no-underscore-dangle
+global.__rootdir = dirname(__filename); // __dirname is transformed by webpack, __filename isn't
+
 module.exports = Object.assign(azure, {
   main: openwhisk,
   lambda: aws,

package/src/template/serviceworker-index.js

@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 /* eslint-env serviceworker */
-const fastly = require('./fastly-adapter');
-const cloudflare = require('./cloudflare-adapter');
+const fastly = require('./fastly-adapter.js');
+const cloudflare = require('./cloudflare-adapter.js');
 
 /* eslint-disable no-restricted-globals */
 if (typeof addEventListener === 'function') {

package/src/utils.js

@@ -9,8 +9,12 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const { fork } = require('child_process');
-const path = require('path');
+import { fileURLToPath } from 'url';
+import { fork } from 'child_process';
+import path from 'path';
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.resolve(fileURLToPath(import.meta.url), '..');
 
 /**
  * @typedef {object} VersionCoordinates
@@ -54,7 +58,7 @@ const path = require('path');
  * @param {VersionSpec} versionspec - which version is current
  * @returns {NamedAction[]} - a list of actions that can safely be deleted
  */
-function filterActions(fns, now, {
+export function filterActions(fns, now, {
   ciAge, patchAge, minorAge, majorAge, ciNum, patchNum, minorNum, majorNum,
 } = {}, { patchVersion, minorVersion, majorVersion } = {}) {
   // sort by updated date
@@ -151,7 +155,7 @@ function filterActions(fns, now, {
     ...cleanmajorbyage, ...cleanmajorbycount];
 }
 
-async function validateBundle(bundlePath, invoke = false) {
+export async function validateBundle(bundlePath, invoke = false) {
   try {
     const opts = {
       invoke,
@@ -175,8 +179,3 @@ async function validateBundle(bundlePath, invoke = false) {
     };
   }
 }
-
-module.exports = {
-  filterActions,
-  validateBundle,
-};