feat(static): remove local static action

fixes #1048

Author: rofe

src/deploy.cmd.js

@@ -23,7 +23,7 @@ const ProgressBar = require('progress');
 const { HelixConfig, GitUrl } = require('@adobe/helix-shared');
 const GitUtils = require('./git-utils');
 const useragent = require('./user-agent-util');
-const StaticCommand = require('./static.cmd.js');
+const AbstractCommand = require('./abstract.cmd.js');
 const PackageCommand = require('./package.cmd.js');
 const ConfigUtils = require('./config/config-utils.js');
 
@@ -33,7 +33,7 @@ function humanFileSize(size) {
   return `${(size / p2).toFixed(2)} ${['B', 'KiB', 'MiB', 'GiB', 'TiB'][i]}`;
 }
 
-class DeployCommand extends StaticCommand {
+class DeployCommand extends AbstractCommand {
   constructor(logger) {
     super(logger);
     this._enableAuto = true;
@@ -356,15 +356,12 @@ Alternatively you can auto-add one using the {grey --add <name>} option.`);
         // eslint-disable-next-line no-param-reassign
         script.actionName = this.actionName(script);
         return script;
-      })
-      // exclude `hlx--static` when deploying static is disabled
-      .filter(script => this._buildStatic || script.actionName !== 'hlx--static');
+      });
 
     const bar = new ProgressBar('[:bar] :action :etas', {
       total: (scripts.length * 2) // two ticks for each script
        + 1 // one tick for creating the package
-       + 1 // one tick for creating a sequence from the static action
-       + (this._bindStatic ? 2 : 0), // optionally two ticks when binding static
+       + 2, // two ticks for binding static
       width: 50,
       renderThrottle: 1,
       stream: process.stdout,
@@ -473,7 +470,7 @@ Alternatively you can auto-add one using the {grey --add <name>} option.`);
 
     let numErrors = 0;
     let staticactionname = '/hlx--static';
-    if (this._bindStatic && !this._dryRun) {
+    if (!this._dryRun) {
       // probe Helix Static action for version number
       await request.get('https://adobeioruntime.net/api/v1/web/helix/helix-services/static@latest', {
         resolveWithFullResponse: true,
@@ -521,7 +518,7 @@ Alternatively you can auto-add one using the {grey --add <name>} option.`);
 
 
     bar.terminate();
-    this.log.info(`✅  deployment of ${scripts.length} actions completed:`);
+    this.log.info(`✅  deployment of ${scripts.length} action${scripts.length !== 1 ? 's' : ''} completed:`);
     scripts.forEach((script) => {
       let status = '';
       if (script.error) {

src/deploy.js

@@ -14,7 +14,6 @@
 
 const yargsOpenwhisk = require('./yargs-openwhisk.js');
 const yargsFastly = require('./yargs-fastly.js');
-const yargsStatic = require('./yargs-static.js');
 const { makeLogger } = require('./log-common.js');
 
 module.exports = function deploy() {
@@ -29,7 +28,6 @@ module.exports = function deploy() {
     builder: (yargs) => {
       yargsOpenwhisk(yargs);
       yargsFastly(yargs);
-      yargsStatic(yargs);
       yargs
         .option('auto', {
           describe: 'Enable auto-deployment',
@@ -164,7 +162,6 @@ module.exports = function deploy() {
         .withFastlyNamespace(argv.fastlyNamespace)
         .withCreatePackages(argv.package)
         .withAddStrain(argv.add)
-        .withStatic(argv.static)
         .withMinify(argv.minify)
         .withResolveGitRefService(argv.svcResolveGitRef)
         .run();