Skip to content

Commit

Permalink
Merge pull request #34 from SpringRoll/release/3.2.0
Browse files Browse the repository at this point in the history
Release/3.2.0
  • Loading branch information
chipbell4 authored Feb 7, 2020
2 parents e1214fd + cd8f363 commit eb75009
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 101 deletions.
2 changes: 1 addition & 1 deletion dist/bellhop-umd.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/bellhop.js.map

Large diffs are not rendered by default.

99 changes: 12 additions & 87 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bellhop-iframe",
"version": "3.1.0",
"version": "3.2.0",
"main": "dist/bellhop.js",
"module": "dist/bellhop.js",
"browser": "dist/bellhop.js",
Expand All @@ -25,13 +25,13 @@
"karma-requirejs": "^1.1.0",
"karma-webpack": "^4.0.2",
"mocha": "^6.2.2",
"prettier": "^1.19.1",
"requirejs": "^2.3.6",
"rollup": "^1.27.5",
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-eslint": "^7.0.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-prettier": "^0.6.0",
"rollup-plugin-terser": "^5.1.2",
"sinon": "^7.5.0",
"uglify": "^0.1.5",
Expand All @@ -47,6 +47,7 @@
"scripts": {
"build": "rollup -c -m",
"dev": "rollup -c -w",
"format": "prettier --write src/*.js",
"test": "karma start karma.conf.js",
"github-test": "karma start --single-run --browsers ChromeHeadless"
},
Expand Down
8 changes: 2 additions & 6 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import { eslint }from 'rollup-plugin-eslint';
import prettier from 'rollup-plugin-prettier';
import { terser } from 'rollup-plugin-terser';
import { terser } from 'rollup-plugin-terser';
import babel from 'rollup-plugin-babel';

const prettierConfig = require('./.prettierrc');

const plugins = [
eslint(),
prettier(prettierConfig),
resolve({
mainFields: ["module", "jsnext:main", "main", "browser"],
mainFields: ['module', 'jsnext:main', 'main', 'browser'],
preferBuiltins: false
}),
commonjs(),
Expand Down
11 changes: 7 additions & 4 deletions src/Bellhop.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ export class Bellhop extends BellhopEventDispatcher {
* @private
*/
this.receive = this.receive.bind(this);

}

/**
Expand Down Expand Up @@ -122,7 +121,6 @@ export class Bellhop extends BellhopEventDispatcher {
}
}
if (this.connected && 'object' === typeof data && data.type) {

this.trigger(data);
}
return;
Expand Down Expand Up @@ -288,7 +286,7 @@ export class Bellhop extends BellhopEventDispatcher {
/**
* @ignore
*/
const internalCallback = async function (event) {
const internalCallback = async function(event) {
if (runOnce) {
bellhop.off(event, internalCallback);
}
Expand All @@ -310,7 +308,12 @@ export class Bellhop extends BellhopEventDispatcher {
if (this.debug && typeof this.debug === 'function') {
this.debug({ isChild: this.isChild, received: false, message: message });
} else if (this.debug) {
console.log(`Bellhop Instance (${this.isChild ? 'Child' : 'Parent'}) ${received ? 'Receieved' : 'Sent'}`, message);
console.log(
`Bellhop Instance (${this.isChild ? 'Child' : 'Parent'}) ${
received ? 'Receieved' : 'Sent'
}`,
message
);
}
}

Expand Down

0 comments on commit eb75009

Please sign in to comment.