Babel 7 support

build-scripts/rollup.browser.config.js

@@ -1,13 +1,13 @@
 import deepmerge from 'deepmerge';
+import json from 'rollup-plugin-json';
 import alias from 'rollup-plugin-alias';
 import babel from 'rollup-plugin-babel';
+import { terser } from 'rollup-plugin-terser';
+import commonjs from 'rollup-plugin-commonjs';
 import { rollup as lerna } from 'lerna-alias';
 import resolve from 'rollup-plugin-node-resolve';
 import globals from 'rollup-plugin-node-globals';
 import builtins from 'rollup-plugin-node-builtins';
-import commonjs from 'rollup-plugin-commonjs';
-import uglify from 'rollup-plugin-uglify';
-import json from 'rollup-plugin-json';
 import { input, output, pkg, production } from './rollup.utils';
 
 export default function createBrowserConfig(options = {}, targets) {
@@ -23,9 +23,10 @@ export default function createBrowserConfig(options = {}, targets) {
         babel({
           babelrc: false,
           runtimeHelpers: true,
+          exclude: '../../../node_modules/**',
           presets: [
             [
-              'env',
+              '@babel/preset-env',
               {
                 modules: false,
                 targets: targets || {
@@ -35,16 +36,14 @@ export default function createBrowserConfig(options = {}, targets) {
             ]
           ],
           plugins: [
-            'external-helpers',
-            'transform-runtime',
-            ['transform-object-rest-spread', { useBuiltIns: true }]
-          ],
-          exclude: ['node_modules/**'],
-          ignore: 'node_modules/**'
+            '@babel/plugin-external-helpers',
+            '@babel/plugin-transform-runtime',
+            ['@babel/plugin-proposal-object-rest-spread', { useBuiltIns: true }]
+          ]
         }),
         globals(),
         builtins(),
-        production && uglify()
+        production && terser()
       ],
       onwarn(message) {
         /* nise uses eval for strings within native fns setTimeout('alert("foo")', 10) */

build-scripts/rollup.node.config.js

@@ -1,9 +1,9 @@
 import deepmerge from 'deepmerge';
+import json from 'rollup-plugin-json';
 import babel from 'rollup-plugin-babel';
-import resolve from 'rollup-plugin-node-resolve';
+import { terser } from 'rollup-plugin-terser';
 import commonjs from 'rollup-plugin-commonjs';
-import uglify from 'rollup-plugin-uglify';
-import json from 'rollup-plugin-json';
+import resolve from 'rollup-plugin-node-resolve';
 import { input, output, pkg, production } from './rollup.utils';
 
 const external = Object.keys(pkg.dependencies || {});
@@ -21,9 +21,10 @@ export default function createNodeConfig(options = {}) {
         babel({
           babelrc: false,
           runtimeHelpers: true,
+          exclude: '../../../node_modules/**',
           presets: [
             [
-              'env',
+              '@babel/preset-env',
               {
                 modules: false,
                 targets: {
@@ -33,14 +34,12 @@ export default function createNodeConfig(options = {}) {
             ]
           ],
           plugins: [
-            'external-helpers',
-            'transform-runtime',
-            ['transform-object-rest-spread', { useBuiltIns: true }]
-          ],
-          exclude: ['node_modules/**'],
-          ignore: 'node_modules/**'
+            '@babel/plugin-external-helpers',
+            '@babel/plugin-transform-runtime',
+            ['@babel/plugin-proposal-object-rest-spread', { useBuiltIns: true }]
+          ]
         }),
-        production && uglify()
+        production && terser()
       ]
     },
     options

package.json

@@ -12,7 +12,9 @@
       "email": "[email protected]"
     }
   ],
-  "workspaces": ["packages/@pollyjs/*"],
+  "workspaces": [
+    "packages/@pollyjs/*"
+  ],
   "scripts": {
     "commitmsg": "commitlint -E GIT_PARAMS",
     "build": "lerna run build --ignore=@pollyjs/ember --parallel",
@@ -30,24 +32,23 @@
     "test:node": "mocha --opts tests/mocha.opts",
     "test:jest": "jest",
     "test:ember": "lerna run test --stream --no-prefix --scope=@pollyjs/ember",
-    "server:build":
-      "yarn build --scope=@pollyjs/node-server --scope=@pollyjs/utils",
+    "server:build": "yarn build --scope=@pollyjs/node-server --scope=@pollyjs/utils",
     "docs:serve": "docsify serve ./docs",
-    "docs:publish":
-      "gh-pages --dist docs --dotfiles --message 'chore: Publish docs'",
+    "docs:publish": "gh-pages --dist docs --dotfiles --message 'chore: Publish docs'",
     "release": "lerna publish",
     "postrelease": "yarn docs:publish"
   },
   "devDependencies": {
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-external-helpers": "^7.0.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
     "@commitlint/cli": "^7.0.0",
     "@commitlint/config-conventional": "^7.0.1",
     "@commitlint/config-lerna-scopes": "^7.0.0",
     "@commitlint/travis-cli": "^7.0.0",
-    "babel-core": "^6.26.3",
-    "babel-plugin-external-helpers": "^6.22.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.7.0",
     "chai": "^4.1.2",
     "deepmerge": "^2.1.1",
     "docsify-cli": "^4.2.1",
@@ -67,17 +68,17 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1",
+    "rollup": "^0.65.2",
     "rollup-plugin-alias": "^1.4.0",
-    "rollup-plugin-babel": "^3.0.7",
-    "rollup-plugin-commonjs": "^9.1.5",
+    "rollup-plugin-babel": "^4.0.3",
+    "rollup-plugin-commonjs": "^9.1.6",
     "rollup-plugin-json": "^3.0.0",
     "rollup-plugin-multi-entry": "^2.0.2",
     "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-node-globals": "^1.2.1",
-    "rollup-plugin-node-resolve": "^3.3.0",
-    "rollup-plugin-uglify": "^3.0.0",
+    "rollup-plugin-node-globals": "^1.3.0",
+    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup-plugin-terser": "^2.0.2",
     "tap-merge": "^0.3.1",
-    "testem": "^2.9.2"
+    "testem": "^2.10.0"
   }
 }

packages/@pollyjs/adapter-fetch/package.json

@@ -58,6 +58,6 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }

packages/@pollyjs/adapter-puppeteer/package.json

@@ -57,6 +57,6 @@
     "prettier": "^1.14.2",
     "puppeteer": "1.7.0",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }

packages/@pollyjs/adapter-xhr/package.json

@@ -57,6 +57,6 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }

packages/@pollyjs/adapter/package.json

@@ -48,6 +48,6 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }

packages/@pollyjs/cli/package.json

@@ -48,7 +48,7 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   },
   "bin": {
     "polly": "./bin/cli.js"

packages/@pollyjs/core/package.json

@@ -64,6 +64,6 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }

packages/@pollyjs/core/src/-private/request.js

@@ -4,7 +4,7 @@ import PollyResponse from './response';
 import NormalizeRequest from '../utils/normalize-request';
 import parseUrl from '../utils/parse-url';
 import serializeRequestBody from '../utils/serialize-request-body';
-import DeferredPromise from '../utils/deferred-promise';
+import defer from '../utils/deferred-promise';
 import isAbsoluteUrl from 'is-absolute-url';
 import { URL, assert, timestamp } from '@pollyjs/utils';
 import HTTPBase from './http-base';
@@ -22,14 +22,15 @@ export default class PollyRequest extends HTTPBase {
     assert('Url is required.', typeof request.url === 'string');
     assert('Method is required.', typeof request.method === 'string');
 
+    this.didRespond = false;
     this.url = request.url;
     this.method = request.method.toUpperCase();
     this.body = request.body;
     this.setHeaders(request.headers);
     this.recordingName = polly.recordingName;
     this.recordingId = polly.recordingId;
     this.requestArguments = freeze(request.requestArguments || []);
-    this.promise = new DeferredPromise();
+    this.promise = defer();
     this[POLLY] = polly;
 
     /*

packages/@pollyjs/core/src/utils/deferred-promise.js

@@ -1,16 +1,17 @@
 /**
  * Create a deferred promise with `resolve` and `reject` methods.
  */
-export default class DeferredPromise extends Promise {
-  constructor() {
-    let resolve, reject;
+export default function defer() {
+  let _resolve;
+  let _reject;
 
-    super((_resolve, _reject) => {
-      resolve = _resolve;
-      reject = _reject;
-    });
+  const promise = new Promise((resolve, reject) => {
+    _resolve = resolve;
+    _reject = reject;
+  });
 
-    this.resolve = resolve;
-    this.reject = reject;
-  }
+  promise.resolve = _resolve;
+  promise.reject = _reject;
+
+  return promise;
 }

packages/@pollyjs/core/src/utils/serialize-request-body.js

@@ -13,7 +13,9 @@ async function serialize(body) {
 
     for (const [key, value] of body.entries()) {
       if (supportsBlob && value instanceof Blob) {
-        data.push(`${key}=${await readBlob(value)}`);
+        const blobContent = await readBlob(value);
+
+        data.push(`${key}=${blobContent}`);
       } else {
         data.push(`${key}=${value}`);
       }
@@ -36,7 +38,6 @@ function readBlob(blob) {
     reader.onend = reject;
     reader.onabort = reject;
     reader.onload = () => resolve(reader.result);
-
     reader.readAsDataURL(new Blob([blob], { type: blob.type }));
   });
 }

packages/@pollyjs/core/tests/browser/unit/utils/serialize-request-body-test.js

@@ -23,24 +23,31 @@ describe('Unit | Utils | serializeRequestBody', function() {
   });
 
   it('should handle files', async function() {
-    expect(await serializeRequestBody(new File(['file'], 'file.txt'))).to.equal(
-      `data:;base64,${btoa('file')}`
-    );
+    expect(
+      await serializeRequestBody(
+        new File(['file'], 'file.txt', {
+          type: 'text/plain'
+        })
+      )
+    ).to.equal(`data:text/plain;base64,${btoa('file')}`);
   });
 
   it('should handle form-data', async function() {
     const formData = new FormData();
 
     formData.append('string', 'string');
     formData.append('array', [1, 2]);
-    formData.append('blob', new Blob(['blob']));
-    formData.append('file', new File(['file'], 'file.txt'));
+    formData.append('blob', new Blob(['blob'], { type: 'text/plain' }));
+    formData.append(
+      'file',
+      new File(['file'], 'file.txt', { type: 'text/plain' })
+    );
 
     const data = await serializeRequestBody(formData);
 
     expect(data).to.include('string=string');
     expect(data).to.include('array=1,2');
-    expect(data).to.include(`blob=data:;base64,${btoa('blob')}`);
-    expect(data).to.include(`file=data:;base64,${btoa('file')}`);
+    expect(data).to.include(`blob=data:text/plain;base64,${btoa('blob')}`);
+    expect(data).to.include(`file=data:text/plain;base64,${btoa('file')}`);
   });
 });

packages/@pollyjs/core/tests/unit/utils/deferred-promise-test.js

@@ -1,21 +1,21 @@
-import DeferredPromise from '../../../src/utils/deferred-promise';
+import defer from '../../../src/utils/deferred-promise';
 
 describe('Unit | Utils | DeferredPromise', function() {
   it('should exist', function() {
-    expect(DeferredPromise).to.be.a('function');
-    expect(new DeferredPromise().resolve).to.be.a('function');
-    expect(new DeferredPromise().reject).to.be.a('function');
+    expect(defer).to.be.a('function');
+    expect(defer().resolve).to.be.a('function');
+    expect(defer().reject).to.be.a('function');
   });
 
   it('should resolve when calling .resolve()', async function() {
-    const promise = new DeferredPromise();
+    const promise = defer();
 
     promise.resolve(42);
     expect(await promise).to.equal(42);
   });
 
   it('should reject when calling .reject()', async function() {
-    const promise = new DeferredPromise();
+    const promise = defer();
 
     promise.reject(new Error('42'));
 

packages/@pollyjs/node-server/package.json

@@ -59,6 +59,6 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }

packages/@pollyjs/persister-fs/package.json

@@ -57,6 +57,6 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }

packages/@pollyjs/persister-local-storage/package.json

@@ -55,6 +55,6 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }

packages/@pollyjs/persister-rest/package.json

@@ -56,6 +56,6 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }

packages/@pollyjs/persister/package.json

@@ -54,6 +54,6 @@
     "npm-run-all": "^4.1.3",
     "prettier": "^1.14.2",
     "rimraf": "^2.6.2",
-    "rollup": "^0.64.1"
+    "rollup": "^0.65.2"
   }
 }