@adobe/helix-deploy 9.3.18 → 9.3.20

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [9.3.20](https://github.com/adobe/helix-deploy/compare/v9.3.19...v9.3.20) (2023-11-30)
+
+
+### Bug Fixes
+
+* **fastly:** do not access empty config ([6e745d6](https://github.com/adobe/helix-deploy/commit/6e745d621476490f61f6f486792b0b725d1af486))
+* **fastly:** do not fork the process, instead use fastly's own CLI backend ([4287706](https://github.com/adobe/helix-deploy/commit/4287706395dd659285438149d9864c69722963be))
+* **fastly:** import correct module ([223c893](https://github.com/adobe/helix-deploy/commit/223c89353cefe00bd97e708b759431d7aa6933fe))
+* **fastly:** use correct log function ([d231db8](https://github.com/adobe/helix-deploy/commit/d231db85edb7ba21e6bfec0885e4a6e3f605091c))
+* **fastly:** use fastly's arg parser ([ce7b376](https://github.com/adobe/helix-deploy/commit/ce7b376bfa32fe1862de619febf48de2e4efca68))
+
+## [9.3.19](https://github.com/adobe/helix-deploy/compare/v9.3.18...v9.3.19) (2023-11-25)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([6ace656](https://github.com/adobe/helix-deploy/commit/6ace6568b7ac5d93453b8f05627580d3d39b69f0))
+
 ## [9.3.18](https://github.com/adobe/helix-deploy/compare/v9.3.17...v9.3.18) (2023-11-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "9.3.18",
+  "version": "9.3.20",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -40,7 +40,7 @@
     "@adobe/fetch": "4.1.1",
     "@aws-sdk/client-apigatewayv2": "3.454.0",
     "@aws-sdk/client-lambda": "3.454.0",
-    "@aws-sdk/client-s3": "3.454.0",
+    "@aws-sdk/client-s3": "3.456.0",
     "@aws-sdk/client-secrets-manager": "3.454.0",
     "@aws-sdk/client-ssm": "3.454.0",
     "@aws-sdk/client-sts": "3.454.0",
@@ -48,7 +48,7 @@
     "@google-cloud/functions": "3.0.1",
     "@google-cloud/secret-manager": "5.0.1",
     "@google-cloud/storage": "7.6.0",
-    "@rollup/plugin-alias": "5.0.1",
+    "@rollup/plugin-alias": "5.1.0",
     "@rollup/plugin-commonjs": "25.0.7",
     "@rollup/plugin-json": "6.0.1",
     "@rollup/plugin-node-resolve": "15.2.3",
@@ -62,7 +62,7 @@
     "fs-extra": "11.1.1",
     "isomorphic-git": "1.25.0",
     "openwhisk": "3.21.7",
-    "rollup": "4.5.0",
+    "rollup": "4.5.2",
     "semver": "7.5.4",
     "tar": "6.2.0",
     "webpack": "5.89.0",

package/src/deploy/ComputeAtEdgeDeployer.js

@@ -9,19 +9,16 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { fork } from 'child_process';
 import chalk from 'chalk-template';
-import { fileURLToPath } from 'url';
 import path from 'path';
 import fs from 'fs/promises';
 import tar from 'tar';
 import Fastly from '@adobe/fastly-native-promises';
+import { compileApplicationToWasm } from '@fastly/js-compute/src/compileApplicationToWasm.js';
+import { parseInputs } from '@fastly/js-compute/src/parseInputs.js';
 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.
  * It should be seen as a functional equivalent to the CloudflareDeployer
@@ -79,29 +76,16 @@ name = "${this.cfg.packageName}"
 service_id = ""
     `);
 
+    const {
+      input,
+      output,
+      wasmEngine,
+    } = await parseInputs([this.cfg.edgeBundle, path.resolve(bundleDir, 'bin', 'main.wasm')]);
+
     return new Promise((resolve, reject) => {
-      const child = fork(
-        path.resolve(
-          __dirname,
-          '..',
-          '..',
-          'node_modules',
-          '@fastly',
-          'js-compute',
-          'js-compute-runtime-cli.js',
-        ),
-        [this.cfg.edgeBundle, 'bin/main.wasm'],
-        {
-          cwd: bundleDir,
-        },
-      );
-      child.on('data', (data) => resolve(data));
-      child.on('error', (err) => reject(err));
-      child.on('close', async (err) => {
-        if (err) {
-          // non-zero status code
-          reject(err);
-        } else {
+      this.log.debug('--: creating WASM bundle of script and interpreter');
+      compileApplicationToWasm(input, output, wasmEngine, false, false)
+        .then(async () => {
           const file = path.resolve(bundleDir, 'fastly-bundle.tar.gz');
           this.log.debug(chalk`{green ok:} created WASM bundle of script and interpreter in ${bundleDir}/bin/main.wasm`);
           await tar.c({
@@ -113,8 +97,11 @@ service_id = ""
           }, ['bin/main.wasm', 'fastly.toml']);
           this.log.debug(chalk`{green ok:} created tar file in ${bundleDir}/fastly-bundle.tar.gz`);
           resolve(fs.readFile(file));
-        }
-      });
+        })
+        // c8 ignore next 3
+        .catch((err) => {
+          reject(err);
+        });
     });
   }