From 41d14cd25a1d2dda1c4ca2e50fd0da24f00e14ee Mon Sep 17 00:00:00 2001 From: Christian Shum-Harden Date: Tue, 2 Jan 2018 10:33:35 -0800 Subject: [PATCH 1/3] (refactor) move prettier to devDependencies and update prettier (#67) --- examples/apps/log.js | 7 +++++-- package.json | 26 ++++++++++++++------------ src/createManager.js | 10 ++++------ 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/examples/apps/log.js b/examples/apps/log.js index 7e4ad5b..4d945bf 100644 --- a/examples/apps/log.js +++ b/examples/apps/log.js @@ -12,8 +12,11 @@ GPT.on(Events.SLOT_RENDER_ENDED, event => { if (!event.isEmpty && event.size) { console.log( - `ad creative '${event.creativeId}' is rendered to slot '${divId}' of size '${event - .size[0]}x${event.size[1]}'`, + `ad creative '${ + event.creativeId + }' is rendered to slot '${divId}' of size '${event.size[0]}x${ + event.size[1] + }'`, event, targeting ); diff --git a/package.json b/package.json index 4b549bf..9a221f1 100644 --- a/package.json +++ b/package.json @@ -25,14 +25,20 @@ "bugs": { "url": "https://github.com/nfl/react-gpt/issues" }, - "files": ["*.md", "docs", "es", "src", "dist", "lib"], + "files": [ + "*.md", + "docs", + "es", + "src", + "dist", + "lib" + ], "dependencies": { "deep-equal": "^1.0.1", "eventemitter3": "^2.0.2", "exenv": "^1.2.2", "hoist-non-react-statics": "^1.0.5", "invariant": "^2.2.2", - "prettier": "^1.7.0", "throttle-debounce": "^1.0.1" }, "devDependencies": { @@ -75,6 +81,7 @@ "karma-webpack": "^1.7.0", "mocha": "^3.1.2", "phantom": "^2.0.4", + "prettier": "^1.9.2", "prop-types": "^15.5.10", "querystring": "^0.2.0", "radium": "^0.18.1", @@ -100,21 +107,16 @@ "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", "build": "npm run clean && npm run compile", "build:es": "BABEL_ENV=es babel --copy-files ./src -d es", - "build:umd": - "NODE_ENV=development webpack src/index.js dist/react-gpt.js", - "build:umd:min": - "NODE_ENV=production webpack -p src/index.js dist/react-gpt.min.js", + "build:umd": "NODE_ENV=development webpack src/index.js dist/react-gpt.js", + "build:umd:min": "NODE_ENV=production webpack -p src/index.js dist/react-gpt.min.js", "bundlesize": "npm run build:umd:min && bundlesize", "clean": "rimraf lib coverage dist lib es", "compile": "babel src --out-dir lib", - "examples": - "webpack-dev-server --config examples/webpack.config.js --content-base examples/apps --inline", + "examples": "webpack-dev-server --config examples/webpack.config.js --content-base examples/apps --inline", "lint": "eslint --fix src test examples", - "start": - "npm run build && env BABEL_ENV=examples node examples/server/index.js", + "start": "npm run build && env BABEL_ENV=examples node examples/server/index.js", "pretest": "npm run build", - "prepublish": - "npm run build && npm run build:es && npm run build:umd && npm run build:umd:min", + "prepublish": "npm run build && npm run build:es && npm run build:umd && npm run build:umd:min", "test": "npm run lint && karma start", "update-apilist": "node ./scripts/updateAPIList.js" }, diff --git a/src/createManager.js b/src/createManager.js index f82c352..4b27071 100644 --- a/src/createManager.js +++ b/src/createManager.js @@ -190,12 +190,10 @@ export class AdManager extends EventEmitter { ].forEach(eventType => { ["pubads", "content", "companionAds"].forEach(service => { // there is no API to remove listeners. - this.googletag - [service]() - .addEventListener( - eventType, - this._onEvent.bind(this, eventType) - ); + this.googletag[service]().addEventListener( + eventType, + this._onEvent.bind(this, eventType) + ); }); }); this._listening = true; From 27187e0de9504088832485cfcac1758a5985f0a7 Mon Sep 17 00:00:00 2001 From: Christian Shum-Harden Date: Thu, 4 Jan 2018 10:41:41 -0800 Subject: [PATCH 2/3] (fix) remove export of createManagerTest from index (#68) * (fix) remove export of createManagerTest from index * (refactor) update bundlesize to reflect removal of mockGPT --- package.json | 2 +- src/index.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 9a221f1..ddd99f0 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "bundlesize": [ { "path": "./dist/react-gpt.min.js", - "maxSize": "10.5 kB" + "maxSize": "8.5 kB" } ] } diff --git a/src/index.js b/src/index.js index 93757c0..4495a8d 100644 --- a/src/index.js +++ b/src/index.js @@ -1,3 +1,2 @@ export {default as Bling} from "./Bling"; export {default as Events} from "./Events"; -export {createManagerTest} from "./utils/createManagerTest"; From bd753ee5496c5b677bd5805622c6968f936f9e79 Mon Sep 17 00:00:00 2001 From: Christian Shum-Harden Date: Thu, 4 Jan 2018 11:21:33 -0800 Subject: [PATCH 3/3] (release) 2.0.0 (#69) (release) 2.0.0 --- CHANGELOG.md | 19 +++++++++++++++++++ package.json | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26c829b..c268e1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ + + +## [2.0.0](https://github.com/nfl/react-gpt/compare/v1.1.1...v2.0.0) (2018-01-04) + +### Bug Fixes + +* Removed test util dependencies from distribution ([27187e0](https://github.com/nfl/react-gpt/commit/27187e0)) + +### Migration notes + +**< 2.0.0** you may have imported `createManagerTest` like this: +``` +import {createManagerTest} from "react-gpt"; +``` +**>= 2.0.0** you now need to import `createManagerTest` like this: +``` +import {createManagerTest} from "react-gpt/es/utils/createManagerTest"; +``` + ## [1.1.1](https://github.com/nfl/react-gpt/compare/v1.0.1...v1.1.1) (2017-11-08) diff --git a/package.json b/package.json index ddd99f0..b254f36 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-gpt", - "version": "1.1.1", + "version": "2.0.0", "description": "A react display ad component using Google Publisher Tag", "main": "lib/index.js", "jsnext:main": "es/index.js",