@adobe/helix-deploy 12.0.0-pre.1 → 12.0.0-pre.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "12.0.0-pre.1",
+  "version": "12.0.0-pre.3",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",

package/src/BaseConfig.js

@@ -190,6 +190,7 @@ export default class BaseConfig {
       .withVersion(argv.pkgVersion)
       .withNodeVersion(argv.nodeVersion)
       .withEntryFile(argv.entryFile)
+      .withDistDir(argv.distDirectory)
       .withAdapterFile(argv.adapterFile)
       .withExternals(argv.externals)
       .withEdgeExternals(argv.edgeExternals)
@@ -219,8 +220,8 @@ export default class BaseConfig {
     return this;
   }
 
-  withDirectory(value) {
-    this.cwd = value === '.' ? process.cwd() : value;
+  withDirectory(value = '.') {
+    this.cwd = path.resolve(process.cwd(), value);
     return this;
   }
 
@@ -450,7 +451,7 @@ export default class BaseConfig {
   }
 
   withDistDir(value) {
-    this.distDir = value;
+    this.distDir = path.resolve(process.cwd(), value);
     return this;
   }
 
@@ -639,7 +640,7 @@ export default class BaseConfig {
         default: [],
       })
 
-      .group(['minify', 'static', 'entryFile', 'externals', 'edge-externals', 'serverless-externals', 'modules', 'adapterFile', 'esm', 'bundler'], 'Build Options')
+      .group(['minify', 'static', 'entryFile', 'externals', 'edge-externals', 'serverless-externals', 'modules', 'adapterFile', 'esm', 'bundler', 'dist-directory'], 'Build Options')
       .option('minify', {
         description: 'Minify the final bundle',
         type: 'boolean',
@@ -662,6 +663,10 @@ export default class BaseConfig {
         type: 'array',
         default: [],
       })
+      .option('dist-directory', {
+        description: 'Specifies the dist (output) directory',
+        default: 'dist',
+      })
       .option('entryFile', {
         description: 'Specifies the entry file (the universal function).',
         default: 'src/index.js',

package/src/cli.js

@@ -141,7 +141,7 @@ export default class CLI {
 
   async run(args) {
     try {
-      const res = await this.prepare(args).run();
+      const res = (await this.prepare(args)).run();
       if (res) {
         console.log(JSON.stringify(res, null, 2));
       }

package/src/template/adapter-utils.js

@@ -1,17 +0,0 @@
-/*
- * Copyright 2024 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
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-/* eslint-env serviceworker */
-
-export function extractPathFromURL(request) {
-  const suffixMatches = /^https?:\/\/[^/]+([^?]+)/.exec(request.url);
-  return suffixMatches ? suffixMatches[1] : request.url.replace(/\?.*/, '');
-}