Skip to content

Commit 30b6be7

Browse files
Julio Farahparlato-segmentnettofarahdanieljackins
authored
Fetch updates from upstream (#18)
* [PD-378] Remove google_cm param from DCF match tag (#514) * remove google_cm param from dcf match tag * remove additional unused params * bump version and update history to force publish (#516) * add not about reinforcing cc (#518) * Update README.md * Remove unnecessary code (#2) * Individual deploys (#1) * Fix yellowhammer integration * Compile integrations individually * Adapt to old js syntax * Setup dev server * Update paths * bump node version * remove weird check against improvements :sweat-smile: * trigger deploy * remove circle config * trigger buildkite * kick off ci * publish on merge to master * test upload to s3 * not really sure what Im doing * booo * upgrade cache * set permissions * add saucelabs back * add segment buildkite image * add to docker plugin * Use correct build folder * remove docker plugin * Better optimized common chunks * Module optimizations * use app role * remove unnecessary step Co-authored-by: Netto Farah <[email protected]> Co-authored-by: Daniel Jackins <[email protected]> * Add source maps and dev command * Skip chunks for now * Add typescript support to webpack (#3) * Setup webpack typescript * fix errors * target es5 * Fix the upload to s3 script (#4) * move aws sdk to dev dependencies * upload script ts -> js * only run upload to s3 on master * Upload integrations to cdn.segment.build (#6) * new build * test on branch * debug * fix path * public read uploaded objects * gzip files * fix suffix * try diff path * test * fix gz * back to master * add comment * Upgrade facade to a more efficient version (#8) * Build assets in Production mode * Add integration versions (#9) * test * temp disable lint * test * fix * debug * bk branch * fix branch * test versions * fix maps * change filename * test diff version * reenable linters * remove redundant build step * upload manifest file (#10) * upload manifest file * disable lint * upload all branches * type * correct file * promise * Revert "upload manifest file (#10)" (#11) This reverts commit 9362ada. * Revert "Revert "upload manifest file (#10)" (#11)" (#13) This reverts commit 4c47483. * gzip manifest file (#14) * compress * sync * Fix asset caching and content type (#15) * Break code into semantic blocks * Do not cache manifest and latest * Use proper content type * Webpack chunks (#17) * Use same version of analytics.js-integration * Use split chunks * Add common chunk dep * Skip commons * Fix filename * Fix another stupid mistake * Also upload vendor * Remove stupid linter rules * Better lint config * Only set js dependencies * Use new manifest format * Build and upload deps * Ship gzipped Co-authored-by: parlato-segment <[email protected]> Co-authored-by: Netto Farah <[email protected]> Co-authored-by: Netto Farah <[email protected]> Co-authored-by: Daniel Jackins <[email protected]> Co-authored-by: dsjackins <[email protected]>
1 parent 954e59f commit 30b6be7

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

Diff for: .github/PULL_REQUEST_TEMPLATE.md

+12
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@
55
**Are there breaking changes in this PR?**
66

77

8+
**Testing**
9+
<!---
10+
11+
All PRs must follow the process for change control as outlined in:
12+
https://segment.atlassian.net/wiki/spaces/GRC/pages/453935287/Reinforcing+Change+Control
13+
14+
- Testing completed successfully using <how did you test, environment>; or
15+
- Testing not required because <explain why you think testing isn't needed>
16+
17+
--->
18+
19+
820
**Any background context you want to provide?**
921

1022

Diff for: integrations/doubleclick-floodlight/HISTORY.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.5.3 / 2020-09-22
2+
==================
3+
4+
* remove google_cm param from dcf match tag
5+
* remove additional unused params
6+
17
1.5.2 / 2020-05-29
28
==================
39

Diff for: integrations/doubleclick-floodlight/lib/index.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var Floodlight = (module.exports = integration('DoubleClick Floodlight')
3131
)
3232
.tag(
3333
'doubleclick id',
34-
'<img src="//cm.g.doubleclick.net/pixel?google_cm&google_nid={{ googleNetworkId }}&segment_write_key={{ segmentWriteKey }}&user_id={{ userId }}&anonymous_id={{ anonymousId }}&google_hm={{ partnerProvidedId }}"/>'
34+
'<img src="//cm.g.doubleclick.net/pixel?google_nid={{ googleNetworkId }}&segment_write_key={{ segmentWriteKey }}&google_hm={{ partnerProvidedId }}"/>'
3535
));
3636

3737
/**
@@ -49,9 +49,6 @@ Floodlight.prototype.initialize = function() {
4949
this.load('doubleclick id', {
5050
googleNetworkId: this.options.googleNetworkId,
5151
segmentWriteKey: this.options.segmentWriteKey,
52-
// TODO: handle userId being nulls/undefined.
53-
userId: this.analytics.user().id(),
54-
anonymousId: this.analytics.user().anonymousId(),
5552
// Hosted match table id https://developers.google.com/authorized-buyers/rtb/cookie-guide#match-table
5653
partnerProvidedId: btoa(this.analytics.user().anonymousId())
5754
});

Diff for: integrations/doubleclick-floodlight/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@segment/analytics.js-integration-doubleclick-floodlight",
33
"description": "The DoubleClick Floodlight analytics.js integration.",
4-
"version": "1.5.2",
4+
"version": "1.5.3",
55
"keywords": [
66
"analytics.js",
77
"analytics.js-integration",

0 commit comments

Comments
 (0)