@adobe/helix-deploy 12.2.2 → 12.3.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [12.3.1](https://github.com/adobe/helix-deploy/compare/v12.3.0...v12.3.1) (2024-10-12)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes to v3.670.0 ([#747](https://github.com/adobe/helix-deploy/issues/747)) ([568de98](https://github.com/adobe/helix-deploy/commit/568de98670ab282b1f26227597dfd644ff94f9fd))
+
+# [12.3.0](https://github.com/adobe/helix-deploy/compare/v12.2.2...v12.3.0) (2024-10-10)
+
+
+### Features
+
+* change package.json config name to 'hlx' ([#744](https://github.com/adobe/helix-deploy/issues/744)) ([8fe86d6](https://github.com/adobe/helix-deploy/commit/8fe86d649d3971af5fdcdf917b9ea258003b7cec))
+
 ## [12.2.2](https://github.com/adobe/helix-deploy/compare/v12.2.1...v12.2.2) (2024-10-05)
 
 

package/README.md

@@ -218,7 +218,7 @@ hedy -p MY_TOKEN=@token.txt
 ### Specifying arguments in the `package.json`
 
 Instead of passing all the arguments via command line, you can also specify them in the `package.json`
-in the `wsk` object. eg:
+in the `hlx` object. eg:
 
 ```json
 {
@@ -227,7 +227,7 @@ in the `wsk` object. eg:
     "build": "./node_modules/.bin/hedy -v",
     "deploy": "./node_modules/.bin/hedy -v --deploy --test"
   },
-  "wsk": {
+  "hlx": {
     "name": "my-test-action",
     "params-file": [
       "secrets/secrets.env"
@@ -247,12 +247,14 @@ in the `wsk` object. eg:
 }
 ```
 
+The config name changed to `hlx` in version `12.3`. The previous name `wsk` is still supported, but deprecated. If both are present, `hlx` will be used.
+
 ### Versioning your action
 
 It can be helpful to version the action name, eg with the `@version` notation. So for example
 
 ```json
-"wsk": {
+"hlx": {
   "name": "my-action@4.3.1"
 }
 ```
@@ -260,7 +262,7 @@ It can be helpful to version the action name, eg with the `@version` notation. S
 In order to automatically use the version of the `package.json` use:
 
 ```json
-"wsk": {
+"hlx": {
   "name": "my-action@${version}"
 }
 ```
@@ -275,7 +277,7 @@ In addition to the `${version}` token described above, arguments will be interpo
 ```json
 {
 ...
-  "wsk": {
+  "hlx": {
     ...
     "docker": "adobe/probot-ow-nodejs8:${env.PROBOT_DOCKER_VERSION}"
   },
@@ -315,7 +317,7 @@ destination filename. eg:
 
 ```json
 ...
-  "wsk": {
+  "hlx": {
     ...
     "static": [
       "config.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "12.2.2",
+  "version": "12.3.1",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -39,18 +39,19 @@
   "dependencies": {
     "@adobe/fetch": "4.1.9",
     "@adobe/helix-shared-process-queue": "3.0.4",
-    "@aws-sdk/client-apigatewayv2": "3.665.0",
-    "@aws-sdk/client-lambda": "3.665.0",
-    "@aws-sdk/client-s3": "3.665.0",
-    "@aws-sdk/client-secrets-manager": "3.665.0",
-    "@aws-sdk/client-ssm": "3.665.0",
-    "@aws-sdk/client-sts": "3.665.0",
+    "@aws-sdk/client-apigatewayv2": "3.670.0",
+    "@aws-sdk/client-lambda": "3.670.0",
+    "@aws-sdk/client-s3": "3.670.0",
+    "@aws-sdk/client-secrets-manager": "3.670.0",
+    "@aws-sdk/client-ssm": "3.670.0",
+    "@aws-sdk/client-sts": "3.670.0",
     "@google-cloud/functions": "3.6.0",
     "@google-cloud/secret-manager": "5.6.0",
     "@google-cloud/storage": "7.13.0",
     "archiver": "7.0.1",
     "chalk-template": "1.1.0",
     "dotenv": "16.4.5",
+    "escalade": "3.2.0",
     "fs-extra": "11.2.0",
     "isomorphic-git": "1.27.1",
     "openwhisk": "3.21.8",
@@ -59,7 +60,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "2.0.7",
+    "@adobe/eslint-config-helix": "2.0.8",
     "@adobe/helix-shared-wrap": "2.0.2",
     "@adobe/helix-status": "10.1.3",
     "@semantic-release/changelog": "6.0.3",

package/src/cli.js

@@ -11,9 +11,11 @@
  */
 
 /* eslint-disable no-console */
+import { readFileSync } from 'fs';
 import yargs from 'yargs';
 import chalk from 'chalk-template';
 import { config as envConfig } from 'dotenv';
+import escalade from 'escalade/sync';
 import BaseConfig from './BaseConfig.js';
 import OpenWhiskDeployer from './deploy/OpenWhiskDeployer.js';
 import AWSDeployer from './deploy/AWSDeployer.js';
@@ -28,6 +30,12 @@ const PLUGINS = [
   WebpackBundler,
 ];
 
+const PKG_CONF = [
+  'hlx',
+  // original name for backwards compatibility
+  'wsk',
+];
+
 envConfig();
 
 async function loadPlugin(name) {
@@ -65,10 +73,31 @@ async function loadPlugin(name) {
   return plugins;
 }
 
+function findPkgJsonConfig() {
+  // fallback to original config name 'wsk' in case anything goes wrong
+  // for safe backwards compatibility
+  let cfg = 'wsk';
+
+  try {
+    // find package.json in parent directories (like yargs does)
+    const pkg = escalade(process.cwd(), (_, names) => (names.includes('package.json') ? 'package.json' : undefined));
+
+    if (pkg) {
+      const pkgJson = JSON.parse(readFileSync(pkg, 'utf8'));
+      // search for config key in package.json by priority in PKG_CONF array
+      cfg = PKG_CONF.find((key) => key in pkgJson) || cfg;
+    }
+  } catch (e) {
+    // ignore
+  }
+
+  return cfg;
+}
+
 export default class CLI {
   buildArgs(plugins) {
     this._yargs = yargs()
-      .pkgConf('wsk')
+      .pkgConf(findPkgJsonConfig())
       .env('HLX')
       .middleware((argv) => {
         // convert process.env to flattened object with flat keys