Skip to content

Commit

Permalink
chore(merge): merge remote into local
Browse files Browse the repository at this point in the history
  • Loading branch information
mxdvl committed Oct 7, 2020
2 parents aecfa73 + aef6e58 commit 72c9993
Show file tree
Hide file tree
Showing 12 changed files with 655 additions and 597 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: TOC Generator
uses: technote-space/toc-generator@v2.4.0
uses: technote-space/toc-generator@v2.5
with:
TOC_TITLE: '## Table of contents'
MAX_HEADER_LEVEL: 3
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [0.6.0](https://github.com/guardian/commercial-core/compare/v0.5.0...v0.6.0) (2020-09-29)


### Features

* **facebook pixel:** actually export it ([c825e76](https://github.com/guardian/commercial-core/commit/c825e76d13e2f230f28d5d12831c21a358a84b53))

# [0.5.0](https://github.com/guardian/commercial-core/compare/v0.4.0...v0.5.0) (2020-09-29)


### Features

* **third party tags:** add facebook pixel ([8ebc439](https://github.com/guardian/commercial-core/commit/8ebc4392adde8ab34d3f24c599a9910e8ea4d402))

# [0.4.0](https://github.com/guardian/commercial-core/compare/v0.3.0...v0.4.0) (2020-09-25)


Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@guardian/commercial-core",
"version": "0.4.0",
"version": "0.6.0",
"description": "Guardian advertising business logic",
"homepage": "https://github.com/guardian/commercial-core#readme",
"bugs": {
Expand Down Expand Up @@ -49,8 +49,8 @@
}
},
"devDependencies": {
"@commitlint/cli": "^9.1.2",
"@commitlint/config-conventional": "^9.1.2",
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/git": "^9.0.0",
"@semantic-release/github": "^7.1.1",
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export { ias } from './third-party-tags/ias';
export { permutive } from './third-party-tags/permutive';
export { inizio } from './third-party-tags/inizio';
export { fbPixel } from './third-party-tags/facebook-pixel';
13 changes: 13 additions & 0 deletions src/third-party-tags/facebook-pixel.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { fbPixel } from './facebook-pixel';

describe('fbPixel', () => {
it('should use the feature switch option', () => {
expect(fbPixel({ shouldRun: true })).toStrictEqual({
shouldRun: true,
url:
'https://www.facebook.com/tr?id=279880532344561&ev=PageView&noscript=1',
name: 'fb',
useImage: true,
});
});
});
8 changes: 8 additions & 0 deletions src/third-party-tags/facebook-pixel.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { GetThirdPartyTag } from '../types';

export const fbPixel: GetThirdPartyTag = ({ shouldRun }) => ({
shouldRun,
url: `https://www.facebook.com/tr?id=279880532344561&ev=PageView&noscript=1`,
name: 'fb',
useImage: true,
});
4 changes: 2 additions & 2 deletions src/third-party-tags/ias.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { ias } from './ias';

describe('index', () => {
describe('ias', () => {
it('should use the feature swtich option', () => {
expect(ias({ shouldRun: true })).toStrictEqual({
shouldRun: true,
url: '//cdn.adsafeprotected.com/iasPET.1.js',
sourcepointId: '5e7ced57b8e05c485246ccf3',
name: 'ias',
});
});
});
2 changes: 1 addition & 1 deletion src/third-party-tags/ias.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import { GetThirdPartyTag } from '../types';
export const ias: GetThirdPartyTag = ({ shouldRun }) => ({
shouldRun,
url: '//cdn.adsafeprotected.com/iasPET.1.js',
sourcepointId: '5e7ced57b8e05c485246ccf3',
name: 'ias',
});
4 changes: 2 additions & 2 deletions src/third-party-tags/permutive.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { permutive } from './permutive';

describe('index', () => {
describe('permutive', () => {
it('should use the feature swtich option', () => {
expect(permutive({ shouldRun: true })).toStrictEqual({
shouldRun: true,
url: '//cdn.permutive.com/d6691a17-6fdb-4d26-85d6-b3dd27f55f08-web.js',
sourcepointId: '5eff0d77969bfa03746427eb',
name: 'permutive',
});
});
});
2 changes: 1 addition & 1 deletion src/third-party-tags/permutive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import { GetThirdPartyTag } from '../types';
export const permutive: GetThirdPartyTag = ({ shouldRun }) => ({
shouldRun,
url: '//cdn.permutive.com/d6691a17-6fdb-4d26-85d6-b3dd27f55f08-web.js',
sourcepointId: '5eff0d77969bfa03746427eb',
name: 'permutive',
});
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export type ThirdPartyTag = {
loaded?: boolean;
onLoad?: () => void;
shouldRun: boolean;
sourcepointId?: string;
name?: string;
url?: string;
useImage?: boolean;
};
Expand Down
Loading

0 comments on commit 72c9993

Please sign in to comment.