@adobe/helix-deploy 4.15.1 → 5.0.3

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,
-};