Merge branch 'develop' of github.com:postmanlabs/postman-sandbox into…

… feature/worker_threads

.github/workflows/ci.yml

@@ -10,6 +10,10 @@ on:
   schedule:
     - cron: '0 12 * * 0'
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
 jobs:
   lint:
     name: Lint
@@ -19,10 +23,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: 'npm'
 
       - name: Install
@@ -39,10 +43,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: 'npm'
 
       - name: Install
@@ -60,11 +64,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [10, 12]
+        node-version: [16, 18]
         os: [ubuntu-latest, windows-latest]
         include:
           - coverage: true
-            node-version: 16
+            node-version: 20
             os: ubuntu-latest
 
     steps:

CHANGELOG.yaml

@@ -1,8 +1,11 @@
 unreleased:
   new features:
     - GH-999 Improved isolation for executing scripts
+  breaking changes:
+    - GH-1004 Dropped support for Node < v16
   chores:
     - GH-999 Bumped `uvm` dependency
+    - GH-1004 Updated ESLint rules
 
 4.7.1:
   date: 2024-04-03

lib/postman-sandbox.js

@@ -43,7 +43,7 @@ class PostmanSandbox extends UniversalVM {
                     this.emit('console', cursor, level, ...teleportJS.parse(args));
                 });
 
-                // eslint-disable-next-line callback-return
+                // eslint-disable-next-line n/callback-return
                 callback(err, context);
                 context = null;
             });
@@ -128,7 +128,7 @@ class PostmanSandbox extends UniversalVM {
         // errors
         this.once(executionEventName, (err, result) => {
             waiting && (waiting = clearTimeout(waiting)); // clear timeout interrupt
-            if (Object.hasOwnProperty.call(this._executing, id)) { // clear any pending timeouts
+            if (Object.hasOwn(this._executing, id)) { // clear any pending timeouts
                 this._executing[id] && clearTimeout(this._executing[id]);
                 delete this._executing[id];
             }

lib/sandbox/cookie-jar.js

@@ -247,9 +247,9 @@ class PostmanCookieJar {
 
         options = {
             // return HttpOnly cookies by default
-            http: Object.hasOwnProperty.call(options, 'http') ? Boolean(options.http) : true,
+            http: Object.hasOwn(options, 'http') ? Boolean(options.http) : true,
             // if undefined, auto-detect from url
-            secure: Object.hasOwnProperty.call(options, 'secure') ? Boolean(options.secure) : undefined
+            secure: Object.hasOwn(options, 'secure') ? Boolean(options.secure) : undefined
         };
 
         this.jar.getCookies(url.toString(true), options, function (err, cookies) {

lib/sandbox/pmapi.js

@@ -26,7 +26,7 @@ const _ = require('lodash'),
         for (prop in properties) {
             if (
                 !_.includes(disabledProperties, prop) &&
-                Object.hasOwnProperty.call(properties, prop) &&
+                Object.hasOwn(properties, prop) &&
                 (properties[prop] !== undefined)
             ) {
                 config.value = properties[prop];

lib/sandbox/postman-legacy-interface.js

@@ -217,7 +217,7 @@ class PostmanLegacyInterface {
 
     clearEnvironmentVariables () {
         for (var prop in this.__environment) {
-            if (Object.hasOwnProperty.call(this.__environment, prop)) {
+            if (Object.hasOwn(this.__environment, prop)) {
                 delete this.__environment[prop];
             }
         }
@@ -246,7 +246,7 @@ class PostmanLegacyInterface {
 
     clearGlobalVariables () {
         for (var prop in this.__globals) {
-            if (Object.hasOwnProperty.call(this.__globals, prop)) {
+            if (Object.hasOwn(this.__globals, prop)) {
                 delete this.__globals[prop];
             }
         }